Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>