gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志的展示宽度判断调整

Browse Source 
特定服务中的基础协议和app协议的分类使用同一个分类
增加特定服务和白名单subscribe国际化
样例和https增加compileId查询条件
This commit is contained in:
duandongmei
2018-08-29 15:32:06 +08:00
parent ae08baa54a
commit 94565252ef
12 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -215,7 +215,7 @@ public class SpecificServiceCfgController extends BaseController {
if(cfgType==1) {
businessTypeList=DictUtils.getDictList("APP_BUSINESS_TYPE");
}else if(cfgType==3) {
businessTypeList=DictUtils.getDictList("BASIC_PROTOCOL_BUSINESS_TYPE");
businessTypeList=DictUtils.getDictList("APP_BUSINESS_TYPE");
}
List<Map<String, Object>> businessList = Lists.newArrayList();
for(SysDataDictionaryItem dict:businessTypeList) {

6
src/main/resources/messages/message_en.properties
View File

@@ -1071,6 +1071,7 @@ website=Website
p2p_ip_config_type=IP Config Type
p2p_hash_type=Hash Type
NTC_SUBSCRIBE_ID=Certification Mark Configuration
WHITE_LIST_SUBSCRIBE_ID=Certification Mark Configuration
app_header_config=APP Header Feature
app_ssl_config=APP SSL Cert Feature
@@ -1125,4 +1126,7 @@ header=Header
layer=Layer
can_not_delete_issued_asn_group=Can not delete issued ASN group
bandwith=Bandwith
limit_rate_type=Limit Rate Type
limit_rate_type=Limit Rate Type
business_type=Business Type
topic=Topic
website_server=Website Server

8
src/main/resources/messages/message_zh_CN.properties
View File

@@ -807,7 +807,7 @@ av_voip_account=VoIP\u8D26\u53F7\u914D\u7F6E
av_cont_ip=\u5185\u5BB9IP\u914D\u7F6E
NTC_SSL_SNI=SNI\u5173\u952E\u5B57\u914D\u7F6E
NTC_SSL_SAN=SAN\u5173\u952E\u5B57\u914D\u7F6E
NTC_SSL_CA=CN\u5173\u952E\u5B57\u914D\u7F6E
NTC_SSL_CN=CN\u5173\u952E\u5B57\u914D\u7F6E
av_pic_ip=\u56FE\u7247IP\u914D\u7F6E
av_cont_url=\u5185\u5BB9URL\u914D\u7F6E
av_pic_url=\u56FE\u7247URL\u914D\u7F6E
@@ -1069,6 +1069,7 @@ website=\u7F51\u7AD9\u57DF\u540D
p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B
p2p_hash_type=HASH\u7C7B\u578B
NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
WHITE_LIST_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
app_header_config=APP\u5C42\u5934\u7279\u5F81
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
@@ -1122,4 +1123,7 @@ header=\u5173\u952E\u5B57
layer=\u5339\u914D\u533A\u57DF
can_not_delete_issued_asn_group=\u4E0D\u80FD\u5220\u9664\u5DF2\u7ECF\u4E0B\u53D1\u8FC7\u7684ASN\u5206\u7EC4
bandwith=\u5E26\u5BBD
limit_rate_type=\u9650\u901F\u65B9\u5F0F
limit_rate_type=\u9650\u901F\u65B9\u5F0F
business_type=\u4E1A\u52A1\u5206\u7C7B
topic=\u4E3B\u9898
website_server=\u7F51\u7AD9

9
src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
View File

@@ -8,6 +8,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
@@ -96,6 +98,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
</form:select>
</div>
@@ -266,10 +269,11 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="src_file"/></th>
<th><spring:message code="sample_file"/></th>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
@@ -291,6 +295,8 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>${indexCfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>
<a href="${cfg.srcUrl }" data-original-title="${cfg.srcUrl }" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -303,7 +309,6 @@
${fn:substring(cfg.sampleUrl,0,20) }
</a>
</td>
<td>${cfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">

14
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -267,20 +267,20 @@
</div>
<%-- action 为64 限速时 可以选择证书--%>
<div class="row ratelimitAction hidden">
<div class="col-md-6">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="limit_rate_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio"
name="userRegion1" value="0"
<c:if test="${(userRegion1 eq 0) || (empty userRegion1)}">
<%-- <c:if test="${(userRegion1 eq 0) || (empty userRegion1)}"> --%>
checked
</c:if>
<%-- </c:if> --%>
class="required" >
<spring:message code="ratelimit" />
</label>
<label class="radio-inline">
<%-- <label class="radio-inline">
<input type="radio"
name="userRegion1" value="1"
<c:if test="${(userRegion1 eq 1)}">
@@ -288,7 +288,7 @@
</c:if>
class="required" >
<spring:message code="bandwith" />
</label>
</label> --%>
</div>
<div for="userRegion1"></div>
</div>
@@ -302,7 +302,7 @@
<div for="userRegion2"></div>
</div>
</div>
<div class="col-md-6 bandwith">
<%-- <div class="col-md-6 bandwith">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="bandwith"/></label>
<div class="col-md-6">
@@ -310,7 +310,7 @@
</div>
<div for="userRegion3"></div>
</div>
</div>
</div> --%>
</div>
<%--action 为80 替换时 可以选择替换动作--%>
<div class="row replaceAction hidden">

6
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -316,7 +316,7 @@
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="ratelimit"/></th>
<th><spring:message code="bandwith"/></th>
<%-- <th><spring:message code="bandwith"/></th> --%>
<th><spring:message code="certificate"/></th>
<c:if test="${interceptType eq 'Ip' }">
<th><spring:message code="replace_zone"/></th>
@@ -355,11 +355,11 @@
${indexCfg.userRegion2 }
</c:if>
</td>
<td>
<%-- <td>
<c:if test="${indexCfg.action eq 64}">
${indexCfg.userRegion3 }
</c:if>
</td>
</td> --%>
<td>
<c:if test="${indexCfg.action eq 1}">
<c:forEach items="${certificateList}" var="certificate">

5
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -9,6 +9,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
@@ -320,6 +322,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
@@ -500,6 +503,7 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th>
<c:if test="${action == 16}">
@@ -541,6 +545,7 @@
<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
</td>
<td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

6
src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
View File

@@ -127,11 +127,11 @@
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
<label><spring:message code='domain' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
</div>
</div>
</div>
<div class="row">
<%-- <div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='expression_type' />:</label>
@@ -167,7 +167,7 @@
</label>
</div>
</div>
</div>
</div> --%>
</div>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
View File

@@ -176,7 +176,7 @@ $(document).ready(function(){
<th><spring:message code='found_time'/></th>
<th><spring:message code='entrance'/></th>
<th><spring:message code='behavior_protocol'/></th>
<th><spring:message code='basic_protocol'/></th>
<th><spring:message code='os_type'/></th>
<th><spring:message code='browser_type'/></th>
<th><spring:message code='behaviour_type'/></th>

2
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -254,7 +254,7 @@
</div>
</c:if>
<c:if test="${dict.itemCode==3}">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="basic_protocol_business_type"/>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="APP_BUSINESS_TYPE"/>:</label>
<div class="col-md-4">
<select id="businessType3" name="businessType" class="form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>

2
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -242,7 +242,7 @@
</c:forEach>
</c:if>
<c:if test="${specificServiceCfg.cfgType==3}">
<c:forEach items="${fns:getDictList('BASIC_PROTOCOL_BUSINESS_TYPE') }" var="dict">
<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE') }" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}'/></form:option>
</c:forEach>
</c:if>

2
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -24,7 +24,7 @@ $(document).ready(function() {
$("table.logTb tbody tr").each(function(){
$(this).find("td").each(function(i){
var tdText = this.innerText;
if((tdText.trim().length > thText.trim().length) && j==i && tdText.trim().length>7){
if((tdText.trim().length > thText.trim().length) && j==i){
var px = getPixelsCount(thText,fontSize)+100;
th.setAttribute('width',px+'px');
}