From d661438afdfb9ba9411fd09ac58368579ed17e7d Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 30 Aug 2018 19:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9E=84=E5=8C=96?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=92=8C=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F?=
 =?UTF-8?q?=E6=84=9F=E8=8B=B1=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  | 10 ++-
 ...pPolicyIpList.jsp => appPolicySubList.jsp} |  0
 .../{ipList.jsp => basicProtocolSubList.jsp}  |  0
 .../{ipList.jsp => encrypedTunnelSubList.jsp} |  0
 .../cfg/fileTransfer/fileDigestSubList.jsp    | 86 ++++++++++++++++---
 5 files changed, 82 insertions(+), 14 deletions(-)
 rename src/main/webapp/WEB-INF/views/cfg/app/{appPolicyIpList.jsp => appPolicySubList.jsp} (100%)
 rename src/main/webapp/WEB-INF/views/cfg/basicprotocol/{ipList.jsp => basicProtocolSubList.jsp} (100%)
 rename src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/{ipList.jsp => encrypedTunnelSubList.jsp} (100%)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 93faa095e..6e6063b83 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1046,9 +1046,9 @@ tunnel_name=Tunnel Behavior Name
 tunnel_desc=Tunnel Behavior Description
 call_external_procedures_failed=Call external procedures failed
 is_hex=Is HEX
-is_case_insenstive=Is Case-senstive
+is_case_insenstive=Is Case-sensitive
 case_senstive=Case-senstive
-case_insenstive=Case-insenstive
+case_insenstive=Case-insensitive
 hex=Hex
 not_hex=Not HEX
 
@@ -1086,7 +1086,7 @@ certificate=Certificate
 do_log=Do Log
 no_log=Not Do Log
 all_log=Log All Logs
-framework_log=Only Framework Logs
+framework_log=Structured Logs
 
 file_strategy=File Strategy
 file_desc=File Desc
@@ -1130,4 +1130,6 @@ limit_rate_type=Limit Rate Type
 business_type=Business Type
 topic=Topic
 website_server=Website Server
-domain_existed=Domain Has Existed
\ No newline at end of file
+domain_existed=Domain Has Existed
+app_ssl_cert_feature_monit=APP SSL Cert Feature Monitoring
+app_header_feature_monit=APP Header Feature Monitoring
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp
rename to src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/cfg/basicprotocol/ipList.jsp
rename to src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/ipList.jsp
rename to src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
index 6d2d6a00c..cc35726c1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
@@ -11,6 +11,18 @@
 </style>
 </head>
 
+<c:if test="${fn:length(tabList)==0}">
+	<div id="NTC_UNIVERSAL_IPInfo${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+					<spring:message code='no_data' />
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
+
 <c:forEach items="${tabList}" var="region" varStatus="regionStatus">
 	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
 		class="col-md-1 tabInfo" name="tabTitle${index }">
@@ -58,18 +70,72 @@
 							</div>
 						</div>
 					</div>
-					<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label><spring:message code='whether_hexbinary' />:</label>
-								<label>
-									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
-									</c:forEach>
-								</label>
+					<c:if test="${cfg.isHexbin==0 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
 							</div>
 						</div>
-					</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
 				</div>
 			</c:if>
 		</c:forEach>