From 39840855029a61a38f5b76fae733e4f8df7099f4 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 9 Aug 2018 17:57:13 +0800
Subject: [PATCH] =?UTF-8?q?Advanced=20APP=20protocol=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=AD=90=E4=B8=B2=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp  | 4 +++-
 .../webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp     | 6 ++++--
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp  | 8 +++++---
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp      | 4 ++--
 5 files changed, 16 insertions(+), 10 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 01e1e3510..c86cfddb2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -96,6 +96,7 @@ $(function(){
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
+                          <div class="row">
                           <!-- desc and action -->
                               <div class="row">
                               		<div class="col-md-6">
@@ -194,7 +195,7 @@ $(function(){
 												<select name="matchMethod"
 													class="selectpicker select2 form-control required">
 													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 													</c:forEach> 
 												</select>
 											</div>
@@ -220,6 +221,7 @@ $(function(){
 										</div>
 									</div>
 								</div>   --%>
+							</div>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
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 8e979c3ff..1ef3e48c7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -111,6 +111,7 @@ $(function(){
 										</div>
 								   </div>
 								</div>
+								<div class="row">
 								 <div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -180,7 +181,7 @@ $(function(){
 												<select name="matchMethod"
 													class="selectpicker select2 form-control required">
 													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 													</c:forEach> 
 												</select>
 											</div>
@@ -198,7 +199,7 @@ $(function(){
 												<select name="isHexbin"
 													class="selectpicker select2 form-control required">
 													<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
 													</c:forEach>
 												</select>
 											</div>
@@ -206,6 +207,7 @@ $(function(){
 										</div>
 									</div>
 								</div>  
+							</div>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
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 67924e142..bb9e03705 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -111,6 +111,7 @@ $(function(){
 										</div>
 								   </div>
 								</div>
+								<div class="row">
 								 <div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -205,7 +206,7 @@ $(function(){
 												<select name="matchMethod"
 													class="selectpicker select2 form-control required">
 													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 													</c:forEach> 
 												</select>
 											</div>
@@ -220,14 +221,15 @@ $(function(){
 												<select name="isHexbin"
 													class="selectpicker select2 form-control required">
 													<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
 													</c:forEach>
 												</select>
 											</div>
 											<div for="isHexbin"></div>
 										</div>
 									</div>
-								</div>  
+								</div> 
+							</div> 
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index 692a4da7e..bab476265 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -199,7 +199,7 @@ $(function(){
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
 										            <div class="col-md-6">
 										            	<select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
-															<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+															<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0  || empty _cfg.strFeaturesCfgList[index1].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 															<option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
 															<option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
 															<option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
@@ -289,7 +289,7 @@ $(function(){
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
 										            <div class="col-md-6">
 										            	<select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
-															<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+															<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 || empty _cfg.complexFeaturesList[index2].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 															<option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
 															<option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
 															<option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index 808a5d6a1..f573fcd0a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -85,7 +85,7 @@ $(function(){
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
 										            <div class="col-md-6">
 										            	<select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
-															<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+															<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 || empty _cfg.strFeaturesCfgList[index1].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 															<option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
 															<option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
 															<option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
@@ -174,7 +174,7 @@ $(function(){
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
 										            <div class="col-md-6">
 										            	<select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
-															<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+															<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 || empty _cfg.complexFeaturesList[index2].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 															<option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
 															<option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
 															<option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>