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

This commit is contained in:
chiguangxu
2018-03-08 11:10:44 +08:00
38 changed files with 974 additions and 952 deletions

View File

@@ -1,13 +1,13 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">基本配置</h3>
<h3 class="form-section"><spring:message code="basic_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">来函</label>
<div class="col-md-8">
<select name="requestId" data-live-search="true" data-live-search-placeholder="搜索" class="selectpicker form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="letter"/></label>
<div class="col-md-6">
<select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
<c:forEach items="${requestInfos}" var="requestInfo">
<option value="${requestInfo.id}"
<c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
@@ -15,14 +15,16 @@
</c:forEach>
</select>
</div>
<div for="requestId"></div>
</div>
</div>
<!--/span-->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">分类</label>
<div class="col-md-8">
<select name="classify" multiple class="selectpicker form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="type"/></label>
<div class="col-md-6">
<select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
<c:forEach items="${fls}" var="fl">
<c:choose>
<c:when test="${_cfg.classify==null or _cfg.classify==''}">
@@ -54,9 +56,9 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">性质</label>
<div class="col-md-8">
<select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="attribute"/></label>
<div class="col-md-6">
<select name="attribute" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
<c:forEach items="${xzs}" var="xz">
<c:choose>
<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
@@ -78,9 +80,9 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">标签</label>
<div class="col-md-8">
<select name="lable" multiple class="selectpicker form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="label"/></label>
<div class="col-md-6">
<select name="lable" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
<c:forEach items="${lables}" var="lable">
<c:choose>
<c:when test="${_cfg.lable==null or _cfg.lable==''}">
@@ -108,7 +110,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">生效范围</label>
<div class="col-md-8">
<div class="col-md-6">
<select class="form-control">
<option>Country 1</option>
<option>Country 2</option>

View File

@@ -1,18 +1,19 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">管控配置</h3>
<h3 class="form-section"><spring:message code="block_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">配置描述</label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-8">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">匹配区域</label>
<label class="control-label col-md-3"><spring:message code="match_area"/></label>
<div class="col-md-8">
<input class="form-control" type="text" name="district" value="${_cfg.district}">
</div>
@@ -22,7 +23,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">关键词</label>
<label class="control-label col-md-3"><spring:message code="key_word"/></label>
<div class="col-md-8">
<input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
</div>
@@ -47,17 +48,17 @@
</div> --%>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否区域管控</label>
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
>
><spring:message code="yes"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
>
><spring:message code="no"/>
</label>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
</div>
@@ -67,30 +68,30 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">表达式类型</label>
<label class="control-label col-md-3"><spring:message code="expression_type"/></label>
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="exprType " value="1"
<input type="radio" name="exprType" value="1"
<c:if test="${_cfg.exprType==1}">checked</c:if>
>与表达式
><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="exprType" value="0"
<c:if test="${_cfg.exprType==0}">checked</c:if>
>无表达式
><spring:message code="null"/>
</label>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">匹配方式</label>
<label class="control-label col-md-3"><spring:message code="match_method"/></label>
<div class="col-md-8">
<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</div>
</div>
@@ -99,19 +100,19 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否hex二进制</label>
<label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
<div class="col-md-8">
<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感且非HEX"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感且非HEX"></spring:message></option>
<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">区域生效id</label>
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
<div class="col-md-8">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>

View File

