diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 1a1d4b268..f1367e6d9 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -656,6 +656,7 @@ public final class Constants { public static String INTERCEPT_IP_MONIT_USER_REGION_KEY=Configurations.getStringProperty("keyring_id", "keyring_id"); public static String INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY=Configurations.getStringProperty("Droprate", "Droprate"); public static String INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY=Configurations.getStringProperty("Bandwidth", "Bandwidth"); + public static String INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY=Configurations.getStringProperty("intercept_domain_intensity", "DOMAIN_INTENSITY"); //大屏统计分析查询接口URL public static final String DASHBOARD_URL = Configurations.getStringProperty("dashboardUrl","dashboardUrl"); 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/messages/message_en.properties b/src/main/resources/messages/message_en.properties index aa3c9aebb..4b5e0d130 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1244,4 +1244,8 @@ mail_address=Mail Address mail_address_whitelist=Mail Address Whitelist mail_address_monit=Mail Address Monit mail_address_reject=Mail Address Reject -ipsec_protocol=IPSEC Protocol \ No newline at end of file +ipsec_protocol=IPSEC Protocol +intercept_intensity=Intercept Intensity +weak_intensity=Weak +stronger_intensity=Strong +strong_intensity=Stronger diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 15ff976a7..d87667c29 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1248,11 +1248,24 @@ traffic_ipactive_hour_max=Active IPTOP10 Maximum In Nearly One Hour ip_addr=IP area_id=Area link_num=Link Number -stat_time=Statistical Time +stat_time=Statistical Time +log_menu=Operation Menu +log_management=Log Management +log_date=Date Range +log_exception=Query Exception +log_user=Operating User +log_submission=Submission +log_ip=Operator IP +log_exception_info=Exception Information +system_log=Log Management protected_ddos=Protected DDOS usual_ddos=Usual DDOS mail_address=Mail Address mail_address_whitelist=Mail Address Whitelist mail_address_monit=Mail Address Monit mail_address_reject=Mail Address Reject -ipsec_protocol=IPSEC Protocol \ No newline at end of file +ipsec_protocol=IPSEC Protocol +intercept_intensity=Intercept Intensity +weak_intensity=Weak +stronger_intensity=Strong +strong_intensity=Stronger diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 12caa4c1e..e0e86583d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1224,17 +1224,23 @@ area_id=\u5730\u57DF link_num=\u8FDE\u63A5\u6B21\u6570 stat_time=\u7EDF\u8BA1\u65F6\u95F4 log_menu=\u64CD\u4F5C\u83DC\u5355 -system_log=\u65E5\u5FD7\u7BA1\u7406 +log_management=\u65E5\u5FD7\u7BA1\u7406 log_date=\u65E5\u671F\u8303\u56F4 log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F log_user=\u64CD\u4F5C\u7528\u6237 log_submission=\u63D0\u4EA4\u65B9\u5F0F log_ip=\u64CD\u4F5C\u8005IP log_exception_info=\u5F02\u5E38\u4FE1\u606F +system_log=Log Management protected_ddos=\u4FDD\u62A4DDOS\u653B\u51FB usual_ddos=\u5E38\u7528DDOS\u653B\u51FB mail_address=\u90AE\u4EF6\u5730\u5740 mail_address_whitelist=\u90AE\u4EF6\u5730\u5740\u767D\u540D\u5355 mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7 -ipsec_protocol=IPSEC\u534F\u8BAE \ No newline at end of file +ipsec_protocol=IPSEC\u534F\u8BAE +intercept_intensity=\u62E6\u622A\u5F3A\u5EA6 +weak_intensity=\u5F31 +stronger_intensity=\u8F83\u5F3A +strong_intensity=\u5F3A + diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 61d7ec580..f500f4750 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -500,6 +500,7 @@ proto_id_region=PROTO_ID keyring_id=keyring_id droprate=Droprate bandwidth=Bandwidth +intercept_domain_intensity=DOMAIN_INTENSITY #IP\u9ed8\u8ba4\u503c ipv4_default_ip_value=\:\: ipv4_default_ip_subnet_value=0.0.0.0/32 diff --git a/src/main/resources/sql/20181012/update_stream_region.sql b/src/main/resources/sql/20181012/update_stream_region.sql deleted file mode 100644 index 9b2a4fb5b..000000000 --- a/src/main/resources/sql/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 监测时 可以选择证书--%>