From c4423ff900981a3101e1d9645cdabd5ca4d46555 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 17 Dec 2018 21:06:45 +0600 Subject: [PATCH 1/9] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=BA4=E4=B8=AA=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basics/PolicyGroupController.java | 14 ++++---- .../resources/messages/message_en.properties | 6 +++- .../resources/messages/message_ru.properties | 6 +++- .../messages/message_zh_CN.properties | 6 +++- .../sql/20181217/split_policy_group_info.sql | 4 +++ .../WEB-INF/views/basics/policyGroupForm.jsp | 24 +++++++++---- .../WEB-INF/views/basics/policyGroupList.jsp | 34 +++++++++++++++---- 7 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/sql/20181217/split_policy_group_info.sql diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java index 1dad01ccb..41c4c4300 100644 --- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java @@ -34,7 +34,6 @@ public class PolicyGroupController extends BaseController { Page pageCondition = new Page(request, response,"r"); Page page = policyGroupInfoService.findPolicyGroupInfoList(pageCondition,cfg); - model.addAttribute("cfg", cfg); model.addAttribute("page", page); return "/basics/policyGroupList"; @@ -49,11 +48,12 @@ public class PolicyGroupController extends BaseController { */ //@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) @RequestMapping(value={"/policyGroupForm"}) - public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) { + public String form(Integer groupType,String ids,Model model,String doAction,RedirectAttributes redirectAttributes) { PolicyGroupInfo policyGroup=new PolicyGroupInfo(); if(!StringUtil.isEmpty(ids)){ policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids)); } + policyGroup.setGroupType(groupType); model.addAttribute("_cfg", policyGroup); return "/basics/policyGroupForm"; } @@ -64,7 +64,7 @@ public class PolicyGroupController extends BaseController { //@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(PolicyGroupInfo cfg,Model model, - RedirectAttributes redirectAttributes,String itType) { + RedirectAttributes redirectAttributes,String itType,Integer groupType) { try { policyGroupInfoService.saveOrUpdate(cfg); @@ -74,7 +74,7 @@ public class PolicyGroupController extends BaseController { addMessage(redirectAttributes,"error","save_failed"); } - return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList"; + return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType; } @@ -86,7 +86,7 @@ public class PolicyGroupController extends BaseController { */ //@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR) @RequestMapping(value={"delete"}) - public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) { + public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) { try { policyGroupInfoService.deldete(ids,isValid); addMessage(redirectAttributes,"success","delete_success"); @@ -94,7 +94,7 @@ public class PolicyGroupController extends BaseController { logger.error("删除失败",e); addMessage(redirectAttributes,"error","delete_failed"); } - return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList"; + return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType; } @RequestMapping(value="ajaxServiceIdState",method=RequestMethod.POST) @ResponseBody @@ -121,7 +121,7 @@ public class PolicyGroupController extends BaseController { if(cfg.getGroupId() != null){ PolicyGroupInfo policyGroup = policyGroupInfoService.getInfoByAsnNo(cfg); - if(policyGroup != null && policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){ + if(policyGroup != null &&policyGroup.getIsValid()!=0&& policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){ return true; } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 05940e2ad..fe5ca8f7e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1395,4 +1395,8 @@ end_ip=End IP action_detail=Action Detail pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +area_type=Area Type +dns_group_manage=DNS Group Manage +asn_group_manage=ASN Group Manage +ip_group_manage=IP Group Manage +ip_spoofing_group_manage=IP Spoofing Group Manage \ 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 ca7780a39..b70714770 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1399,4 +1399,8 @@ end_ip=End IP action_detail=Action Detail pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +area_type=Area Type +dns_group_manage=DNS Group Manage +asn_group_manage=ASN Group Manage +ip_group_manage=IP Group Manage +ip_spoofing_group_manage=IP Spoofing Group Manage \ 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 438ecd572..bb919d4d4 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1395,4 +1395,8 @@ end_ip=End IP action_detail=\u52a8\u4f5c\u8be6\u60c5 pass=Pass live_link=Live Link -area_type=Area Type \ No newline at end of file +area_type=Area Type +dns_group_manage=DNS\u5206\u7EC4\u7BA1\u7406 +asn_group_manage=ASN\u5206\u7EC4\u7BA1\u7406 +ip_group_manage=IP\u5206\u7EC4\u7BA1\u7406 +ip_spoofing_group_manage=IP Spoofing\u5206\u7EC4\u7BA1\u7406 \ No newline at end of file diff --git a/src/main/resources/sql/20181217/split_policy_group_info.sql b/src/main/resources/sql/20181217/split_policy_group_info.sql new file mode 100644 index 000000000..b840c3d3f --- /dev/null +++ b/src/main/resources/sql/20181217/split_policy_group_info.sql @@ -0,0 +1,4 @@ +insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1197,109,'0,1,109,','asn_group_manage','ASN分组',470,'/basics/policyGroup/policyGroupList?groupType=4','','fa fa-sitemap',1,'','1','2018-12-16 22:17:54','1','2018-12-17 20:03:13','',1,NULL,0,0,NULL); +insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1203,109,'0,1,109,','ip_spoofing_group_manage','IP spoofing 分组',500,'/basics/policyGroup/policyGroupList?groupType=6','','fa fa-gear',1,'','1','2018-12-17 20:02:22','1','2018-12-17 20:09:53','',1,NULL,0,0,NULL); +insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1205,109,'0,1,109,','ip_group_manage','IP分组管理',530,'/basics/policyGroup/policyGroupList?groupType=5','','fa fa-tasks',1,'','1','2018-12-17 20:05:14','1','2018-12-17 20:08:44','',1,NULL,0,0,NULL); +UPDATE sys_menu SET CODE='dns_group_manage',NAME='dns分组管理', href='/basics/policyGroup/policyGroupList?groupType=1' WHERE id=716; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp index 926967c4c..87b48bdcc 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp @@ -17,16 +17,16 @@ $(function(){ $("#serviceId").val($(this).attr("serviceId")); }); */ - if($("#groupType").val() == 4){ + if("${_cfg.groupType}" == 4){ $("#asnNo").parents(".form-group").removeClass("hidden"); } - $("#groupType").on("change",function(){ + /* $("#groupType").on("change",function(){ if($(this).val() != 4){ $("#asnNo").parents(".form-group").addClass("hidden"); }else{ $("#asnNo").parents(".form-group").removeClass("hidden"); } - }); + }); */ $("#cfgFrom").validate({ errorPlacement: function(error,element){ if($(element).parents().hasClass("tagsinput")){ @@ -49,7 +49,18 @@ $(function(){

- + + + + + + + + + + + +

@@ -66,6 +77,7 @@ $(function(){ +
@@ -77,7 +89,7 @@ $(function(){
-
+ <%--
@@ -91,7 +103,7 @@ $(function(){
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index 427afdd8e..5c1b28b69 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.groupName}"){ $("#intype").val("${cfg.groupName}"); + }else if(''!="${cfg.asnNo}"){ + $("#intype").val("${cfg.asnNo}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -116,14 +118,25 @@ <%-- --%> <%----%>

- + + + + + + + + + + + +

@@ -133,13 +146,14 @@ +
-
+ <%--
-
+
--%>
@@ -164,7 +178,9 @@ + +
@@ -180,8 +196,8 @@
<%-- --%> - - + + <%-- --%> @@ -245,7 +261,9 @@ - + + + @@ -269,7 +287,9 @@ + ${cfg.asnNo} + ${fns:abbr(cfg.description,20)} ${cfg.creatorName } From 8a3633d1c3cab12c40a0a9691653adbf6a4fc0d4 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 17 Dec 2018 21:26:04 +0600 Subject: [PATCH 2/9] =?UTF-8?q?APP=20payload=E7=89=B9=E5=BE=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0session=E6=95=B0=E5=80=BC=E5=9F=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AppFeatureIndex.java | 7 ++ .../AppFeatureCfgController.java | 5 ++ .../configuration/AppMultiFeatureCfgDao.java | 6 ++ .../configuration/AppMultiFeatureCfgDao.xml | 69 +++++++++++++++ .../AppMultiFeatureCfgService.java | 42 ++++++++++ .../resources/messages/message_en.properties | 9 +- .../resources/messages/message_ru.properties | 9 +- .../messages/message_zh_CN.properties | 9 +- .../views/cfg/app/appMultiFeatureCfgForm.jsp | 83 +++++++++++++++++-- .../views/cfg/app/appSubFeatureList.jsp | 20 ++++- .../webapp/WEB-INF/views/cfg/numCfgForm.jsp | 83 +++++++++++++++++++ .../views/cfg/proxy/spoofingIpPool/form.jsp | 5 +- .../views/cfg/proxy/spoofingIpPool/list.jsp | 2 +- 13 files changed, 329 insertions(+), 20 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp diff --git a/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java b/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java index a1b63b558..45ef53501 100644 --- a/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java +++ b/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java @@ -39,6 +39,7 @@ public class AppFeatureIndex extends BaseCfg { private List ipPortList = new ArrayList(); private List strList = new ArrayList(); private List complexList = new ArrayList(); + private List numCfgList = new ArrayList(); protected Integer exprType ; protected Integer matchMethod ; protected Integer isHexbin; @@ -126,5 +127,11 @@ public class AppFeatureIndex extends BaseCfg { public void setCfgRegionCode1(String cfgRegionCode1) { this.cfgRegionCode1 = cfgRegionCode1; } + public List getNumCfgList() { + return numCfgList; + } + public void setNumCfgList(List numCfgList) { + this.numCfgList = numCfgList; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index 265112aac..b1e3b7154 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -104,6 +104,7 @@ public class AppFeatureCfgController extends BaseController { entity.setIpPortList(appMultiFeatureCfgService.getAppIpRangeCfg(entity.getCompileId(), entity.getFunctionId())); entity.setStrList(appMultiFeatureCfgService.getAppStringFeatureCfg(entity.getCompileId(), entity.getFunctionId(),null)); entity.setComplexList(appMultiFeatureCfgService.getAppComplexFeatureCfg(entity.getCompileId(), entity.getFunctionId(),null)); + entity.setNumCfgList(appMultiFeatureCfgService.getAppTcpCfg(entity.getCompileId(), entity.getFunctionId(),null)); initUpdateFormCondition(model,entity); }else{ initFormCondition(model,entity); @@ -249,6 +250,10 @@ public class AppFeatureCfgController extends BaseController { List complexList = appMultiFeatureCfgService.getAppComplexFeatureCfg(compileId,functionId,Integer.valueOf(cfgRegionCode[i])); map.put("complexList", complexList); } + if("4".equals(cfgRegionType[i])){ + List numCfgList = appMultiFeatureCfgService.getAppTcpCfg(compileId,functionId,Integer.valueOf(cfgRegionCode[i])); + map.put("numCfgList", numCfgList); + } tabList.add(map); } }else{ diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java index 34dacf6a7..544cedd5f 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java @@ -56,6 +56,12 @@ public interface AppMultiFeatureCfgDao { //增强字符串类特征配置 public List getAppComplexFeatureCfg(@Param("compileId")Integer compileId, @Param("functionId")Integer functionId,@Param("cfgRegionCode")Integer cfgRegionCode); + //数值类特征配置 + public List getAppTcpCfg(@Param("compileId")Integer compileId, + @Param("functionId")Integer functionId,@Param("cfgRegionCode")Integer cfgRegionCode); + public int insertAppTcpCfg(AppTcpCfg entity); + public void deleteAppTcpCfg(BaseCfg entity); + public int insertAppComplexFeatureCfg(AppComplexFeatureCfg entity); public void deleteAppComplexFeatureCfg(BaseCfg entity); //IP RANGE配置 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 e450dcd85..8c2bb17ed 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -137,6 +137,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT, @@ -181,6 +211,13 @@ #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER} + + r.CFG_ID, r.APP_CODE,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT, + 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.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE, + r.low_boundary,r.up_boundary as upBoundary,r.do_log + + + @@ -509,6 +556,24 @@ #{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} ) + + + + SELECT LAST_INSERT_ID() + + insert into app_session_cfg ( + APP_CODE,BEHAV_CODE,SPEC_SERVICE_ID,CFG_DESC,ACTION,IS_VALID,IS_AUDIT, + 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, + low_boundary,up_boundary,DO_LOG + )values ( + , + #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}, + #{lowBoundary,jdbcType=INTEGER},#{upBoundary,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} + ) + delete from app_ip_range_cfg where compile_id=#{compileId} and function_id=#{functionId} @@ -521,6 +586,10 @@ delete from app_complex_feature_cfg where compile_id=#{compileId} and function_id=#{functionId} + + + delete from app_session_cfg where compile_id=#{compileId} and function_id=#{functionId} +
- + @@ -334,8 +349,8 @@ var delContent = function(contentClassName, addBtnClassName) { class="row boxSolid ${tabName}${status.index} hidden disabled"> <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
- + @@ -347,7 +362,61 @@ var delContent = function(contentClassName, addBtnClassName) { <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
- + + + + + + +

+ + hidden" + onClick="addContent(this,'${tabName}')" title="add"> +

+ + <%-- --%> + + + + + + + +
+ <%@include file="/WEB-INF/views/cfg/numCfgForm.jsp"%> + + + +
+ + + + + + + + + + + + +
1 and status.index>0}"> hidden disabled"> + + + + <%@include file="/WEB-INF/views/cfg/numCfgForm.jsp"%> +
+ 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 909db24df..f23e4ebd7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSubFeatureList.jsp @@ -37,7 +37,7 @@
- + <%-- _${regionStatus.index} --%>
@@ -357,6 +357,24 @@
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp new file mode 100644 index 000000000..f3d5a6181 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp @@ -0,0 +1,83 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + +<%-- + --%> + + + + + + +<%-- + --%> + +
+
+ +
+
+
+ +
+
+
+ +
+ + +
+
+
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp index 498b07d90..ab72302e6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp @@ -27,7 +27,7 @@ $(function(){

- +

@@ -51,6 +51,7 @@ $(function(){ + @@ -153,7 +154,7 @@ $(function(){
- <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> + <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> --%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> 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 40871e17c..0909070b7 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 @@ -73,7 +73,7 @@

- +

From d7f6c6de49378c569c82471a2e9b0e53ff0cfa12 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 17 Dec 2018 21:32:04 +0600 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E8=AF=91=E6=95=88=E7=8E=87=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.project b/.project index fe32f5dbf..2868bdfa2 100644 --- a/.project +++ b/.project @@ -1,15 +1,10 @@ - gwall + ntc_mesalab - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.jdt.core.javabuilder @@ -36,12 +31,12 @@ - org.eclipse.m2e.core.maven2Builder + com.genuitec.eclipse.springframework.springbuilder - com.genuitec.eclipse.springframework.springbuilder + org.eclipse.m2e.core.maven2Builder @@ -54,6 +49,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature - org.zeroturnaround.eclipse.jrebelNature From 3ef37ce35601c7e1a1ad3e5671fc50a5e0f88a20 Mon Sep 17 00:00:00 2001 From: tanghao Date: Mon, 17 Dec 2018 23:42:59 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=20Traffic=E6=80=A7?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 2 + .../TrafficStatisticsInfoController.java | 28 +++ src/main/resources/nis.properties | 238 +++++++++--------- .../views/dashboard/trafficBandwidthList.jsp | 128 ++++++++-- 4 files changed, 252 insertions(+), 144 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 5a08537d3..89df965d8 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -699,6 +699,8 @@ public final class Constants { public static final String NTC_RADIUS_REPORT=Configurations.getStringProperty("ntcRadiusReport","ntcRadiusReport"); public static final String TRAFFIC_BANDWIDTH_TRANS=Configurations.getStringProperty("trafficBandwidthTrans","trafficBandwidthTrans"); public static final String TRAFFIC_BANDWIDTH_TRANS_TWO=Configurations.getStringProperty("trafficBandwidthTransTwo","trafficBandwidthTransTwo"); + public static final String TRAFFIC_BANDWIDTH_TRANS_THREE=Configurations.getStringProperty("trafficBandwidthTransThree","trafficBandwidthTransThree"); + public static final String TRAFFIC_BANDWIDTH_TRANS_FOUR=Configurations.getStringProperty("trafficBandwidthTransFour","trafficBandwidthTransFour"); public static final String TRAFFIC_PROTOCOL_LIST=Configurations.getStringProperty("trafficProtocolList","trafficProtocolList"); public static final String TRAFFIC_APP_LIST=Configurations.getStringProperty("trafficAppList","trafficAppList"); public static final String NTC_ACTION_ENTRANCE_REPORT=Configurations.getStringProperty("ntcActionEntranceReport","ntcActionEntranceReport"); diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 3b68d81ff..9fb9037d3 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -256,6 +256,34 @@ public class TrafficStatisticsInfoController extends BaseController { } return map; } + /** + * 间隔5分钟数据 + */ + @RequestMapping(value="bandwidthTransThree") + @ResponseBody + public Map bandwidthTransThree(String beginDate,String endDate){ + Map fromJsonList = new HashMap(); + Map map = new HashMap(); + //String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO; + //String url="http://192.168.11.78:8080/galaxy/service/log/v1/"+Constants.TRAFFIC_BANDWIDTH_TRANS_THREE; + //String url="http://192.168.11.78:8080/galaxy/service/log/v1/"+Constants.TRAFFIC_BANDWIDTH_TRANS_FOUR; + String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_THREE; + //String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_FOUR; + try { + url=urlAddDate(url,beginDate,endDate); + + String string = HttpClientUtil.get(url); + Gson gson = new GsonBuilder().create(); + fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); + logger.debug("bandwidthTransThree服务查询数据成功"); + Map result = (Map)fromJsonList.get("data"); + return result; + } catch (Exception e) { + e.printStackTrace(); + logger.error("带宽详情数据获取错误"+e); + } + return map; + } /** * 协议类型详细列表 */ diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 4fbfc0f92..9f582e56b 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 ############################################################################################################################################ @@ -269,7 +269,7 @@ mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs ######################################## -#\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 @@ -293,28 +293,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 +#\u5bfc\u51fa\u6700\u5927\u6761\u6570 maxExportSize=100000 -#\u5141\u8BB8\u914D\u7F6E\u6700\u5927\u5C42\u7EA7 +#\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 @@ -342,16 +342,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 @@ -361,25 +361,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 @@ -388,53 +388,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 @@ -443,7 +443,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 @@ -462,7 +462,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 @@ -481,41 +481,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 @@ -529,36 +529,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 @@ -568,7 +568,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 @@ -583,10 +583,12 @@ redis.timeout=10000 dns_spoofing_ip_desc=Default Spoofing IP dns_spoofing_ip_ip=1.1.1.1 trafficBandwidthTransTwo=trafficBandwidthTransTwo +trafficBandwidthTransThree=trafficBandwidthTransThree +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 diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index 5c869c885..d2da130d6 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -91,15 +91,15 @@ $(document).ready(function(){ $("#endDate").val(endh); var unitType=$("#unitType").val(); changeBandwidth(unitType,starth,endh); - changeBandwidth2(unitType,starth,endh); + //changeBandwidth2(unitType,starth,endh); $("#unitType").on("change",function(){ changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val()); - changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val()); + // changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val()); }); setInterval(function(){ changeBandwidth($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00")); - changeBandwidth2($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00")); + // changeBandwidth2($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00")); },500000);// 五分钟调用一次 //筛选功能初始化 @@ -122,12 +122,12 @@ function searchList(){ window.location.reload(); }else{ changeBandwidth($("#unitType").val(),start,end); - changeBandwidth2($("#unitType").val(),start,end); +// changeBandwidth2($("#unitType").val(),start,end); } } // 默认显示四条线 ip46,tcp,udp -function rankItemChanged(addrType,transType,beginDate,endDate){ +/* function rankItemChanged(addrType,transType,beginDate,endDate){ loading(); var result=null; $.ajax({ @@ -177,32 +177,70 @@ function rankItemChanged2(addrType,transType,beginDate,endDate){ } }); return result2; +} */ +function rankItemChanged3(beginDate,endDate){ + loading(); + var result=null; + $.ajax({ + url:"${ctx}/dashboard/traffic/bandwidthTransThree", + type:"get", + data:{"beginDate":beginDate,"endDate":endDate}, + dataType:"json", + async:false, + timeout:40000, + success:function (data){ + if(data!=null){ + console.log(4444); + result=data; + } + closeTip(); + }, + error: function(data, textStatus, errorThrown){ + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } + }); + return result; } // 根据单位切换数据 function changeBandwidth(unitType,beginDate,endDate){ - var ipv4=rankItemChanged(4,null,beginDate,endDate); + /* var ipv4=rankItemChanged(4,null,beginDate,endDate); var ipv6=rankItemChanged(6,null,beginDate,endDate); var transTcp=rankItemChanged(null,6,beginDate,endDate); - var transUdp=rankItemChanged(null,17,beginDate,endDate); - var xdata=ipv4.statTime; - if(unitType=="Gbps"){ - ipv4data=ipv4.gbps; - ipv6data=ipv6.gbps; - tcpdata=transTcp.gbps; - udpdata=transUdp.gbps; - } - if(unitType=="pps"){ - ipv4data=ipv4.pps; - ipv6data=ipv6.pps; - tcpdata=transTcp.pps; - udpdata=transUdp.pps; - - } - if(unitType=="linkNumber"){ - ipv4data=ipv4.linkNum; - ipv6data=ipv6.linkNum; - tcpdata=transTcp.linkNum; - udpdata=transUdp.linkNum; + var transUdp=rankItemChanged(null,17,beginDate,endDate); */ + var data=rankItemChanged3(beginDate,endDate); + var xdata=null; + var ipv4data=null; + var ipv6data=null; + var tcpdata=null; + var udpdata=null; + var ipv4data2=null; + var ipv6data2=null; + var tcpdata2=null; + var udpdata2=null; + if(Object.keys(data).length>0){ + xdata=data.ipv4Type1[0].statTime; + if(unitType=="Gbps"){ + ipv4data=data.ipv4Type1[0].gbps; + ipv6data=data.ipv6Type1[0].gbps; + tcpdata=data.trans6Type1[0].gbps; + udpdata=data.trans17Type1[0].gbps; + } + if(unitType=="pps"){ + ipv4data=data.ipv4Type1.pps; + ipv6data=data.ipv6Type1.pps; + tcpdata=data.trans6Type1.pps; + udpdata=data.trans17Type1.pps; + + } + if(unitType=="linkNumber"){ + ipv4data=data.ipv4Type1.linkNum; + ipv6data=data.ipv6Type1.linkNum; + tcpdata=data.trans6Type1.linkNum; + udpdata=data.trans17Type1.linkNum; + } } var series=new Array(); series.push({ @@ -219,6 +257,44 @@ function changeBandwidth(unitType,beginDate,endDate){ data: udpdata }); showBandwidthChart("chart1",unitType,xdata,series,"Astana"); + + if(Object.keys(data).length>0){ + if(unitType=="Gbps"){ + ipv4data2=data.ipv4Type2[0].gbps; + ipv6data2=data.ipv6Type2[0].gbps; + tcpdata2=data.trans6Type2[0].gbps; + udpdata2=data.trans17Type2[0].gbps; + } + if(unitType=="pps"){ + ipv4data2=data.ipv4Type2.pps; + ipv6data2=data.ipv6Type2.pps; + tcpdata2=data.trans6Type2.pps; + udpdata2=data.trans17Type2.pps; + + } + if(unitType=="linkNumber"){ + ipv4data2=data.ipv4Type2.linkNum; + ipv6data2=data.ipv6Type2.linkNum; + tcpdata2=data.trans6Type2.linkNum; + udpdata2=data.trans17Type2.linkNum; + } + } + var series=new Array(); + series.push({ + name: "IPv4", + data: ipv4data2 + },{ + name: "IPv6", + data: ipv6data2 + },{ + name: "TCP", + data: tcpdata2 + },{ + name: "UDP", + data: udpdata2 + }); + showBandwidthChart("chart2",unitType,xdata,series,"Alamty"); + } // 根据单位切换数据 function changeBandwidth2(unitType,beginDate,endDate){ From 765cbb4fe3b567713a86897911dfebdc4905cde1 Mon Sep 17 00:00:00 2001 From: tanghao Date: Mon, 17 Dec 2018 23:44:11 +0800 Subject: [PATCH 5/9] merge --- .project | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.project b/.project index fe32f5dbf..76a2595da 100644 --- a/.project +++ b/.project @@ -1,15 +1,10 @@ - gwall + ntc_mesalab - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.jdt.core.javabuilder @@ -36,12 +31,12 @@ - org.eclipse.m2e.core.maven2Builder + com.genuitec.eclipse.springframework.springbuilder - com.genuitec.eclipse.springframework.springbuilder + org.eclipse.m2e.core.maven2Builder @@ -54,6 +49,6 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature - org.zeroturnaround.eclipse.jrebelNature + \ No newline at end of file From 0244c55ced0bbf69759ad85f68e145cb57924a56 Mon Sep 17 00:00:00 2001 From: tanghao Date: Tue, 18 Dec 2018 00:09:10 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=B8=AE=E9=9B=B7=E5=86=9B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9:=E5=AF=BC?= =?UTF-8?q?=E5=87=BAcsv=E6=96=87=E4=BB=B6=E4=B9=B1=E7=A0=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=20=20=20http=E3=80=81=E7=BD=91=E9=A1=B5=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/excel/ExcelCsv.java | 5 ++++- .../web/controller/log/ntc/HttpKeyLogController.java | 6 ++++++ .../nis/web/controller/log/ntc/HttpLogController.java | 9 +++++++++ src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp | 10 ++++++++++ src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp | 10 ++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 2e1747e48..fcabd9363 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -26,6 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import com.nis.util.DictUtils; +import com.nis.util.Encodes; import com.nis.util.Reflections; import com.nis.util.StringUtil; @@ -381,6 +382,8 @@ public class ExcelCsv { private static void writeRow(String data, BufferedWriter csvWriter) throws Exception { // 写入文件内容 + //Html 解码 + data = Encodes.unescapeHtml(data.toString()); String [] datas=data.split(","); for (String tag : datas) { StringBuffer sb = new StringBuffer(); @@ -399,7 +402,7 @@ public class ExcelCsv { if(isDate(tag)){ tag=tag + "\t"; } - + } String rowStr = sb.append("\"").append(tag==null?"":tag).append("\",").toString(); csvWriter.write(rowStr); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java index 783ecd011..fa6c06375 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java @@ -48,6 +48,9 @@ public class HttpKeyLogController extends BaseController { if (StringUtils.isNotBlank(log.getUrl())) { params.put("searchUrl", log.getUrl()); } + if (StringUtils.isNotBlank(log.getWebsite())) { + params.put("searchWebsite", log.getWebsite()); + } initLogSearchValue(log, params); List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); @@ -102,6 +105,9 @@ public class HttpKeyLogController extends BaseController { if (StringUtils.isNotBlank(log.getUrl())) { params.put("searchUrl", log.getUrl()); } + if (StringUtils.isNotBlank(log.getWebsite())) { + params.put("searchWebsite", log.getWebsite()); + } initLogSearchValue(log, params); List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java index 7afebf511..029b59b89 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java @@ -46,6 +46,9 @@ public class HttpLogController extends BaseController { if (StringUtils.isNotBlank(log.getUrl())) { params.put("searchUrl", log.getUrl()); } + if (StringUtils.isNotBlank(log.getWebsite())) { + params.put("searchWebsite", log.getWebsite()); + } initLogSearchValue(log, params); List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); @@ -111,6 +114,12 @@ public class HttpLogController extends BaseController { Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); + if (StringUtils.isNotBlank(log.getUrl())) { + params.put("searchUrl", log.getUrl()); + } + if (StringUtils.isNotBlank(log.getWebsite())) { + params.put("searchWebsite", log.getWebsite()); + } initLogSearchValue(log, params); List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); 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 f80f80425..8ce7ecc26 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -241,9 +241,19 @@
+
+
+ +
+
+ + +
+
+ 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 fbfb1d6b2..2bb7fa89d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -215,9 +215,19 @@
+
+
+ +
+
+ + +
+
+ From 05ae3f8d1dc49a4f6c3097ce3b2d83e4e270ae4d Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 17 Dec 2018 22:53:28 +0600 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9http=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=9A=84Action=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 2bb7fa89d..acee93873 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -97,7 +97,17 @@ - + + + + + + + + + + + From efd08e1faa771f4ba62b2efcfac7fdaf93b98df8 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 17 Dec 2018 23:14:31 +0600 Subject: [PATCH 8/9] =?UTF-8?q?ddos=20IP=E5=AF=BC=E5=85=A5protocl=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEDDOS=E5=8D=8F=E8=AE=AE=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index af45a3927..1b102cf48 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -14,6 +14,14 @@ $(function(){ $("#bpsThreadshold").attr("disabled","true"); $("#ppsThreadshold").attr("disabled","true"); } + if($("[name='protocol']").val()==0){ + var _ddosProtocol=$("#antiddosProtocol").val(); + if(_ddosProtocol=="TCP_SYN"){ + $("[name='protocol']").val(6); + }else if(_ddosProtocol=="UDP_NTP"||_ddosProtocol=="UDP_DNS"){ + $("[name='protocol']").val(17); + } + } $("#antiddosProtocol").on("change",function(){ var ddosProtocol=$("#antiddosProtocol").val(); if(ddosProtocol==null||ddosProtocol==""){ @@ -27,6 +35,11 @@ $(function(){ $("#bpsThreadshold").removeAttr("disabled"); $("#ppsThreadshold").removeAttr("disabled"); } + if(ddosProtocol=="TCP_SYN"){ + $("[name='protocol']").val(6); + }else if(ddosProtocol=="UDP_NTP"||ddosProtocol=="UDP_DNS"){ + $("[name='protocol']").val(17); + } }) $(".action").on("change", function() { From f280af71b7a979f9e81a48cc902d3e3903d6ad7e Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 18 Dec 2018 00:13:48 +0600 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 8 ++++---- src/main/resources/messages/message_ru.properties | 14 +++++++------- .../resources/messages/message_zh_CN.properties | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index c4435efee..4958b61e3 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1368,7 +1368,7 @@ av_tips=The system does not support the index information of audio and video cod asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.) keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration. conn_record=Connection Records -bps=Bps +bps=Gbps bps_percent=Bps Percent pps=pps pps_percent=pps Percent @@ -1379,12 +1379,12 @@ spoofing=spoofing service=Service s_asn=SASN d_asn=DASN -asn_conn_report=ANS Report -https_url_report=HTTP(s) URL Report +asn_conn_report=ASN Statistics +https_url_report=Http(s) URL Statistics url=URL sum=SUM url_count=URL Count -ip_range_report=IP Range Report +ip_range_report=IN/EX Host Identity ip_start=Start IP ip_end=End IP ip_start_num=IP Start Num diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ef8620861..2d3af49a4 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1372,7 +1372,7 @@ av_tips=\u041a\u043e\u0433\u0434\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u043 asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.) keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u043c\u0438 \u0441\u043b\u043e\u0432\u0430\u043c\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043b\u043e\u0445\u0438\u043c, \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0434\u0435\u0434\u0443\u043f\u043b\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0434\u0430\u043d\u043d\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e \u7395u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 URL\ufffd \u0434\u043b\u044f \u043f\u043e\u0434\u0430\u0432\u0448\u0435\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. conn_record=Connection Records -bps=Bps +bps=Gbps bps_percent=Bps Percent pps=pps pps_percent=pps Percent @@ -1380,15 +1380,15 @@ spoofing_ip_object=Spoofing IP Pool spoofing_ip_policy=IP Spoofing action_spoofing=Spoofing spoofing=spoofing -service=Service +service=\u0421\u0435\u0440\u0432\u0438\u0441 s_asn=SASN d_asn=DASN -asn_conn_report=ANS Report -https_url_report=HTTP(s) URL Report +asn_conn_report=ASN Statistics +https_url_report=Http(s) URL Statistics url=URL sum=SUM url_count=URL Count -ip_range_report=ip Range Report +ip_range_report=IN/EX Host Identity ip_start=Start IP ip_end=End IP ip_start_num=IP Start Num @@ -1397,8 +1397,8 @@ ip_sub=IP Subnet start_ip=Start IP end_ip=End IP action_detail=Action Detail -pass=Pass -live_link=Live Link +pass=\u041F\u0430\u0441 +live_link=\u0410\u043A\u0442\u0438\u0432\u043D\u0430\u044F \u0421\u0441\u044B\u043B\u043A\u0430 area_type=Area Type dns_group_manage=DNS Group Manage asn_group_manage=ASN Group Manage diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0d669500d..1c9a71a89 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1368,7 +1368,7 @@ av_tips=\u5bf9\u4e8e\u97f3\u89c6\u9891\u7f16\u7801\u7684\u7d22\u5f15\u4fe1\u606f asn_ip_group_delete=(\u8be5ASN\u7ec4\u4e0b\u7684IP\u914d\u7f6e\u4e5f\u4f1a\u88ab\u5220\u9664) keyword_log_tips=\u6e05\u6d17\u540e\u7f51\u9875\u5173\u952e\u5b57\u65e5\u5fd7\uff0c\u7f51\u9875\u5173\u952e\u5b57\u7ba1\u63a7\u72b6\u51b5\u4e0d\u7406\u60f3\u65f6\uff0c\u53ef\u5c06\u6e05\u6d17\u540e\u5efa\u8bae\u7ed9\u51fa\u7684\u547d\u4e2d\u5173\u952e\u5b57\u7f51\u9875\u914d\u7f6e\u4e3aURL\u7ba1\u63a7 conn_record=\u901a\u8054\u5173\u7cfb -bps=Bps +bps=Gbps bps_percent=Bps Percent pps=pps pps_percent=pps Percent @@ -1379,12 +1379,12 @@ spoofing=spoofing service=Service s_asn=SASN d_asn=DASN -asn_conn_report=ANS Report -https_url_report=HTTP(s) URL Report +asn_conn_report=ASN Statistics +https_url_report=Http(s) URL Statistics url=URL sum=SUM url_count=URL Count -ip_range_report=ip Range Report +ip_range_report=IN/EX Host Identity ip_start=Start IP ip_end=End IP ip_start_num=IP Start Num