@@ -1,124 +1,136 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">管控配置</h3>
<h3 class="form-section"><spring:message code="block_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">配置描述</label>
<div class="col-md-8">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
<div for="cfgDesc"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">ip类型</label>
<div class="col-md-8">
<select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="ip_type"/></label>
<div class="col-md-6">
<select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
</select>
<!-- <input class="form-control" type="text" value="${_cfg.ipType}">-->
</div>
<div for="ipType"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">源IP地址</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="client_ip"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
</div>
<div for="srcIp"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">源地址掩码</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="client_address_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
</div>
<div for="srcIpMask"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">源端口</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="client_port"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
</div>
<div for="srcPort"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">源端口掩码</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="client_port_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
</div>
<div for="srcPortMask"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">目的IP地址</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
</div>
<div for="dstIp"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">目的地址掩码</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="server_address_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
</div>
<div for="dstIpMask"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">目的端口</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="server_port"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
</div>
<div for="dstPort"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">目的端口掩码</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="server_port_mask"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
</div>
<div for="dstPortMask"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">方向</label>
<div class="col-md-8">
<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="direction"/></label>
<div class="col-md-6">
<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
<option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
</select>
<%-- <input class="form-control" type="text" name="direction" value="${_cfg.direction}"> --%>
</div>
<div for="direction"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">协议</label>
<div class="col-md-8">
<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
<label class="control-label col-md-3"><spring:message code="protocol"/></label>
<div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
<option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>>任意</option>
<option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
</select>
<%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
</div>
<div for="protocol"></div>
</div>
</div>
</div>
@@ -126,15 +138,15 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">协议ID</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">管控类型</label>
<div class="col-md-8">
<label class="control-label col-md-3">管控类型</div>
<div class="col-md-6">
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
@@ -151,28 +163,30 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否区域管控</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
>
><spring:message code="yes"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
>
><spring:message code="no"/>
</label>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
</div>
<div for="isAreaEffective"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">区域生效id</label>
<div class="col-md-8">
<label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>
<div for="areaEffectiveIds"></div>
</div>
</div>
</div>

View File

@@ -1,10 +1,10 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<h3 class="form-section">管控配置</h3>
<h3 class="form-section"><spring:message code="block_config"/></h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">配置描述</label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-8">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
@@ -12,7 +12,7 @@
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">配置关键词</label>
<label class="control-label col-md-3"><spring:message code="key_word"/></label>
<div class="col-md-8">
<input class="form-control" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
</div>
@@ -22,15 +22,15 @@
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">管控类型</label>
<label class="control-label col-md-3"><spring:message code="block_type"/></label>
<div class="col-md-8">
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>
<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>
<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>
<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>
</select>
<%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
</div>
@@ -38,17 +38,17 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否区域管控</label>
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
>
><spring:message code="yes"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
>
><spring:message code="no"/>
</label>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
</div>
@@ -58,30 +58,30 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">表达式类型</label>
<label class="control-label col-md-3"><spring:message code="expression_type"/></label>
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="exprType " value="1"
<input type="radio" name="exprType" value="1"
<c:if test="${_cfg.exprType==1}">checked</c:if>
>与表达式
><spring:message code="and"/>
</label>
<label class="radio-inline">
<input type="radio" name="exprType" value="0"
<c:if test="${_cfg.exprType==0}">checked</c:if>
>无表达式
><spring:message code="null"/>
</label>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">匹配方式</label>
<label class="control-label col-md-3"><spring:message code="match_method"/></label>
<div class="col-md-8">
<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
</select>
</div>
</div>
@@ -90,19 +90,19 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否hex二进制</label>
<label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
<div class="col-md-8">
<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感且非HEX"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感且非HEX"></spring:message></option>
<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
</select>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">区域生效id</label>
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
<div class="col-md-8">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>

View File

@@ -141,13 +141,13 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div>
<h3 class="page-title">
配置管理
<spring:message code="configuration_manage"/>
</h3>
<div class="row">
@@ -155,7 +155,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<select id="itemType" name="itemType" class="form-control">
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
<form:select path="isLeaf" class="form-control">
@@ -218,7 +218,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">描述信息:</label>
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>
@@ -226,8 +226,8 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>
</div>

View File

