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

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

Browse Source 
Conflicts:
	src/main/java/com/nis/domain/Page.java
	src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
	src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
This commit is contained in:
wangxin
2018-03-06 18:54:04 +08:00
parent 663d4f7f0f 173d80f07f
commit b21c159fdd
13 changed files with 205 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/include/form/complexInfo.jsp
View File

@@ -10,6 +10,7 @@
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">匹配区域</label>

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

@@ -31,7 +31,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">
@@ -81,8 +81,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>

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

@@ -5,20 +5,6 @@
<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() {
@@ -112,10 +98,10 @@
<!-- <th>编译id</th> -->
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="property"/></th>
<!-- <th>区域生效id</th> -->
<th><spring:message code="valid_indentifier"/></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>

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

@@ -74,8 +74,7 @@ $(function(){
$("input[name='dstIp']").val("::");
}
}
});
});
$("#ipCfgFrom").validate({
rules: {
cfgDesc: {

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

@@ -5,20 +5,6 @@
<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() {
@@ -37,13 +23,9 @@
<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}&audit=${audit}'"><spring:message code="refresh"></spring:message></button>
<c:if test="${audit==0 }">
<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="add"></spring:message></button>
</c:if>
</div>
<h3 class="page-title">
@@ -69,7 +51,6 @@
<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">
<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">
@@ -132,16 +113,12 @@
<!-- <th>区域生效id</th> -->
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<c:if test="${audit==0}">
<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>
</c:if>
<c:if test="${audit==1}">
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
</c:if>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -160,11 +137,7 @@
<td>${ipCfg.dstPort }</td>
<td>${ipCfg.dstPortMask }</td>
<td>${ipCfg.direction }</td>
<td>
<c:if test="${ipCfg.protocol==0 }">任意</c:if>
<c:if test="${ipCfg.protocol==6 }">TCP</c:if>
<c:if test="${ipCfg.protocol==17 }">UDP</c:if>
</td>
<td>${ipCfg.protocol }</td>
<%-- <td>${ipCfg.protocolId }</td> --%>
<td>
<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>
@@ -219,50 +192,36 @@
<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>
<c:if test="${audit==0}">
<td>${ipCfg.creatorName }</td>
<td><fmt:formatDate value="${ipCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${ipCfg.editorName }</td>
<td><fmt:formatDate value="${ipCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</c:if>
<c:if test="${audit==1}">
<td>${ipCfg.auditorName }</td>
<td><fmt:formatDate value="${ipCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</c:if>
<td>
<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:if test="${audit==0}">
<c:choose>
<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:when test="${ipCfg.isAudit eq '1'}"></c:when>
<c:otherwise>
<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:otherwise>
</c:choose>
</c:if>
<c:if test="${audit==1}">
<c:choose>
<!-- 审核未通过可修改 -->
<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=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>

2
src/main/webapp/WEB-INF/views/login.jsp
View File

@@ -80,7 +80,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>

32
src/main/webapp/WEB-INF/views/systemService/form.jsp
View File

@@ -154,14 +154,14 @@
function addDatatable() {
$("#datatables").append(
'<div class="table-list col-md-10">' +
'<div>' +
'<div class="table-item">' +
'<input type="hidden" name="sciId" value="0"/>' +
'<input type="hidden" name="sciIsValid" value="1"/>' +
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_name"/>'+':</span> ' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="tableName"/></span> ' +
'</div>' +
'<div>' +
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
'<span> ' +
'<select class="child-required child-input" name="tableType" onchange="autoServiceId()"> ' +
'<option value="">'+'<spring:message code="select"/>'+'</option>' +
@@ -172,12 +172,12 @@
'</select>' +
'</span> ' +
'</div>' +
'<div>' +
'<span class="child-label col-md-2"><font color="red">*</font>MAAT '+'<spring:message code="table_name"/>'+':</span> ' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>MAAT '+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="maatTable"/></span>' +
'</div>' +
'<div>' +
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_des"/>'+':</span> ' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_des"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="tableDesc"/></span>' +
'<button type="button" class="btn btn-danger del-button" onclick="del2(this)">'+'<spring:message code="delete"/>'+'</button>' +
'</div>' +
@@ -273,15 +273,15 @@
</shiro:hasPermission>
<c:forEach items="${systemServiceInfo.serviceConfigInfoList }" var="serviceConfigInfo">
<div class="table-list col-md-10">
<div>
<div class="table-item">
<input type="hidden" name="sciId" value="${serviceConfigInfo.id }"/>
<input type="hidden" name="sciIsValid" value="1"/>
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_name"/>:</span>
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="tableName" value="${serviceConfigInfo.tableName }"/></span>
</div>
<div>
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_type"/>:</span>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_type"/>:</span>
<span>
<select class="child-required child-input" name="tableType">
<option value=""><spring:message code="select"/></option>
@@ -292,12 +292,12 @@
</select>
</span>
</div>
<div>
<span class="child-label col-md-2"><font color="red">*</font>MAAT <spring:message code="table_name"/>:</span>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font>MAAT <spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span>
</div>
<div>
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_des"/>:</span>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_des"/>:</span>
<span><input class="child-required form-control child-input" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
<button type="button" class="btn btn-danger del-button" onclick="del(this)"><spring:message code="delete"/></button>

4
src/main/webapp/static/pages/css/systemService.css
View File

@@ -49,4 +49,8 @@ select, input {
margin-top: 15px;
margin-bottom: 15px;
background-color: #F8F8FF;
}
.table-item {
margin-top: 5px;
margin-bottom: 5px;
}