From 316e9c8c81443783e4bd542988c04f6e8b6c8a9c Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 13 Jul 2018 19:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96code=E4=BD=BF=E7=94=A8null=5Fexpress?=
 =?UTF-8?q?ion=E5=92=8Cand=5Fexpression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/form/complexInfo.jsp      | 4 ++--
 .../webapp/WEB-INF/include/form/multiple/complexInfo.jsp  | 4 ++--
 src/main/webapp/WEB-INF/include/form/stringInfo.jsp       | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp  | 4 ++--
 .../webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp     | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp  | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp      | 8 ++++----
 .../webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp   | 4 ++--
 .../webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp     | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp   | 4 ++--
 .../views/cfg/proxy/control/httpReqReplaceList.jsp        | 4 ++--
 .../views/cfg/proxy/control/httpResReplaceList.jsp        | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp       | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index 7fa979b4e..47e719cb8 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -29,12 +29,12 @@
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1" class="required"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		><spring:message code="and"/>
+            		><spring:message code="and_expression"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="0" class="required"
             			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		><spring:message code="null"/>
+            		><spring:message code="null_expression"/>
             	</label>
             </div>
             <div for="exprType"></div>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
index f685d1225..820270308 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
@@ -62,12 +62,12 @@ $(function(){
          	<label class="radio-inline">
            		<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="1"
            			<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==1}">checked</c:if>
-           		class="required"/><spring:message code="and"/>
+           		class="required"/><spring:message code="and_expression"/>
            	</label>
            	<label class="radio-inline">
            		<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="0"
            			<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==0}">checked</c:if>
-           		class="required"/><spring:message code="null"/>
+           		class="required"/><spring:message code="null_expression"/>
            	</label>
             </div>
 	        <div for="complexCfg[${tableInfo.tableName}].exprType"></div>
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index d0c93067d..38cf7c87b 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -36,12 +36,12 @@
 	            	<label class="radio-inline">
 	            		<input type="radio" name="exprType" value="1" class="required"
 	            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-	            		><spring:message code="and"/>
+	            		><spring:message code="and_expression"/>
 	            	</label>
 	            	<label class="radio-inline">
 	            		<input type="radio" name="exprType" value="0" class="required"
 	            			<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
-	            		><spring:message code="null"/>
+	            		><spring:message code="null_expression"/>
 	            	</label>
 	            </div>
 	            <div for="exprType"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index 51da0a42c..856a6d167 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -304,8 +304,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 693f427c8..e575f20ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -304,8 +304,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index ffa2412bd..ceaec9d2d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -311,8 +311,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index 1d3326ae7..b2166547b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -180,12 +180,12 @@ $(function(){
 										            	<label class="radio-inline">
 										            		<input type="radio" class="required" name="strFeaturesCfgList[${index1}].exprType" value="1"
 										            		<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==1}">checked</c:if>
-										            		><spring:message code="and"/>
+										            		><spring:message code="and_expression"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" class ="required" name="strFeaturesCfgList[${index1}].exprType" value="0"
 										            		<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==0}">checked</c:if>
-										            		><spring:message code="null"/>
+										            		><spring:message code="null_expression"/>
 										            	</label>
 										            </div>
 										            <div for="exprType"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index c168fe4e2..808a5d6a1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -66,12 +66,12 @@ $(function(){
 										            	<label class="radio-inline">
 										            		<input type="radio" class="required" name="strFeaturesCfgList[${index1}].exprType" value="1"
 										            		<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==1}">checked</c:if>
-										            		><spring:message code="and"/>
+										            		><spring:message code="and_expression"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" class ="required" name="strFeaturesCfgList[${index1}].exprType" value="0"
 										            		<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==0}">checked</c:if>
-										            		><spring:message code="null"/>
+										            		><spring:message code="null_expression"/>
 										            	</label>
 										            </div>
 										            <div for="exprType"></div>
@@ -158,12 +158,12 @@ $(function(){
 										            	<label class="radio-inline">
 										            		<input type="radio" class="required" name="complexFeaturesList[${index2}].exprType" value="1"
 										            		<c:if test="${_cfg.complexFeaturesList[index2].exprType==1}">checked</c:if>
-										            		><spring:message code="and"/>
+										            		><spring:message code="and_expression"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" class="required" name="complexFeaturesList[${index2}].exprType" value="0"
 										            		<c:if test="${_cfg.complexFeaturesList[index2].exprType==0}">checked</c:if>
-										            		><spring:message code="null"/>
+										            		><spring:message code="null_expression"/>
 										            	</label>
 										            </div>
 										            <div for="exprType"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index b3b673464..3272f4721 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -310,8 +310,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 625bc12c1..47a5ed4d8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -311,8 +311,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 333222b1a..e61b261ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -181,12 +181,12 @@
 										            	<label class="radio-inline">
 										            		<input type="radio" name="exprType" value="1" class="required"
 										            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-										            		><spring:message code="and"/>
+										            		><spring:message code="and_expression"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" name="exprType" value="0" class="required"
 										            			<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
-										            		><spring:message code="null"/>
+										            		><spring:message code="null_expression"/>
 										            	</label>
 										            </div>
 										            <div for="exprType"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 521fea4af..4d9ee0ff2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -299,8 +299,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index f639b64db..164d36ff2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -299,8 +299,8 @@
 				               			</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
+										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
+										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index c2980bef4..85b76ac44 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -49,12 +49,12 @@ $(function(){
 				<label class="radio-inline"> <input type="radio"
 					name="${cfgName}.exprType" value="1"
 					class="required" <c:if test="${strCfg.exprType==1}">checked</c:if>>
-					<spring:message code="and" />
+					<spring:message code="and_expression" />
 				</label> <label class="radio-inline"> <input type="radio"
 					name="${cfgName}.exprType" value="0"
 					class="required"
 					<c:if test="${strCfg.exprType==0 || strCfg.exprType==null}">checked</c:if>>
-					<spring:message code="null" />
+					<spring:message code="null_expression" />
 				</label>
 			</div>
 			<div for="${cfgName}.exprType"></div>