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

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

Browse Source
This commit is contained in:
chenjinsong
2018-03-05 17:02:51 +08:00
parent 2db47dca3f 848087dbef
commit 05ba52f8bf
34 changed files with 799 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,6 @@ $(function(){
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
</h3>
<div class="row">
@@ -32,9 +30,9 @@ $(function(){
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

49
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -25,11 +25,11 @@
<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>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">新增<spring:message code="${cfgName}"></spring:message></button>
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
</div>
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>详情
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
@@ -37,7 +37,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,7 +85,7 @@
</form:form>
</div>
<div class="table-responsive">
<table class="table table-bordered text-nowrap">
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>配置ID</th>
@@ -93,14 +93,14 @@
<th>匹配区域</th>
<th>关键字</th>
<th>管控类型</th>
<th>业务id</th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th>编译id</th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th>区域生效id</th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
@@ -127,17 +127,38 @@
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq cfg.action }">灰名单</c:if>
</td>
<td>${cfg.serviceId }</td>
<%-- <td>${cfg.serviceId }</td> --%>
<td>${cfg.requestName }</td>
<td>${cfg.compileId }</td>
<%-- <td>${cfg.compileId }</td> --%>
<td>
<c:if test="${cfg.isAreaEffective==0}">否</c:if>
<c:if test="${cfg.isAreaEffective==1}">是</c:if>
</td>
<td>${cfg.classifyName }</td>
<td>${cfg.attributeName }</td>
<td>${cfg.lableName }</td>
<td>${cfg.areaEffectiveIds }</td>
<td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
<c:forEach items="${fls}" var="fl">
<c:if test="${classifyId==fl.itemCode}">
${fl.itemValue},
</c:if>
</c:forEach>
</c:forEach>
${classifyName[status]}
</td>
<td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
<c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<td>
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
<c:forEach items="${lables}" var="lable">
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<%-- <td>${cfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${cfg.isValid==0}">否</c:if>
<c:if test="${cfg.isValid==1}">是</c:if>
@@ -172,7 +193,7 @@
<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="修改配置"></spring:message></a></li>
<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>

8
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -70,8 +70,6 @@ $(function(){
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
</h3>
<div class="row">
@@ -79,9 +77,9 @@ $(function(){
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

61
src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
View File

@@ -25,11 +25,11 @@
<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="${cfgName}"></spring:message></button>
onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
</div>
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>详情
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
@@ -37,7 +37,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,10 +85,10 @@
</form:form>
</div>
<div class="table-responsive">
<table class="table table-bordered text-nowrap">
<table class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>配置ID</th>
<th>序列</th>
<th>配置描述</th>
<th>ip类型</th>
<th>源IP地址</th>
@@ -101,16 +101,16 @@
<th>目的端口掩码</th>
<th>方向</th>
<th>协议</th>
<th>协议ID</th>
<!-- <th>协议ID</th> -->
<th>管控类型</th>
<th>业务id</th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th>编译id</th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th>区域生效id</th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
@@ -123,9 +123,9 @@
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="ipCfg">
<tr>
<td>${ipCfg.cfgId }</td>
<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
<tr pId="${status.index}">
<td>${status.index+1 }</td>
<td>${ipCfg.cfgDesc }</td>
<td>V${ipCfg.ipType }</td>
<td>${ipCfg.srcIp }</td>
@@ -138,7 +138,7 @@
<td>${ipCfg.dstPortMask }</td>
<td>${ipCfg.direction }</td>
<td>${ipCfg.protocol }</td>
<td>${ipCfg.protocolId }</td>
<%-- <td>${ipCfg.protocolId }</td> --%>
<td>
<c:if test="${1 eq ipCfg.action }">阻断</c:if>
<c:if test="${2 eq ipCfg.action }">监测</c:if>
@@ -147,17 +147,38 @@
<c:if test="${7 eq ipCfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq ipCfg.action }">灰名单</c:if>
</td>
<td>${ipCfg.serviceId }</td>
<%-- <td>${ipCfg.serviceId }</td> --%>
<td>${ipCfg.requestName }</td>
<td>${ipCfg.compileId }</td>
<%-- <td>${ipCfg.compileId }</td> --%>
<td>
<c:if test="${ipCfg.isAreaEffective==0}">否</c:if>
<c:if test="${ipCfg.isAreaEffective==1}">是</c:if>
</td>
<td>${ipCfg.classifyName }</td>
<td>${ipCfg.attributeName }</td>
<td>${ipCfg.lableName }</td>
<td>${ipCfg.areaEffectiveIds }</td>
<td>
<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
<c:forEach items="${fls}" var="fl">
<c:if test="${classifyId==fl.itemCode}">
${fl.itemValue},
</c:if>
</c:forEach>
</c:forEach>
${classifyName[status]}
</td>
<td>
<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
<c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<td>
<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
<c:forEach items="${lables}" var="lable">
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${ipCfg.isValid==0}">否</c:if>
<c:if test="${ipCfg.isValid==1}">是</c:if>
@@ -192,7 +213,7 @@
<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="修改配置"></spring:message></a></li>
<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>

8
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -23,8 +23,6 @@ $(function(){
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
</h3>
<div class="row">
@@ -32,9 +30,9 @@ $(function(){
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
<c:if test="${empty _cfg.cfgId}">新增</c:if>
<c:if test="${not empty _cfg.cfgId}">修改</c:if>
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
<!-- <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

55
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -25,11 +25,11 @@
<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="${cfgName}"></spring:message></button>
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
</div>
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>详情
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
@@ -37,7 +37,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
</div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,21 +85,21 @@
</form:form>
</div>
<div class="table-responsive">
<table class="table table-bordered text-nowrap">
<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>业务id</th>
<!-- <th>业务id</th> -->
<th>来函</th>
<th>编译id</th>
<!-- <th>编译id</th> -->
<th>是否区域管控</th>
<th>分类</th>
<th>性质</th>
<th>标签</th>
<th>区域生效id</th>
<!-- <th>区域生效id</th> -->
<th>有效标识</th>
<th>是否审核</th>
<th>创建人员</th>
@@ -112,9 +112,9 @@
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg">
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>${cfg.cfgId }</td>
<td>${status.index+1 }</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>
@@ -125,17 +125,38 @@
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
<c:if test="${8 eq cfg.action }">灰名单</c:if>
</td>
<td>${cfg.serviceId }</td>
<%-- <td>${cfg.serviceId }</td> --%>
<td>${cfg.requestName }</td>
<td>${cfg.compileId }</td>
<%-- <td>${cfg.compileId }</td> --%>
<td>
<c:if test="${cfg.isAreaEffective==0}">否</c:if>
<c:if test="${cfg.isAreaEffective==1}">是</c:if>
</td>
<td>${cfg.classifyName }</td>
<td>${cfg.attributeName }</td>
<td>${cfg.lableName }</td>
<td>${cfg.areaEffectiveIds }</td>
<td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
<c:forEach items="${fls}" var="fl">
<c:if test="${classifyId==fl.itemCode}">
${fl.itemValue},
</c:if>
</c:forEach>
</c:forEach>
${classifyName[status]}
</td>
<td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
<c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<td>
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
<c:forEach items="${lables}" var="lable">
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
</c:forEach>
</c:forEach>
</td>
<%-- <td>${cfg.areaEffectiveIds }</td> --%>
<td>
<c:if test="${cfg.isValid==0}">否</c:if>
<c:if test="${cfg.isValid==1}">是</c:if>
@@ -170,7 +191,7 @@
<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="修改配置"></spring:message></a></li>
<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>