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

(1)getList方法改名，原先版本的是根据编译ID获取配置列表，这里改成两个方法，getListByCfgId和getListByCompileId

Browse Source 
(2)调整后台返回给界面的提示信息
(3)修复几处functionId没有传递的bug
(4)nis.properties调整url
(5)白名单的审核提交
(6)注释掉CrudService的sendTomaat的方法实现，在后续代码没有用到该方法时删除该方法
This commit is contained in:
wangxin
2018-05-24 19:33:59 +08:00
parent 45a860e779
commit 262087ecf0
16 changed files with 308 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -72,7 +72,7 @@
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/whitelist/domainList" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${audit}"/>
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -115,7 +115,7 @@
<div class="pull-right">
<shiro:hasPermission name="whitelist:config">
<sys:delRow url="${ctx}/ntc/whitelist/domainForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/deleteDomain?isValid=-1&functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/deleteDomain?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
@@ -194,6 +194,7 @@
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -138,7 +138,7 @@ $(function(){
<div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${_cfg.portPattern==1}">selected</c:if> ><spring:message code="port"/></option>
<option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="port_range"/></option>
<option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="subnet"/></option>
</select>
</div>
<div for="portPattern"></div>
@@ -150,7 +150,7 @@ $(function(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
<div class="col-md-6">
<input class="form-control required" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
<input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
</div>
<div for="srcIpAddress"></div>
</div>

13
src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
View File

@@ -120,19 +120,19 @@
</div>
<div class="pull-right">
<shiro:hasPermission name="whitelist:config">
<sys:delRow url="${ctx}/ntc/whitelist/ipForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/deleteIp?isValid=-1&functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/ipForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/deleteIp?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="whitelist:audit">
<shiro:hasPermission name="whitelist:config">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=1&isValid=1" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=2&isValid=0" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=3&isValid=0" id="contentTable" label="cancelPass"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=1&isValid=1&functionId=${cfg.functionId}" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=2&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/whitelist/auditIp?isAudit=3&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</shiro:hasPermission>
@@ -202,6 +202,7 @@
</form:form>
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>