gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
2018-08-19 15:55:27 +08:00
parent 8c7e1d088d 8db613d464
commit 45556b7e05
27 changed files with 1118 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -7,7 +7,7 @@
</head>
<%-- <c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId
test="${cfg.functionId eq regionDistrict.functionId
and regionDistrict.regionType eq 3
and regionValue eq regionDistrict.configRegionValue}"> --%>
<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
@@ -35,10 +35,10 @@
<c:forEach items="${fn:split(region.configDistrict,',')}"
var="_district">
<option value="${_district }"
<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
<c:if test="${cfg.district==_district}">selected</c:if>>${_district }</option>
</c:forEach>
</select>
<input type="hidden" name="${cfgName}.districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${complexCfg.district}"/>
<input type="hidden" name="${cfgName}.districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${cfg.district}"/>
</div>
<div for="${cfgName}.district"></div>
</div>
@@ -55,7 +55,7 @@
<div class="col-md-6">
<input class="form-control required tags" type="text" id="tags_${tabName}"
name="${cfgName}.cfgKeywords"
value="${complexCfg.cfgKeywords}">
value="${cfg.cfgKeywords}">
</div>
</c:if>
<!-- 此配置的关键词不允许输入多个关键词 -->
@@ -63,14 +63,29 @@
<div class="col-md-6">
<input class="form-control required invisibleChar" type="text"
name="${cfgName}.cfgKeywords"
value="${complexCfg.cfgKeywords}">
value="${cfg.cfgKeywords}">
</div>
</c:if>
<div for="${cfgName}.cfgKeywords"></div>
</div>
</div>
<c:if test="${region.configServiceType eq 'p2p_hash'}">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
<div class="col-md-6">
<select name="userRegion2" class="selectpicker show-tick form-control">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
<option value="${hashType.itemCode}" <c:if test="${cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion2"></div>
</div>
</div>
</c:if>
</div>
<div class="row">
<div class="col-md-6">
@@ -87,7 +102,7 @@
<input type="radio"
name="${cfgName}.exprType" value="${exprType }"
class="required"
<c:if test="${complexCfg.exprType eq exprType || (empty complexCfg.exprType && exprType eq 0)}">
<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
@@ -102,7 +117,7 @@
<c:if test="${exprTypeC.itemCode eq 0}">
<label class="radio-inline">
<input type="radio"
name="${cfgName}.exprType" value="${exprType }"
name="${cfgName}.exprType" value="${exprTypeC.itemCode }"
class="required" checked >
<spring:message code="${exprTypeC.itemValue }" />
</label>
@@ -127,7 +142,7 @@
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq matchMethod}">
<option value="${matchMethodC.itemCode}"
<c:if test="${complexCfg.matchMethod eq matchMethod || (empty complexCfg.matchMethod && matchMethod eq 0)}">
<c:if test="${cfg.matchMethod eq matchMethod || (empty cfg.matchMethod && matchMethod eq 0)}">
selected
</c:if>
>
@@ -164,12 +179,10 @@
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="1" class="required"
<c:if test="${complexCfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required"
<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
@@ -182,12 +195,10 @@
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="1" class="required"
<c:if test="${complexCfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
@@ -236,7 +247,7 @@
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${isHexbinC.itemCode eq isHexbin}">
<option value="${isHexbinC.itemCode}"
<c:if test="${complexCfg.isHexbin eq isHexbin || (empty complexCfg.isHexbin && isHexbin eq 0)}">
<c:if test="${cfg.isHexbin eq isHexbin || (empty isHexbin && isHexbin eq 0)}">
selected
</c:if>
>
@@ -247,7 +258,7 @@
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${!empty region.configHex}">
<c:if test="${empty region.configHex}">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${isHexbinC.itemCode eq 0}">