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

Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp

@@ -90,12 +90,6 @@ $(function(){
                        	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
                        	<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
                        	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
                               <div class="row">
@@ -127,6 +121,10 @@ $(function(){
 										</div>
 								   </div>
 								</div>
+							<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
 								<div class="row">
 								 <div class="row">
 									<div class="col-md-6 hidden">
@@ -155,122 +153,201 @@ $(function(){
 								       </div>
 										
 									</div>
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="district" /></label>
-											<div class="col-md-6">
-												<select name="district"
-													class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
-														<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${!empty region.configDistrict }">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="district" /></label>
+												<div class="col-md-6">
+													<select name="district"
+														class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
 															<c:forEach items="${fn:split(region.configDistrict,',')}"
 																var="_district">
 																<option value="${_district }"
 																	<c:if test="${_cfg.district==_district}">selected</c:if>>${_district }</option>
 															</c:forEach>
-														</c:forEach>
-												</select>
-												<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
+													</select>
+													<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
+												</div>
+												<div for="district"></div>
 											</div>
-											<div for="district"></div>
 										</div>
-										
-									</div>
-								
+									</c:if>
 								</div>
 								<div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><font color="red">*</font>
 											<spring:message code="keywords" /></label>
-											<div class="col-md-6">
-												<input class="form-control required tags" type="text" id="tags_1"
-													name="cfgKeywords"
-													value="${_cfg.cfgKeywords}">
-											</div>
+											<!-- 此配置的关键词可以输入多个关键词 -->
+											<c:if test="${region.configMultiKeywords eq 1}">
+												<div class="col-md-6">
+													<input class="form-control required tags" type="text" id="tags_${tabName}"
+														name="cfgKeywords"
+														value="${_cfg.cfgKeywords}">
+												</div>
+											</c:if>
+											<!-- 此配置的关键词不允许输入多个关键词 -->
+											<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+												<div class="col-md-6">
+													<input class="form-control required invisibleChar" type="text"
+														name="cfgKeywords"
+														value="${_cfg.cfgKeywords}">
+												</div>
+											</c:if>
+											
 											<div for="cfgKeywords"></div>
 										</div>
 									</div>
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="expression_type" /></label>
-											<div class="col-md-6">
-												<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_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_expression" />
-												</label>
-											</div>
-											<div for="exprType"></div>
-										</div>
-									</div>
-									
+								
 								</div>
 								<div class="row">
-									<div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="match_method" /></label>
-											<div class="col-md-6">
-												<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==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-													</c:forEach> 
-												</select>
+										<div class="col-md-6">
+											<div class="form-group">
+											
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="expression_type" /></label>
+												<div class="col-md-6">
+													<c:if test="${!empty region.configExprType}">
+														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
+															<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																<c:if test="${exprTypeC.itemCode eq exprType}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="exprType" value="${exprType }"
+																			class="required"
+																			<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
+																				checked
+																			</c:if>
+																		> 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+													</c:if>
+													<c:if test="${empty region.configExprType}">
+														<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																<c:if test="${exprTypeC.itemCode eq 0}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="exprType" value="${exprTypeC.itemCode }"
+																			class="required" checked > 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+													</c:if>
+												</div>
+												<div for="exprType"></div>
+												
 											</div>
-											<div for="matchMethod"></div>
 										</div>
-									</div>
-									 <div class="col-md-6">
+									
+										<div class="col-md-6">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="match_method" /></label>
+												<div class="col-md-6">
+													<select name="matchMethod"
+														class="selectpicker select2 form-control required">
+														<c:if test="${!empty region.configMatchMethod}">
+															<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+																<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																	<c:if test="${matchMethodC.itemCode eq matchMethod}">
+																		<option value="${matchMethodC.itemCode}" 
+																		<c:if test="${_cfg.matchMethod eq matchMethod || (empty _cfg.matchMethod && matchMethod eq 0)}">
+																		selected
+																		</c:if>
+																		>
+																		<spring:message code="${matchMethodC.itemValue}"/>
+																		</option>
+																	</c:if>
+																
+																</c:forEach> 
+															</c:forEach>
+														</c:if>
+														<c:if test="${empty region.configMatchMethod}">
+															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																	<c:if test="${matchMethodC.itemCode eq 0}">
+																		<option value="${matchMethodC.itemCode}" 
+																		selected
+																		>
+																		<spring:message code="${matchMethodC.itemValue}"/>
+																		</option>
+																	</c:if>
+																
+																</c:forEach> 
+														</c:if>
+													</select>
+												</div>
+												<div for="matchMethod"></div>
+											</div>
+										</div>
+								</div>
+								<div class="row">
+										<c:if test="${!empty region.configHex}">
+										    <div class="col-md-6">
 										        <div class="form-group ">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
 										            <div class="col-md-6">
 										            	<label class="radio-inline">
 										            		<input type="radio" name="isHex" value="1" class="required"
-										            			<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
 										            		><spring:message code="hex"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" name="isHex" value="0" class="required"
-										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="not_hex"/>
 										            	</label>
 										            </div>
 										            <div for="isHex"></div>
 										        </div>
 										    </div>
-	     
-										</div>
-										<div class="row">
-											
-											<div class="col-md-6">
+										    <div class="col-md-6">
 										        <div class="form-group ">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
 										            <div class="col-md-6">
 										            	<label class="radio-inline">
 										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
-										            			<c:if test="${_cfg.isHexbin==1}">checked</c:if>
 										            		><spring:message code="case_senstive"/>
 										            	</label>
 										            	<label class="radio-inline">
 										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
-										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="case_insenstive"/>
 										            	</label>
 										            </div>
 										            <div for="isCaseInsenstive"></div>
 										        </div>
 										    </div>
-	     
-										</div>
+								  	</c:if>
+								  	<c:if test="${empty region.configHex}"> 
+										<div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required" checked
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="isHex"></div>
+										        </div>
+										    </div>
+										    <div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+										            			checked
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="isCaseInsenstive"></div>
+										        </div>
+										    </div>
+									</c:if>
+								</div>
 								<div class="row hidden">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -279,17 +356,42 @@ $(function(){
 											<div class="col-md-6">
 												<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.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-													</c:forEach>
+													<c:if test="${!empty region.configHex}">
+														<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
+																<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																	<c:if test="${isHexbinC.itemCode eq isHexbin}">
+																		<option value="${isHexbinC.itemCode}" 
+																		<c:if test="${_cfg.isHexbin eq isHexbin || (empty _cfg.isHexbin && isHexbin eq 0)}">
+																		selected
+																		</c:if>
+																		>
+																		<spring:message code="${isHexbinC.itemValue}"/>
+																		</option>
+																	</c:if>
+																
+																</c:forEach> 
+														</c:forEach>
+													</c:if>
+													<c:if test="${empty region.configHex}"> 
+													
+														<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+															<c:if test="${isHexbinC.itemCode eq 0}">
+																<option value="${isHexbinC.itemCode}"  selected >
+																<spring:message code="${isHexbinC.itemValue}"/>
+																</option>
+															</c:if>
+														</c:forEach> 
+													
+													</c:if>
 												</select>
 											</div>
 											<div for="isHexbin"></div>
 										</div>
 									</div>
-									
-								</div> 
+								</div>
 							</div> 
+							</c:if>
+                   		</c:forEach>
                          <input name="isAreaEffective" type="hidden" value="0">
                            <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
 							<input name="requestId" value="0" type="hidden">