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://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
wangxin
2018-10-25 16:44:13 +08:00
parent eac273be9b 97ae9af60f
commit 92e3ea93dc
13 changed files with 93 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
View File

@@ -21,6 +21,7 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
private String groupName;
private Integer groupType;
private Integer serviceGroupId;
private String description;
public Integer getServiceGroupId() {
return serviceGroupId;
@@ -58,4 +59,10 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
public void setGroupType(Integer groupType) {
this.groupType = groupType;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}

2
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -131,7 +131,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
//查询时left join policyGroup
Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model,entity);
initFormCondition(model,entity);
return "/cfg/maintenance/ipMultiplexPool/snatlist";
}

14
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -12,10 +12,11 @@
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="editor_id" property="editorId" jdbcType="INTEGER" />
<result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
<result column="description" property="description" jdbcType="VARCHAR" />
</resultMap>
<sql id="PolicyGroupInfoColumns">
r.group_id,r.group_name,r.group_type,r.is_valid,
r.create_time,r.edit_time,r.creator_id,r.editor_id,r.service_group_id
r.group_id,r.group_name,r.group_type,r.is_valid,r.create_time,
r.edit_time,r.creator_id,r.editor_id,r.service_group_id,r.description
</sql>
<!-- 查出所有 有效数据-->
@@ -95,14 +96,16 @@
CREATE_TIME,
GROUP_NAME,
GROUP_TYPE,
SERVICE_GROUP_ID
SERVICE_GROUP_ID,
DESCRIPTION
)values (
1,
#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP},
#{groupName,jdbcType=VARCHAR},
#{groupType,jdbcType=INTEGER},
#{serviceGroupId,jdbcType=INTEGER}
#{serviceGroupId,jdbcType=INTEGER},
#{description,jdbcType=VARCHAR}
)
</insert>
<update id="update" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
@@ -115,6 +118,9 @@
<if test="groupType != null" >
group_type = #{groupType,jdbcType=INTEGER},
</if>
<if test="description != null" >
description = #{description,jdbcType=VARCHAR},
</if>
<if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER},
</if>

4
src/main/resources/messages/message_en.properties
View File

@@ -165,7 +165,7 @@ ssl_certificate_monitor=SSL Cert Monitor
response_header_control=Response Header Control
ip_website_text_control=IP+Website Keyword Control
request_task=Letter and Task
realtime_report=Log Report
realtime_report=Statistics
protocol_and_app=Protocol And App
text_content_monitor=Plaintext
multimedia=Multimedia
@@ -991,7 +991,7 @@ ip_multiplex_pool_config=IP Reuse Addr Pool
letter=Official Letter
show_more=Show More
#===============dashboard begin===================================
dashboard=Dashboard
dashboard=Traffic Statistics
traffic_chart=Traffic Chart
os_type=OS Type
browser_type=Browser Type

