From 94565252ef3b89668e058bb687f15d1741a8d595 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 29 Aug 2018 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=E5=92=8Capp=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=88=86=E7=B1=BB=20=E5=A2=9E=E5=8A=A0=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E5=92=8C=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?subscribe=E5=9B=BD=E9=99=85=E5=8C=96=20=E6=A0=B7=E4=BE=8B?=
 =?UTF-8?q?=E5=92=8Chttps=E5=A2=9E=E5=8A=A0compileId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specific/SpecificServiceCfgController.java     |  2 +-
 src/main/resources/messages/message_en.properties  |  6 +++++-
 .../resources/messages/message_zh_CN.properties    |  8 ++++++--
 .../webapp/WEB-INF/views/cfg/av/fileSampleList.jsp |  9 +++++++--
 .../WEB-INF/views/cfg/intercept/interceptForm.jsp  | 14 +++++++-------
 .../WEB-INF/views/cfg/intercept/interceptList.jsp  |  6 +++---
 .../views/cfg/proxy/control/httpRedirectList.jsp   |  5 +++++
 .../WEB-INF/views/cfg/whitelist/domianSubList.jsp  |  6 +++---
 .../views/log/manipulation/dkBehaviorList.jsp      |  2 +-
 .../views/specific/specificServiceCfgForm.jsp      |  2 +-
 .../views/specific/specificServiceCfgList.jsp      |  2 +-
 src/main/webapp/static/pages/scripts/pageLogs.js   |  2 +-
 12 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
index 4335b9050..00772e7b8 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -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) {
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 7ad6fdead..a38f92b0c 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -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
\ No newline at end of file
+limit_rate_type=Limit Rate Type
+business_type=Business Type
+topic=Topic
+website_server=Website Server
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 631ddda14..1a7d7d283 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -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
\ No newline at end of file
+limit_rate_type=\u9650\u901F\u65B9\u5F0F
+business_type=\u4E1A\u52A1\u5206\u7C7B
+topic=\u4E3B\u9898
+website_server=\u7F51\u7AD9
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 23bdce097..769c339b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -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 }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index bcfdbec73..b96e4d1cd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -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">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 013117b86..31688ca5c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -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">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 1b63b8818..d88d1d8d1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -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">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
index 9c1a82e0c..797772d37 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 45b140820..0be7f8d43 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 023e65a5b..2b6b4db90 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index 70f685760..ee5fdc4d1 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -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>
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index d42f8929a..0fb0c97da 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -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');
 				}