diff --git a/src/main/java/com/nis/domain/configuration/AppComplexFeatureCfg.java b/src/main/java/com/nis/domain/configuration/AppComplexFeatureCfg.java index 87f8945c0..779681480 100644 --- a/src/main/java/com/nis/domain/configuration/AppComplexFeatureCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppComplexFeatureCfg.java @@ -43,6 +43,19 @@ public class AppComplexFeatureCfg extends BaseCfg { private String appName; private List ipPortList = new ArrayList(); private String cfgRegionCode1; + //以下参数为APP PAYLOAD L3_HEADER的特殊属性（使用偏移表达式处理） + private String ver; + private String ihl; + private String tos; + private String totalLength; + private String flags; + private String fragmentOffset; + private String protocol; + private String icmpType; + private String icmpCode; + private String icmpIdentifier; + private String headerType; + public String getCfgRegionCode1() { return cfgRegionCode1; } @@ -197,5 +210,94 @@ public class AppComplexFeatureCfg extends BaseCfg { public void setIpPortList(List ipPortList) { this.ipPortList = ipPortList; } + + public String getVer() { + return ver; + } + + public void setVer(String ver) { + this.ver = ver; + } + + public String getIhl() { + return ihl; + } + + public void setIhl(String ihl) { + this.ihl = ihl; + } + + public String getTos() { + return tos; + } + + public void setTos(String tos) { + this.tos = tos; + } + + public String getTotalLength() { + return totalLength; + } + + public void setTotalLength(String totalLength) { + this.totalLength = totalLength; + } + + public String getFlags() { + return flags; + } + + public void setFlags(String flags) { + this.flags = flags; + } + + public String getFragmentOffset() { + return fragmentOffset; + } + + public void setFragmentOffset(String fragmentOffset) { + this.fragmentOffset = fragmentOffset; + } + + public String getProtocol() { + return protocol; + } + + public void setProtocol(String protocol) { + this.protocol = protocol; + } + + public String getIcmpType() { + return icmpType; + } + + public void setIcmpType(String icmpType) { + this.icmpType = icmpType; + } + + public String getIcmpCode() { + return icmpCode; + } + + public void setIcmpCode(String icmpCode) { + this.icmpCode = icmpCode; + } + + public String getIcmpIdentifier() { + return icmpIdentifier; + } + + public void setIcmpIdentifier(String icmpIdentifier) { + this.icmpIdentifier = icmpIdentifier; + } + + public String getHeaderType() { + return headerType; + } + + public void setHeaderType(String headerType) { + this.headerType = headerType; + } + } diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index 446203897..1ae4d318c 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -12,11 +12,11 @@ public class AvFileSampleCfg extends BaseCfg { private String indexTable="av_file_sample_cfg"; @Expose @SerializedName("srcFile") - @ExcelField(title="src_file",sort=2) + @ExcelField(title="src_file",sort=3) private String srcUrl; @Expose @SerializedName("dstFile") - @ExcelField(title="sample_file",sort=3) + @ExcelField(title="sample_file",sort=4) private String sampleUrl; @Expose @SerializedName("srcFileMd5") diff --git a/src/main/java/com/nis/domain/configuration/CachePolicyUserRegion.java b/src/main/java/com/nis/domain/configuration/CachePolicyUserRegion.java new file mode 100644 index 000000000..d1b82e673 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/CachePolicyUserRegion.java @@ -0,0 +1,159 @@ +/** + *@Title: HttpDomainConfig.java + *@Package com.nis.domain.restful + *@Description TODO + *@author dell + *@date 2018年2月5日 下午5:33:05 + *@version 版本号 + */ +package com.nis.domain.configuration; + +import java.util.Map; + +import com.nis.util.excel.ExcelField; + +/** + * @ClassName: HttpDomainConfig.java + * @Description: TODO + * @author (dell) + * @date 2018年2月5日 下午5:33:05 + * @version V1.0 + */ +public class CachePolicyUserRegion extends BaseCfg { + + private static final long serialVersionUID = -1741829305216502322L; + + @ExcelField(title="cache_cookied_cont",dictType="CACHE_COOKIED_CONT",sort=7) + private String cache_cookied_cont; + @ExcelField(title="cache_dyn_url",dictType="CACHE_DYN_URL",sort=6) + private String cache_dyn_url; + @ExcelField(title="force_caching",dictType="FORCE_CACHING",sort=10) + private String force_caching; + @ExcelField(title="ignore_req_nocache",dictType="IGNORE_REQ_NOCACHE",sort=8) + private String ignore_req_nocache; + @ExcelField(title="ignore_res_nocache",dictType="IGNORE_RES_NOCACHE",sort=9) + private String ignore_res_nocache; + @ExcelField(title="inactive_time",sort=14) + private String inactive_time; + @ExcelField(title="max_cache_obj_size",sort=15) + private String max_cache_obj_size; + @ExcelField(title="max_cache_size",sort=13) + private String max_cache_size; + @ExcelField(title="min_use",sort=11) + private String min_use; + @ExcelField(title="no_revalidate",dictType="CACHE_NO_REVALIDATE",sort=5) + private String no_revalidate; + @ExcelField(title="pinning_time",dictType="",sort=12) + private String pinning_time; + @ExcelField(title="ignore_query_string",sort=3) + private String ignore_qs; + @ExcelField(title="include_cookie",sort=4) + private String cookie; + + private Map cache_key; + + private BaseStringCfg strCfg; + + @ExcelField(title="action",sort=2) + protected String actionCode; + + + public String getActionCode() { + return actionCode; + } + public void setActionCode(String actionCode) { + this.actionCode = actionCode; + } + public BaseStringCfg getStrCfg() { + return strCfg; + } + public void setStrCfg(BaseStringCfg strCfg) { + this.strCfg = strCfg; + } + public Map getCache_key() { + return cache_key; + } + public void setCache_key(Map cache_key) { + this.cache_key = cache_key; + } + public String getIgnore_res_nocache() { + return ignore_res_nocache; + } + public void setIgnore_res_nocache(String ignore_res_nocache) { + this.ignore_res_nocache = ignore_res_nocache; + } + public String getCache_cookied_cont() { + return cache_cookied_cont; + } + public void setCache_cookied_cont(String cache_cookied_cont) { + this.cache_cookied_cont = cache_cookied_cont; + } + public String getCache_dyn_url() { + return cache_dyn_url; + } + public void setCache_dyn_url(String cache_dyn_url) { + this.cache_dyn_url = cache_dyn_url; + } + public String getForce_caching() { + return force_caching; + } + public void setForce_caching(String force_caching) { + this.force_caching = force_caching; + } + public String getIgnore_req_nocache() { + return ignore_req_nocache; + } + public void setIgnore_req_nocache(String ignore_req_nocache) { + this.ignore_req_nocache = ignore_req_nocache; + } + public String getInactive_time() { + return inactive_time; + } + public void setInactive_time(String inactive_time) { + this.inactive_time = inactive_time; + } + public String getMax_cache_obj_size() { + return max_cache_obj_size; + } + public void setMax_cache_obj_size(String max_cache_obj_size) { + this.max_cache_obj_size = max_cache_obj_size; + } + public String getMax_cache_size() { + return max_cache_size; + } + public void setMax_cache_size(String max_cache_size) { + this.max_cache_size = max_cache_size; + } + public String getMin_use() { + return min_use; + } + public void setMin_use(String min_use) { + this.min_use = min_use; + } + public String getNo_revalidate() { + return no_revalidate; + } + public void setNo_revalidate(String no_revalidate) { + this.no_revalidate = no_revalidate; + } + public String getPinning_time() { + return pinning_time; + } + public void setPinning_time(String pinning_time) { + this.pinning_time = pinning_time; + } + public String getIgnore_qs() { + return ignore_qs; + } + public void setIgnore_qs(String ignore_qs) { + this.ignore_qs = ignore_qs; + } + public String getCookie() { + return cookie; + } + public void setCookie(String cookie) { + this.cookie = cookie; + } + + +} diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index 8be421416..57fef7b6d 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -29,13 +29,13 @@ public class FileDigestCfg extends BaseCfg { private static final long serialVersionUID = 2796500715438264119L; private static final String tableName="file_digest_cfg"; private String indexTable="file_digest_cfg"; - @ExcelField(title="raw_len",sort=3) + @ExcelField(title="raw_len",sort=4) private Long rawLen; - @ExcelField(title="digest",sort=2) + @ExcelField(title="digest",sort=3) private String digest; - @ExcelField(title="cfds_level",sort=4) + @ExcelField(title="harm_level",sort=5) private Integer cfdsLevel; - @ExcelField(title="file_url",sort=5) + @ExcelField(title="file_url",sort=6) private String fileUrl; private NtcSubscribeIdCfg ntcSubscribeIdCfg; diff --git a/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java b/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java index f8cdda62c..f8e854c0f 100644 --- a/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpAddrPoolCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import java.util.List; import com.google.gson.annotations.SerializedName; +import com.nis.util.excel.ExcelField; /** * IP复用地址池实体 @@ -13,15 +14,16 @@ public class IpAddrPoolCfg extends BaseCfg{ private static final long serialVersionUID = 1392197458744667669L; private String indexTable="ip_reuse_addr_pool"; - + @ExcelField(title="address_pool",sort=2) private String addrPoolName; // 地址池名称 + @ExcelField(title="ip_total",sort=3) private Integer ipTotal; // IP总数 private Integer availableIpTotal; // 可用IP总数 private String description; // 描述信息 private List ipCfgs; // 地址池IP信息 - @SerializedName("cfgId") + @ExcelField(title="address_pool_id",sort=0) private Integer compileId; public String getIndexTable() { diff --git a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java index 47803a4f8..124bb0bd8 100644 --- a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.Constants; +import com.nis.util.excel.ExcelField; /** * IP复用DNAT策略实体 @@ -16,6 +17,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("configId") + @ExcelField(title="cfg_id",sort=0) private Integer compileId; @Expose @@ -24,22 +26,26 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("originalDestIp") + @ExcelField(title="original_dest_ip",sort=4) private String srcIpAddress; @Expose @SerializedName("originalDestPort") + @ExcelField(title="original_dest_port",sort=5) private String srcPort; - @Expose @SerializedName("originalProtocol") + @ExcelField(title="protocol",dictType="PROTOCOL",sort=8) private Integer protocol; @Expose @SerializedName("translatedDestIp") + @ExcelField(title="translated_dest_ip",sort=6) private String destIpAddress; @Expose @SerializedName("translatedDestPort") + @ExcelField(title="translated_dest_port",sort=7) private String destPort; @Expose diff --git a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java index 573bb6f00..af29f5ca5 100644 --- a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java @@ -3,6 +3,7 @@ package com.nis.domain.configuration; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.Constants; +import com.nis.util.excel.ExcelField; /** * IP复用策略 @@ -20,6 +21,7 @@ public class IpReusePolicyCfg extends BaseCfg{ private Integer userId; // 用户标识 @Expose + @ExcelField(title="user_type",dictType="USER_TYPE",sort=4) protected String userType; // 用户类型 @Expose protected Integer addrPoolId; // 地址池ID @@ -27,11 +29,14 @@ public class IpReusePolicyCfg extends BaseCfg{ protected String translateParam; // 地址翻译参数 @Expose @SerializedName("userId") + @ExcelField(title="user",sort=5) private String userName; + @ExcelField(title="address_pool",sort=3) private String addrPoolName; // 仅用于列表条件检索 private Integer ipType; private Integer ipPattern; + @ExcelField(title="ip",sort=6) private String srcIpAddress; private String destIpAddress; @Expose diff --git a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java index 6094f6f2c..7c712c3b8 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java @@ -1,7 +1,5 @@ package com.nis.domain.configuration; -import java.util.Date; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -23,10 +21,13 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{ private String port; @Expose @SerializedName("addrType") + @ExcelField(title="ip_type",dictType="IP_TYPE",sort=4) private Integer ipType; @Expose @SerializedName("ip") + @ExcelField(title="IP",sort=5) private String ipAddress; + @ExcelField(title="group",sort=3) private String groupName;//欺骗IP池（IP组）名称 @Expose @SerializedName("policyGroup") @@ -36,6 +37,7 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{ private Integer location;//位置，无意义，固定为0 @Expose @SerializedName("cfgId") + @ExcelField(title="cfg_id",sort=0) private Integer compileId; @Expose @SerializedName("userRegion") diff --git a/src/main/java/com/nis/domain/configuration/UserManage.java b/src/main/java/com/nis/domain/configuration/UserManage.java index da0163f70..5ce08c73e 100644 --- a/src/main/java/com/nis/domain/configuration/UserManage.java +++ b/src/main/java/com/nis/domain/configuration/UserManage.java @@ -3,25 +3,33 @@ package com.nis.domain.configuration; import java.util.Date; import com.nis.domain.BaseEntity; +import com.nis.util.excel.ExcelField; public class UserManage extends BaseEntity{ private static final long serialVersionUID = -2749633756272829982L; private static final String tableName="user_manage"; + @ExcelField(title="user_name",sort=1) private String userName; private String userPwd; + @ExcelField(title="vpn_ip",sort=2) private String serverIp; private String authMethod; private Integer numLogins; private String lastLogin; private String transferBytes; private String transferPackets; + private Long creatorId; + @ExcelField(title="config_time",sort=5) private Date createTime; + private Long editorId; + @ExcelField(title="edit_time",sort=7) private Date editTime; private Integer isValid; + @ExcelField(title="desc",sort=3) private String remarks; private String userType; @@ -39,8 +47,9 @@ public class UserManage extends BaseEntity{ private String incomingBroadcastPackets; private String incomingBroadcastTotalSize; private Integer numberOfLogins;*/ - + @ExcelField(title="creator",sort=4) private String creatorName; + @ExcelField(title="editor",sort=6) private String editorName; private Date search_create_time_start; private Date search_create_time_end; diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 79c7af97b..cc17b59ee 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -714,6 +714,7 @@ public final class Constants { public static final String TRAFFIC_WEBSITELIST_NOTIME=Configurations.getStringProperty("trafficWebsiteListNoTime","trafficWebsiteListNoTime"); public static final String TRAFFIC_TOPICLIST=Configurations.getStringProperty("trafficTopicList","trafficTopicList"); public static final String TRAFFIC_DOMAIN_TRANS=Configurations.getStringProperty("trafficDomainTrans","trafficDomainTrans"); + public static final String TRAFFIC_PORTACTIVE_FIVEMINUTE=Configurations.getStringProperty("trafficPortActiveFiveMinute","trafficPortActiveFiveMinute"); /** * httpclient 工具超时时间设置 */ diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 0b96126c7..766c0d7b0 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -130,6 +130,9 @@ public class ExcelCsv { Map> commentMap=new HashMap>(); for (String title : titleList) { String noExportField=noExportMap.get(title); + if(noExportField.contains("do_log")){ + noExportField=",do_blacklist,"+noExportField; + } List annotationList = Lists.newArrayList(); List list=new ArrayList(); // Get annotation field diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index fe63edeb2..098c7ad77 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -33,6 +33,7 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.RegionUtil; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; @@ -2132,6 +2133,9 @@ public class ExportExcel { Map> commentMap=new HashMap>(); for (String title : titleList) { String noExportField=noExportMap.get(title); + if(noExportField.contains("do_log")){ + noExportField=",do_blacklist,"+noExportField; + } List annotationList = Lists.newArrayList(); List list=new ArrayList(); // Get annotation field @@ -2293,11 +2297,10 @@ public class ExportExcel { Row timeRow = sheet.createRow(0); timeRow.setHeightInPoints(16); Cell cellt = timeRow.createCell(0); - cellt.setCellStyle(style); cellt.setCellValue(titleTime); sheet.addMergedRegion(callRangeAddress); sheet.autoSizeColumn(0); - //-------------------- + setBorderStyle(CellStyle.BORDER_THIN,callRangeAddress,sheet,wb); } Integer rownum=rownums.get(title); Row headerRow = sheet.createRow(rownum++); @@ -2326,6 +2329,21 @@ public class ExportExcel { log.debug("Initialize success."); } + + public void setBorderStyle(int border, CellRangeAddress region, Sheet sheet, SXSSFWorkbook wb){ + RegionUtil.setBorderBottom(border, region, sheet, wb);//下边框 + RegionUtil.setBorderLeft(border, region, sheet, wb); //左边框 + RegionUtil.setBorderRight(border, region, sheet, wb); //右边框 + RegionUtil.setBorderTop(border, region, sheet, wb); //上边框 + RegionUtil.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + RegionUtil.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex(), region, sheet, wb); + } + + + + /** * 输出数据流 * @param os 输出数据流 diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index de827a5e8..cbe2ca96c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2071,30 +2071,25 @@ public class BaseController { titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start()); if(cfg.getSearch_create_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); - } - }else{ - if(cfg.getSearch_create_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); + } } if(cfg.getSearch_edit_time_start()!=null){ titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start()); if(cfg.getSearch_edit_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); - } - }else{ - if(cfg.getSearch_edit_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); } } if(cfg.getSearch_audit_time_start()!=null){ titleTime+=" "+msgProp.getProperty("audit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_audit_time_start()); if(cfg.getSearch_audit_time_end()!=null){ titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end()); - } - }else{ - if(cfg.getSearch_audit_time_end()!=null){ - titleTime+=" "+msgProp.getProperty("audit_time")+"： —"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); } } return titleTime; diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index d78ccde84..3736613d4 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -50,9 +50,9 @@ public class AsnIpController extends BaseController{ // List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4); // model.addAttribute("policyGroups", policyGroups); - AsnCacheUtils.init(false); - List policyGroups=AsnCacheUtils.getAllAsnGroup(); - model.addAttribute("policyGroups", policyGroups); +// AsnCacheUtils.init(false); +// List policyGroups=AsnCacheUtils.getAllAsnGroup(); +// model.addAttribute("policyGroups", policyGroups); return "/basics/asnIpCfgList"; } @RequestMapping(value = {"/addForm"}) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java index 25569c76e..564c499ac 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java @@ -1,7 +1,6 @@ package com.nis.web.controller.configuration.maintenance; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -21,7 +20,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.IpReuseIpCfg; -import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.IpAddrPoolCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; @@ -224,5 +222,67 @@ public class IpAddrPoolController extends BaseController{ List ipList = ipReuseIpCfgService.getPolicyIpInfo(addrPoolId); return ipList; } + + + @RequestMapping(value = "exportIpPool") + public void exportIpPool(Model model, HttpServletRequest request, HttpServletResponse response, + @ModelAttribute("cfg") IpAddrPoolCfg entity, String ids, RedirectAttributes redirectAttributes) { + try { + // export data info + List titleList = new ArrayList(); + Map> classMap = new HashMap>(); + Map dataMap = new HashMap(); + Map noExportMap = new HashMap(); + + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = ipAddrPoolCfgService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipAddrPoolCfgService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + for (IpAddrPoolCfg ipAddrPoolCfg : ipLists) { + Integer compId=ipAddrPoolCfg.getCfgId().intValue(); + ipAddrPoolCfg.setCompileId(compId); + } + + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), IpAddrPoolCfg.class); + String cfgIndexInfoNoExport = ",cfg_id,config_describe,block_type,policy_name,do_log,,whether_area_block,do_blacklist,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { + cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; + } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), ipLists); + + String timeRange = initTimeMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(entity.getExType())) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("ip white export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index 7359c6dbf..1fccb9aaa 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -23,9 +23,14 @@ import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.basics.IpReuseIpCfg; import com.nis.domain.basics.ServiceDictInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.UserManage; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; +import com.nis.util.DateUtils; import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; @@ -352,4 +357,83 @@ public class UserManageController extends BaseController{ model.addAttribute("user", user); return "/cfg/maintenance/userManage/userView"; }*/ + // 配置导出 + @RequestMapping(value = "exportUser") + public void exportbgp(Model model, HttpServletRequest request, HttpServletResponse response,String hColumns,String exType, + @ModelAttribute("cfg") UserManage entity, String ids, RedirectAttributes redirectAttributes) { + try { + // export data info + List titleList = new ArrayList(); + Map> classMap = new HashMap>(); + Map dataMap = new HashMap(); + Map noExportMap = new HashMap(); + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = userManageService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = userManageService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add("user_manage"); + classMap.put("user_manage", UserManage.class); + String cfgIndexInfoNoExport = ","; + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + + if (!StringUtil.isEmpty(hColumns)) { + cfgIndexInfoNoExport = "," + hColumns + "," + cfgIndexInfoNoExport; + } + for (UserManage userManage : ipLists) { + if(!StringUtils.isEmpty( userManage.getServerIp())){ + userManage.setServerIp(userManage.getServerIp().substring(0,userManage.getServerIp().length()-1).replaceAll(",", "，")); + } + } + noExportMap.put("user_manage", cfgIndexInfoNoExport); + dataMap.put("user_manage", ipLists); + String timeRange = initUserMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(exType)) { + this._exportCsv(model, request, response, redirectAttributes, "user_manage", titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, "user_manage", titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("user export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + // return "redirect:" + adminPath + // +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + public String initUserMap(UserManage cfg){ + Properties msgProp = getMsgProp(); + String titleTime=msgProp.getProperty("user_manage","user_manage"); + if(cfg.getSearch_create_time_start()!=null){ + titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start()); + if(cfg.getSearch_create_time_end()!=null){ + titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); + }else { + titleTime+="—"+DateUtils.getDateTime(); + } + } + if(cfg.getSearch_edit_time_start()!=null){ + titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start()); + if(cfg.getSearch_edit_time_end()!=null){ + titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); + }else{ + titleTime+="—"+DateUtils.getDateTime(); + } + } + return titleTime; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index b5c54efea..df8f9a255 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -31,6 +31,7 @@ import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpAddrPoolCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpReuseDnatPolicyCfg; @@ -430,7 +431,7 @@ public class IpMultiplexController extends CommonController { // snat配置导出 @RequestMapping(value = "exportSnat") public void exportSnat(Model model, HttpServletRequest request, HttpServletResponse response, - @ModelAttribute("cfg") BaseIpCfg entity, String ids, RedirectAttributes redirectAttributes) { + @ModelAttribute("cfg") IpReusePolicyCfg entity, String ids, RedirectAttributes redirectAttributes) { try { // export data info List titleList = new ArrayList(); @@ -438,27 +439,38 @@ public class IpMultiplexController extends CommonController { Map dataMap = new HashMap(); Map noExportMap = new HashMap(); Properties msgProp = getMsgProp(); - - /* - * //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String - * id:ids.split(",")){ Long.parseLong(id); } //List - * list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename() - * , entity.getFunctionId(), ids); }else{ - */ - // 条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.findPage(pageInfo, entity);// - for (BaseIpCfg baseIp : page.getList()) { - if (StringUtil.isEmpty(baseIp.getGroupName())) { - baseIp.setGroupName(msgProp.getProperty("default_group")); + // 导出选中记录 + List ipLists = new ArrayList(); + + if (!StringUtil.isEmpty(ids)) { + ipLists = ipMultiplexService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipMultiplexService.findPage(pageInfo,entity); + ipLists = page.getList(); + } + List addrPools = ipAddrPoolCfgService.getEffectiveAddrPool(); + for (IpReusePolicyCfg ipReusePolicyCfg : ipLists) { + if(ipReusePolicyCfg.getAddrPoolId()!=null){ + for (IpAddrPoolCfg addr : addrPools) { + if(ipReusePolicyCfg.getAddrPoolId()==addr.getCfgId().intValue()){ + ipReusePolicyCfg.setAddrPoolName(addr.getAddrPoolName()); + } + } + } + if(ipReusePolicyCfg.getUserType().equals("VPN")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_vpn_user","VPN")); + }else if(ipReusePolicyCfg.getUserType().equals("SIPv4")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_sipv4_user","SIPv4")); + }else if(ipReusePolicyCfg.getUserType().equals("SIPv6")){ + ipReusePolicyCfg.setUserType(msgProp.getProperty("policy_sipv6_user","SIPv6")); } } titleList.add(entity.getMenuNameCode()); - classMap.put(entity.getMenuNameCode(), BaseIpCfg.class); - String snatNoExport = ",client_ip,group_name,server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; + classMap.put(entity.getMenuNameCode(), IpReusePolicyCfg.class); + String snatNoExport = ",block_type,client_ip,group_name,server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -475,7 +487,7 @@ public class IpMultiplexController extends CommonController { } noExportMap.put(entity.getMenuNameCode(), snatNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); @@ -497,7 +509,7 @@ public class IpMultiplexController extends CommonController { // dnat配置导出 @RequestMapping(value = "exportDnat") public void exportDnat(Model model, HttpServletRequest request, HttpServletResponse response, - @ModelAttribute("cfg") BaseIpCfg entity, String ids, RedirectAttributes redirectAttributes) { + @ModelAttribute("cfg") IpReuseDnatPolicyCfg entity, String ids, RedirectAttributes redirectAttributes) { try { // export data info List titleList = new ArrayList(); @@ -505,27 +517,21 @@ public class IpMultiplexController extends CommonController { Map dataMap = new HashMap(); Map noExportMap = new HashMap(); Properties msgProp = getMsgProp(); - - /* - * //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String - * id:ids.split(",")){ Long.parseLong(id); } //List - * list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename() - * , entity.getFunctionId(), ids); }else{ - */ - // 条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "r"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = ipCfgService.findPage(pageInfo, entity);// - for (BaseIpCfg baseIp : page.getList()) { - if (StringUtil.isEmpty(baseIp.getGroupName())) { - baseIp.setGroupName(msgProp.getProperty("default_group")); - } + // 导出选中记录 + List ipLists = new ArrayList(); + if (!StringUtil.isEmpty(ids)) { + ipLists = ipMultiplexService.findPageByDnat(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = ipMultiplexService.findPageDnat(pageInfo, entity); + ipLists = page.getList(); } + titleList.add(entity.getMenuNameCode()); - classMap.put(entity.getMenuNameCode(), BaseIpCfg.class); - String snatNoExport = ",direction,client_ip,ip_type,ip_pattern,port_pattern,client_port,ir_type,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; + classMap.put(entity.getMenuNameCode(), IpReuseDnatPolicyCfg.class); + String snatNoExport = ",group_name,block_type,direction,client_ip,ip_type,ip_pattern,port_pattern,client_port,ir_type,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -542,7 +548,7 @@ public class IpMultiplexController extends CommonController { } noExportMap.put(entity.getMenuNameCode(), snatNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(),ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 126b59d4e..32baf47df 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -43,6 +43,7 @@ import com.nis.domain.configuration.AvSignSampleCfg; import com.nis.domain.configuration.AvSignSampleCfgModel; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.ToMaatResult; @@ -585,18 +586,20 @@ public class AvController extends BaseController { Map dataMap = new HashMap(); Map noExportMap = new HashMap(); - /* - * //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String - * id:ids.split(",")){ Long.parseLong(id); } //List - * list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename() - * , entity.getFunctionId(), ids); }else{ - */ + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = avCfgService.getAvFileBySampleList(ids); + } else { + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = avCfgService.getAvFileSampleList(pageInfo, entity); + ipLists = page.getList(); + } // 条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = avCfgService.getAvFileSampleList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class); String cfgIndexInfoNoExport = ",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; @@ -616,7 +619,7 @@ public class AvController extends BaseController { } noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index ff536414c..98d141c71 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -826,23 +826,22 @@ public class FileTransferCfgController extends BaseController { Map> classMap = new HashMap>(); Map dataMap = new HashMap(); Map noExportMap = new HashMap(); - - /* - * //导出选中记录 if(!StringUtil.isEmpty(ids)){ for(String - * id:ids.split(",")){ Long.parseLong(id); } //List - * list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename() - * , entity.getFunctionId(), ids); }else{ - */ - // 条件导出数据大于最大导出数，只导出最大导出条数 - entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "a"); - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = fileTransferCfgService.getFileByDigestList(ids); + } else { + Page pageInfo = new Page(request, response, "a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; - + // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; @@ -858,7 +857,7 @@ public class FileTransferCfgController extends BaseController { } noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put(entity.getMenuNameCode(), ipLists); /* } */ String timeRange = initTimeMap(entity); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java index 36c053f0e..44206d84c 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java @@ -3,39 +3,27 @@ package com.nis.web.controller.configuration.proxy; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; -import com.nis.domain.callback.ProxyFileStrategyCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CachePolicyUserRegion; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; -import com.nis.domain.configuration.FileDigestCfg; -import com.nis.domain.configuration.HttpBodyCfg; -import com.nis.domain.configuration.HttpReqHeadCfg; -import com.nis.domain.configuration.HttpResHeadCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; -import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -43,7 +31,6 @@ import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; -import jersey.repackaged.com.google.common.collect.Lists; /** * http重定向策略 @@ -233,166 +220,90 @@ public class CachePolicyController extends BaseController{ //http配置导出 - /*@RequestMapping(value = "exportHttp") - public String exportHttp(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ - try { - //export data info - List titleList=new ArrayList(); - Map> classMap=new HashMap>(); - Map dataMap=new HashMap(); - Map noExportMap=new HashMap(); - - List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); - - //导出选中记录 - if(!StringUtil.isEmpty(ids)){ - for(String id:ids.split(",")){ - Long.parseLong(id); - } - //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); - }else{ - //条件导出数据大于最大导出数，只导出最大导出条数 - Page pageInfo=new Page(request, response,"a"); - if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ - pageInfo.setPageNo(1); - pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); - }else{ - pageInfo.setPageNo(1); - pageInfo.setPageSize(-1); - } - - Page page = cachePolicyService.getCachePolicyList(pageInfo, entity); - Properties prop = getMsgProp(); - for (CfgIndexInfo str : page.getList()) { - if(entity.getFunctionId()!=210 && entity.getFunctionId()!=211){ - String type="RESPONSE_CODE"; - if(entity.getFunctionId()==207){ - type="RESPONSE_CODE"; - }else if(entity.getFunctionId()==208){ - type="REDIRECT_RESPONSE_CODE"; - }else if(entity.getFunctionId()==209){ - type="CONTROL_REPLACE_ZONE"; - } - String dictlabel= DictUtils.getDictLabel(type, str.getUserRegion1()); - str.setUserRegion1(prop.getProperty(dictlabel)); - if(entity.getFunctionId()==207 || entity.getFunctionId()==208){ - if(StringUtil.isEmpty(str.getUserRegion2())){ - if(!StringUtil.isEmpty(str.getUserRegion3())){ - ProxyFileStrategyCfg file= new ProxyFileStrategyCfg(); - file.setCompileId(Integer.valueOf(str.getUserRegion3())); - List allProxyFileStrategys = proxyFileStrategyService.getProxyFileStrategyCfgList(file); - if(allProxyFileStrategys!=null && allProxyFileStrategys.size()>0){ - str.setUserRegion2(allProxyFileStrategys.get(0).getCfgDesc()); - } - } - } - } - } - } - String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; - if(entity.getFunctionId()==207){ - cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-"; - }else if(entity.getFunctionId()==208){ - cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-"; - }else if(entity.getFunctionId()==209){ - cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-"; - }else if(entity.getFunctionId()==211){ - cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; - } - String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - String httpReqHeadCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - String httpResHeadCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - String httpReqBodyCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - String httpResBodyCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - String ipPortCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; - String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" - + ",config_time,editor,edit_time,auditor,audit_time" - +",letter,whether_area_block,classification,attribute,label" - +",userregion1,userregion2,userregion3,userregion4,userregion5,"; - List httpUrlList = new ArrayList<>(); - List httpReqHdrList = new ArrayList<>(); - List httpResHdrList = new ArrayList<>(); - List httpReqBodyList = new ArrayList<>(); - List httpResBodyList = new ArrayList<>(); - List ipPortList = new ArrayList<>(); - List subscribeIdList = new ArrayList<>(); - for (CfgIndexInfo cfg : page.getList()) { - Map maps=cachePolicyService.exportCachePolicy(cfg); - httpUrlList.addAll(maps.get("NTC_HTTP_URL")); - httpReqHdrList.addAll(maps.get("NTC_HTTP_REQ_HDR")); - httpResHdrList.addAll(maps.get("NTC_HTTP_RES_HDR")); - httpReqBodyList.addAll(maps.get("NTC_HTTP_REQ_BODY")); - httpResBodyList.addAll(maps.get("NTC_HTTP_RES_BODY")); - ipPortList.addAll(maps.get("NTC_UNIVERSAL_IP")); - subscribeIdList.addAll(maps.get("NTC_SUBSCRIBE_ID")); - } - httpUrlList=BaseStringCfg.replaceBaseKeyList(httpUrlList); - httpReqHdrList=ComplexkeywordCfg.replaceComplexKeyList(httpReqHdrList); - httpResHdrList=ComplexkeywordCfg.replaceComplexKeyList(httpResHdrList); - httpReqBodyList=BaseStringCfg.replaceBaseKeyList(httpReqBodyList); - httpResBodyList=BaseStringCfg.replaceBaseKeyList(httpResBodyList); - subscribeIdList=BaseStringCfg.baseHexList(subscribeIdList); - titleList.add(entity.getMenuNameCode()); - titleList.add("NTC_HTTP_URL"); - titleList.add("NTC_HTTP_REQ_HDR"); - classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); - classMap.put("NTC_HTTP_URL", HttpUrlCfg.class); - classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class); - noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport); - noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport); - dataMap.put(entity.getMenuNameCode(), page.getList()); - dataMap.put("NTC_HTTP_URL", httpUrlList); - dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList); - if(entity.getFunctionId()!=208 && entity.getFunctionId()!=211){ - titleList.add("NTC_HTTP_RES_BODY"); - classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class); - noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport); - dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList); - }else if(entity.getFunctionId()!=211){ - titleList.add("NTC_HTTP_RES_HDR"); - titleList.add("NTC_HTTP_REQ_BODY"); - classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class); - classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class); - noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport); - noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport); - dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList); - dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList); - } - titleList.add("NTC_UNIVERSAL_IP"); - titleList.add("NTC_SUBSCRIBE_ID"); - classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); - classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); - noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport); - noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); - dataMap.put("NTC_UNIVERSAL_IP", ipPortList); - dataMap.put("NTC_SUBSCRIBE_ID",subscribeIdList); - - } - this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); - } catch (Exception e) { - logger.error("http export failed",e); - addMessage(redirectAttributes, "export_failed"); + @RequestMapping(value = "exportCache") + public void exportdomain(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CachePolicyUserRegion entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap = new HashMap(); + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = cachePolicyService.getCachePolicyByUserRegionList(ids); + } else { + Page pageInfo=new Page(request, response,"a"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = cachePolicyService.getCachePolicyUserRegionList(pageInfo, entity); + ipLists = page.getList(); } - return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); - }*/ + + List serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); + Properties msgProp = getMsgProp(); + for (CachePolicyUserRegion cache : ipLists) { + for (FunctionServiceDict service : serviceList) { + if(cache.getAction().intValue()==service.getAction().intValue()){ + cache.setActionCode(msgProp.getProperty(service.getActionCode(),service.getActionCode())); + } + } + } + titleList.add(entity.getMenuNameCode()); + titleList.add("PXY_CACHE_HTTP_URL"); + titleList.add("PXY_CACHE_HTTP_COOKIE"); + classMap.put(entity.getMenuNameCode(), CachePolicyUserRegion.class); + classMap.put("PXY_CACHE_HTTP_URL", HttpUrlCfg.class); + classMap.put("PXY_CACHE_HTTP_COOKIE", HttpUrlCfg.class); + String cfgIndexInfoNoExport=",block_type,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-"; + String httpUrlInfoNoExport=",block_type,do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + + // 时间过滤 + if (entity.getSearch_create_time_start() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_audit_time_start() == null) { + cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; + } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("PXY_CACHE_HTTP_URL", httpUrlInfoNoExport); + noExportMap.put("PXY_CACHE_HTTP_COOKIE", httpUrlInfoNoExport); + List urlList=new ArrayList(); + List cookieList=new ArrayList(); + for (CachePolicyUserRegion cfg : ipLists) { + Map maps=cachePolicyService.getExport(Long.valueOf(cfg.getCfgId())); + urlList.addAll(maps.get("PXY_CACHE_HTTP_URL")); + cookieList.addAll(maps.get("PXY_CACHE_HTTP_COOKIE")); + } + urlList=BaseStringCfg.replaceBaseKeyList(urlList); + cookieList=BaseStringCfg.replaceBaseKeyList(cookieList); + dataMap.put(entity.getMenuNameCode(), ipLists); + dataMap.put("PXY_CACHE_HTTP_URL", urlList); + dataMap.put("PXY_CACHE_HTTP_COOKIE", cookieList); + /*}*/ + String timeRange = initTimeMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(entity.getExType())) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("ip white export failed",e); + addMessage(redirectAttributes,"error", "export_failed"); + } + } } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java index 081957466..1587ce73e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java @@ -39,6 +39,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.basics.PolicyGroupInfo; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjSpoofingIpPool; @@ -198,4 +199,66 @@ public class PxyObjSpoofingIpPoolController extends BaseController { return "redirect:" + adminPath +"/proxy/spoofing/pool/list?functionId="+functionId; } + + // ip配置导出 + @RequestMapping(value = "exportIpPool") + public void exportIpAddr(Model model, HttpServletRequest request, HttpServletResponse response, + @ModelAttribute("cfg") PxyObjSpoofingIpPool entity, String ids, RedirectAttributes redirectAttributes) { + try { + // export data info + List titleList = new ArrayList(); + Map> classMap = new HashMap>(); + Map dataMap = new HashMap(); + Map noExportMap = new HashMap(); + + List ipLists = new ArrayList(); + // 导出选中记录 + if (!StringUtil.isEmpty(ids)) { + ipLists = pxyObjSpoofingIpPoolService.findByPage(ids); + } else { + Page pageInfo = new Page(request, response, "r"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = pxyObjSpoofingIpPoolService.findPage(pageInfo, entity); + ipLists = page.getList(); + } + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), PxyObjSpoofingIpPool.class); + String cfgIndexInfoNoExport = ",policy_name,do_log,ir_type,whether_area_block,do_blacklist,block_type,ip_pattern,client_ip,server_ip,port_pattern,client_port,server_port,direction,protocol,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + + // 时间过滤 + if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { + cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_edit_time_start() == null && entity.getSearch_edit_time_end() == null) { + cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport; + } + if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { + cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; + } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), ipLists); + /* } */ + String timeRange = initTimeMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(entity.getExType())) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } + } catch (Exception e) { + logger.error("ip white export failed", e); + addMessage(redirectAttributes, "error", "export_failed"); + } + // return "redirect:" + adminPath + // +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + + } diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index 4ef22df78..a85f0886a 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -6,6 +6,8 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -94,6 +96,49 @@ public class DashboardController extends BaseController{ } return list; } + /** + * 跳转活跃端口详情界面 + * @return + */ + @RequestMapping(value="portActiveChart") + @ResponseBody + public List portActiveChart(String beginDate,String endDate){ + Map fromJsonList = new HashMap(); + List list = new ArrayList(); + try { + String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_PORTACTIVE_FIVEMINUTE;//+Constants.TRAFFIC_IPACTIVE_ONEHOUR; + url=urlAddDate(url, beginDate, endDate); + String string = HttpClientUtil.get(url); + Gson gson = new GsonBuilder().create(); + fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); + logger.debug("活跃端口从"+beginDate+"到"+endDate+",间隔5分钟数据"+fromJsonList); + list = (ArrayList) fromJsonList.get("data"); + return list; + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + logger.error("活跃端口详情界面数据获取错误"+e); + } + return list; + } + + /** + * 跳转活跃端口详情界面 + * @return + */ + @RequestMapping(value="portActiveList") + public String portActiveList(Model model){ + // 默认当前时间一小时 + Calendar cal = Calendar. getInstance (); + cal.setTime(new Date()); + String endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 + cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); + String beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); + model.addAttribute("beginDate", beginDate); + model.addAttribute("endDate", endDate); + return "/dashboard/trafficPortActiveList"; + } /** * 活跃IP TOP10 */ @@ -194,7 +239,7 @@ public class DashboardController extends BaseController{ return "/dashboard/trafficIpActiveList"; } /** - * 活跃IP TOP10 一小时 间隔5分钟数据 + * 活跃IP TOP10 一小时每个IP的最大值 */ @RequestMapping(value="ajaxIpActiveList") @ResponseBody @@ -209,6 +254,24 @@ public class DashboardController extends BaseController{ fromJsonList = gson.fromJson(string, new TypeToken>(){}.getType()); logger.debug("活跃IP1小时"+fromJsonList); list = gson.fromJson(fromJsonList.get("data").toString(), new TypeToken>() {}.getType()) ; + Collections.sort(list, new Comparator() { + + @Override + public int compare(TrafficIpActiveStatistic o1, TrafficIpActiveStatistic o2) { + if(o1==null&&o2!=null){ + return 1; + } + if(o1!=null&&o2==null){ + return -1; + } + if(o1==o2&&o1==null){ + return 0; + } + Long ob1 = o1.getC2sByteLen()+o1.getS2cByteLen(); + Long ob2 = o2.getC2sByteLen()+o2.getS2cByteLen(); + return -(ob1).compareTo(ob2); + } + }); } catch (Exception e) { e.printStackTrace(); @@ -283,19 +346,19 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(list!=null&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("protoType").toString()); + Double value1 = Double.parseDouble(map.get("protoType").toString().trim()); for (CodeResult code : codeList) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); if(value1.equals(value2)){ - map.put("protoType", code.getItem()); + map.put("protoType", code.getItem().trim()); break; } } // 协议没匹配的匹配app码表 for (CodeResult code : appCodeList) { - Double value3 = Double.valueOf(code.getCode()); + Double value3 = Double.valueOf(code.getCode().trim()); if(value1.equals(value3)){ - map.put("protoType", code.getItem()); + map.put("protoType", code.getItem().trim()); break; } } @@ -330,11 +393,11 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(list!=null&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("appType").toString()); + Double value1 = Double.parseDouble(map.get("appType").toString().trim()); for (CodeResult code : codeList) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); if(value1.equals(value2)){ - map.put("appType", code.getItem()); + map.put("appType", code.getItem().trim()); break; } } @@ -369,11 +432,11 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(list!=null&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("osType").toString()); + Double value1 = Double.parseDouble(map.get("osType").toString().trim()); for (CodeResult code : codeList) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); if(value1.equals(value2)){ - map.put("osType", code.getItem()); + map.put("osType", code.getItem().trim()); break; } } @@ -403,8 +466,8 @@ public class DashboardController extends BaseController{ //将标签文字转为数字 Integer os=null; for (CodeResult codeResult : codeList1) { - if(osType.equalsIgnoreCase(codeResult.getItem())){ - os=Integer.parseInt(codeResult.getCode()); + if(osType.equalsIgnoreCase(codeResult.getItem().trim())){ + os=Integer.parseInt(codeResult.getCode().trim()); break; } } @@ -421,11 +484,11 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(null!=list&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("bsType").toString()); + Double value1 = Double.parseDouble(map.get("bsType").toString().trim()); for (CodeResult code : codeList2) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); if(value1.equals(value2)){ - map.put("bsType", code.getItem()); + map.put("bsType", code.getItem().trim()); break; } //10个域名之外的为others 设为-1外 @@ -465,11 +528,11 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(list!=null&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("bsType").toString()); + Double value1 = Double.parseDouble(map.get("bsType").toString().trim()); for (CodeResult code : codeList) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); if(value1.equals(value2)){ - map.put("bsType", code.getItem()); + map.put("bsType", code.getItem().trim()); break; } } @@ -499,13 +562,13 @@ public class DashboardController extends BaseController{ //将标签文字转为数字 Integer bs=null; for (CodeResult codeResult : codeList1) { - if(bsType.equalsIgnoreCase(codeResult.getItem())){ - bs=Integer.parseInt(codeResult.getCode()); + if(bsType.equalsIgnoreCase(codeResult.getItem().trim())){ + bs=Integer.parseInt(codeResult.getCode().trim()); break; } } if(bs==null){ - bs=Integer.parseInt(bsType);//处理为匹配项编码 + bs=Integer.parseInt(bsType.trim());//处理为匹配项编码 } try { String string = HttpClientUtil.get(Constants.DASHBOARD_URL+Constants.TRAFFIC_SYSTEM_CHART+"?bsType="+bs); @@ -517,16 +580,16 @@ public class DashboardController extends BaseController{ //将数字替换为标签文字 if(null!=list&&!list.isEmpty()){ for (Map map : list) { - Double value1 = Double.parseDouble(map.get("osType").toString()); + Double value1 = Double.parseDouble(map.get("osType").toString().trim()); for (CodeResult code : codeList2) { - Double value2 = Double.valueOf(code.getCode()); + Double value2 = Double.valueOf(code.getCode().trim()); //10个域名之外的为others webId设为-1外 if(map.get("osType").toString().equals("-1")){ map.put("osType", "Others"); break; } if(value1.equals(value2)){ - map.put("osType", code.getItem()); + map.put("osType", code.getItem().trim()); break; } } @@ -563,15 +626,15 @@ public class DashboardController extends BaseController{ if(list!=null&&!list.isEmpty()){ for (Map map : list) { Double value1=0d; - if(StringUtil.isBlank(map.get("websiteServiceId").toString())){ + if(StringUtil.isBlank(map.get("websiteServiceId").toString().trim())){ value1=268435455d; }else{ - value1 = Double.parseDouble(map.get("websiteServiceId").toString()); + value1 = Double.parseDouble(map.get("websiteServiceId").toString().trim()); } for (SysDataDictionaryItem code : codeList) { - Double value2 = Double.valueOf(code.getItemCode()); + Double value2 = Double.valueOf(code.getItemCode().trim()); if(value1.equals(value2)){ - map.put("websiteService", code.getItemValue()); + map.put("websiteService", code.getItemValue().trim()); break; } } @@ -611,7 +674,7 @@ public class DashboardController extends BaseController{ if(wdt!=null){ String domain = wdt.getDomain(); Double domainId = wdt.getId().doubleValue(); - Double webId = Double.parseDouble(dataMap.get("webId").toString()); + Double webId = Double.parseDouble(dataMap.get("webId").toString().trim()); //10个域名之外的为others webId设为-1外 if(dataMap.get("webId").toString().equals("-1")){ dataMap.put("domain", "Others"); @@ -661,12 +724,12 @@ public class DashboardController extends BaseController{ if(StringUtil.isBlank(map.get("topicId").toString())){ value1=268435455d; }else{ - value1 = Double.parseDouble(map.get("topicId").toString()); + value1 = Double.parseDouble(map.get("topicId").toString().trim()); } for (SysDataDictionaryItem code : codeList) { - Double value2 = Double.valueOf(code.getItemCode()); + Double value2 = Double.valueOf(code.getItemCode().trim()); if(value1.equals(value2)){ - map.put("topic", code.getItemValue()); + map.put("topic", code.getItemValue().trim()); break; } } @@ -678,7 +741,7 @@ public class DashboardController extends BaseController{ if(wdt!=null){ String domain = wdt.getDomain(); Double domainId = wdt.getId().doubleValue(); - Double webId = Double.parseDouble(dataMap.get("webId").toString()); + Double webId = Double.parseDouble(dataMap.get("webId").toString().trim()); //10个域名之外的为others webId设为-1 // if(dataMap.get("webId").toString().equals("-1")){ // dataMap.put("domain", "Others"); diff --git a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java index 6c39d5fa0..afcda50a7 100644 --- a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java +++ b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java @@ -98,7 +98,7 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 1; + hour = 2; } Date now = new Date(); @@ -175,7 +175,8 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + //hour = 24; + hour = 2; } Date now = new Date(); @@ -244,7 +245,7 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + hour = 2; } Date now = new Date(); diff --git a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java index 5946ac71a..9a8d6a7d1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java @@ -142,7 +142,7 @@ public class CollectVoipLogController extends BaseController { url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG; String jsonString = HttpClientUtil.getMsg(url, params, request); -// GsonBuilder builder = new GsonBuilder(); + GsonBuilder builder = new GsonBuilder(); // builder.registerTypeAdapter(Date.class, new JsonDeserializer() { // // public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT, @@ -150,8 +150,8 @@ public class CollectVoipLogController extends BaseController { // return new Date(json.getAsJsonPrimitive().getAsLong()); // } // }); -// Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create(); - Gson gson = new GsonBuilder().create(); + Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create(); +// Gson gson = new GsonBuilder().create(); // gson泛型支持 LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>() { diff --git a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml index 4662b37b8..34eab36c5 100644 --- a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml @@ -32,6 +32,7 @@ AND action=#{action,jdbcType=INTEGER} + order by sort \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 89895b804..e5f448047 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -682,10 +682,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -826,10 +826,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -956,10 +956,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1059,10 +1059,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1159,10 +1159,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1260,10 +1260,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1360,10 +1360,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1455,10 +1455,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1558,10 +1558,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1661,10 +1661,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml index 8c2bb17ed..a0987faa1 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -104,6 +104,17 @@ + + + + + + + + + + + @@ -191,7 +202,9 @@ r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE, - r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG + r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG, + r.ver,r.ihl,r.tos,r.total_length,r.flags,r.fragment_offset,r.protocol,r.icmp_type,r.icmp_code,r.icmp_identifier, + r.header_type @@ -339,10 +352,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -526,14 +539,18 @@ CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, - DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 + DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5, + ver,ihl,tos,total_length,flags,fragment_offset,protocol,icmp_type,icmp_code,icmp_identifier,header_type )values ( , #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}, #{district,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR}, #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}, - #{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} + #{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}, + #{ver,jdbcType=VARCHAR},#{ihl,jdbcType=VARCHAR},#{tos,jdbcType=VARCHAR},#{totalLength,jdbcType=VARCHAR}, + #{flags,jdbcType=VARCHAR},#{fragmentOffset,jdbcType=VARCHAR},#{protocol,jdbcType=VARCHAR},#{icmpType,jdbcType=VARCHAR}, + #{icmpCode,jdbcType=VARCHAR},#{icmpIdentifier,jdbcType=VARCHAR},#{headerType,jdbcType=VARCHAR} ) diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml index d551d6440..0c91f1df8 100644 --- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml @@ -130,10 +130,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java index cb4593bc3..ff82c26ff 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.java @@ -23,4 +23,6 @@ public interface AvCfgDao { public void updateAvSignSampleValid(AvSignSampleCfg entity); public void auditAvFileSample(AvFileSampleCfg entity); public void auditAvSignSample(AvSignSampleCfg entity); + + public List getAvFileBySampleList(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index eccc12071..b3d1a0426 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -190,10 +190,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -289,10 +289,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -560,4 +560,20 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index e90559178..44d539907 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -411,10 +411,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -538,10 +538,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1577,10 +1577,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1886,10 +1886,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index 8e915f9af..0629d63aa 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -285,10 +285,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java index 11cdc8e03..72e786fdf 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java @@ -1,13 +1,11 @@ package com.nis.web.dao.configuration; -import java.util.Date; import java.util.List; - import org.apache.ibatis.annotations.Param; - import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CachePolicyUserRegion; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; @@ -39,4 +37,8 @@ public interface CommonPolicyDao { public void deleteHttpUrlCfg(@Param("tableName")String tableName, @Param("entity")BaseCfg baseCfg, @Param("compileIds")List compileIds); + + public List getCachePolicyUserRegionList(CachePolicyUserRegion entity); + + public List getCachePolicyByUserRegionList(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index 411a2ca6d..70564e398 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -34,6 +34,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -274,10 +310,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -814,4 +850,119 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index 6f8ff863a..e325c0507 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -286,10 +286,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -303,7 +303,7 @@ - from ${tableName} + from ${tableName} a AND ${page.where} @@ -311,10 +311,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml index b65d4774b..c726213c2 100644 --- a/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml @@ -122,10 +122,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index 0d5bd808f..155f3921a 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -170,10 +170,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 9b7429421..a536c558c 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -172,10 +172,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index 8627c300e..00246872e 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -129,10 +129,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy}, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml index 8c2fff8ea..83c835762 100644 --- a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml @@ -305,10 +305,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -322,7 +322,7 @@ - from HTTP_URL_CFG + from HTTP_URL_CFG AND ${page.where} @@ -330,10 +330,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},is_audit,CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY is_audit,CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java index fc3bbb240..21c1378f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java @@ -57,5 +57,6 @@ public interface FileTransferCfgDao extends CrudDao { public void deleteP2pHashCfg(CfgIndexInfo entity); public void deleteP2pKeywordCfg(CfgIndexInfo entity); public void deleteP2pSubscribeIdCfg(CfgIndexInfo entity); + public List getFileByDigestList(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index ee96246fa..8e63f0b89 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -311,10 +311,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -765,10 +765,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -1153,10 +1153,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc @@ -1267,4 +1267,20 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java index a31492f26..91236942f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java @@ -36,6 +36,8 @@ public interface IpAddrPoolCfgDao extends CrudDao{ Long getAddrPoolIdByName(String addrPoolName); IpReuseIpCfg checkAddrPoolIp(@Param("srcIpAddress")String ip); + + List findByPage(@Param("ids")String ids); diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index 859c119db..eb17f8a87 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -135,10 +135,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.cfg_id DESC + ORDER BY r.is_audit,r.CFG_ID desc @@ -163,7 +163,7 @@ AND r.is_audit = #{isAudit,jdbcType=INTEGER} - ORDER BY r.cfg_id + ORDER BY r.is_audit,r.CFG_ID desc @@ -489,4 +489,28 @@ r.is_audit != 3 AND r.user_region1 IS NOT NULL + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index b8ea447a3..9f923529f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -531,10 +531,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -548,7 +548,7 @@ - from ${tableName} + from ${tableName} r AND ${page.where} @@ -556,10 +556,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -1141,10 +1141,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java index 549e736c9..5bd15336f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java @@ -44,4 +44,8 @@ public interface IpMultiplexDao extends CrudDao{ IpReusePolicyCfg getSnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); IpReuseDnatPolicyCfg getDnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); + + List findByPage(@Param("ids")String ids); + + List findPageByDnat(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index 603256054..a672f431c 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -188,10 +188,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.cfg_id DESC + ORDER BY r.is_audit,r.CFG_ID desc @@ -213,7 +213,7 @@ AND r.is_valid != -1 - ORDER BY r.cfg_id + ORDER BY r.is_audit,r.CFG_ID desc @@ -684,10 +684,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.cfg_id DESC + ORDER BY a.is_audit,a.CFG_ID desc @@ -709,7 +709,7 @@ AND a.is_valid != -1 - ORDER BY a.cfg_id + ORDER BY a.is_audit,a.CFG_ID desc + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml index 019981f1b..5e379dffe 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml @@ -168,10 +168,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml index aa6bae109..b33ce612b 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -243,10 +243,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml index 51f832b34..1b64e30fb 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml @@ -127,10 +127,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 2971e2990..8e4ea49a9 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -213,10 +213,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -296,10 +296,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java index b36b2cab5..75ffe3093 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java @@ -18,4 +18,6 @@ public interface PxyObjSpoofingIpPoolDao extends CrudDao{ PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId); int insert(PxyObjSpoofingIpPool spoofingPool); int update(PxyObjSpoofingIpPool spoofingPool); + + List findByPage(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index 5fb39f261..a1519f23f 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -121,10 +121,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc - ORDER BY r.CFG_ID desc + ORDER BY r.is_audit,r.CFG_ID desc @@ -289,4 +289,23 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index b18d65812..7f5f94cd3 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -86,10 +86,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.create_time desc - ORDER BY r.create_time desc + ORDER BY r.is_audit,r.create_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index df968ffad..0053f52a2 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -346,10 +346,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc - ORDER BY CFG_ID desc + ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc @@ -363,7 +363,7 @@ - from ${tableName} + from ${tableName} r AND ${page.where} @@ -371,10 +371,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.cfg_id desc - ORDER BY CFG_ID desc + ORDER BY r.is_audit,r.cfg_id desc diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 93032cba3..d7e9b37ae 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -84,10 +84,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},r.is_audit,r.create_time desc - ORDER BY r.create_time desc + ORDER BY r.is_audit,r.create_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/UserManageDao.java b/src/main/java/com/nis/web/dao/configuration/UserManageDao.java index 11f5c2d50..b92e4363f 100644 --- a/src/main/java/com/nis/web/dao/configuration/UserManageDao.java +++ b/src/main/java/com/nis/web/dao/configuration/UserManageDao.java @@ -15,6 +15,6 @@ public interface UserManageDao extends CrudDao{ UserManage getUserByLoginName(@Param("userName") String userName); List findList(UserManage entity); UserManage getUserById(@Param("id") String id); - + List findByList(@Param("ids")String ids); List findUsers(); } diff --git a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml index 0cfecdd2f..dcf81652f 100644 --- a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml @@ -157,4 +157,16 @@ from user_manage a where a.is_valid !=-1 + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 271e34d4e..ae5586621 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -333,10 +333,10 @@ - ORDER BY ${page.orderBy} + ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc - ORDER BY a.CFG_ID desc + ORDER BY a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 66e166d1f..e3fdc73d2 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -205,7 +205,8 @@ public abstract class BaseService { } else { // 如果包含全部权限，则去掉之前添加的所有条件但增加配置审核取消以及删除的配置，并跳出循环。 sqlString = new StringBuilder(); - sqlString.append(" OR " + configAlias + ".is_audit !=3"); +// sqlString.append(" OR " + configAlias + ".is_audit !=3"); + sqlString.append(" OR " + configAlias + ".creator_id <> 1"); } } if (StringUtils.isNotBlank(sqlString.toString())) { @@ -272,11 +273,14 @@ public abstract class BaseService { + ".type>1)"); } else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) { - scopeSql.append(" OR " + configAlias + ".is_audit !=3"); +// scopeSql.append(" OR " + configAlias + ".is_audit !=3"); + scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); } else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) { scopeSql.append(" OR " + configAlias + ".is_audit = 0 or " + configAlias + ".is_audit = 1"); + scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); } else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) { scopeSql.append(" OR " + configAlias + ".is_audit = 1"); + scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); } return scopeSql.toString(); diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index 1d8e2bbe3..5b105e535 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -105,8 +105,52 @@ public class AppMultiFeatureCfgService extends BaseService { } if(entity.getComplexList()!=null){ for(AppComplexFeatureCfg cfg:entity.getComplexList()){ - if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ + if(StringUtils.isNotBlank(cfg.getDistrict()) && cfg.getDistrict().equals("L3_header")){ BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + cfg.setIsHexbin(1); + cfg.setIsCaseInsenstive(0); + cfg.setExprType(3); + cfg.setMatchMethod(0); + String keyword = ""; + if(cfg.getHeaderType().equals("IP_header")){ + if(StringUtils.isNoneBlank(cfg.getVer())){ + keyword += "0-3:"+cfg.getVer()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIhl())){ + keyword += "4-7:"+cfg.getIhl()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getTos())){ + keyword += "8-15:"+cfg.getTos()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getTotalLength())){ + keyword += "16-31:"+cfg.getTotalLength()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getFlags())){ + keyword += "48-50:"+cfg.getFlags()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getFragmentOffset())){ + keyword += "56-63:"+cfg.getFragmentOffset()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getProtocol())){ + keyword += "72-79:"+cfg.getProtocol()+Constants.KEYWORD_EXPR; + } + }else{ + if(StringUtils.isNoneBlank(cfg.getIcmpType())){ + keyword += "0-7:"+cfg.getIcmpType()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIcmpCode())){ + keyword += "8-15:"+cfg.getIcmpCode()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIcmpIdentifier())){ + keyword += "32-47:"+cfg.getIcmpIdentifier()+Constants.KEYWORD_EXPR; + } + } + keyword=keyword.substring(0,keyword.lastIndexOf(Constants.KEYWORD_EXPR)); + cfg.setCfgKeywords(keyword); + appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); + }else if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + cfg.setHeaderType(null); appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); } @@ -155,9 +199,53 @@ public class AppMultiFeatureCfgService extends BaseService { } if(entity.getComplexList()!=null){ for(AppComplexFeatureCfg cfg:entity.getComplexList()){ - if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ - BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); - appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); + if(StringUtils.isNotBlank(cfg.getDistrict()) && cfg.getDistrict().equals("L3_header")){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + cfg.setIsHexbin(1); + cfg.setIsCaseInsenstive(0); + cfg.setExprType(3); + cfg.setMatchMethod(0); + String keyword = ""; + if(cfg.getHeaderType().equals("IP_header")){ + if(StringUtils.isNoneBlank(cfg.getVer())){ + keyword += "0-3:"+cfg.getVer()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIhl())){ + keyword += "4-7:"+cfg.getIhl()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getTos())){ + keyword += "8-15:"+cfg.getTos()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getTotalLength())){ + keyword += "16-31:"+cfg.getTotalLength()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getFlags())){ + keyword += "48-50:"+cfg.getFlags()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getFragmentOffset())){ + keyword += "56-63:"+cfg.getFragmentOffset()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getProtocol())){ + keyword += "72-79:"+cfg.getProtocol()+Constants.KEYWORD_EXPR; + } + }else{ + if(StringUtils.isNoneBlank(cfg.getIcmpType())){ + keyword += "0-7:"+cfg.getIcmpType()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIcmpCode())){ + keyword += "8-15:"+cfg.getIcmpCode()+Constants.KEYWORD_EXPR; + } + if(StringUtils.isNotBlank(cfg.getIcmpIdentifier())){ + keyword += "32-47:"+cfg.getIcmpIdentifier()+Constants.KEYWORD_EXPR; + } + } + keyword=keyword.substring(0,keyword.lastIndexOf(Constants.KEYWORD_EXPR)); + cfg.setCfgKeywords(keyword); + appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); + }else if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + cfg.setHeaderType(null); + appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); } } } diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index bf93033f5..49994ac48 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -66,6 +66,12 @@ public class AvCfgService extends BaseService{ page.setList(list); return page; } + + public List getAvFileBySampleList(String ids){ + List list = avCfgDao.getAvFileBySampleList(ids); + return list; + } + public Page getAvSignSampleList(Page page, AvSignSampleCfg entity){ // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); diff --git a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java index 205519007..718e32325 100644 --- a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java @@ -16,9 +16,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CachePolicyUserRegion; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.CommonStringCfg; import com.nis.domain.configuration.HttpBodyCfg; @@ -38,6 +40,7 @@ import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; +import com.nis.util.DictUtils; import com.nis.util.StringUtil; import com.nis.web.dao.configuration.AreaIpCfgDao; import com.nis.web.dao.configuration.CommonPolicyDao; @@ -69,26 +72,81 @@ public class CachePolicyService extends CrudService return entity; } - /*public Map exportCachePolicy(CfgIndexInfo entity){ + public Page getCachePolicyUserRegionList(Page page, CachePolicyUserRegion entity){ + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.setPage(page); + List list = commonPolicyDao.getCachePolicyUserRegionList(entity); + for (CachePolicyUserRegion c : list) { + JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1()); + CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class); + c.setCache_cookied_cont(stu.getCache_cookied_cont()); + c.setCache_dyn_url(stu.getCache_dyn_url()); + c.setForce_caching(stu.getForce_caching()); + c.setIgnore_req_nocache(stu.getIgnore_req_nocache()); + c.setIgnore_res_nocache(stu.getIgnore_res_nocache()); + c.setInactive_time(stu.getInactive_time()); + c.setMax_cache_obj_size(stu.getMax_cache_obj_size()); + c.setMax_cache_size(stu.getMax_cache_size()); + c.setMin_use(stu.getMin_use()); + c.setNo_revalidate(stu.getNo_revalidate()); + c.setPinning_time(stu.getPinning_time()); + if(stu.getCache_key()!=null){ + String ignore=String.valueOf(stu.getCache_key().get("ignore_qs")); + String cookie=String.valueOf(stu.getCache_key().get("cookie")); + if(!ignore.equals("null") && ignore!=null){ + c.setIgnore_qs(ignore); + } + if(!cookie.equals("null") && cookie!=null){ + c.setCookie(cookie); + } + } + } + page.setList(list); + return page; + } + + + public List getCachePolicyByUserRegionList(String ids){ + List list = commonPolicyDao.getCachePolicyByUserRegionList(ids); + for (CachePolicyUserRegion c : list) { + JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1()); + CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class); + c.setCache_cookied_cont(stu.getCache_cookied_cont()); + c.setCache_dyn_url(stu.getCache_dyn_url()); + c.setForce_caching(stu.getForce_caching()); + c.setIgnore_req_nocache(stu.getIgnore_req_nocache()); + c.setIgnore_res_nocache(stu.getIgnore_res_nocache()); + c.setInactive_time(stu.getInactive_time()); + c.setMax_cache_obj_size(stu.getMax_cache_obj_size()); + c.setMax_cache_size(stu.getMax_cache_size()); + c.setMin_use(stu.getMin_use()); + c.setNo_revalidate(stu.getNo_revalidate()); + c.setPinning_time(stu.getPinning_time()); + if(stu.getCache_key()!=null){ + String ignore=String.valueOf(stu.getCache_key().get("ignore_qs")); + String cookie=String.valueOf(stu.getCache_key().get("cookie")); + if(!ignore.equals("null") && ignore!=null){ + c.setIgnore_qs(ignore); + } + if(!cookie.equals("null") && cookie!=null){ + c.setCookie(cookie); + } + } + } + return list; + } + + public Map getExport(Long cfgId){ Map dataMap=new HashMap(); - List httpUrlList = commonPolicyDao.getHttpUrlList(entity); - List httpReqHdrList = commonPolicyDao.getHttpReqHdrList(entity); - List httpResHdrList = commonPolicyDao.getHttpResHdrList(entity); - List ipPortCfgList = commonPolicyDao.getIpPortList(entity); - entity.setCfgType(Constants.HTTP_REDIRECT_REQ_BODY_REGION); - List httpReqBodyList = commonPolicyDao.getHttpReqBodyList(entity); - entity.setCfgType(Constants.HTTP_REDIRECT_RES_BODY_REGION); - List httpResBodyList = commonPolicyDao.getHttpResBodyList(entity); - List subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity); - dataMap.put("NTC_UNIVERSAL_IP", ipPortCfgList); - dataMap.put("NTC_CACHE_URL", httpUrlList); - dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList); - dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList); - dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList); - dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList); - dataMap.put("NTC_SUBSCRIBE_ID", subscribeIdList); + CfgIndexInfo entity = commonPolicyDao.getPolicyById(cfgId); + entity.setCfgType("PXY_CACHE_HTTP_URL"); + List urlList = commonPolicyDao.getCommonStringList(entity); + entity.setCfgType("PXY_CACHE_HTTP_COOKIE"); + List cookieList = commonPolicyDao.getCommonStringList(entity); + dataMap.put("PXY_CACHE_HTTP_URL", urlList); + dataMap.put("PXY_CACHE_HTTP_COOKIE", cookieList); return dataMap; - }*/ + } public Page getCachePolicyList(Page page, CfgIndexInfo entity){ // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index b571e16ea..6a7fcf8f9 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -401,6 +401,15 @@ public class FileTransferCfgService extends CrudService getFileByDigestList(String ids){ + List list = fileTransferCfgDao.getFileByDigestList(ids); + return list; + } + + + + + public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){ FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId); List subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity); diff --git a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java index eadb57e4c..93db450f4 100644 --- a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java @@ -54,6 +54,11 @@ public class IpAddrPoolCfgService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=ipAddrPoolCfgDao.findByPage(ids); + return list; + } + /** * 获取数据跳转表单 * @param id diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index a6de5c52a..4e7f2f8d3 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -43,6 +43,11 @@ public class IpMultiplexService extends BaseService{ page.setList(list); return page; } + + public List findByPage(String ids) { + List list=ipMultiplexDao.findByPage(ids); + return list; + } public IpReusePolicyCfg getPolicyCfg(Long cfgId, Integer isValid) { List list=ipMultiplexDao.findList(cfgId,isValid); @@ -284,6 +289,12 @@ public class IpMultiplexService extends BaseService{ page.setList(list); return page; } + + public List findPageByDnat(String ids) { + List list=ipMultiplexDao.findPageByDnat(ids); + return list; + } + public IpReuseDnatPolicyCfg getDnatPolicyCfg(Long cfgId, Integer isValid) { List list=ipMultiplexDao.findDnatList(cfgId,isValid); diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java index b7b8630e6..c1261877b 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java @@ -73,6 +73,11 @@ public class PxyObjSpoofingIpPoolService extends BaseService{ return page; } + public List findByPage(String ids) { + List list=pxyObjSpoofingIpPoolDao.findByPage(ids); + return list; + } + public List findPxyObjSpoofingIpPools(PxyObjSpoofingIpPool entity) { List list=pxyObjSpoofingIpPoolDao.findList(entity); @@ -212,7 +217,7 @@ public class PxyObjSpoofingIpPoolService extends BaseService{ if(!ispList.contains(ispCode)){ ispList.add(ispCode); } - map.replace(areaCode, ispList); + //map.replace(areaCode, ispList); } }else { // 区域 diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index 296ef4a81..a2c3c96d0 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -47,6 +47,13 @@ public class UserManageService extends BaseService{ page.setList(list); return page; } + + public List findByPage(String ids ) { + List list=userManageDao.findByList(ids); + return list; + } + + public UserManage getUserByLoginName(String userName) { return userManageDao.getUserByLoginName(userName); } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index d2253d9b9..a34e19c0d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1407,4 +1407,11 @@ ip=IP country=Country desc=Desc unique_num=Unique -import_limit_is=The maximum import size is \ No newline at end of file +import_limit_is=The maximum import size is +upload_limit_is=The limitation of file uplaod is +count=Count +do_blacklist=Blacklist Option +l3_header_error=Only four attribute values are allowed to be entered at most +IP_HEADER=IP Header +ICMP_HEADER=ICMP Header +offset_expression=Offset Expression \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 494004ad7..d1e8fdf07 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1411,4 +1411,11 @@ ip=IP country=Country desc=Desc unique_num=Unique -import_limit_is=The maximum import size is \ No newline at end of file +import_limit_is=The maximum import size is +upload_limit_is=The limitation of file uplaod is +count=Count +do_blacklist=Blacklist Option +l3_header_error=Only four attribute values are allowed to be entered at most +IP_HEADER=IP Header +ICMP_HEADER=ICMP Header +offset_expression=Offset Expression \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index c45ed3dd5..d78d81acc 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1407,4 +1407,11 @@ ip=IP country=Country desc=Desc unique_num=Unique -import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570 \ No newline at end of file +import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570 +upload_limit_is=\u6587\u4EF6\u4E0A\u4F20\u4E2A\u6570\u9650\u5236 +count=\u6570\u91CF +do_blacklist=Blacklist Option +l3_header_error=Only four attribute values are allowed to be entered at most +IP_HEADER=IP Header +ICMP_HEADER=ICMP Header +offset_expression=Offset Expression \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8e50734bb..dd9089f22 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -1,49 +1,49 @@ -#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml +#\u7BA1\u7406\u57FA\u7840\u8DEF\u5F84, \u9700\u540C\u6B65\u4FEE\u6539\uFF1Aweb.xml adminPath=/nis -#Restful\u670d\u52a1\u9ed8\u8ba4\u8def\u5f84\ufffd +#Restful\u670D\u52A1\u9ED8\u8BA4\u8DEF\u5F84\uFFFD servicePath=/service -#\u5206\u9875\u914d\u7f6e +#\u5206\u9875\u914D\u7F6E page.pageSize=20 -#\u5206\u9875\u914d\u7f6e +#\u5206\u9875\u914D\u7F6E page.count=0 -#\u7d22\u5f15\u9875\u8def\u5f84 +#\u7D22\u5F15\u9875\u8DEF\u5F84 web.view.index=/nis/index -#\u7f13\u5b58\u8bbe\u7f6e +#\u7F13\u5B58\u8BBE\u7F6E ehcache.configFile=cache/ehcache-local.xml #ehcache.configFile=cache/ehcache-rmi.xml -#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms +#\u4F1A\u8BDD\u8D85\u65F6\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C 20m=1200000ms, 30m=1800000ms, 60m=3600000ms session.sessionTimeout=1800000 -#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002 +#\u4F1A\u8BDD\u6E05\u7406\u95F4\u9694\u65F6\u95F4\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C2m=120000ms\u3002 session.sessionTimeoutClean=120000 -#\u9759\u6001\u6587\u4ef6\u540e\u7f00 +#\u9759\u6001\u6587\u4EF6\u540E\u7F00 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk -#\u7f51\u7ad9URL\u540e\u7f00 +#\u7F51\u7AD9URL\u540E\u7F00 urlSuffix=.jsp -#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84 +#\u89C6\u56FE\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84 web.view.prefix=/WEB-INF/views/ web.view.suffix=.jsp -#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55 +#\u662F\u5426\u4E0D\u5141\u8BB8\u5237\u65B0\u4E3B\u9875\uFF0C\u4E0D\u5141\u8BB8\u60C5\u51B5\u4E0B\uFF0C\u5237\u65B0\u4E3B\u9875\u4F1A\u5BFC\u81F4\u91CD\u65B0\u767B\u5F55 notAllowRefreshIndex=false -#\u524d\u7aef\u57fa\u7840\u8def\u5f84 +#\u524D\u7AEF\u57FA\u7840\u8DEF\u5F84 frontPath=/f -#\u662f\u5426\u8fd0\u884c\u591a\u8d26\u6237\u540c\u65f6\u767b\u5f55? +#\u662F\u5426\u8FD0\u884C\u591A\u8D26\u6237\u540C\u65F6\u767B\u5F55? user.multiAccountLogin=true -#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58 +#\u7855\u6B63\u7EC4\u4EF6\u662F\u5426\u4F7F\u7528\u7F13\u5B58 supcan.useCache=false -#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms +#\u901A\u77E5\u95F4\u9694\u65F6\u95F4\u8BBE\u7F6E, \u5355\u4F4D\uFF1A\u6BEB\u79D2, 30s=30000ms, 60s=60000ms work.notify.remind.interval=60000 @@ -51,13 +51,13 @@ work.notify.remind.interval=60000 #===== System settings ======# #============================# -#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e +#\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E productName=National Traffic Control System copyrightYear=2015 version=V1.0.0 -#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d +#\u4E0A\u4F20\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84, \u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8\u5305\u542B\u201Cuserfiles\u201D userfiles.basedir=upload @@ -65,7 +65,7 @@ userfiles.basedir=upload #===== webservice settings ======# #============================# -#ESB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u1e69\ufffd\ufffd\u0373\u04bb\ufffd\ufffd\u05b7 +#ESB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u1E69\uFFFD\uFFFD\u0373\u04BB\uFFFD\uFFFD\u05B7 webservice.esb.endpoint=http://10.55.0.197:7879/TongServiceProxy_doprocess/services/WebService1/ #webservice RID webservice.rid=XFBL @@ -88,47 +88,47 @@ webservice.data.dict.code.sid=s_2042_0660BD17-35E4-4482-AA3A-556F2C024902 #webservice request timeout for seconds webservice.request.timeout=30 -#\ufffd\ufffd\ufffd\ufffd\ufffdURL +#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL webservice.jg.service.url=http://10.55.0.155:8080/jgService -#\ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffdURL +#\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL webservice.yh.service.url=http://10.55.0.155:8080/ryService -#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffdURL +#\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFDURL webservice.data.dict.service.url=http://10.55.0.155:8080/sjzdService -#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffd\ufffd\ufffd\ufffdURL +#\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFD\uFFFD\uFFFD\uFFFDURL webservice.data.dict.bm.url=http://10.55.0.155:8080/sjzdbmService -#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdURL +#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL webservice.data.code.url=http://10.55.0.155:8080/sjmbService -#webservice\ufffd\u04ff\ufffd\ufffd\ufffd\ufffd\u00ff\u04b3\ufffd\ufffd\ufffd\ufffd +#webservice\uFFFD\u04FF\uFFFD\uFFFD\uFFFD\uFFFD\u00FF\u04B3\uFFFD\uFFFD\uFFFD\uFFFD webservice.data.pagesize = 2000 -#webservice\ufffd\ufffd\u01f0\u012c\ufffd\ufffd\u04b3 +#webservice\uFFFD\uFFFD\u01F0\u012C\uFFFD\uFFFD\u04B3 webservice.data.currentpage = 1 -#webservice \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd +#webservice \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD webservice.jgmb.name=CK_T_JC_RY -#webservice \ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd +#webservice \uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD webservice.yhmb.name=CK_T_YH_RY -#webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u022b\ufffd\ufffd +#webservice\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \u022B\uFFFD\uFFFD webservice.method.name.ql=getData -# webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd +# webservice\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD webservice.method.name.zl=getDataZL -# redis\u914d\u7f6e\u6587\u4ef6 -#redis \u5404\u4e2a\u5206\u7247\u7684 IP\u7aef\u53e3 +# redis\u914D\u7F6E\u6587\u4EF6 +#redis \u5404\u4E2A\u5206\u7247\u7684 IP\u7AEF\u53E3 redis.cluster.host_port=10.0.6.32:6379,10.0.6.32:6380,10.0.6.32:6381,10.0.6.33:6379,10.0.6.33:6380,10.0.6.33:6381 -#\u4e2d\u5fc3\u73b0\u573aredis\u5730\u5740\u548c\u7aef\u53e3 +#\u4E2D\u5FC3\u73B0\u573Aredis\u5730\u5740\u548C\u7AEF\u53E3 #redis.cluster.host_port=10.174.196.33:6379,10.174.196.33:6380,10.174.196.33:6381,10.174.196.34:6379,10.174.196.34:6380,10.174.196.34:6381,10.174.196.35:6379,10.174.196.35:6380,10.174.196.35:6381,10.174.196.36:6379,10.174.196.36:6380,10.174.196.36:6381,10.174.196.37:6379,10.174.196.37:6380,10.174.196.37:6381,10.174.196.38:6379,10.174.196.38:6380,10.174.196.38:6381,10.174.196.39:6379,10.174.196.39:6380,10.174.196.39:6381 redis.cluster.connectiontimeout=5000 redis.cluster.sotimeout=5000 redis.cluster.maxattempts=3 -#redis\u8fde\u63a5\u6c60\u76f8\u5173\u914d\u7f6e +#redis\u8FDE\u63A5\u6C60\u76F8\u5173\u914D\u7F6E redis.pool.maxtotal=500 @@ -141,31 +141,31 @@ redis.pool.testonreturn=false redis.pool.testwhileidle=true redis.pool.timebetweenevictionrunsmillis=60000 redis.pool.minevictableidletimemillis=60000 -#oracle\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba43\u5206\u949f\u5373180s) +#oracle\u6570\u636Eredis\u5B58\u50A8\u65F6\u95F4(\u79D2\u4E3A\u5355\u4F4D \u9ED8\u8BA43\u5206\u949F\u5373180s) oracleExpire=180 -#hive\u6570\u636e\u4e2d\u5fc3\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba420\u5206\u949f\u53731200s) +#hive\u6570\u636E\u4E2D\u5FC3\u6570\u636Eredis\u5B58\u50A8\u65F6\u95F4(\u79D2\u4E3A\u5355\u4F4D \u9ED8\u8BA420\u5206\u949F\u53731200s) hiveExpire=300 -#redis\u5f00\u5173 +#redis\u5F00\u5173 isOpenRedis=false -#\u662f\u5426\u5c06\u6570\u636e\u4e2d\u5fc3\u7684\u65e5\u5fd7\u52a0\u5165\u5230redis\u4e2d +#\u662F\u5426\u5C06\u6570\u636E\u4E2D\u5FC3\u7684\u65E5\u5FD7\u52A0\u5165\u5230redis\u4E2D dataCenterOpenRedis=true -#\u8de8\u57df\u95ee\u9898\u5141\u8bb8 \u7684url Access-Control-Allow-Origin *\u5141\u8bb8\u6240\u6709\uff0c\u8bbe\u7f6e\u6210\u5176\u4ed6url\u53ea\u5141\u8bb8\u8be5url.\u4e0d\u80fd\u8bbe\u7f6e\u591a\u4e2aurl +#\u8DE8\u57DF\u95EE\u9898\u5141\u8BB8 \u7684url Access-Control-Allow-Origin *\u5141\u8BB8\u6240\u6709\uFF0C\u8BBE\u7F6E\u6210\u5176\u4ED6url\u53EA\u5141\u8BB8\u8BE5url.\u4E0D\u80FD\u8BBE\u7F6E\u591A\u4E2Aurl target_url=* -#\u8de8\u57df\u95ee\u9898 3600\uff1a\u8868\u660e\u57283600\u79d2\u5185\uff0c\u4e0d\u9700\u8981\u518d\u53d1\u9001\u9884\u8bf7\u6c42\uff0c\u53ef\u4ee5\u7f13\u5b58\u8be5\u7ed3\u679c +#\u8DE8\u57DF\u95EE\u9898 3600\uFF1A\u8868\u660E\u57283600\u79D2\u5185\uFF0C\u4E0D\u9700\u8981\u518D\u53D1\u9001\u9884\u8BF7\u6C42\uFF0C\u53EF\u4EE5\u7F13\u5B58\u8BE5\u7ED3\u679C ACCESS_CONTROL_MAX_AGE=3600 ##########HTTPCLIENT POOL START################### -#\u4ece\u8fde\u63a5\u6c60\u4e2d\u83b7\u53d6\u5230\u8fde\u63a5\u7684\u6700\u957f\u65f6\u95f4 +#\u4ECE\u8FDE\u63A5\u6C60\u4E2D\u83B7\u53D6\u5230\u8FDE\u63A5\u7684\u6700\u957F\u65F6\u95F4 http.request.connectionRequestTimeout=500 #5000 http.request.connectTimeout=5000 -#\u6570\u636e\u4f20\u8f93\u7684\u6700\u957f\u65f6\u95f4 +#\u6570\u636E\u4F20\u8F93\u7684\u6700\u957F\u65F6\u95F4 http.request.socketTimeout=30000 -#\u63d0\u4ea4\u8bf7\u6c42\u524d\u6d4b\u8bd5\u8fde\u63a5\u662f\u5426\u53ef\u7528 +#\u63D0\u4EA4\u8BF7\u6C42\u524D\u6D4B\u8BD5\u8FDE\u63A5\u662F\u5426\u53EF\u7528 http.request.staleConnectionCheckEnabled=true -#\u8bbe\u7f6e\u8fde\u63a5\u603b\u6570 +#\u8BBE\u7F6E\u8FDE\u63A5\u603B\u6570 http.pool.maxTotal=200 -#\u8bbe\u7f6e\u6bcf\u4e2a\u5730\u5740\u7684\u5e76\u53d1\u6570 +#\u8BBE\u7F6E\u6BCF\u4E2A\u5730\u5740\u7684\u5E76\u53D1\u6570 http.pool.defaultMaxPerRoute=100 ##########HTTPCLIENT POOL END################### search.dateformat=yyyy-MM-dd HH:mm:ss @@ -176,45 +176,45 @@ search.eshostandport_C=10.0.6.115:9200 #search.eshostandport=10.174.196.135:9200 -#\u65e5\u5fd7\u662f\u5426\u4ecehive\u4e2d\u67e5\u8be2 +#\u65E5\u5FD7\u662F\u5426\u4ECEhive\u4E2D\u67E5\u8BE2 selFromHive=false -#\u662f\u5426\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2\u8bb0\u5f55\u7684\u603b\u6761\u6570 +#\u662F\u5426\u83B7\u53D6\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2\u8BB0\u5F55\u7684\u603B\u6761\u6570 isGetHiveCount=false -#\u6bcf\u6b21\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u591a\u5c11\u6761\u6570\u636e,\u54b1\u4eec\u5728\u5bf9\u83b7\u53d6\u7684\u6570\u636e\u8fdb\u884c\u5206\u9875\u5904\u7406 +#\u6BCF\u6B21\u83B7\u53D6\u6570\u636E\u4E2D\u5FC3\u591A\u5C11\u6761\u6570\u636E,\u54B1\u4EEC\u5728\u5BF9\u83B7\u53D6\u7684\u6570\u636E\u8FDB\u884C\u5206\u9875\u5904\u7406 everyGetHiveDataNum=10000 -#oracle\u6570\u636e\u5e93\u6709\u95ee\u9898\u4e0d\u4eceoracle\u67e5\u8be2\u6570\u636e,\u6240\u6709\u65e5\u5fd7\u6570\u636e\u5747\u4ece\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 +#oracle\u6570\u636E\u5E93\u6709\u95EE\u9898\u4E0D\u4ECEoracle\u67E5\u8BE2\u6570\u636E,\u6240\u6709\u65E5\u5FD7\u6570\u636E\u5747\u4ECE\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2 onlySelFromHive=false -#\u662f\u5426\u67e5\u8be2\u795e\u901a\u6570\u636e\u5e93 +#\u662F\u5426\u67E5\u8BE2\u795E\u901A\u6570\u636E\u5E93 isSelectCluster=true -#\u7528\u6237\u67e5\u8be2\u65e5\u5fd7\u8d85\u8fc7\u591a\u5c11\u5c0f\u65f6\u53bb\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 +#\u7528\u6237\u67E5\u8BE2\u65E5\u5FD7\u8D85\u8FC7\u591A\u5C11\u5C0F\u65F6\u53BB\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2 dataCenterTime=48 -#\u662f\u5426\u5f00\u542f\u57fa\u7840\u9a8c\u8bc1 +#\u662F\u5426\u5F00\u542F\u57FA\u7840\u9A8C\u8BC1 baseValidate=true -#\u662f\u5426\u5f00\u542f\u4e1a\u52a1\u9a8c\u8bc1 +#\u662F\u5426\u5F00\u542F\u4E1A\u52A1\u9A8C\u8BC1 serviceValidate=true -#\u65e5\u5fd7\u5b58\u50a8\u672c\u5730\u65f6\u95f4(\u5355\u4f4d\u5c0f\u65f6) +#\u65E5\u5FD7\u5B58\u50A8\u672C\u5730\u65F6\u95F4(\u5355\u4F4D\u5C0F\u65F6) logLocalTime=48 -#\u5b9e\u65f6\u7edf\u8ba1\u9ed8\u8ba4\u67e5\u8be2\u672c\u5730\u4e00\u4e2a\u5c0f\u65f6\u7684\u6570\u636e(\u5355\u4f4d\uff1a\u5c0f\u65f6) +#\u5B9E\u65F6\u7EDF\u8BA1\u9ED8\u8BA4\u67E5\u8BE2\u672C\u5730\u4E00\u4E2A\u5C0F\u65F6\u7684\u6570\u636E(\u5355\u4F4D\uFF1A\u5C0F\u65F6) reportLocalTime=1 -#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u65e5\u5fd7\u65f6\u95f4(A\u7248\u6beb\u79d2) +#\u795E\u901A\u6570\u636E\u5E93\u6700\u65E9\u65E5\u5FD7\u65F6\u95F4(A\u7248\u6BEB\u79D2) #2017-08-13 10:07:25 clusterAStartTime=1503504000725 -#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u7ed3\u675f\u65f6\u95f4(B\u7248\u6beb\u79d2) +#\u795E\u901A\u6570\u636E\u5E93\u6700\u65E9\u7ED3\u675F\u65F6\u95F4(B\u7248\u6BEB\u79D2) #2017-08-13 10:07:25 clusterBStartTime=1503504000725 ############################################################################################################################################ -#\u8bbe\u7f6e\u914d\u7f6e\u662f\u5426\u5165\u5e93 +#\u8BBE\u7F6E\u914D\u7F6E\u662F\u5426\u5165\u5E93 ############################################################################################################################################ isCommit=true ############################################################################################################################################ @@ -272,7 +272,7 @@ trafficAreaStat=trafficAreaStat logServiceTopn=logServiceTopn blockAndDropStat=blockAndDropStat ######################################## -#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 +#\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol @@ -296,28 +296,28 @@ logsearch_menu_id=152 #use elasticsearch or not# isUseES=false -#httpclient \u5de5\u5177\u8bbe\u7f6e\u8d85\u65f6\u65f6\u95f4 +#httpclient \u5DE5\u5177\u8BBE\u7F6E\u8D85\u65F6\u65F6\u95F4 http_socket_timeout=300000 http_connect_timeout=10000 http_connect_request_timeout=50000 http_connect_retry_times=3 -#\u6570\u636e\u4e2d\u5fc3A\u7248\u6570\u636e\u5e93\u540d\u79f0,\u7a0b\u5e8f\u4e2d\u6bcf\u6b21\u67e5\u8be2\u65f6\u4f7f\u7528\u7684\u6570\u636e\u5e93\u540d\u79f0 use dbA +#\u6570\u636E\u4E2D\u5FC3A\u7248\u6570\u636E\u5E93\u540D\u79F0,\u7A0B\u5E8F\u4E2D\u6BCF\u6B21\u67E5\u8BE2\u65F6\u4F7F\u7528\u7684\u6570\u636E\u5E93\u540D\u79F0 use dbA jdbc.hive.AName=xa_dfbhit_hive -#\u6570\u636e\u4e2d\u5fc3B\u7248\u6570\u636e\u5e93\u540d\u79f0 +#\u6570\u636E\u4E2D\u5FC3B\u7248\u6570\u636E\u5E93\u540D\u79F0 jdbc.hive.BName=xa_z2_mesalog_hive maxPageSize=100000 -#\u5bfc\u51fa\u6700\u5927\u6761\u6570 -maxExportSize=100000 -#\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7 +#\u5BFC\u51FA\u6700\u5927\u6761\u6570 +maxExportSize=5000 +#\u5141\u8BB8\u914D\u7F6E\u6700\u5927\u5C42\u7EA7 maxLevelNo=4 -#\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26 +#\u4E0A\u4E0B\u7EA7\u663E\u793A\u95F4\u9694\u6807\u8BC6\u7B26 childrenMark=. -#\u4e1a\u52a1\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6 +#\u4E1A\u52A1\u5B57\u5178\u5728\u8BCD\u5178\u4E2D\u7684\u6807\u8BC6 SERVICE_DICT_ITM_TYPE=SERVICE_DICT_ITM_TYPE -#\u7cfb\u7edf\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6 +#\u7CFB\u7EDF\u5B57\u5178\u5728\u8BCD\u5178\u4E2D\u7684\u6807\u8BC6 SYS_DICT_ITM_TYPE=SYS_DICT_ITM_TYPE area_region=NTC_IP_RANGE protocol_num_region=NTC_UNIVERSAL_PROTO_TYPE @@ -345,16 +345,16 @@ ssl_ip_region=ssl_ip bgp_ip_region=bgp_ip behav_id_region=BEHAV_ID rate_limit_region=Droprate -#\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26 +#\u5B58\u5728\u4E0E\u8868\u8FBE\u5F0F\u7684\u5173\u952E\u5B57\u7279\u6B8A\u5206\u9694\u7B26 keyword_expr=***and*** -#\u65f6\u533a +#\u65F6\u533A time_zone=8 -#\u9700\u8981\u7279\u6b8a\u5904\u7406\u7684\u4e1a\u52a1\u7c7b\u578b +#\u9700\u8981\u7279\u6B8A\u5904\u7406\u7684\u4E1A\u52A1\u7C7B\u578B service_pxy_domain_intercept=513 service_ip_mulitiplex=768 service_ip_ratelimit=1057 service_domain_ratelimit=1058 -#\u7528\u6237\u81ea\u5b9a\u4e49\u57df +#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF userregion_rate_limit=Droprate userregion_ir_strategy=IR_STRATEGY userregion_ir_type=IR_TYPE @@ -364,25 +364,25 @@ userregion_replace_type_key=zone userregion_replace_req_key_value=http_req_body userregion_replace_res_key_value=http_res_body userregion_replace_regex_key=regex -#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5360\u4f4d\u7b26 +#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5360\u4F4D\u7B26 user_region_placeholder=0 -#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5206\u9694\u7b26 +#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5206\u9694\u7B26 user_region_split=; -#IP\u76f8\u5173\u9a8c\u8bc1\u6b63\u5219 +#IP\u76F8\u5173\u9A8C\u8BC1\u6B63\u5219 ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$ ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/([2-9]|[1-9][0-9]|1[0-2][0-8])$ ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$ ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ ipv6_ip_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$ -#\u91cd\u5b9a\u5411\u4e1a\u52a1\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570 +#\u91CD\u5B9A\u5411\u4E1A\u52A1\u81EA\u5B9A\u4E49\u57DF\u76F8\u5173\u53C2\u6570 redirect_response_code_key=code redirect_url_key=url redirect_content_key=content redirect_response_code_startwith=30 replace_zone_key=zone replace_substitute_key=substitute -#\u6837\u4f8b\u6587\u4ef6\u4e0a\u4f20\u7684uri\u5173\u952e\u8bcd +#\u6837\u4F8B\u6587\u4EF6\u4E0A\u4F20\u7684uri\u5173\u952E\u8BCD sample_upload_url_keyword=/av digest_upload_url_keyword=/filetransfer cert_upload_url_keyword=/intercept/strateagy @@ -391,53 +391,53 @@ cert_upload_url_keyword=/intercept/strateagy sample_total_file_max_size=12582912 #audio File Types audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,wav,mp3, -#audio File Size 10M 10485760\uff08single\uff09 +#audio File Size 10M 10485760\uFF08single\uFF09 audio_single_file_max_size=0 -#speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b +#speaker File Types \u8BF4\u8BDD\u4EBA\u8BC6\u522B\u6587\u4EF6\u7C7B\u578B speaker_file_type= -#audio File Size 10M 10485760\uff08single\uff09 +#audio File Size 10M 10485760\uFF08single\uFF09 speaker_single_file_max_size=0 #video File Types video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv, -#video File Size 10M 10485760\uff08single\uff09 +#video File Size 10M 10485760\uFF08single\uFF09 video_single_file_max_size=0 -#face File Types \u4eba\u8138\u8bc6\u522b +#face File Types \u4EBA\u8138\u8BC6\u522B face_file_type= -#face File Size 10M 10485760\uff08single\uff09 +#face File Size 10M 10485760\uFF08single\uFF09 face_single_file_max_size=0 #picture File Types picture_file_type= -#picture File Size 10M 10485760\uff08single\uff09 +#picture File Size 10M 10485760\uFF08single\uFF09 picture_single_file_max_size=10485760 -#logo File Types \u53f0\u6807\u8bc6\u522b +#logo File Types \u53F0\u6807\u8BC6\u522B logo_file_type= -#logo File Size 10M 10485760\uff08single\uff09 +#logo File Size 10M 10485760\uFF08single\uFF09 logo_single_file_max_size=10485760 #voip File Types voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3, -#voip File Size 10M 10485760\uff08single\uff09 +#voip File Size 10M 10485760\uFF08single\uFF09 voip_single_file_max_size=0 #digest File Types digest_file_type= -#digest File Size 10M 10485760\uff08single\uff09 +#digest File Size 10M 10485760\uFF08single\uFF09 digest_single_file_max_size=10485760 -#digest File Size 12M 12582912\uff08total\uff09 +#digest File Size 12M 12582912\uFF08total\uFF09 digest_total_file_max_size=12582912 -#cert File Size 12M 12582912\uff08total\uff09 +#cert File Size 12M 12582912\uFF08total\uFF09 cert_total_file_max_size=12582912 #public File Types public_file_type= -#public File Size 10M 10485760\uff08single\uff09 +#public File Size 10M 10485760\uFF08single\uFF09 public_single_file_max_size=10485760 #private File Types private_file_type= -#private File Size 10M 10485760\uff08single\uff09 +#private File Size 10M 10485760\uFF08single\uFF09 private_single_file_max_size=10485760 -#YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84 +#YSP\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84 av_file_path=/home/ysp/ #av_file_path=D\:\\ysp\\ -#YSP\u6587\u4ef6\u7279\u5f81\u7c7b\u578b +#YSP\u6587\u4EF6\u7279\u5F81\u7C7B\u578B av_sample_audio_region=av_sample_audio av_sample_video_region=av_sample_video av_sample_picture_region=av_sample_picture @@ -446,7 +446,7 @@ mm_speaker_recognization_region=MM_SPEAKER_RECOGNIZATION mm_logo_detection_region=MM_LOGO_DETECTION mm_face_recognization_region=MM_FACE_RECOGNIZATION -#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f +#\u6837\u4F8B\u6587\u4EF6\u751F\u6210\u7A0B\u5E8F audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc video_sample_create_proc=/home/ceiec/av_feature_gen/extract_frame_feature picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc @@ -465,7 +465,7 @@ picture_sample_proc_param_is_translation=false speaker_sample_proc_param_is_translation=false logo_sample_proc_param_is_translation=false face_sample_proc_param_is_translation=false -#\u672c\u5730\u6d4b\u8bd5 +#\u672C\u5730\u6D4B\u8BD5 #audio_sample_create_proc=java -jar D\:\\sampleTest.jar #video_sample_create_proc=java -jar D\:\\sampleTest.jar #picture_sample_create_proc=java -jar D\:\\sampleTest.jar @@ -484,41 +484,41 @@ face_sample_proc_param_is_translation=false #speaker_sample_proc_param_is_translation=true #logo_sample_proc_param_is_translation=true #face_sample_proc_param_is_translation=true -#http\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570 +#http\u81EA\u5B9A\u4E49\u57DF\u76F8\u5173\u53C2\u6570 http_header_user_region_key=HTTP_HEADER http_header_dict_module=HTTP_HEADER_DISTRICT -#dns\u81ea\u5b9a\u4e49\u57df\u53c2\u6570key +#dns\u81EA\u5B9A\u4E49\u57DF\u53C2\u6570key dns_strategy_user_region_key=DNS_STRATEGY -#p2p\u81ea\u5b9a\u4e49\u57dfkey +#p2p\u81EA\u5B9A\u4E49\u57DFkey p2p_ip_type_user_region_key=P2P_IP_TYPE p2p_hash_type_user_region_key=P2P_HASH_TYPE -#\u7279\u5b9a\u670d\u52a1\u7c7b\u522b +#\u7279\u5B9A\u670D\u52A1\u7C7B\u522B specific_service_cfg_type_app=social_app specific_service_cfg_type_encrypted_tunnel_behavior=encrypted_tunnel_behavior specific_service_cfg_type_basic_protocol=basic_protocol -#\u57fa\u7840\u534f\u8bae\u81ea\u5b9a\u4e49\u57df +#\u57FA\u7840\u534F\u8BAE\u81EA\u5B9A\u4E49\u57DF proto_id_region=PROTO_ID -#\u62e6\u622aIP\u81ea\u5b9a\u4e49\u57dfkey +#\u62E6\u622AIP\u81EA\u5B9A\u4E49\u57DFkey keyring_id=keyring_id droprate=Droprate bandwidth=Bandwidth intercept_domain_intensity=DOMAIN_INTENSITY -#IP\u9ed8\u8ba4\u503c +#IP\u9ED8\u8BA4\u503C ipv4_default_ip_value=0.0.0.0 ipv6_default_ip_value=\:\: ipv4_default_ip_subnet_value=0.0.0.0/16 ipv6_default_ip_subnet_value=::/128 ipv4_default_ip_range_value=0.0.0.0-1 ipv6_default_ip_range_value=::-:: -#\u7aef\u53e3\u9ed8\u8ba4\u503c +#\u7AEF\u53E3\u9ED8\u8BA4\u503C port_default=0 port_mask_default=0/65535 -#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c +#MAAT CFG \u4E00\u4E9B\u9ED8\u8BA4\u503C maat_cfg_dolog_default=2 maat_cfg_dolog_doblacklist_default=1 maat_cfg_dolog_configpercent_default=100 maat_cfg_dolog_configoption_default=1 -#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26 +#app\uFF0C\u57FA\u7840\u534F\u8BAE\uFF0C\u7279\u5B9A\u670D\u52A1\u7684userregion\u5206\u9694\u7B26 app_cfg_userregion_splitor=& app_id_region=APP_ID #application spec service code scope @@ -532,36 +532,36 @@ area_tag=location isp_tag=isp mmFileDigestLog=mmFileDigestLogs ntcStreamMediaLog=ntcStreamMediaLogs -#\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2 +#\u97F3\u89C6\u9891\u6837\u4F8B\u9650\u5236\u65F6\u957F\uFF0C\u5355\u4F4D\u79D2 av_duration_limit=120 video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame -#\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84 +#\u8BC1\u4E66\u6587\u4EF6\u8DEF\u5F84 cert_file_path=/home/cert/ -#\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0 +#\u8BC1\u4E66\u6821\u9A8C\u5DE5\u5177\u540D\u79F0 cert_validate_file=x509 -#\u8bc1\u4e66\u6821\u9a8c\u6210\u529f\u7684\u5173\u952e\u4fe1\u606f +#\u8BC1\u4E66\u6821\u9A8C\u6210\u529F\u7684\u5173\u952E\u4FE1\u606F cert_validate_success_info=Successful -#ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2 +#ipv4 range\u65B0\u683C\u5F0F0.0.0.1-2 ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$ -#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219 +#\u57DF\u540D\u9A8C\u8BC1\u6B63\u5219 domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$ -#IP\u590d\u7528maat json\u4e2d\u7684ip region\u5355\u6b21send \u6700\u5927\u4e2a\u6570 +#IP\u590D\u7528maat json\u4E2D\u7684ip region\u5355\u6B21send \u6700\u5927\u4E2A\u6570 maat_json_send_size=20000 -#\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf +#\u5BFC\u5165\u9A8C\u8BC1\u7684\u7EBF\u7A0B\u6570\u91CF mulity_thread_size=5 ntcRadiusReport=ntcRadiusReport ntcCollectVoipLog=ntcCollectVoipLogs ntcKeywordsUrlLog=ntcKeywordsUrlLogs save_and_del_thread_size=5 -#mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e +#mysql \u5355\u4E2Asql\u5927\u5C0F\u9650\u5236,\u6839\u636Emariadb\u76F8\u5173\u53C2\u6570\u914D\u7F6E max_allowed_packet=1048576 -#http client\u8fde\u63a5\u6c60\u76f8\u5173\u53c2\u6570\uff0chttp_max_connection:\u6700\u5927\u8fde\u63a5\u6570\uff0cdefault_max_perroute:\u6bcf\u4e2a\u4e3b\u673a\u5730\u5740\u7684\u5e76\u53d1\u6570\uff0cpoolcm_socket_timeout:socket\u8d85\u65f6\u65f6\u95f4 +#http client\u8FDE\u63A5\u6C60\u76F8\u5173\u53C2\u6570\uFF0Chttp_max_connection:\u6700\u5927\u8FDE\u63A5\u6570\uFF0Cdefault_max_perroute:\u6BCF\u4E2A\u4E3B\u673A\u5730\u5740\u7684\u5E76\u53D1\u6570\uFF0Cpoolcm_socket_timeout:socket\u8D85\u65F6\u65F6\u95F4 http_max_connection=1000 default_max_perroute=100 poolcm_socket_timeout=3000 app_vignore_user_region_key=VIGNORE -#policies\u83dc\u5355\u7684\u83dc\u5355ID +#policies\u83DC\u5355\u7684\u83DC\u5355ID policies_menu_id=86 userCreate=UserCreate userPasswordSet=UserPasswordSet @@ -571,7 +571,7 @@ userList=UserList ip_reuse_call_cgi_url=http://192.168.11.137:8090/command ipNumGet=IpNumGet allIpGet=AllIpGet -#\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 +#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5 trafficBandwidthTrans=trafficBandwidthTrans trafficProtocolList=trafficProtocolList irSnatLog=irSnatLogs @@ -591,7 +591,7 @@ trafficBandwidthTransFour=trafficBandwidthTransFour ntcCollectRadiusLog=ntcCollectRadiusLogs ntcConnRecordLog=ntcConnRecordLogs ntcConnRecordPercent=ntcConnRecordPercent -#\u5bfc\u51fa\u6700\u5927\u6761\u6570 +#\u5BFC\u51FA\u6700\u5927\u6761\u6570 maxLogExportSize=2000 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID ntc_subscribe_id_region=NTC_SUBSCRIBE_ID @@ -602,4 +602,5 @@ trafficWebsiteListNoTime=trafficWebsiteListNoTime trafficTopicList=trafficTopicList trafficDomainTrans=trafficDomainTrans #maximum number to import -import_limit=10 \ No newline at end of file +import_limit=10 +trafficPortActiveFiveMinute=trafficPortActiveFiveMinute \ No newline at end of file diff --git a/src/main/resources/sql/20181222/add_app_feature_column b/src/main/resources/sql/20181222/add_app_feature_column new file mode 100644 index 000000000..9054704b5 --- /dev/null +++ b/src/main/resources/sql/20181222/add_app_feature_column @@ -0,0 +1,11 @@ +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `header_type` varchar(16) NULL DEFAULT '' AFTER `user_region5`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `ver` varchar(4) NULL DEFAULT '' AFTER `header_type`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `ihl` varchar(4) NULL DEFAULT '' AFTER `ver`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `tos` varchar(8) NULL DEFAULT '' AFTER `ihl`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `total_length` varchar(16) NULL DEFAULT '' AFTER `tos`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `flags` varchar(3) NULL DEFAULT '' AFTER `total_length`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `fragment_offset` varchar(8) NULL DEFAULT '' AFTER `flags`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `protocol` varchar(8) NULL DEFAULT '' AFTER `fragment_offset`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `icmp_type` varchar(8) NULL DEFAULT '' AFTER `protocol`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `icmp_code` varchar(8) NULL DEFAULT '' AFTER `icmp_type`; +ALTER TABLE `app_complex_feature_cfg` ADD COLUMN `icmp_identifier` varchar(16) NULL DEFAULT '' AFTER `icmp_code`; \ No newline at end of file diff --git a/src/main/resources/sql/20181223/add_function_service_dict_column.sql b/src/main/resources/sql/20181223/add_function_service_dict_column.sql new file mode 100644 index 000000000..1e9387e26 --- /dev/null +++ b/src/main/resources/sql/20181223/add_function_service_dict_column.sql @@ -0,0 +1,149 @@ +ALTER TABLE `function_service_dict` ADD COLUMN `sort` int(11) NOT NULL DEFAULT 0 AFTER `is_import`; + +INSERT INTO `function_service_dict` VALUES ('1', '28', '0', '16', 'reject', '261', 'audio_sample_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '0', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('2', '28', '0', '1', 'monit', '389', 'audio_sample_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('3', '29', '0', '16', 'reject', '262', 'video_sample_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('4', '29', '0', '1', 'monit', '390', 'video_sample_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('5', '30', '0', '16', 'reject', '263', 'pic_sample_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('6', '30', '0', '1', 'monit', '391', 'pic_sample_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('7', '31', '0', '16', 'reject', '264', 'voip_sample_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('8', '31', '0', '1', 'monit', '392', 'voip_sample_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('9', '32', '0', '16', 'reject', '266', 'video_pornography_sample_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('10', '32', '0', '1', 'monit', '394', 'video_pornography_sample_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('11', '33', '0', '16', 'reject', '266', 'video_pornography_sample_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('12', '33', '0', '1', 'monit', '394', 'video_pornography_sample_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('13', '3', '0', '1', 'monit', '13', 'ip_white_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('14', '3', '0', '16', 'reject', '14', 'ip_white_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('15', '3', '0', '128', 'whitelist', '1', 'ip_white_whitelist', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('16', '24', '22', '16', 'reject', '38', 'av_voip_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('17', '24', '22', '1', 'monit', '150', 'av_voip_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('18', '8', '4', '16', 'reject', '17', 'website_advanced_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('19', '8', '4', '1', 'monit', '129', 'website_advanced_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('20', '6', '0', '128', 'whitelist', '2', 'domain_white_whitelist', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('21', '20', '0', '16', 'reject', '271', 'av_content_ip_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('22', '20', '0', '1', 'monit', '384', 'av_content_ip_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('23', '5', '0', '16', 'reject', '16', 'ip_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('24', '5', '0', '1', 'monit', '128', 'ip_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('25', '5', '0', '32', 'drop', '3', 'ip_drop', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '1', '4'); +INSERT INTO `function_service_dict` VALUES ('26', '34', '10', '1', 'monit', '131', 'ssl_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('27', '34', '10', '16', 'reject', '19', 'ssl_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('28', '21', '0', '16', 'reject', '258', 'av_pic_ip_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('29', '21', '0', '1', 'monit', '386', 'av_pic_ip_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('30', '22', '23', '16', 'reject', '39', 'av_content_url_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('31', '22', '23', '1', 'monit', '151', 'av_content_url_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('32', '23', '0', '16', 'reject', '259', 'av_pic_url_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('33', '23', '0', '1', 'monit', '387', 'av_pic_url_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('34', '5', '0', '96', 'loop', '4', 'ip_loop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('35', '7', '6', '16', 'reject', '18', 'website_dns_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('36', '7', '6', '1', 'monit', '130', 'website_dns_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('37', '35', '5', '16', 'reject', '20', 'mail_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('38', '35', '5', '1', 'monit', '132', 'mail_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('39', '41', '11', '1', 'monit', '138', 'ssh_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('40', '41', '11', '16', 'reject', '26', 'ssh_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('41', '51', '7', '1', 'monit', '133', 'ftp_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('42', '51', '7', '16', 'reject', '21', 'ftp_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('43', '42', '14', '16', 'reject', '24', 'openvpn_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('44', '42', '14', '1', 'monit', '136', 'openvpn_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('45', '43', '13', '16', 'reject', '23', 'l2tp_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('46', '43', '13', '1', 'monit', '135', 'l2tp_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('47', '44', '12', '16', 'reject', '22', 'pptp_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('48', '44', '12', '1', 'monit', '134', 'pptp_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('49', '45', '16', '16', 'reject', '27', 'socks_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('50', '45', '16', '1', 'monit', '139', 'socks_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('51', '46', '15', '32', 'drop', '28', 'gre_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('52', '46', '15', '1', 'monit', '140', 'gre_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('53', '47', '8', '32', 'drop', '29', 'ike_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('55', '48', '0', '32', 'drop', '25', 'ipsec_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('56', '48', '8', '1', 'monit', '137', 'ipsec_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('57', '61', '20', '16', 'reject', '31', 'bgp_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('58', '61', '20', '1', 'monit', '143', 'bgp_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('59', '52', '0', '1', 'monit', '399', 'file_transfer_digest_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('60', '52', '0', '16', 'reject', '273', 'file_transfer_digest_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('61', '62', '17', '1', 'monit', '142', 'xmpp_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('62', '62', '17', '16', 'reject', '30', 'xmpp_reject', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('63', '200', '0', '1', 'monit', '512', 'ip_intercepter_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('64', '201', '0', '1', 'monit', '513', 'domain_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('65', '400', '0', '16', 'reject', '65', 'dns_strategy_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('66', '205', '0', '80', 'replace', '560', 'proxy_http_req_body_replace', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('67', '203', '0', '80', 'replace', '561', 'proxy_http_res_body_replace', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('68', '401', '0', '16', 'reject', '64', 'dns_fake_ip_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('69', '63', '21', '16', 'reject', '33', 'app_strategy_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('70', '63', '21', '64', 'ratelimit', '1056', 'app_strategy_ratelimit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '3'); +INSERT INTO `function_service_dict` VALUES ('71', '202', '0', '48', 'redirect', '528', 'proxy_ip_redirect', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('72', '202', '0', '2', 'forward', '544', 'proxy_ip_forward', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('73', '405', '0', '1', 'monit', '1028', 'app_protocol_ip_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('74', '402', '0', '1', 'monit', '1024', 'app_http_feature_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('75', '403', '0', '1', 'monit', '1026', 'app_domain_feature_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('76', '404', '0', '1', 'monit', '1027', 'app_byte_feature_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('77', '204', '0', '2', 'forward', '545', 'proxy_domain_forward', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('78', '302', '0', '64', 'ratelimit', '1057', 'ip_ratelimit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('79', '303', '0', '64', 'ratelimit', '1058', 'domain_ratelimit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('80', '300', '0', '80', 'loop', '835', 'snat_ip_complex_loop', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('81', '206', '0', '48', 'redirect', '529', 'http_redirect', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('82', '301', '0', '96', 'loop', '5', 'ddos_ip_drop', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('83', '406', '0', '96', 'loop', '832', 'dnat_ip_reuse_adress_pool_loop', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('84', '63', '21', '1', 'monit', '145', 'app_strategy_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('85', '63', '21', '32', 'drop', '1040', 'app_strategy_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('86', '207', '0', '16', 'reject', '576', 'ctrl_http_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('87', '208', '0', '48', 'redirect', '528', 'ctrl_http_redirect', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('88', '209', '0', '80', 'replace', '560', 'ctrl_http_replace', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('89', '210', '0', '1', 'monit', '592', 'ctrl_http_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5,6', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('90', '211', '0', '128', 'whitelist', '750', 'ctrl_http_whitelist', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('91', '407', '21', '16', 'reject', '35', 'basic_protocol_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('92', '407', '21', '64', 'ratelimit', '1059', 'basic_protocol_ratelimit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '3'); +INSERT INTO `function_service_dict` VALUES ('93', '407', '21', '1', 'monit', '147', 'basic_protocol_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('94', '407', '21', '32', 'drop', '1041', 'basic_protocol_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('95', '408', '21', '16', 'reject', '36', 'encrypted_tunnel_behavior_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('96', '408', '21', '64', 'ratelimit', '1060', 'encrypted_tunnel_behavior_ratelimit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('97', '408', '21', '1', 'monit', '148', 'encrypted_tunnel_behavior_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '1', '3'); +INSERT INTO `function_service_dict` VALUES ('98', '408', '21', '32', 'drop', '1042', 'encrypted_tunnel_behavior_drop', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('99', '200', '0', '128', 'whitelist', '521', 'ip_intercepter_whitelist', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('100', '201', '0', '128', 'whitelist', '521', 'domain_whitelist', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('101', '510', '0', '16', 'reject', '34', 'p2p_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('102', '25', '0', '1', 'monit', '395', 'av_voip_account_monit', '', '0', null, '2018-08-16 20:53:44', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('103', '25', '0', '16', 'reject', '267', 'av_voip_account_reject', '', '0', null, '2018-08-16 20:55:38', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('104', '520', '0', '1', 'monit', '1029', 'app_ssl_cert_feature_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('105', '530', '0', '1', 'monit', '1031', 'APP_LAYER_HEADER', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('108', '5', '0', '64', 'ratelimit', '514', 'ip_intercepter_ratelimit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '4', '1', '3'); +INSERT INTO `function_service_dict` VALUES ('109', '201', '0', '64', 'ratelimit', '515', 'domain_intercepter_ratelimit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '3'); +INSERT INTO `function_service_dict` VALUES ('110', '212', '0', '80', 'replace', '517', 'ip_intercepter_replace', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('114', '550', '0', '1', 'monit', '1030', 'app_session_feature_monit', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('115', '560', '0', '1', 'monit', '1152', 'app_topic_domain_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('116', '570', '0', '1', 'monit', '520', 'intercept_file_strategy', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('118', '601', '0', '16', 'reject', '37', 'ANS_POLICY_REJECT', 'ANS_POLICY_REJECT', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('119', '601', '0', '1', 'monit', '149', 'ANS_POLICY_MONIT', 'ANS_POLICY_MONIT', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('120', '510', '0', '1', 'monit', '146', 'p2p_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('121', '630', '0', '16', 'reject', '268', 'mm_speaker_recognization_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('122', '630', '0', '1', 'monit', '396', 'mm_speaker_recognization_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('123', '631', '0', '1', 'monit', '397', 'mm_logo_detection_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('124', '631', '0', '16', 'reject', '269', 'mm_logo_detection_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('125', '632', '0', '1', 'monit', '398', 'mm_face_recognization_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('126', '632', '0', '16', 'reject', '270', 'mm_face_recognization_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('127', '561', '0', '1', 'monit', '1025', 'APP_PAYLOAD', null, '1', '1', null, null, null, '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('129', '562', '0', '1', 'monit', '1027', 'APP_DNS', null, '1', null, null, null, null, '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('130', '22', '0', '128', 'whitelist', '257', 'av_content_url_whitelist', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('131', '20', '0', '128', 'whitelist', '256', 'av_content_ip_whitelist', '', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('132', '563', '0', '1', 'monit', '1025', 'APP_PAYLOAD_ADMIN', '', '1', '1', '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2,3,4,5', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('133', '564', '0', '1', 'monit', '1027', 'APP_DNS_ADMIN', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '1,2', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('134', '565', '0', '1', 'monit', '1024', 'APP_HTTP_ADMIN', '', '1', '1', '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2,3,4,5', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('135', '566', '0', '1', 'monit', '1029', 'APP_SSL_ADMIN', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2,3,4,5', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('136', '567', '0', '1', 'monit', '1030', 'APP_DK_GL', '', '1', '1', '2018-09-20 11:14:07', null, '2018-09-20 11:14:10', '2', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('137', '5', '0', '64', 'ratelimit', '514', 'ip_ratelimit', 'ip地址限速', '0', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '4', '0', '0'); +INSERT INTO `function_service_dict` VALUES ('138', '6', '4', '16', 'reject', '17', 'website_http_reject', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '1', '3'); +INSERT INTO `function_service_dict` VALUES ('139', '6', '4', '1', 'monit', '129', 'website_http_monit', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '2', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('140', '5', '0', '16', 'reject', '37', 'asn_reject', 'ANS_REJECT', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '5', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('141', '5', '0', '1', 'monit', '149', 'asn_monit', 'ANS_MONIT', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '5', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('142', '633', '0', '96', 'loop', '834', 'snat_ip_reuse_adress_pool_loop', '', '1', null, '0000-00-00 00:00:00', null, '0000-00-00 00:00:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('143', '304', '0', '80', 'loop', '836', 'dnat_ip_complex_loop', '', '1', null, '2018-09-30 13:00:00', null, '2018-09-30 14:00:00', '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('147', '37', '5', '128', 'whitelist', '66', 'mail_address_whitelist', null, '1', null, '2018-10-15 14:01:32', null, null, '1,2', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('148', '37', '5', '1', 'monit', '132', 'mail_address_monit', null, '1', null, '2018-10-15 14:01:35', null, null, '1,2', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('149', '37', '5', '16', 'reject', '20', 'mail_address_reject', null, '1', null, '2018-10-15 14:01:38', null, null, '1,2', '1', '3'); +INSERT INTO `function_service_dict` VALUES ('150', '635', '4', '1', 'monit', '152', 'http_keyword_monit', null, '1', null, null, null, null, '', '1', '1'); +INSERT INTO `function_service_dict` VALUES ('151', '635', '4', '16', 'reject', '40', 'http_keyword_reject', null, '1', null, null, null, null, '', '1', '2'); +INSERT INTO `function_service_dict` VALUES ('152', '571', '0', '1', 'monit', '640', 'PXY_OBJ_TRUSTED_CA_CERT', '', '1', null, '2018-10-06 14:21:00', null, '2018-10-06 14:21:00', '', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('153', '0', '0', '0', '', '0', '', null, '0', null, null, null, null, null, '0', '0'); +INSERT INTO `function_service_dict` VALUES ('154', '213', '0', '48', 'cache', '625', 'proxy_cache_policy_redirect', null, '1', null, '2018-11-08 11:14:30', null, '2018-11-08 11:14:33', '2', '0', '2'); +INSERT INTO `function_service_dict` VALUES ('155', '213', '0', '128', 'cache_whitelist', '624', 'proxy_cache_policy_whitelist', null, '1', null, '2018-11-08 11:16:18', null, '2018-11-08 11:16:23', null, '0', '1'); +INSERT INTO `function_service_dict` VALUES ('157', '301', '0', '1', 'monit', '6', 'ddos_ip_monit', '', '1', '1', '2018-12-15 09:47:57', '1', '2018-12-15 09:47:57', '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('159', '666', '0', '1', 'monit', '642', 'PXY_OBJ_SPOOFING_IP_POOL', null, '1', null, '2018-12-16 15:04:45', null, '2018-12-16 15:04:47', '1', '0', '1'); +INSERT INTO `function_service_dict` VALUES ('161', '214', '0', '48', 'spoofing', '518', 'ip_intercept_spoofing', 'ip仿冒', '1', null, '2018-12-16 17:27:32', null, '2018-12-16 17:27:34', '1', '0', '1'); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index b4ec2e83d..0794ba3f4 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -26,27 +26,27 @@ - + - + - + - + - + @@ -114,8 +114,8 @@ function update(url){ top.$.jBox.tip("", ""); return; }else if(cked.val()==3){ - top.$.jBox.tip("", ""); - return; + /* top.$.jBox.tip("", ""); + return; */ } //处理asnIp,asn组下发过的ip配置不允许修改 if(cked.attr("serviceGroupId")&&cked.attr("isValid")){ @@ -400,7 +400,7 @@ function cancelPassOpt(url){ return flag; } //导出 - function exportData(url,maxRow,searchUrl){ + function exportData(url,maxRow,searchUrl,exType){ var column=[]; var hColumn=[]; //隐藏列名 $("#${id} ${value} thead tr th").each(function(){ @@ -428,7 +428,7 @@ function cancelPassOpt(url){ //导出检索条件下所有数据 }else{ var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); - if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) { + if (exType!='log') { if(totalCount > maxRow){ top.$.jBox.confirm(""+maxRow+"!","",function(v,h,f){ if(v=="ok"){ @@ -453,12 +453,5 @@ function cancelPassOpt(url){ } } - function confirmEnding(str, target) { - var result=true; - var num=str.indexOf(target); - if (-1==num) { - result=false; - } - return result; - } + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index 9e6903056..26eecb7cc 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -100,14 +100,14 @@
-
+ <%--
-
+
--%> <%--
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp index 6f13ddcfa..725f60f5f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp @@ -8,6 +8,41 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); }); + $(".district").on("change", function() { + if($(this).val()=='L3_header'){ + $(this).parents(".boxSolid").find(".keywords").addClass("hidden"); + $(this).parents(".boxSolid").find(".L3_header").removeClass("hidden"); + $(this).parents(".boxSolid").find(".matchMethod").addClass("hidden"); + $(this).parents(".boxSolid").find(".exprType").addClass("hidden"); + $(this).parents(".boxSolid").find("input:radio[name$='isHex'][value=1]").prop("checked",true); + $(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive'][value=0]").prop("checked",true); + $(this).parents(".boxSolid").find("input:radio[name$='isHex']").attr("disabled",true); + $(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive']").attr("disabled",true); + $(this).parents(".boxSolid").find(".headerType").change(); + }else{ + $(this).parents(".boxSolid").find(".keywords").removeClass("hidden"); + $(this).parents(".boxSolid").find(".L3_header").addClass("hidden"); + $(this).parents(".boxSolid").find(".matchMethod").removeClass("hidden"); + $(this).parents(".boxSolid").find(".exprType").removeClass("hidden"); + $(this).parents(".boxSolid").find(".IP_header").addClass("hidden"); + $(this).parents(".boxSolid").find(".ICMP_header").addClass("hidden"); + $(this).parents(".boxSolid").find("input:radio[name$='isHex']").attr("disabled",false); + $(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive']").attr("disabled",false); + } + }); + + $(".headerType").on("change", function() { + if($(this).val()=='IP_header'){ + $(this).parents(".boxSolid").find(".ICMP_header").addClass("hidden"); + $(this).parents(".boxSolid").find(".IP_header").removeClass("hidden"); + }else{ + $(this).parents(".boxSolid").find(".IP_header").addClass("hidden"); + $(this).parents(".boxSolid").find(".ICMP_header").removeClass("hidden"); + } + }); + $(".boxSolid:visible").find(".district").each(function(){ + $(this).change(); + }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#cfgFrom").validate({ errorPlacement: function(error,element){ @@ -25,21 +60,50 @@ $(function(){ return; } $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ + if($(this).val()==''){ - $(this).parents(".form-group").find( - "div[for='" - + $(this).attr("name") - + "']").html(""); - flag = false; + var length = 0; + $(this).parents(".boxSolid").find(".l3_header_prop").each(function(){ + if($(this).val()!=''){ + length += 1; + } + }) + if(length==0){ + $(this).parents(".form-group").find( + "div[for='" + + $(this).attr("name") + + "']").html(""); + flag = false; + }else if(length>4){ + $(this).parents(".boxSolid").find( + "div[class='l3_header_tips']").html(""); + flag = false; + } + + }else{ + var length = 0; + $(this).parents(".boxSolid").find(".l3_header_prop").each(function(){ + if($(this).val()!=''){ + length += 1; + } + }) + if(length>0){ + $(this).val(""); + if(length>4){ + $(this).parents(".boxSolid").find( + "div[class='l3_header_tips']").html(""); + flag = false; + } + } } - }) + }); //keywords非空校验完成校验二进制字符串 $(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - keywords=keywords.replace("***and***","") - if(keywords != ''){ + keywords=keywords.replace("***and***",""); + if(keywords != ''){ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".boxSolid").find( "div[for='" @@ -109,6 +173,8 @@ var delContent = function(contentClassName, addBtnClassName) { code="required"> +
@@ -143,6 +209,7 @@ var delContent = function(contentClassName, addBtnClassName) { +
@@ -191,6 +258,7 @@ var delContent = function(contentClassName, addBtnClassName) { + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp index f23e4ebd7..bee4cc0c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp @@ -256,13 +256,89 @@
-
-
-
- + + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + + +
+
+
+ +
+
-
-
+ +
@@ -271,6 +347,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 12f1897ab..102091528 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -237,12 +237,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index 28c0f1f51..8d7ff244e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -99,6 +99,11 @@ $(function(){ if(sfd==632||sfd==631){ var files = $(this)[0].files; if(files.length>0){ + //多文件上传个数限制防止get请求url过长 + if(files.length>50){ + top.$.jBox.tip(""+' '+50); + return false; + } for(var i = 0;i < files.length;i ++) { var file = files[i]; var faceName = file.name; diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index fa79e79f5..541d00564 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -137,8 +137,19 @@ -<%-- - --%> + + +
+ +
    +
    • +
    • +
+
+
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 882cb7229..8691b240f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -49,7 +49,7 @@
-
+
@@ -108,8 +108,127 @@
-
+ + + + + + + + + + +
+
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index a24a8400c..c93109aa0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -212,12 +212,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 9599766bc..3deeeb8bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -535,12 +535,12 @@ var showHideIPSECProtocol=function(obj){
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index d01e9b341..66dbe66f0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -243,12 +243,12 @@
-
+
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp index fc1671cbe..d0290870e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp @@ -233,6 +233,18 @@ <%-- --%> + +
+ +
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+ href="javascript:;"> @@ -227,13 +239,13 @@ - - - - - - - + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp index 72e7f5154..8a4f7dd8f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp @@ -139,6 +139,18 @@ <%-- --%> + +
+ +
    +
    • +
    • +
+
+
+
    +
    • +
    • +
+
+
-
+ <%--
- + @@ -226,7 +227,7 @@
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 5a359ae09..02a770fec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -371,7 +371,7 @@ - + <%-- --%> @@ -418,13 +418,13 @@ - + <%-- - + --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp index 1a7f477be..79821e40f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp @@ -180,19 +180,18 @@ -<%-- --%> - - -<%-- --%> - - - -<%--
    • --%> -<%--
    • --%> - - +
    + +
      +
      • +
      • +
    +
    diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp index 378647a1e..9f1b8b643 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp @@ -146,6 +146,18 @@ + +
    + +
      +
      • +
      • +
    +
    +
    -
    +
    - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index b52d159ed..3bf6899de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -370,7 +370,7 @@ - + <%-- --%> @@ -422,13 +422,13 @@ - + <%-- - + --%>
    diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 355e0dc19..fb27b1522 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -281,12 +281,12 @@
    -
    +
    - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index ea8fb3de1..dfd5a6712 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -225,12 +225,12 @@
    -
    +
    - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index 0e3f105de..ecb6dc728 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -210,12 +210,12 @@
    -
    +
    - + diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index 75356164d..17d655c0d 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -23,8 +23,8 @@ body { color: #fff } .fa-arrow-circle-up { - color: #fe392e; - background-color: white; + color: #001029; + background-color: #fe392e; border-radius: 10px; font-size: 13px; width: 10px; @@ -32,8 +32,8 @@ body { line-height: 9px !important; } .fa-arrow-circle-down { - color: #42DEEB; - background-color: white; + color: #001029; + background-color: #009966; border-radius: 10px; font-size: 13px; width: 10px; @@ -72,7 +72,7 @@ body {
    - +

    @@ -81,7 +81,7 @@ body {

    -

    0

     +

    0
    @@ -90,38 +90,37 @@ body {
    - +

    " class="tooltips" data-flag="false" data-html="true" data-placement="top">

    -

    0

     +

    0
    - +
    <%-- --%>

    " class="tooltips" data-flag="false" data-html="true" data-placement="top">

    -

    0

    +

    0
    - +

    " class="tooltips" data-flag="false" data-html="true" data-placement="top">

    -

    0

    - +

    0
    @@ -178,8 +177,8 @@ body {
    - - +<%-- --%> +<%-- --%>
    @@ -217,9 +216,12 @@ body {
    - + + + +
    diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new deleted file mode 100644 index bc3ab2e8c..000000000 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new +++ /dev/null @@ -1,935 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - - - - - 数据概览 - - - - - - - - - - - -
    - - -
    -
    -
    -
    -
    -
    - -
    -
    -

    - -

    -

    c2s 0 | s2c 0

    - 0 bps     -
    -
    -
    -
    - -
    -
    -

    - -

    -

    0

     -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

     -
    -
    -
    -
    - -
    -
    -<%-- --%> -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    -
    -
    -
    -
    - -
    -
    - -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    - -
    -
    - -
    -
    - -
    -
    - -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    - -
    -
    -
    -
    - -
    -
    -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    - -
    -
    - -
    -
    - -
    -
    -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    -
    -
    -
    -
    - -
    -
    -

    " - class="tooltips" data-flag="false" data-html="true" data-placement="top"> -

    -

    0

    -
    -
    - -
    -
    -
    -
    - - - - -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    - -
    -
    -
    - - - - - - - -
    -
    -
    -
    - -
    -
    -
    - - - - -
    - -
    - - - - - - - - - - -
    -
    - -
    -
    - -
    - - -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - -
    -
    -
    -
    -
    -
    - <%--
    - -
    --%> -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    -
    - <%--
    - -
    --%> -
    -
    -
    -
    -
    - -
    -
    - - - - - - - - - - - - - -<%-- --%> - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp index e6b540661..3fdcd0936 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp @@ -155,17 +155,18 @@ function showActionTransChart(rs){ credits:{//是否有highcharts水印 enabled:false }, - /* plotOptions: { - area: { - stacking: 'normal', - lineColor: '#666666', - lineWidth: 1, - marker: { - lineWidth: 1, - lineColor: '#666666' - } - } - }, */ + plotOptions: { + series: { + marker: { + radius: 2, + hover: { + enabled: true, + radius: 7, + radiusPlus: 5 + } + } + } + }, // legend: { // layout: 'vertical', // align: 'right', diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index 815ba280f..3be456d0e 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -32,7 +32,7 @@
    + value="" onclick="WdatePicker({onpicked:function(){console.log(endDate);console.log(this);$(endDate).val('')},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
    @@ -41,7 +41,7 @@
    + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/>
    @@ -86,6 +86,7 @@ + + + + + + +<%-- --%> + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index 7b91a36e1..56b620563 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -361,11 +361,13 @@ } function openPicWindow(url){ $.jBox("iframe:"+url, { - title: "", + title: "Domain", top: '1%', draggable:false, width: $(document).width()*0.9, height:$(document).height()*0.9, + showScrolling: false, /* 是否显示浏览的滚动条 */ + iframeScrolling: 'no', buttons: { 'close': true } }); } diff --git a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp index f5543bfd5..701270085 100644 --- a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp @@ -897,14 +897,14 @@ color: 'white', fontSize: 12, formatter: function (value, index) { - if (value > 1000 && value <= 1000000) { - return value/1000 + " K"; + if (value > 1024 && value <= 1048576) { + return value/1024 + " KBps"; } - if (value > 10000000 && value <= 1000000000) { - return value/1000000 + " M"; + if (value > 1048576 && value <= 1073741824) { + return value/1048576 + " MBps"; } - if (value > 100000000) { - return value/1000000000 + " B"; + if (value > 1073741824) { + return value/1073741824 + " GBps"; } return value; } diff --git a/src/main/webapp/WEB-INF/views/home.jsp.new b/src/main/webapp/WEB-INF/views/home.jsp.new index 77f5ec52f..274323d77 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp.new +++ b/src/main/webapp/WEB-INF/views/home.jsp.new @@ -28,7 +28,7 @@ sessionStorage.setItem("log_total","${log_total}"); sessionStorage.setItem("log_time_start","${log_time_start}"); sessionStorage.setItem("log_time_range","${log_time_range}"); - window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&baseNum=" + baseNum; + window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&hour=2&baseNum=" + baseNum; //window.frames['mainFrame'].location="${ctx}/dashboard/logChart"; //国际化切换 var lang = "${cookie.Language.value }".toLowerCase(); diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index da344fc51..d6b7abb42 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -2,6 +2,9 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + index + ">
    @@ -111,10 +194,22 @@ [：${requestStatisticTime }] - + +
    +
    + + +
    +
    - +
    @@ -150,18 +245,33 @@ +
    ${page}
    -
    - - [：${configStatisticTime }] - +
    + + + [：${configStatisticTime }] + + +
    +
    + + +
    +
    - +
    @@ -221,6 +331,7 @@ +
    diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 67c8d7358..6de17df8c 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -270,7 +270,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -418,7 +418,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 0749ce63f..a98de291f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -207,7 +207,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -354,7 +354,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index b421a5d48..d0a0a071a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -250,7 +250,7 @@ - + <%-- --%> @@ -363,7 +363,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} ${log.type } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp index 01450527e..a06e7e1bc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp @@ -272,7 +272,7 @@ - + <%-- --%> @@ -399,7 +399,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index e074c2b4c..86de617e0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -263,7 +263,7 @@ $(document).ready(function(){ - + @@ -399,7 +399,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index b80380308..0f0bdf8cd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -269,7 +269,7 @@ - + <%-- --%> @@ -437,7 +437,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 8dd570d54..5e42a1cc3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -388,7 +388,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 8ce7ecc26..71d3646f7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -298,7 +298,7 @@ - + <%-- --%> @@ -421,7 +421,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index acee93873..0d7cec69e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -292,7 +292,7 @@ - + <%-- --%> @@ -474,7 +474,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 0392a8ab4..93515f8de 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -251,7 +251,7 @@ - + <%-- --%> @@ -360,7 +360,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index f25efe6fd..6564e31f2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -190,7 +190,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -312,7 +312,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp index 940c40327..e9ec0e3b0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp @@ -226,7 +226,7 @@ - + <%-- --%> @@ -344,7 +344,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp index b41b35b96..7ee304285 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp @@ -226,7 +226,7 @@ - + <%-- --%> @@ -345,7 +345,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 807bf7e4e..524638047 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -201,7 +201,7 @@ - + <%-- --%> @@ -324,7 +324,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index 5bf5a8a23..5230578b6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -280,7 +280,7 @@ - + <%-- --%> @@ -414,7 +414,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index b45b50b92..5cce8f958 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -207,7 +207,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -366,7 +366,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 580422444..b1afb0003 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -204,7 +204,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -361,7 +361,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index bd595b385..0c30f19ee 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -256,7 +256,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -414,7 +414,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 8064cab45..544450245 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -203,7 +203,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -363,7 +363,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index bff10d1bb..3957750c4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -202,7 +202,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -360,7 +360,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index 3d6241e1e..ff2e68cf8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -204,7 +204,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -358,7 +358,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 996d2a88c..7d93d8e9e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -256,7 +256,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -414,7 +414,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 1d2408069..beeba3985 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -316,7 +316,7 @@ - + <%-- --%> @@ -469,7 +469,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index 9cceeae17..99a09c952 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -245,7 +245,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -404,7 +404,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index 9e3fd5adc..83d5eca56 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -245,7 +245,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -401,7 +401,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 9b3f7859c..b4809cd38 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -255,7 +255,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -412,7 +412,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 33c3b9d0c..bc7a76a9a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -245,7 +245,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -403,7 +403,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index f048d9f3e..73feb9a13 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -256,7 +256,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -415,7 +415,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index cbe7dc4ab..023a39091 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -261,7 +261,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -410,7 +410,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 4a906fbfc..17624938c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -211,7 +211,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -354,7 +354,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 74fe6e0be..d88d601b1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -267,7 +267,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -418,7 +418,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 876bece24..5872d07b8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -251,7 +251,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -372,7 +372,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index b3c20796d..bf2db70e2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -334,7 +334,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index ca795e7b7..daa766dae 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -254,7 +254,7 @@ - + <%-- --%> @@ -371,7 +371,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index 4a8d96b63..80c11ead8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -198,7 +198,7 @@ - + <%-- --%> @@ -317,7 +317,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp index d3364395f..48b67760a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp @@ -245,7 +245,7 @@ - + <%-- --%> @@ -369,7 +369,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 034028d18..2ff265de6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -205,7 +205,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -325,7 +325,7 @@ $(document).ready(function(){ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index ed2af9ea0..2afe9a28d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -268,7 +268,7 @@ - + <%-- --%> @@ -386,7 +386,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 8d94795ef..2a85014ae 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -265,7 +265,7 @@ - + <%-- --%> @@ -400,7 +400,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.userRegion} + <%-- ${log.userRegion} --%> ${log.sceneFile} diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 309f35684..11b3a2d51 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -70,6 +70,7 @@ $(document).ready(function() { }); //ajaxServiceLogTotal(); $(".export-btn").click(function(){ + loading(''); var suffix = $(this).data("export-type"); totaltb(1,-1); @@ -85,6 +86,7 @@ $(document).ready(function() { $("#myexport").click(); $("caption").remove(); //totaltb(pato,size); + closeTip(); }); @@ -484,7 +486,10 @@ white-space:nowrap; <%-- --%> -
    + <%-- --%> +
    +
    +
    - - <%-- --%> -
    -
    href="javascript:;"> diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp index 1bcbaac80..129f0635f 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp @@ -91,6 +91,7 @@ $(obj).find(".itemCode").attr("name","dictItemList["+index+"].itemCode"); $(obj).find(".itemValue").attr("name","dictItemList["+index+"].itemValue"); $(obj).find(".itemDesc").attr("name","dictItemList["+index+"].itemDesc"); + $(obj).find(".itemSort").attr("name","dictItemList["+index+"].itemSort"); $(obj).find(".itemStatus").attr("name","dictItemList["+index+"].status"); $(obj).find(".itemType").attr("name","dictItemList["+index+"].type"); @@ -180,6 +181,7 @@ + readonly="readonly"/> readonly="readonly"/> readonly="readonly"/> + readonly="readonly"/>