@@ -12,13 +12,13 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div>
<h3 class="page-title">
配置管理
<spring:message code="configuration_manage"/>
</h3>
<div class="row">
@@ -26,7 +26,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>配置查看</div>
<i class="fa fa-gift"></i><spring:message code="show"/></div>
</div>
<div class="portlet-body form">
@@ -39,37 +39,37 @@
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>编码:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4">
<input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>编码对应值:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label>
<div class="col-md-4">
<input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否叶子节点:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">描述信息:</label>
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>

View File

@@ -39,11 +39,11 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
</div>
<h3 class="page-title">
配置管理
<spring:message code="configuration_manage"/>
</h3>
<div class="row">
@@ -51,7 +51,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>列表信息
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
</div>
<div class="portlet-body">
@@ -62,11 +62,11 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
<label class="search-lable itemType">数据类型:</label>
<label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
<label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
<label class="search-lable itemType"><spring:message code="item_type"/>:</label>
<select id="itemType" name="itemType" >
<option value="" selected="selected">-请选择-</option>
<option value="" selected="selected"><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}">
@@ -88,7 +88,7 @@
</div>
</form:form>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗?', this.href)">修改</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗?', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗?', this.href)">删除</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗?', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

View File

@@ -141,13 +141,13 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div>
<h3 class="page-title">
配置管理
<spring:message code="effect_range"/>
</h3>
<div class="row">
@@ -155,7 +155,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<select id="itemType" name="itemType" class="form-control">
<c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
<form:select path="isLeaf" class="form-control">
@@ -218,7 +218,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">描述信息:</label>
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>
@@ -226,8 +226,8 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>
</div>

View File

