From d1a465329fbea95ae245fef8fd6b008fc64c61a2 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 2 Jul 2018 10:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E7=9A=84action=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=96=E8=87=AA=E7=B3=BB=E7=BB=9F=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp  | 6 +++++-
 .../webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp     | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp  | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp    | 6 +++++-
 .../webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp     | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp   | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp   | 6 +++++-
 .../WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp     | 6 +++++-
 .../webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp     | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp       | 6 +++++-
 .../views/cfg/maintenance/ipMultiplexPool/form.jsp        | 8 ++++++--
 .../WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp  | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp     | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp    | 6 +++++-
 src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp     | 6 +++++-
 15 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index def6f3b1c..46b59a6f2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -119,7 +119,11 @@ $(function(){
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 505cfe894..fcdf5a1eb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -119,7 +119,11 @@ $(function(){
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index d914f040b..066894bb4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -119,7 +119,11 @@ $(function(){
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index 98a70bdff..5b1bbe33c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -185,7 +185,11 @@ $(function(){
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 2428095d1..2a3666e2a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -127,7 +127,11 @@ $(function(){
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index a69cb64b0..d3ab43966 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -195,7 +195,11 @@ $(function(){
 							                		<c:if test="${_cfg.functionId eq service.functionId}">
 							                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
 									            			<c:if test="${_cfg.action==service.action}">checked</c:if>>
-									            			<spring:message code="${service.actionCode }"/>
+									            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 							                		</c:if>
 							            		</label>
 							            	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index 3822f4655..f77226d5f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -131,7 +131,11 @@ $(function(){
 							                		<c:if test="${_cfg.functionId eq service.functionId}">
 							                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
 									            			<c:if test="${_cfg.action==service.action}">checked</c:if>>
-									            			<spring:message code="${service.actionCode }"/>
+									            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 							                		</c:if>
 							            		</label>
 							            	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index b3c711f6b..1de074962 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -90,7 +90,11 @@ $(function(){
 							                		<c:if test="${_cfg.functionId eq service.functionId}">
 							                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
 									            			<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-									            			<spring:message code="${service.actionCode }"/>
+									            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 							                		</c:if>
 							            		</label>
 							            	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index 693c998cd..e2c240085 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -152,7 +152,11 @@
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index 1cdb4fcf9..b60ee306e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -158,7 +158,11 @@
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index 7bf8bc050..ee38708a2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -82,7 +82,11 @@ $(function(){
 																serviceId="${service.serviceId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
@@ -99,7 +103,7 @@ $(function(){
 								            <div class="col-md-6">
 								                <select name="ipType"
 													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+													<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="ipTypeC">
 														<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
 													</c:forEach>
 												</select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index 52a8d34e2..09daa3d30 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -217,7 +217,11 @@
 																					protocolId="${service.protocolId }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-																				<spring:message code="${service.actionCode }" />
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
 																			</c:if>
 																		</label>
 																	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 2f856fb55..b2c4b512b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -152,7 +152,11 @@
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index 08d7c210a..69c518fb6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -218,7 +218,11 @@
 																					protocolId="${service.protocolId }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-																				<spring:message code="${service.actionCode }" />
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
 																			</c:if>
 																		</label>
 																	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index b92776acc..6c6105ec0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -152,7 +152,11 @@
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>