2
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -212,7 +212,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
var requestName =requestNameArr[1];
if(requestName.indexOf("null")==-1&&typeof(indexTableName)!="undefined"&&indexTableName!=null&&indexTableName!=''&&indexTableName.indexOf("null")==-1){
$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 500, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 400, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
submit: function (v, h, f) {
if (v == 0) {
return true; // close the window

14
src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
View File

@@ -53,7 +53,7 @@ $(function(){
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="cfgFrom" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
<form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
<input type="hidden" name="groupId" value="${_cfg.groupId}">
<div class="form-body">
<div class="row">
@@ -79,6 +79,16 @@ $(function(){
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-6">
<form:textarea path="description" htmlEscape="false" maxlength="128" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="form-actions">
<div class="row">
@@ -93,7 +103,7 @@ $(function(){
<div class="col-md-6"> </div>
</div>
</div>
</form>
</form:form>
<!-- END FORM-->
</div>
</div>

3
src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
View File

@@ -216,6 +216,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="group_name"/></th>
<th><spring:message code="group_type"/></th>
<th><spring:message code="desc"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
@@ -238,7 +239,7 @@
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</td>
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>

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

@@ -174,12 +174,12 @@ $(function(){
function hiddenlevel(){
var action=$("input[name='action']:checked").val();
if(action==16){
$(".leveL").addClass("hidden");
$(".level").addClass("hidden");
$("select[name='level']").find("option").eq(0).attr("value","0");
$("select[name='level']").val("0");
$("select[name='level']").selectpicker("refresh");
}else {
$(".leveL").removeClass("hidden");
$(".level").removeClass("hidden");
$("select[name='level']").find("option").eq(0).attr("value","");
$("select[name='level']").val("100");
$("select[name='level']").selectpicker("refresh");
@@ -328,7 +328,7 @@ function sampleFileValidate(fileType,fileName){
</c:choose>
</div>
&nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>"
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
<div for="srcFileInfo"></div>
<div id="fileErrorNote"></div>
</div>
@@ -356,7 +356,7 @@ function sampleFileValidate(fileType,fileName){
<div for="sampleFileInfo"></div>
</div>
</div> --%>
<div class="col-md-6 leveL" >
<div class="col-md-6 level" >
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">

36
src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
View File

@@ -16,23 +16,37 @@ $(function(){
})
}); */
if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){
$("#level").show();
$(".level").removeClass("hidden");
$(".level").find("select[name='level']").find("option").eq(0).attr("value","");
$(".level").find("select[name='level']").val("100");
$(".level").find("select[name='level']").selectpicker("refresh");
}else{
$("#level").hide();
$("input[name$='level']").val(0);
$(".level").addClass("hidden");
$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
$(".level").find("select[name$='level']").val("0");
$(".level").find("select[name$='level']").selectpicker("refresh");
}
$("input[name~=action]").on("change",function(){
$("#serviceId").val($(this).attr("serviceId"));
if($(".action:checked").val()==1){
$("#level").show();
$(".level").removeClass("hidden");
$(".level").find("select[name$='level']").find("option").eq(0).attr("value","");
$(".level").find("select[name$='level']").val("100");
$(".level").find("select[name$='level']").selectpicker("refresh");
}else{
$("#level").hide();
$(".level").addClass("hidden");
$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
$(".level").find("select[name$='level']").val("0");
$(".level").find("select[name$='level']").selectpicker("refresh");
}
if($("#level").is(":hidden")){
$("input[name$='level']").val(0);
}
if($(".action:checked").attr("id")=="actionOff"){
$("#level").hide();
$(".level").addClass("hidden");
$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
$(".level").find("select[name$='='level']").val("0");
$(".level").find("select[name$='level']").selectpicker("refresh");
}
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -172,12 +186,18 @@ $(function(){
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<div id="level" class="form-group" hidden="hidden">
<div id="level" class="form-group level hidden" >
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="cfgs[${status.index }].level" value="${_cfg.level }">
<select name="cfgs[${status.index }].level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 100)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>
</select>
</div>
</div>
<div for="cfgs[${status.index }].level"></div>
</div>
</div>

4
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -5,7 +5,7 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function() {
var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","\n","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
$("#fileNoteInfo").attr("title","<spring:message code='select_file'/>: "+fileType);
$("#uploadSrc,#fileInfo").on('click', function() {
$("#file").trigger("click");
@@ -253,7 +253,7 @@
value="${_cfg.rawLen }" />
</div>
&nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>"
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
<div for="fileInfo"></div>
<div id="fileErrorNote"></div>
</div>

12
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -94,7 +94,7 @@
</c:if>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/proxy/intercept/intercept${interceptType}Form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
@@ -116,7 +116,7 @@
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</customTag:hasAnyPermissions>
</shiro:hasPermission>
</div>
<h3 class="page-title">
@@ -190,12 +190,12 @@
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
<sys:delRow url="${ctx}/proxy/intercept/intercept${interceptType}Form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/updateIntercept${interceptType}Valid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</customTag:hasAnyPermissions>
<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:confirm">
</shiro:hasPermission>
<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:confirm">
<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>
@@ -207,7 +207,7 @@
<li><sys:delRow url="${ctx}/proxy/intercept/auditIntercept${interceptType}Cfg?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</customTag:hasAnyPermissions>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>

12
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
View File

@@ -278,6 +278,7 @@
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="group"/></th>
<th><spring:message code="isp"/></th>
<th><spring:message code="server_ip"/></th>
<%-- <th><spring:message code="port"/></th> --%>
<%-- <th><spring:message code="protocol"/></th>
@@ -317,6 +318,17 @@
${fns:abbr(cfg.groupName,20)}
</a>
</td>
<td>
<c:set value="${cfg.areaEffectiveIds }" var="isp"></c:set>
<c:if test="${fn:contains(cfg.areaEffectiveIds,':') }">
<c:set value="${fns:substringAfterLast(cfg.areaEffectiveIds,':') }" var="isp"></c:set>
</c:if>
<c:forEach items="${isps}" var="dict">
<c:if test="${dict.itemCode eq isp }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<%-- <td>${cfg.port }</td> --%>
<%-- <td>

6
src/main/webapp/static/global/scripts/common.js
View File

@@ -1,5 +1,5 @@
$(function(){
var leff =$("span[class~='le-ca-fo']").attr("data-original-title")
// var leff =$("span[class~='le-ca-fo']").attr("data-original-title")
$("#contentTable").not(".logTb").find("tbody tr").each(function(i){
if($(this).find("input[type='checkbox']").attr("value")==3){
@@ -16,9 +16,9 @@ $(function(){
success:function(data){//处理返回结果
//根据表名跟cfgid获取 requestNumber；
if(data.requestTitle!=null){
resetLeff.attr("data-original-title",leff+data.requestTitle)
resetLeff.attr("data-original-title",data.requestTitle)
}else{
resetLeff.attr("data-original-title",leff+"")
resetLeff.attr("data-original-title","")
}
}
});