@@ -39,11 +39,11 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
</div>
<h3 class="page-title">
配置管理
<spring:message code="effect_range"/>
</h3>
<div class="row">
@@ -51,7 +51,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>列表信息
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
</div>
<div class="portlet-body">
@@ -62,11 +62,11 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
<label class="search-lable itemType">数据类型:</label>
<label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
<label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
<label class="search-lable itemType"><spring:message code="item_value"/>:</label>
<select id="itemType" name="itemType" >
<option value="" selected="selected">-请选择-</option>
<option value="" selected="selected"><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}">
@@ -88,7 +88,7 @@
</div>
</form:form>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
<td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗?', this.href)">修改</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗?', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗?', this.href)">删除</a></li>
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗?', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script type="text/javascript">
$(function(){
$("#save").on("click",function(){
@@ -31,7 +45,7 @@ $(function(){
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
@@ -49,29 +63,11 @@ $(function(){
<c:if test="${not empty _cfg.cfgId}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
</c:if>
<input type="hidden" name="audit" value="${audit}">
<input type="hidden" name="tableName" value="${_cfg.tableName}">
<input type="hidden" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" name="cfgName" value="${cfgName}">
<input type="hidden" name="action" value="${_cfg.action}">
<!-- <div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">IP地址</label>
<div class="col-md-8">
<input class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">配置名称</label>
<div class="col-md-8">
<input class="form-control" type="text">
</div>
</div>
</div>
</div>
-->
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
@@ -81,8 +77,8 @@ $(function(){
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green">保存</button>
<button id="cancel" type="button" class="btn default">Cancel</button>
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script>
$(document).ready(function() {
@@ -24,8 +38,10 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<c:if test="${audit==0}">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
</c:if>
</div>
<h3 class="page-title">
@@ -37,7 +53,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message>
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -51,19 +67,20 @@
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
<form:option value=""></form:option>
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
</form:select>
<spring:message code="函号"/> :
<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
<form:option value=""></form:option>
<spring:message code="request_number"/> :
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach>
@@ -71,16 +88,16 @@
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button>
<spring:message code="排序"/> :
<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
<form:option value=""></form:option>
<form:option value="createTime asc">按创建时间顺序</form:option>
<form:option value="createTime desc">按创建时间倒序</form:option>
<form:option value="editTime asc">按修改时间顺序</form:option>
<form:option value="editTime desc">按修改时间倒序</form:option>
<form:option value="auditTime asc">按审核时间顺序</form:option>
<form:option value="auditTime desc">按审核时间倒序</form:option>
</form:select>
<spring:message code="sort"/> :
<select name="orderBy" class="selectpicker select2">
<option value=""><spring:message code="select"/></option>
<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
</select>
</div>
</form:form>
</div>
@@ -88,27 +105,27 @@
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>配置ID</th>
<th>配置描述</th>
<th>匹配区域</th>
<th>关键字</th>
<th>管控类型</th>
<th><spring:message code="seq"/></th>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="match_area"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th><spring:message code="letter"/></th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
<th>配置时间</th>
<th>修改人员</th>
<th>修改时间</th>
<th>审核人员</th>
<th>审核时间</th>
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -120,19 +137,19 @@
<td>${cfg.district }</td>
<td>${cfg.keywords }</td>
<td>
<c:if test="${1 eq cfg.action }">阻断</c:if>
<c:if test="${2 eq cfg.action }">监测</c:if>
<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
<c:if test="${6 eq cfg.action }">监测白名单</c:if>
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq cfg.action }">灰名单</c:if>
<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
</td>
<%-- <td>${cfg.serviceId }</td> --%>
<td>${cfg.requestName }</td>
<%-- <td>${cfg.compileId }</td> --%>
<td>
<c:if test="${cfg.isAreaEffective==0}"></c:if>
<c:if test="${cfg.isAreaEffective==1}"></c:if>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td>
<td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -160,16 +177,16 @@
</td>
<%-- <td>${cfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${cfg.isValid==0}"></c:if>
<c:if test="${cfg.isValid==1}"></c:if>
<c:if test="${cfg.isValid==-1}">已删除</c:if>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td>
<td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${cfg.creatorName }</td>
@@ -182,26 +199,28 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<!-- 审核未通过可修改 -->
<c:choose>
<c:if test="${audit==0}">
<c:choose>
<c:when test="${cfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
</c:choose>
</c:if>
<c:if test="${audit==1}">
<c:choose>
<c:when test="${cfg.isAudit eq '1'}">
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="unapproved"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:otherwise>
<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise>
</c:choose>
</c:if>
</ul>
</div>
</td>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script type="text/javascript">
$(function(){
$("#save").on("click",function(){
@@ -60,6 +74,106 @@ $(function(){
$("input[name='dstIp']").val("::");
}
}
});
$("#ipCfgFrom").validate({
rules: {
cfgDesc: {
required: true,
},
ipType: {
required: true,
},
srcIp: {
required: true,
},
srcIpMask: {
required: true,
},
srcPort: {
required: true,
},
srcPortMask: {
required: true,
},
dstIp: {
required: true,
},
dstIpMask: {
required: true,
},
dstPort: {
required: true,
},
dstPortMask: {
required: true,
},
direction: {
required: true,
},
protocol: {
required: true,
},
isAreaEffective: {
required: true,
},
requestId: {
required: true,
}
},
messages: {
cfgDesc: {
required: '<spring:message code="required"/>',
},
ipType: {
required: '<spring:message code="required"/>',
},
srcIp: {
required: '<spring:message code="required"/>',
},
srcIpMask: {
required: '<spring:message code="required"/>',
},
srcPort: {
required: '<spring:message code="required"/>',
},
srcPortMask: {
required: '<spring:message code="required"/>',
},
dstIp: {
required: '<spring:message code="required"/>',
},
dstIpMask: {
required: '<spring:message code="required"/>',
},
dstPort: {
required: '<spring:message code="required"/>',
},
dstPortMask: {
required: '<spring:message code="required"/>',
},
direction: {
required: '<spring:message code="required"/>',
},
protocol: {
required: '<spring:message code="required"/>',
},
isAreaEffective: {
required: '<spring:message code="required"/>',
},
requestId: {
required: '<spring:message code="required"/>',
}
},
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
//loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
});
</script>
@@ -78,7 +192,7 @@ $(function(){
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
@@ -129,8 +243,8 @@ $(function(){
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green">保存</button>
<button id="cancel" type="button" class="btn default">Cancel</button>
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script>
$(document).ready(function() {
@@ -23,9 +37,12 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="refresh"></spring:message></button>
<c:if test="${audit==0}">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
</c:if>
</div>
<h3 class="page-title">
@@ -37,7 +54,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -50,20 +67,21 @@
</div>
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}" method="post" class="form-search">
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
<form:option value=""></form:option>
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select>
<spring:message code="函号"/> :
<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
<form:option value=""></form:option>
<spring:message code="request_number"/> :
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach>
@@ -71,16 +89,16 @@
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button>
<spring:message code="排序"/> :
<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
<form:option value=""></form:option>
<form:option value="createTime asc">按创建时间顺序</form:option>
<form:option value="createTime desc">按创建时间倒序</form:option>
<form:option value="editTime asc">按修改时间顺序</form:option>
<form:option value="editTime desc">按修改时间倒序</form:option>
<form:option value="auditTime asc">按审核时间顺序</form:option>
<form:option value="auditTime desc">按审核时间倒序</form:option>
</form:select>
<spring:message code="sort"/> :
<select name="orderBy" class="selectpicker select2">
<option value=""><spring:message code="select"/></option>
<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
</select>
</div>
</form:form>
</div>
@@ -88,37 +106,37 @@
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>序列</th>
<th>配置描述</th>
<th>ip类型</th>
<th>源IP地址</th>
<th>源地址掩码</th>
<th>源端口</th>
<th>源端口掩码</th>
<th>目的IP地址</th>
<th>目的地址掩码</th>
<th>目的端口</th>
<th>目的端口掩码</th>
<th>方向</th>
<th>协议</th>
<th><spring:message code="seq"/></th>
<th><spring:message code="config_describe"/></th>
<th>ip<spring:message code="type"/></th>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="client_address_mask"/></th>
<th><spring:message code="client_port"/></th>
<th><spring:message code="client_port_mask"/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="server_address_mask"/></th>
<th><spring:message code="server_port"/></th>
<th><spring:message code="server_port_mask"/></th>
<th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th>
<!-- <th>协议ID</th> -->
<th>管控类型</th>
<th><spring:message code="block_type"/></th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th><spring:message code="letter"/></th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
<th>配置时间</th>
<th>修改人员</th>
<th>修改时间</th>
<th>审核人员</th>
<th>审核时间</th>
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -136,23 +154,30 @@
<td>${ipCfg.dstIpMask }</td>
<td>${ipCfg.dstPort }</td>
<td>${ipCfg.dstPortMask }</td>
<td>${ipCfg.direction }</td>
<td>${ipCfg.protocol }</td>
<td>
<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
</td>
<td>
<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>
<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>
<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>
</td>
<%-- <td>${ipCfg.protocolId }</td> --%>
<td>
<c:if test="${1 eq ipCfg.action }">阻断</c:if>
<c:if test="${2 eq ipCfg.action }">监测</c:if>
<c:if test="${5 eq ipCfg.action }">封堵白名单</c:if>
<c:if test="${6 eq ipCfg.action }">监测白名单</c:if>
<c:if test="${7 eq ipCfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq ipCfg.action }">灰名单</c:if>
<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq ipCfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq ipCfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq ipCfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq ipCfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq ipCfg.action }"><spring:message code="grey_list"/></c:if>
</td>
<%-- <td>${ipCfg.serviceId }</td> --%>
<td>${ipCfg.requestName }</td>
<%-- <td>${ipCfg.compileId }</td> --%>
<td>
<c:if test="${ipCfg.isAreaEffective==0}"></c:if>
<c:if test="${ipCfg.isAreaEffective==1}"></c:if>
<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td>
<td>
<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
@@ -180,16 +205,16 @@
</td>
<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${ipCfg.isValid==0}"></c:if>
<c:if test="${ipCfg.isValid==1}"></c:if>
<c:if test="${ipCfg.isValid==-1}">已删除</c:if>
<c:if test="${ipCfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${ipCfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${ipCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td>
<td>
<c:choose>
<c:when test="${ipCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${ipCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${ipCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${ipCfg.creatorName }</td>
@@ -202,26 +227,28 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<!-- 审核未通过可修改 -->
<c:choose>
<c:if test="${audit==0}">
<c:choose>
<c:when test="${ipCfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
</c:when>
<c:when test="${ipCfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
</c:choose>
</c:if>
<c:if test="${audit==1}">
<c:choose>
<c:when test="${ipCfg.isAudit eq '1'}">
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when>
<c:when test="${ipCfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="unapproved"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:when test="${ipCfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:otherwise>
<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise>
</c:choose>
</c:if>
</ul>
</div>
</td>

View File

@@ -286,4 +286,4 @@
</script>
</body>
</html>
</html>

View File

@@ -5,7 +5,7 @@
<title>结果跳转页</title>
<script type="text/javascript">
$(document).ready(function() {
setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'",1000);
setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'",1000);
});
</script>
</head>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script type="text/javascript">
$(function(){
$("#save").on("click",function(){
@@ -31,7 +45,7 @@ $(function(){
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
@@ -49,6 +63,7 @@ $(function(){
<c:if test="${not empty _cfg.cfgId}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
</c:if>
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input type="hidden" name="tableName" value="${_cfg.tableName}">
<input type="hidden" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" name="cfgName" value="${cfgName}">
@@ -80,8 +95,8 @@ $(function(){
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green">保存</button>
<button id="cancel" type="button" class="btn default">Cancel</button>
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>

View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script>
$(document).ready(function() {
@@ -24,8 +38,10 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
<c:if test="${audit==0}">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
</c:if>
</div>
<h3 class="page-title">
@@ -37,7 +53,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -51,6 +67,7 @@
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
@@ -59,11 +76,11 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select>
<spring:message code="函号"/> :
<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
<form:option value=""></form:option>
<spring:message code="request_number"/> :
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach>
@@ -71,16 +88,16 @@
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button>
<spring:message code="排序"/> :
<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
<form:option value=""></form:option>
<form:option value="createTime asc">按创建时间顺序</form:option>
<form:option value="createTime desc">按创建时间倒序</form:option>
<form:option value="editTime asc">按修改时间顺序</form:option>
<form:option value="editTime desc">按修改时间倒序</form:option>
<form:option value="auditTime asc">按审核时间顺序</form:option>
<form:option value="auditTime desc">按审核时间倒序</form:option>
</form:select>
<spring:message code="sort"/> :
<select name="orderBy" class="selectpicker select2">
<option value=""><spring:message code="select"/></option>
<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
</select>
</div>
</form:form>
</div>
@@ -88,26 +105,26 @@
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>序列</th>
<th>配置描述</th>
<th>配置关键词</th>
<th>管控类型</th>
<th><spring:message code="seq"/></th>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th><spring:message code="letter"/></th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
<th>配置时间</th>
<th>修改人员</th>
<th>修改时间</th>
<th>审核人员</th>
<th>审核时间</th>
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -118,19 +135,19 @@
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:if test="${1 eq cfg.action }">阻断</c:if>
<c:if test="${2 eq cfg.action }">监测</c:if>
<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
<c:if test="${6 eq cfg.action }">监测白名单</c:if>
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq cfg.action }">灰名单</c:if>
<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
</td>
<%-- <td>${cfg.serviceId }</td> --%>
<td>${cfg.requestName }</td>
<%-- <td>${cfg.compileId }</td> --%>
<td>
<c:if test="${cfg.isAreaEffective==0}"></c:if>
<c:if test="${cfg.isAreaEffective==1}"></c:if>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td>
<td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -158,16 +175,16 @@
</td>
<%-- <td>${cfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${cfg.isValid==0}"></c:if>
<c:if test="${cfg.isValid==1}"></c:if>
<c:if test="${cfg.isValid==-1}">已删除</c:if>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td>
<td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${cfg.creatorName }</td>
@@ -180,26 +197,28 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<!-- 审核未通过可修改 -->
<c:choose>
<c:if test="${audit==0}">
<c:choose>
<c:when test="${cfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
</c:choose>
</c:if>
<c:if test="${audit==1}">
<c:choose>
<c:when test="${cfg.isAudit eq '1'}">
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '0'}">
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="unapproved"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:when test="${cfg.isAudit eq '2'}">
<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:otherwise>
<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise>
</c:choose>
</c:if>
</ul>
</div>
</td>

View File

@@ -22,6 +22,7 @@
<link href="${pageContext.request.contextPath}/static/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
<!-- END GLOBAL MANDATORY STYLES -->
<!-- BEGIN THEME GLOBAL STYLES -->
<link href="${pageContext.request.contextPath}/static/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
@@ -80,7 +81,7 @@
<p>
<div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}">
<span class="label label-danger">ERROR:&nbsp;&nbsp;</span>
<label id="loginError" class="error">${message}</label>
<label id="loginError" class="error"><spring:message code="${message}"></spring:message></label>
</div>
</p>
@@ -106,6 +107,9 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/scripts/jeesite.js" type="text/javascript"></script>
<!-- END CORE PLUGINS -->
<!-- BEGIN THEME GLOBAL SCRIPTS -->
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
@@ -124,8 +128,8 @@
captcha: {remote: "${pageContext.request.contextPath}/validateCode"}
},
messages: {
username: {required: "请填写用户名..."},password: {required: "请填写密码..."},
captcha: {remote: "验证码不正确...", required: "请填写验证码..."}
username: {required: '<spring:message code="fill_loginName"/>...'},password: {required: '<spring:message code="fill_loginPassWord"/>...'},
captcha: {remote: '<spring:message code="captcha_error"/>...', required: '<spring:message code="enter_captcha"/>...'}
},
errorLabelContainer: "#messageBox",
errorPlacement: function(error, element) {
@@ -133,12 +137,10 @@
}
});
// 如果在框架或在对话框中,则弹出提示并跳转到首页
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
alert('未登录或登录超时。请重新登录,谢谢!');
top.location = "${pageContext.request.contextPath }";
alertx("<spring:message code='login_timeout'/>");
window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
}

View File

@@ -106,7 +106,7 @@ function showTip(mess, type, timeout, lazytime){
// 显示加载框
function loading(mess){
if (mess == undefined || mess == ""){
mess = "正在提交,请稍等...";
mess = "OnLoading...";
}
resetTip();
top.$.jBox.tip(mess,'loading',{opacity:0});
@@ -114,7 +114,7 @@ function loading(mess){
// 警告对话框
function alertx(mess, closed){
top.$.jBox.info(mess, '提示', {closed:function(){
top.$.jBox.info(mess, 'Waring', {closed:function(){
if (typeof closed == 'function') {
closed();
}
@@ -124,7 +124,7 @@ function alertx(mess, closed){
// 确认对话框
function confirmx(mess, href, closed){
top.$.jBox.confirm(mess,'系统提示',function(v,h,f){
top.$.jBox.confirm(mess,'System Prompt',function(v,h,f){
if(v=='ok'){
if (typeof href == 'function') {
href();
@@ -147,7 +147,7 @@ function promptx(title, lable, href, closed){
top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + "<input type='text' id='txt' name='txt'/></div>", {
title: title, submit: function (v, h, f){
if (f.txt == '') {
top.$.jBox.tip("请输入" + lable + "。", 'error');
top.$.jBox.tip("Please input" + lable + "。", 'error');
return false;
}
if (typeof href == 'function') {