diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index c38a34674..3b5c7d80b 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -365,6 +365,7 @@ public class InterceptCfgService extends CrudService maatCfg.setUserRegion(userRegion); } + //域名拦截需要增加域名id和域名字符串自定义配置 if(StringUtil.isEmpty(maatCfg.getUserRegion()) || maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){ if(doaminFlag){ @@ -378,6 +379,18 @@ public class InterceptCfgService extends CrudService } } + //域名拦截需要增加拦截强度自定义域 + if(doaminFlag){ + if(StringUtil.isEmpty(entity.getUserRegion5()) || maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){ + userRegion= Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5(); + maatCfg.setUserRegion(userRegion); + }else{ + userRegion= maatCfg.getUserRegion(); + userRegion=userRegion+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5(); + maatCfg.setUserRegion(userRegion); + } + } + configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); maatBean.setAuditTime(entity.getAuditTime()); diff --git a/src/main/resources/sql/20181015/20181012/update_stream_region.sql b/src/main/resources/sql/20181015/20181012/update_stream_region.sql deleted file mode 100644 index 9b2a4fb5b..000000000 --- a/src/main/resources/sql/20181015/20181012/update_stream_region.sql +++ /dev/null @@ -1 +0,0 @@ -update function_region_dict set config_region_value ='NTC_SUBSCRIBE_ID' where dict_id='201'; \ No newline at end of file diff --git a/src/main/resources/sql/20181015/add_dictionary.sql b/src/main/resources/sql/20181015/add_dictionary.sql new file mode 100644 index 000000000..0a3ef7633 --- /dev/null +++ b/src/main/resources/sql/20181015/add_dictionary.sql @@ -0,0 +1,19 @@ +INSERT INTO sys_data_dictionary_name + (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) +VALUES + (116, 'ǿ', 'INTERCEPT_DOMAIN_INTENSITY', '', 'user:Ա,2018-10-15 15:24:55edit|user:Ա,2018-10-15 15:24:37edit', "2018/10/15 15:24:04", "2018/10/15 15:24:55", 1); + +INSERT INTO sys_data_dictionary_item + (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) +VALUES + (2703, '1', 'weak_intensity', '', 0, 1, 1, 116); + +INSERT INTO sys_data_dictionary_item + (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) +VALUES + (2704, '2', 'stronger_strong_intensity', 'ǿ', 0, 1, 1, 116); + +INSERT INTO sys_data_dictionary_item + (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) +VALUES + (2705, '3', 'strong_intensity', 'ǿ', 0, 1, 1, 116); \ No newline at end of file diff --git a/src/main/resources/sql/20181015/update_function_service.sql b/src/main/resources/sql/20181015/update_function_service.sql new file mode 100644 index 000000000..d822b4894 --- /dev/null +++ b/src/main/resources/sql/20181015/update_function_service.sql @@ -0,0 +1,2 @@ +update function_service_dict set is_valid=0 where dict_id=137 ; +update function_service_dict set function_id=5 where dict_id=108 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index e1d7c425b..00a212176 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -239,8 +239,33 @@ + + +
+
+
+ +
+ +
+
+
+
+
+
<%-- action 为1 监测时 可以选择证书--%>