From cb650427e44317d0d95b327aaa7a44c7ce7b44c4 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 23 Jul 2018 18:48:11 +0800 Subject: [PATCH 01/11] =?UTF-8?q?(1)=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B=EF=BC=9B=20(2)app?= =?UTF-8?q?=E7=AD=96=E7=95=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=88=97?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AppPolicyCfg.java | 46 +++++++++++- .../domain/specific/SpecificServiceCfg.java | 8 +- .../configuration/AppCfgController.java | 3 - .../SpecificServiceCfgController.java | 25 ++++++- .../nis/web/dao/configuration/AppCfgDao.xml | 43 ++++++++++- .../dao/specific/SpecificServiceCfgDao.xml | 17 ++++- .../basics/ServiceDictInfoService.java | 13 ++++ .../resources/messages/message_en.properties | 3 + .../resources/messages/message_ru.properties | 14 ++++ .../messages/message_zh_CN.properties | 3 + .../webapp/WEB-INF/tags/sys/treeselect.tag | 2 + .../WEB-INF/views/cfg/app/appByteCfgForm.jsp | 5 +- .../views/cfg/app/appDomainCfgForm.jsp | 5 +- .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp | 5 +- .../WEB-INF/views/cfg/app/appIpCfgForm.jsp | 5 +- .../views/cfg/app/appPolicyCfgForm.jsp | 75 +++++++++++++++++-- .../views/cfg/app/appPolicyCfgList.jsp | 2 + .../views/specific/specificServiceCfgForm.jsp | 10 ++- .../views/specific/specificServiceCfgList.jsp | 5 ++ 19 files changed, 262 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 01235948e..38ac364d0 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -36,7 +36,11 @@ public class AppPolicyCfg extends BaseCfg { private Integer specServiceId; private String appName; private String cfgKeywords; - + private String userRegion1; + private String userRegion2; + private String userRegion3; + private String userRegion4; + private String userRegion5; @Expose @ExcelField(title="expression_type") @SerializedName("exprType") @@ -155,5 +159,45 @@ public class AppPolicyCfg extends BaseCfg { public void setIpPort(IpPortCfg ipPort) { this.ipPort = ipPort; } + + public String getUserRegion1() { + return userRegion1; + } + + public void setUserRegion1(String userRegion1) { + this.userRegion1 = userRegion1; + } + + public String getUserRegion2() { + return userRegion2; + } + + public void setUserRegion2(String userRegion2) { + this.userRegion2 = userRegion2; + } + + public String getUserRegion3() { + return userRegion3; + } + + public void setUserRegion3(String userRegion3) { + this.userRegion3 = userRegion3; + } + + public String getUserRegion4() { + return userRegion4; + } + + public void setUserRegion4(String userRegion4) { + this.userRegion4 = userRegion4; + } + + public String getUserRegion5() { + return userRegion5; + } + + public void setUserRegion5(String userRegion5) { + this.userRegion5 = userRegion5; + } } diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java index fcc2e9811..40b187746 100644 --- a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java +++ b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java @@ -25,11 +25,17 @@ public class SpecificServiceCfg extends BaseEntity{ private SpecificServiceCfg parent; //parent_id 父节点id int N 0表示一级节点 private Integer isLeaf; //is_leaf 是否是叶子节点 int N 0否，1是，只有一级填0 private Integer groupId; //group_id maat端配置分组id int N 缺省0，表示未与maat分组同步 + private Integer cfgType;//配置类型，1，app;2,加密隧道协议 private Date beginDate; // 开始日期 private Date endDate; // 结束日期 private String showSequence; //显示序号 - + public Integer getCfgType() { + return cfgType; + } + public void setCfgType(Integer cfgType) { + this.cfgType = cfgType; + } public Integer getSpecServiceId() { return specServiceId; } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index c5428af83..498aa7618 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -16,14 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; -import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.AppByteCfg; import com.nis.domain.configuration.AppDomainCfg; import com.nis.domain.configuration.AppHttpCfg; import com.nis.domain.configuration.AppIpCfg; import com.nis.domain.configuration.AppPolicyCfg; -import com.nis.domain.configuration.BaseStringCfg; -import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.MaatConvertException; diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index ed725f25a..d0c9b1c45 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -190,7 +190,7 @@ public class SpecificServiceCfgController extends BaseController { @ResponseBody @RequestMapping(value = "treeData") public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, - @RequestParam(required=false)boolean isLeafShow,HttpServletResponse response){ + @RequestParam(required=false)boolean isLeafShow,@RequestParam(required=true)Integer cfgType,HttpServletResponse response){ List> mapList = Lists.newArrayList(); Map map2 = Maps.newHashMap(); map2.put("id", 0); @@ -203,7 +203,7 @@ public class SpecificServiceCfgController extends BaseController { SpecificServiceCfg specificServiceCfg = list.get(i); if(StringUtils.isBlank(extId)||(extId!=null&&!extId.equals(specificServiceCfg.getSpecServiceId().toString()))){ if(specificServiceCfg.getIsValid().equals(0)|| - (!isLeafShow && specificServiceCfg.getIsLeaf().equals(1))){ + (!isLeafShow && specificServiceCfg.getIsLeaf().equals(1))||specificServiceCfg.getCfgType().intValue()!=cfgType){ continue; } Map map = Maps.newHashMap(); @@ -215,7 +215,26 @@ public class SpecificServiceCfgController extends BaseController { } return mapList; } - + /** + * + */ + @ResponseBody + @RequestMapping(value = "childrenList") + public List> childrenList(@RequestParam(required=false)Integer parent,HttpServletResponse response){ + List> mapList = Lists.newArrayList(); + List list = specificServiceCfgService.getChildrenById(parent); + for (int i=0; i map = Maps.newHashMap(); + SpecificServiceCfg specificServiceCfg = list.get(i); + if(specificServiceCfg.getIsLeaf().equals(1)){ + map.put("code", specificServiceCfg.getSpecServiceCode()); + map.put("pId", specificServiceCfg.getParent().getSpecServiceId()); + map.put("name",specificServiceCfg.getSpecServiceName()); + mapList.add(map); + } + } + return mapList; + } /** * 校验协议id是否重复 * @param specServiceId 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 f5f63912b..a2ace008d 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -29,6 +29,11 @@ + + + + + @@ -229,7 +234,8 @@ 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.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN + r.CFG_TYPE,r.CFG_REGION_CODE,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.USER_REGION1,r.USER_REGION2, + r.USER_REGION3,r.USER_REGION4,r.USER_REGION5 @@ -440,6 +446,21 @@ AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') + + + AND r.user_region1 =#{userRegion1,jdbcType=VARCHAR} + + + AND r.user_region2 =#{userRegion2,jdbcType=VARCHAR} + + + AND r.user_region3 =#{userRegion3,jdbcType=VARCHAR} + + + AND r.user_region4 =#{userRegion4,jdbcType=VARCHAR} + + + AND r.user_region5 =#{userRegion5,jdbcType=VARCHAR} AND r.compile_id in (select t.compile_id from ip_port_cfg t @@ -991,10 +1012,13 @@ 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,RATELIMIT,FUNCTION_ID, - CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,USER_REGION1 + ,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5 )values ( , #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER} + ,#{userRegion1,jdbcType=VARCHAR} ,#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR} + ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} ) @@ -1230,6 +1254,21 @@ CFG_TYPE =#{cfgType,jdbcType=VARCHAR}, + + + USER_REGION1 =#{userRegion1,jdbcType=VARCHAR}, + + + USER_REGION2 =#{userRegion2,jdbcType=VARCHAR}, + + + USER_REGION1 =#{userRegion3,jdbcType=VARCHAR}, + + + USER_REGION1 =#{userRegion4,jdbcType=VARCHAR}, + + + USER_REGION1 =#{userRegion5,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index c62e0b229..4ba609c2c 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -11,6 +11,7 @@ + @@ -26,7 +27,8 @@ s.op_time AS opTime, s.parent_id AS "parent.specServiceId", s.is_leaf AS isLeaf, - s.group_id AS groupId + s.group_id AS groupId, + s.cfg_type AS cfgType @@ -53,6 +55,9 @@ AND group_id like '%${groupId}%' + + AND cfg_type =#{cfgType,jdbcType=INTEGER} + AND s.op_time >= #{beginDate,jdbcType=TIMESTAMP} @@ -112,6 +117,9 @@ AND group_id like '%${specificServiceCfg.groupId}%' + + AND cfg_type = #{specificServiceCfg.cfgType} + AND op_time > #{specificServiceCfg.beginDate} @@ -130,8 +138,8 @@ - insert into specific_service_cfg (spec_service_code,spec_service_name,spec_service_desc,is_valid, op_time, parent_id,is_leaf,group_id) - values(#{specServiceCode},#{specServiceName},#{specServiceDesc},#{isValid},#{opTime},#{parent.specServiceId},#{isLeaf},#{groupId}) + insert into specific_service_cfg (spec_service_code,spec_service_name,spec_service_desc,is_valid, op_time, parent_id,is_leaf,group_id,cfg_type) + values(#{specServiceCode},#{specServiceName},#{specServiceDesc},#{isValid},#{opTime},#{parent.specServiceId},#{isLeaf},#{groupId},#{cfgType}) @@ -144,7 +152,8 @@ s.op_time = #{opTime}, s.parent_id = #{parent.specServiceId}, s.is_leaf = #{isLeaf}, - s.group_id = #{groupId} + s.group_id = #{groupId}, + s.cfg_type = #{cfgType} WHERE s.spec_service_id = #{specServiceId} diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java index f42ed13fb..6c1e0c5fa 100644 --- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -86,6 +86,19 @@ public class ServiceDictInfoService extends BaseService{ } return list; } + /** + * 查询该类型所有的非叶子配置 + */ + public List findAllNoLeafDictList(String itType,Integer cfgType) { + List list = Lists.newArrayList(); + List intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SERVICE_DICT_ITM_TYPE", ""), itType); + + for(Integer intType:intArr){ + List tempList = serviceDictInfoDao.findAllNoLeafDictList(intType); + list.addAll(tempList); + } + return list; + } /** * 根据主键查询字典详细信息 * @param serviceDictId diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index a7d5faa4c..6fe82cc33 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -790,6 +790,9 @@ app_byte_config=APP Byte Feature social_app=Applicaiton app_policy_config=APP Policy app_features_config=APP Feature +cfg_type=Cfg Type +encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol +behaviour_type=Behaviour Type #=============about app config=========== #=============about Maintenance========= ip_Reuse_pool_config=IP Reuseing Pool diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index fc408eef6..7c4ce27d8 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -702,6 +702,20 @@ ratelimit=ratelimit scale ir_type=multiplex type dns_strategy_id=dns strategy id #=============about manipulation========= +#=============about app config=========== +domain=Domain +app_ip_config=APP Protocol IP +bytes=byte +app_http_config=APP HTTP Feature +app_domain_config=APP Domain Feature +app_byte_config=APP Byte Feature +social_app=Applicaiton +app_policy_config=APP Policy +app_features_config=APP Feature +cfg_type=Cfg Type +encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol +behaviour_type=Behaviour Type +#=============about app config=========== #=============about Maintenance========= ip_multiplex_pool_config=ip multiplex pool config dns_res_strategy=dns response strategy diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 44b006689..54626da72 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -792,6 +792,9 @@ app_byte_config=APP\u5B57\u8282\u7279\u5F81 social_app=\u793E\u4EA4\u5E94\u7528 app_policy_config=APP\u7B56\u7565 app_features_config=APP\u7279\u5F81 +cfg_type=\u914D\u7F6E\u7C7B\u578B +encrypted_tunnel_protpcol=\u52A0\u5BC6\u96A7\u9053\u534F\u8BAE +behaviour_type=\u884C\u4E3A\u7C7B\u578B #=============about app config=========== #=============about Maintenance========= ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60 diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index e4c10942a..a59988eea 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -107,10 +107,12 @@ break; // 如果为非复选框选择，则返回第一个选择 } $("#${id}Id").val(ids.join(",").replace(/u_/ig,"")); + $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(names.join(",")); }// else if (v=="clear"){ $("#${id}Id").val(""); + $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(""); }// if(typeof ${id}TreeselectCallBack == 'function'){ diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp index 442549211..c41709564 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp @@ -46,6 +46,9 @@ $(function(){
+ + +

@@ -88,7 +91,7 @@ $(function(){

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp index 85262ef3a..8e979c3ff 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp @@ -47,6 +47,9 @@ $(function(){
+ + +

@@ -88,7 +91,7 @@ $(function(){

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 21d592d47..67924e142 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -47,6 +47,9 @@ $(function(){
+ + +

@@ -88,7 +91,7 @@ $(function(){

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index 088670e10..4fc2d3e96 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -29,6 +29,9 @@ $(function(){
+ + +

@@ -69,7 +72,7 @@ $(function(){
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 6af343023..99e926114 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -57,7 +57,57 @@ $(function(){ }, errorContainer: "#messageBox", }); + if('${_cfg.userRegion1}'){ + ajaxBehaviour($("#specServiceIdId").val()); + } + $("#specServiceIdId").on("change",function(){ + ajaxBehaviour($(this).val()); + }); }); +var ajaxBehaviour=function(val){ + var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4); + var request=$.ajax({ + type:'post', + url:pathName+'/specific/specificServiceCfg/childrenList', + data:{"parent":val}, + dataType:'json', + async:true, + success:function(data,textStatus){//处理返回结果 + if(textStatus=="success"){ + if(data.length>0){ + var html=''; + $("#behaviour").prev("label").removeClass("hidden"); + $("#behaviour").html(html); + $("[name='userRegion1']").selectpicker("refresh"); + $("[name='userRegion1']").selectpicker("render"); + }else{ + if($("#behaviour").prev("label").is(":visible")){ + $("#behaviour").prev("label").addClass("hidden"); + $("#behaviour").html(""); + } + } + + } + }, + complete:function(XMLHttpRequest,status){//超时设置 + if(status=="timeout"){ + if($("#behaviour").prev("label").is(":visible")){ + $("#behaviour").prev("label").addClass("hidden"); + $("#behaviour").html(""); + } + } + } + }); +} //业务窗口打开 var addContent = function(obj, contentClassName) { var showDiv = $(obj).parent().parent().next(); @@ -76,6 +126,9 @@ var delContent = function(contentClassName, addBtnClassName) {
+ + +

@@ -109,6 +162,16 @@ var delContent = function(contentClassName, addBtnClassName) { +
+
+
+ +
+ +
+
+
+
@@ -117,20 +180,16 @@ var delContent = function(contentClassName, addBtnClassName) {
-
-
- -
- -
-
+ +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 1d16ea7b8..0ae7b8ea8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -310,6 +310,7 @@ + @@ -337,6 +338,7 @@ ${cfg.cfgDesc } ${cfg.appName } + ${cfg.userRegion1 } ${cfg.ratelimit } diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index f2b9ed711..b5cdd3a7f 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -115,7 +115,7 @@
- +
@@ -130,6 +130,14 @@
--%> +
+ +
+ + + +
+
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index a556e1911..802803142 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -255,6 +255,7 @@ + @@ -268,6 +269,10 @@ ${fns:abbr(specificServiceCfg.specServiceDesc,15)} ${specificServiceCfg.groupId } + + + + <%--
From 3a11461acdee78f11fd6c05cb895a51724adacb1 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 23 Jul 2018 18:48:53 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=A2=9E=E5=87=8F=E8=B6=8B=E5=8A=BF=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=89=87=E5=BD=A2=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=85=B6=E5=AE=83?= =?UTF-8?q?=E9=A1=B9others?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/dashboard/dashBoardIndex.jsp | 50 ++++++-- .../global/plugins/highcharts/css/common.css | 8 +- .../plugins/highcharts/css/data_text.css | 110 +++++++++--------- .../global/plugins/highcharts/echart.js | 15 +-- 4 files changed, 112 insertions(+), 71 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index c41521d97..687d34433 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -15,18 +15,35 @@
-
+
@@ -352,8 +369,14 @@ function systemList(){ $(rs).each(function(i, itemObj) { var tr = ""; tr += ""+n+""; - tr += ""+itemObj.osType+""; - tr += ""+itemObj.count+""; + tr += ""+itemObj.osType+""; + if(itemObj.preCount"+""+""; + }else if(itemObj.preCount>itemObj.count){ + tr += ""+""+""; + }else{ + tr += ""+""+""; + } n=n-1; $("#tbodyData1").prepend(tr); }) @@ -431,8 +454,13 @@ function browserList() { var tr = ""; tr += ""+n+""; tr += ""+itemObj.bsType+""; - tr += ""+itemObj.count+""; - + if(itemObj.preCount"+""+""; + }else if(itemObj.preCount>itemObj.count){ + tr += ""+""+""; + }else{ + tr += ""+""+""; + } $("#tbodyData1").prepend(tr); n=n-1; }) @@ -477,7 +505,13 @@ function websiteList() { var tr = ""; tr += ""+n+""; tr += ""+itemObj.webId+""; - tr += ""+itemObj.count+""; + if(itemObj.preCount"+""+""; + }else if(itemObj.preCount>itemObj.count){ + tr += ""+""+""; + }else{ + tr += ""+""+""; + } $("#tbodyData2").prepend(tr); n=n-1; diff --git a/src/main/webapp/static/global/plugins/highcharts/css/common.css b/src/main/webapp/static/global/plugins/highcharts/css/common.css index 6593d893c..e4277bd7d 100644 --- a/src/main/webapp/static/global/plugins/highcharts/css/common.css +++ b/src/main/webapp/static/global/plugins/highcharts/css/common.css @@ -85,8 +85,12 @@ a { td a { color:#fff } -/* td a:link { - color:#fff; +td a i { + color:#21a10e +} +/* +tr td a:link { + color:red; text-decoration:none } td a:active { diff --git a/src/main/webapp/static/global/plugins/highcharts/css/data_text.css b/src/main/webapp/static/global/plugins/highcharts/css/data_text.css index 7cdaa2f79..671423e22 100644 --- a/src/main/webapp/static/global/plugins/highcharts/css/data_text.css +++ b/src/main/webapp/static/global/plugins/highcharts/css/data_text.css @@ -1,8 +1,8 @@ .data_content{ /*overflow-x: hidden;*/ /* min-width: 1366px; */ - background-color: #1c1c1c; - padding-top: 10px; + background-color: #303030; + padding-top: 40px; padding-bottom: 10px; } .data_content .data_main{ @@ -17,12 +17,12 @@ width: 100%; height: 400px; box-sizing: border-box; - border: 1px solid #333333; - /*box-shadow: 0px 0px 10px #333333 inset;*/ - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + border: 1px solid #3D3D3D; + /*box-shadow: 0px 0px 10px #3D3D3D inset;*/ + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; } .data_content .data_main .main_left div.left_1{ @@ -36,7 +36,7 @@ width: 230px; height: 35px; line-height: 33px; - background-color: #333333; + background-color: #3D3D3D; border-radius: 18px; position: absolute; top: -17px; @@ -46,8 +46,9 @@ font-size: 18px; font-weight: 600; box-sizing: border-box; - padding-left: 45px; + text-align:center; z-index: 1000; + border-radius:18px !important; } .data_content .data_main .main_left div .main_title img{ position: absolute; @@ -67,11 +68,11 @@ margin-left: 15px; margin-right: 15px; box-sizing: border-box; - border: 1px solid #333333; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + border: 1px solid #3D3D3D; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; /*background: url("../img/chart_map.png") no-repeat center ;*/ } @@ -79,19 +80,18 @@ width: 250px; height: 35px; line-height: 33px; - background-color: #333333; - border-radius: 18px; + background-color: #3D3D3D; position: absolute; top: -17px; - left:45%; + left:50%; margin-left: -90px; color:#fff; font-size: 18px; font-weight: 600; box-sizing: border-box; - padding-left: 45px; - text-align:auto; + text-align:center; z-index: 1000; + border-radius:18px !important; } .data_content .data_main .main_right{ @@ -101,11 +101,11 @@ width: 100%; height: 400px; box-sizing: border-box; - border: 1px solid #333333; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + border: 1px solid #3D3D3D; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; } .data_content .data_main .main_right div.right_1 .choice{ @@ -154,7 +154,7 @@ width: 230px; height: 35px; line-height: 33px; - background-color: #333333; + background-color: #3D3D3D; border-radius: 18px; position: absolute; top: -17px; @@ -164,8 +164,9 @@ font-size: 18px; font-weight: 600; box-sizing: border-box; - padding-left: 45px; + text-align:center; z-index: 1000; + border-radius:18px !important; } .data_content .data_main .main_right div .main_title img{ position: absolute; @@ -186,13 +187,13 @@ .data_content .data_bottom .bottom_1{ width: 22%; height: 430px; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; box-sizing: border-box; - border: 1px solid #333333; + border: 1px solid #3D3D3D; /*background: url("../img/chart_5.png") no-repeat;*/ } .data_content .data_bottom .bottom_center{ @@ -202,46 +203,46 @@ .data_content .data_bottom .bottom_2{ width: calc(53% - 10px); height: 430px; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; box-sizing: border-box; - border: 1px solid #333333; + border: 1px solid #3D3D3D; margin-left: 15px; /*background: url("../img/chart_6.png") no-repeat;*/ } .data_content .data_bottom .bottom_3{ width: calc(47% - 35px); height: 430px; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; box-sizing: border-box; - border: 1px solid #333333; + border: 1px solid #3D3D3D; /*background: url("../img/chart_7.png") no-repeat;*/ margin-left:15px; } .data_content .data_bottom .bottom_4{ width: 26%; height: 430px; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 0px -10px 15px #333333 inset, /*上边阴影*/ - 10px 0px 15px #333333 inset, /*右边阴影*/ - 0px 10px 15px #333333 inset; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 0px -10px 15px #3D3D3D inset, /*上边阴影*/ + 10px 0px 15px #3D3D3D inset, /*右边阴影*/ + 0px 10px 15px #3D3D3D inset; position: relative; box-sizing: border-box; - border: 1px solid #333333; + border: 1px solid #3D3D3D; /*background: url("../img/chart_8.png") no-repeat;*/ } .data_content .data_bottom div .main_title{ width: 220px; height: 35px; line-height: 33px; - background-color: #333333; + background-color: #3D3D3D; border-radius: 18px; position: absolute; top: -17px; @@ -251,7 +252,8 @@ font-size: 18px; font-weight: 600; box-sizing: border-box; - padding-left: 30px; + text-align:center; + border-radius:18px !important; } .data_content .data_bottom div .main_title img{ position: absolute; @@ -288,7 +290,7 @@ width: 35%; } .data_content .data_bottom div .main_table td{ - color:#fff; + color:#3D3D3D; font-size: 12.8px; text-align: center; } @@ -297,8 +299,8 @@ .data_content .data_bottom div .main_table tbody tr:nth-child(7), .data_content .data_bottom div .main_table tbody tr:nth-child(9), .data_content .data_bottom div .main_table tbody tr:nth-child(5){ - background-color: #1c1c1c; - box-shadow:-10px 0px 15px #333333 inset, /*左边阴影*/ - 10px 0px 15px #333333 inset; /*右边阴影*/ - /*0px 10px 15px #333333 inset;*/ + background-color: #303030; + box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/ + 10px 0px 15px #3D3D3D inset; /*右边阴影*/ + /*0px 10px 15px #3D3D3D inset;*/ } \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/highcharts/echart.js b/src/main/webapp/static/global/plugins/highcharts/echart.js index 4090b8e24..423e52d4b 100644 --- a/src/main/webapp/static/global/plugins/highcharts/echart.js +++ b/src/main/webapp/static/global/plugins/highcharts/echart.js @@ -40,7 +40,7 @@ // margin:10, }, - colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6' ,'#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6' ,'#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null }, @@ -174,7 +174,7 @@ marginTop:50, inverted: true, }, - colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null }, @@ -299,7 +299,7 @@ fontFamily:'Microsoft YaHei' }, }, - colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null }, @@ -320,6 +320,7 @@ align:'high', style: {//设置字体颜色 color: '#fff', + fontSize:'10px', fontFamily:'Microsoft YaHei' }, }, @@ -431,7 +432,7 @@ function echart_2(rs){ fontFamily:'Microsoft YaHei', } }, - colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null, style: {//设置字体颜色 @@ -555,7 +556,7 @@ function echart_5(rs){ fontFamily:'Microsoft YaHei', } }, - colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null, style: {//设置字体颜色 @@ -664,7 +665,7 @@ function echart_4(rs){ type: 'pie' }, - colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null, }, @@ -774,7 +775,7 @@ function echart_6(rs){ type: 'pie' }, - colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], + colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'], title: { text: null, }, From 272afe55f7a445aec8df389982b165c4fd2f7faa Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 10:46:54 +0800 Subject: [PATCH 03/11] =?UTF-8?q?(1)=E8=A1=8C=E4=B8=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=94=B1userRegion=E6=94=B9=E4=B8=BA=E5=8A=A0=E5=9C=A8behavCod?= =?UTF-8?q?e=E5=AD=97=E6=AE=B5=E4=B8=8A=20(2)=E7=95=8C=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=A1=8C=E4=B8=BA=E7=B1=BB=E5=9E=8B=E7=9A=84name=20(3?= =?UTF-8?q?)=E5=AE=A1=E6=A0=B8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0BEHAV=5FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AppPolicyCfg.java | 9 +++++++ src/main/java/com/nis/util/Constants.java | 7 ++++++ .../configuration/AppCfgController.java | 25 +++++++++++++++++++ .../dao/specific/SpecificServiceCfgDao.xml | 3 +++ .../service/configuration/AppCfgService.java | 7 ++++-- src/main/resources/nis.properties | 7 +++++- .../views/cfg/app/appPolicyCfgForm.jsp | 12 ++++----- .../views/cfg/app/appPolicyCfgList.jsp | 2 +- 8 files changed, 62 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 38ac364d0..398556343 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -35,12 +35,21 @@ public class AppPolicyCfg extends BaseCfg { private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; private String appName; + private String behavName; private String cfgKeywords; private String userRegion1; private String userRegion2; private String userRegion3; private String userRegion4; private String userRegion5; + public String getBehavName() { + return behavName; + } + + public void setBehavName(String behavName) { + this.behavName = behavName; + } + @Expose @ExcelField(title="expression_type") @SerializedName("exprType") diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 4a173c9d8..67d2c945a 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,6 +7,11 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + /** + * + */ + public static String SPECIFIC_SERVICE_CFG_TYPE_APP=Configurations.getStringProperty("specific_service_cfg_type_app", "social_app"); + public static String SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_PROTPCOL=Configurations.getStringProperty("specific_service_cfg_type_encrypted_tunnel_protpcol", "encrypted_tunnel_protpcol"); /** * 报表去重连接符 */ @@ -391,6 +396,8 @@ public final class Constants { public static final Integer CLIENT_CONNECT_TIMEOUT = Configurations.getIntProperty("client_connect_timeout",1000); public static final Integer CLIENT_READ_TIMEOUT = Configurations.getIntProperty("client_read_timeout",1000); public static final Integer CLIENT_SOCKET_TIMEOUT = Configurations.getIntProperty("client_socket_timeout",1000); + public static final String BEHAV_ID_REGION = Configurations.getStringProperty("behav_id_region","BEHAV_ID"); + public static final String RATE_LIMIT_REGION = Configurations.getStringProperty("rate_limit_region","RATE_LIMIT"); public static final String AREA_REGION = Configurations.getStringProperty("area_region","area_ip"); public static final String HTTP_IP_REGION = Configurations.getStringProperty("http_ip_region","http_ip"); public static final String HTTP_REQ_HEAD_REGION = Configurations.getStringProperty("http_req_hdr_region","http_req_hdr"); diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 498aa7618..e8cfae07a 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; +import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.configuration.AppByteCfg; import com.nis.domain.configuration.AppDomainCfg; import com.nis.domain.configuration.AppHttpCfg; @@ -24,6 +25,8 @@ import com.nis.domain.configuration.AppPolicyCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; +import com.nis.util.DictUtils; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -51,6 +54,28 @@ public class AppCfgController extends BaseController { SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); entity.setAppName(app.getSpecServiceName()); } + //查找社交应用的所有有效二级特定服务 + SpecificServiceCfg second=new SpecificServiceCfg(); + for(SysDataDictionaryItem dict:DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { + if(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) { + second.setCfgType(Integer.parseInt(dict.getItemCode())); + break; + } + } + second.setIsValid(Constants.VALID_YES); + second.setIsLeaf(1); + List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); + //遍历，找到匹配项后将行为设置进去 + for(SpecificServiceCfg secondCfg:secondList) { + if(secondCfg.getSpecServiceCode()==null) continue; + for(AppPolicyCfg entity:page.getList()){ + if(entity.getBehavCode()==null) continue; + if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { + entity.setBehavName(secondCfg.getSpecServiceName()); + break; + } + } + } model.addAttribute("page", page); initPageCondition(model,cfg); return "/cfg/app/appPolicyCfgList"; diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index 4ba609c2c..8d0cfed6d 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -120,6 +120,9 @@ AND cfg_type = #{specificServiceCfg.cfgType} + + AND is_leaf = #{specificServiceCfg.isLeaf} + AND op_time > #{specificServiceCfg.beginDate} diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 11718b5c8..d09ac8ce1 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -476,10 +477,12 @@ public class AppCfgService extends BaseService { String actionCode = DictUtils.getDictCode("SERVICE_ACTION", "action_ratelimit"); if(!actionCode.equals("默认")){ if(entity.getAction().equals(Integer.parseInt(actionCode))){ - userRegion += Constants.USER_REGION_SPLIT+"RATE_LIMIT="+entity.getRatelimit(); + userRegion += Constants.USER_REGION_SPLIT+Constants.RATE_LIMIT_REGION+"="+entity.getRatelimit(); } } - + if(entity.getBehavCode()!=null) { + userRegion += Constants.USER_REGION_SPLIT+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode(); + } maatCfg.setUserRegion(userRegion); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index e026df15c..8055627b4 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -310,6 +310,8 @@ ssl_san_region=ssl_san ssl_ca_region=ssl_ca ssl_ip_region=ssl_ip bgp_ip_region=bgp_ip +behav_id_region=BEHAV_ID +rate_limit_region=RATE_LIMIT #存在与表达式的关键字特殊分隔符 keyword_expr=***and*** #时区 @@ -390,4 +392,7 @@ picture_sample_proc_param_is_translation=false http_header_user_region_key=HTTP_HEADER http_header_dict_module=HTTP_HEADER_DISTRICT #dns自定义域参数key -dns_strategy_user_region_key=DNS_STRATEGY \ No newline at end of file +dns_strategy_user_region_key=DNS_STRATEGY +#特定服务类别 +specific_service_cfg_type_app=social_app +specific_service_cfg_type_encrypted_tunnel_protpcol=encrypted_tunnel_protpcol \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 99e926114..bea003f0e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -57,7 +57,7 @@ $(function(){ }, errorContainer: "#messageBox", }); - if('${_cfg.userRegion1}'){ + if('${_cfg.behavCode}'){ ajaxBehaviour($("#specServiceIdId").val()); } $("#specServiceIdId").on("change",function(){ @@ -75,11 +75,11 @@ var ajaxBehaviour=function(val){ success:function(data,textStatus){//处理返回结果 if(textStatus=="success"){ if(data.length>0){ - var html='' +''; for(i=0;i'; @@ -87,8 +87,8 @@ var ajaxBehaviour=function(val){ html+=''; $("#behaviour").prev("label").removeClass("hidden"); $("#behaviour").html(html); - $("[name='userRegion1']").selectpicker("refresh"); - $("[name='userRegion1']").selectpicker("render"); + $("[name='behavCode']").selectpicker("refresh"); + $("[name='behavCode']").selectpicker("render"); }else{ if($("#behaviour").prev("label").is(":visible")){ $("#behaviour").prev("label").addClass("hidden"); @@ -150,7 +150,7 @@ var delContent = function(contentClassName, addBtnClassName) { <%-- --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 0ae7b8ea8..407197225 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -338,7 +338,7 @@ ${cfg.cfgDesc } ${cfg.appName } - ${cfg.userRegion1 } + ${cfg.behavName } ${cfg.ratelimit } From ee6108c78bb7e18d179c703134225b5c80946eb5 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 10:52:46 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=A4=BE=E4=BA=A4=E5=BA=94=E7=94=A8=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp | 5 ++++- src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp | 5 ++++- src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp | 5 ++++- src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp | 5 ++++- src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index 856a6d167..feee82863 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -41,6 +41,9 @@
+ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 56d065618..489143ea8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -41,6 +41,9 @@
+ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index ceaec9d2d..1d0302101 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -41,6 +41,9 @@
+ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 7dbf9bd1e..428eb1ebf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -44,6 +44,9 @@
+ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 407197225..1a7769bb5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -84,6 +84,9 @@
+ + +
From 56e7dd6751b8ce9b3e8de8ee374ede78f1e58d2d Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 11:00:14 +0800 Subject: [PATCH 05/11] =?UTF-8?q?app=E7=AD=96=E7=95=A5=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E5=AD=90=E4=B8=B2=E5=8C=B9?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index bea003f0e..445e96abe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -152,7 +152,7 @@ var delContent = function(contentClassName, addBtnClassName) { <%-- --%> <%-- --%> - +
From 8eda4424d3ca7e30f941f1153b324fa2e5bff15b Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 11:11:22 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dapp=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=9C=A8=E6=9C=89=E8=A1=8C=E4=B8=BA=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8B=E5=8F=91=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=AC=A6=E4=B8=BA\\&=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/configuration/AppCfgService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index d09ac8ce1..aa1887e96 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -415,7 +415,7 @@ public class AppCfgService extends BaseService { if(isAudit==1){ if(entity.getBehavCode()!=null){ - entity.setCfgKeywords(entity.getAppCode()+"&"+entity.getBehavCode()); + entity.setCfgKeywords(entity.getAppCode()+Constants.KEYWORD_EXPR+entity.getBehavCode()); }else{ entity.setCfgKeywords(entity.getAppCode()+""); } From 55567bc5e80cb9299f23b6cc99c29ad01e19c731 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 24 Jul 2018 11:19:37 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E9=9F=B3=E8=A7=86?= =?UTF-8?q?=E9=A2=91voipIP,voipAccount=E5=B1=95=E7=A4=BA2.=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=B7=9F=E5=89=8D=E6=AE=B5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 4 +- .../log/ntc/MmVoipAccountLogController.java | 79 +++++ .../log/ntc/MmVoipIpLogController.java | 79 +++++ src/main/resources/nis.properties | 4 +- .../WEB-INF/views/log/ntc/mmAvIpList.jsp | 1 + .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 1 + .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 1 + .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 1 + .../views/log/ntc/mmVoipAccountList.jsp | 273 ++++++++++++++++++ .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 273 ++++++++++++++++++ 10 files changed, 714 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java create mode 100644 src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java create mode 100644 src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp create mode 100644 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 67d2c945a..eafbae1f5 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -384,7 +384,9 @@ public final class Constants { public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", ""); public static final String NTC_MMPICIP_LOG = Configurations.getStringProperty("mmPicIpLog", ""); public static final String NTC_MMPICURL_LOG = Configurations.getStringProperty("mmPicUrlLog", ""); - + public static final String NTC_MMVOIP_IP_LOG = Configurations.getStringProperty("mmVoipIpLog", ""); + public static final String NTC_MMVOIP_ACCOUNT_LOG = Configurations.getStringProperty("mmVoipAccountLog", ""); + //报表类型,1- 配置命中总量业务 public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1); //报表类型,2- 配置报表业务 diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java new file mode 100644 index 000000000..2ad4de5f4 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java @@ -0,0 +1,79 @@ +package com.nis.web.controller.log.ntc; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.http.client.ClientProtocolException; +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 com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmVoipLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmAvVoipAccountLogs") +public class MmVoipAccountLogController extends BaseController{ + + /** + * @param model + * @param entry + * @param request + * @param response + * @return + * @throws ClientProtocolException + * @throws IOException + */ + @RequestMapping(value={"list",""}) + public String list(Model model,@ModelAttribute("log")MmVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + + try { + + PageLog page = new PageLog(request, response); + Map params=new HashMap<>(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); + + String url = ""; + url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_ACCOUNT_LOG; + String jsonString = HttpClientUtil.getMsg(url,params,request); + + Gson gson = new GsonBuilder().create(); + //gson泛型支持 + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + + if (fromJson.getStatus().intValue() == 200) { + Page data = fromJson.getData(); + page.setList(data.getList()); + List list = page.getList(); + for (MmVoipLog l : list) { + l.setFunctionId(entry.getFunctionId()); + setLogAction(l); + } + model.addAttribute("page", page); + logger.info("查询mmVoipAccount日志成功"); + } + } catch (Exception e) { + logger.info("查询mmVoipAccount日志失败", e); + addMessage(model, e.getMessage()); + } + return "/log/ntc/mmVoipAccountList"; + } + +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java new file mode 100644 index 000000000..ac56131eb --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java @@ -0,0 +1,79 @@ +package com.nis.web.controller.log.ntc; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.http.client.ClientProtocolException; +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 com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmVoipLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmVoipIpLogs") +public class MmVoipIpLogController extends BaseController{ + + /** + * @param model + * @param entry + * @param request + * @param response + * @return + * @throws ClientProtocolException + * @throws IOException + */ + @RequestMapping(value={"list",""}) + public String list(Model model,@ModelAttribute("log")MmVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + + try { + + PageLog page = new PageLog(request, response); + Map params=new HashMap<>(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); + + String url = ""; + url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG; + String jsonString = HttpClientUtil.getMsg(url,params,request); + + Gson gson = new GsonBuilder().create(); + //gson泛型支持 + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + + if (fromJson.getStatus().intValue() == 200) { + Page data = fromJson.getData(); + page.setList(data.getList()); + List list = page.getList(); + for (MmVoipLog l : list) { + l.setFunctionId(entry.getFunctionId()); + setLogAction(l); + } + model.addAttribute("page", page); + logger.info("查询VoipIp日志成功"); + } + } catch (Exception e) { + logger.info("查询VoipIp日志失败", e); + addMessage(model, e.getMessage()); + } + return "/log/ntc/mmVoipIpList"; + } + +} diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8055627b4..b75ee7c63 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -226,7 +226,7 @@ callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ +logBaseUrl=http://10.0.6.104:8080/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -254,6 +254,8 @@ mmAvIpLog=mmAvIpLogs mmAvUrlLog=mmAvUrlLogs mmPicIpLog=mmPicIpLogs mmPicUrlLog=mmPicUrlLogs +mmVoipIpLog=mmVoipIpLogs +mmVoipAccountLog=mmVoipAccountLogs ######################################## #大屏图表展示服务接口 dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/ 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 3447cbe69..8767a7871 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -61,6 +61,7 @@ $(document).ready(function(){
+ 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 095a63cef..d128c41ec 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -61,6 +61,7 @@ $(document).ready(function(){
+ 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 173c76665..34c184961 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -61,6 +61,7 @@ $(document).ready(function(){
+ 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 009064dde..1a0dd7c50 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -61,6 +61,7 @@ $(document).ready(function(){
+ diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp new file mode 100644 index 000000000..d647f578a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -0,0 +1,273 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+

+ VOIP ACCOUNT + +

+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.foundTime}${log.recvTime}${log.transProto}${log.duation}${log.protocol}${log.callingAccount}${log.calledAccount}${log.callingNumber}${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid}${log.logUri}${log.level} + + + + + + + + ${log.dIp}${log.sIp}${log.dPort}${log.sPort}${log.deviceId} + + + + ${log.capIp}${log.addrList}${log.userRegion}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp new file mode 100644 index 000000000..c0be5e9ac --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -0,0 +1,273 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+

+ VOIP IP + +

+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.foundTime}${log.recvTime}${log.transProto}${log.duation}${log.protocol}${log.callingAccount}${log.calledAccount}${log.callingNumber}${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid}${log.logUri}${log.level} + + + + + + + + ${log.dIp}${log.sIp}${log.dPort}${log.sPort}${log.deviceId} + + + + ${log.capIp}${log.addrList}${log.userRegion}
+
${page}
+
+
+
+
+
+
+ + From 3a22b8621b1b96be096a2aaed1ca0a34baf41bba Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Tue, 24 Jul 2018 11:43:16 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AF=B7=E6=B1=82URL.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 8 +++++++- src/main/resources/nis.properties | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index eafbae1f5..2bdf967a3 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -386,7 +386,13 @@ public final class Constants { public static final String NTC_MMPICURL_LOG = Configurations.getStringProperty("mmPicUrlLog", ""); public static final String NTC_MMVOIP_IP_LOG = Configurations.getStringProperty("mmVoipIpLog", ""); public static final String NTC_MMVOIP_ACCOUNT_LOG = Configurations.getStringProperty("mmVoipAccountLog", ""); - + public static final String NTC_MMSAMPLEAUDIO_LOG = Configurations.getStringProperty("mmSampleAudioLog", ""); + public static final String NTC_MMSAMPLEVIDEO_LOG = Configurations.getStringProperty("mmSampleVideoLog", ""); + public static final String NTC_MMPORNAUDIOLEVEL_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", ""); + public static final String NTC_MMPORNVIDEOLEVEL_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); + public static final String NTC_MMSAMPLEPIC_LOG = Configurations.getStringProperty("mmSamplePicLog", ""); + public static final String NTC_MMSAMPLEVOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); + //报表类型,1- 配置命中总量业务 public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1); //报表类型,2- 配置报表业务 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index b75ee7c63..e82d84e3c 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -226,7 +226,7 @@ callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://10.0.6.104:8080/galaxy/service/log/v1/ +logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -256,6 +256,12 @@ mmPicIpLog=mmPicIpLogs mmPicUrlLog=mmPicUrlLogs mmVoipIpLog=mmVoipIpLogs mmVoipAccountLog=mmVoipAccountLogs +mmSampleAudioLog=mmSampleAudioLogs +mmSampleVideoLog=mmSampleVideoLogs +mmPornAudioLevelLog=mmPornAudioLevelLogs +mmPornVideoLevelLog=mmPornVideoLevelLogs +mmSamplePicLog=mmSamplePicLogs +mmSampleVoipLog=mmSampleVoipLogs ######################################## #大屏图表展示服务接口 dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/ From 96df02fe1d4fb63aeba680a39a9490635c73633d Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 13:20:27 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=BD=93=E7=94=A8=E6=88=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=A1=8C=E4=B8=BA=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 445e96abe..bca1c9a3e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -50,6 +50,9 @@ $(function(){ $(this).remove(); }); $("input[name$='exprType']").attr("disabled",false); + if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ + $("input[name$='exprType']").val(1); + } /* $("#appCode").val($("#specServiceIdId").val()); */ loading('onloading...'); form.submit(); From 6ae404cd3bc2bb960015b74673e81b4873e38d12 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 24 Jul 2018 14:18:01 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=E5=AD=97=E5=85=B8=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=E5=AD=97?= =?UTF-8?q?=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 | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- src/main/resources/messages/message_zh_CN.properties | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 6fe82cc33..7a30e0c65 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -791,8 +791,9 @@ social_app=Applicaiton app_policy_config=APP Policy app_features_config=APP Feature cfg_type=Cfg Type -encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol +encrypted_tunnel_behavior=Encrypted Tunnel Behavior behaviour_type=Behaviour Type +basic_protocol=Basic Protocol #=============about app config=========== #=============about Maintenance========= ip_Reuse_pool_config=IP Reuseing Pool diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 7c4ce27d8..96058f1df 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -713,8 +713,9 @@ social_app=Applicaiton app_policy_config=APP Policy app_features_config=APP Feature cfg_type=Cfg Type -encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol +encrypted_tunnel_behavior=Encrypted Tunnel Behavior behaviour_type=Behaviour Type +basic_protocol=Basic Protocol #=============about app config=========== #=============about Maintenance========= ip_multiplex_pool_config=ip multiplex pool config diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 54626da72..808b0b2e8 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -793,8 +793,9 @@ social_app=\u793E\u4EA4\u5E94\u7528 app_policy_config=APP\u7B56\u7565 app_features_config=APP\u7279\u5F81 cfg_type=\u914D\u7F6E\u7C7B\u578B -encrypted_tunnel_protpcol=\u52A0\u5BC6\u96A7\u9053\u534F\u8BAE +encrypted_tunnel_behavior=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A behaviour_type=\u884C\u4E3A\u7C7B\u578B +basic_protocol=\u57FA\u7840\u534F\u8BAE #=============about app config=========== #=============about Maintenance========= ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60 From 255160214e22ccc06c81b150c60c1132052ccc11 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 24 Jul 2018 14:36:21 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=9D=A1=E4=BB=B6=E6=8D=A2=E4=B8=BA=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=9C=BAIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/log/manipulation/dkBehaviorList.jsp | 12 ++++++------ .../webapp/WEB-INF/views/log/ntc/appList.jsp | 12 ++++++------ .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 12 ++++++------ .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 17 +++++++++++------ .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 12 ++++++------ .../webapp/WEB-INF/views/log/ntc/mmVoipList.jsp | 12 ++++++------ .../WEB-INF/views/log/ntc/pptpLogList.jsp | 17 +++++++++++------ .../webapp/WEB-INF/views/log/ntc/sslLogList.jsp | 17 +++++++++++------ 14 files changed, 99 insertions(+), 84 deletions(-) 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 2c85b6826..ec1117794 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -142,6 +136,12 @@ $(document).ready(function(){
+
+
+
+ + +
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 028f4a577..2b42a5239 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 a99ca6fc6..a34e1523c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 7ac6bdf0d..087207c1d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 94918a050..dc98ccd4a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -122,16 +122,21 @@
+
+
+ + + + + + + +
+
-
-
-
-
- -
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 8767a7871..36e5207d5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 d128c41ec..8a948cb13 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 34c184961..cb435de50 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 1a0dd7c50..aaa8f894c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 d647f578a..1130625cf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 c0be5e9ac..f9c0543ed 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp index fe5e6f700..126a32937 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp @@ -126,12 +126,6 @@ $(document).ready(function(){
-
-
- - -
-
@@ -143,6 +137,12 @@ $(document).ready(function(){
+
+
+ + +
+
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 cdacd2505..c164d6131 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -122,16 +122,21 @@
+
+
+ + + + + + + +
+
-
-
-
-
- -
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 628ea07c0..066a20201 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -131,16 +131,21 @@
+
+
+ + + + + + + +
+
-
-
-
-
- -