diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 1a1d4b268..2f99eb3e0 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -7,6 +7,10 @@ import java.util.Map;
 import com.google.gson.GsonBuilder;
 
 public final class Constants {
+	/**
+	 * IPSEC协议
+	 */
+	public static Integer IPSEC_PROTOCOL=Configurations.getIntProperty("ipsec_protocol", 8);
 	public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources");
 	public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001);
 	public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455);
@@ -656,6 +660,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/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 8a18b0823..d6300ead7 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1237,4 +1237,15 @@ log_user=Operating User
 log_submission=Submission
 log_ip=Operator IP
 log_exception_info=Exception Information
-system_log=Log Management
\ No newline at end of file
+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
+intercept_intensity=Intercept Intensity
+weak_intensity=Weak
+stronger_intensity=Strong
+strong_intensity=Stronger
\ 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 869b28bdb..eb41e619d 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1216,7 +1216,7 @@ protocol_identify=Protocol Identify
 NTC_ASN_IP=ASN
 MM_FILE_DIGEST=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043b\u043e\u0432
 NTC_STREAMING_MEDIA_URL=Streaming Media URL
-NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442
+NTC_VOIP_ACCOUNT=VoIP \u0410\u043a\u043a\u0430\u0443\u043d\u0442
 export_failed=Export Failed
 user_manage=Client Account Manage
 ip_reuse_policy_object=IP Reuse Policy Object
@@ -1248,4 +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
+intercept_intensity=Intercept Intensity
+weak_intensity=Weak
+stronger_intensity=Strong
+strong_intensity=Stronger
\ 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 736077094..44861e3c5 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1230,4 +1230,16 @@ 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
\ No newline at end of file
+log_exception_info=\u5F02\u5E38\u4FE1\u606F
+system_log=\u65E5\u5FD7\u7BA1\u7406
+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
+intercept_intensity=\u62E6\u622A\u5F3A\u5EA6
+weak_intensity=\u5F31
+stronger_intensity=\u5F3A
+strong_intensity=\u8F83\u5F3A
\ No newline at end of file
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index e53b79b14..637f0059d 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -219,14 +219,14 @@ clusterBStartTime=1503504000725
 isCommit=true
 ############################################################################################################################################
 ############################################################################################################################################
-httpUrl=http://192.168.10.204:7777/galaxy-service/service/cfg/v1/
+httpUrl=http://192.168.10.204:9999/galaxy-service/service/cfg/v1/
 maatCfg=configSources
 fileUploadCfg=fileUploadSources
 callbackCfg=commonSources
 fileDigestCfg=fileDigestSources
 configIdSources=configPzIdSources
 #logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/
-logBaseUrl=http://192.168.10.204:7777/galaxy-service/service/log/v1/
+logBaseUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/
 ntcPzReport=ntcPzReport
 ntcServiceReport=ntcServiceReport
 ntcTagReport=ntcTagReport
@@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs
 mmFaceRecognizationLog=mmFaceRecognizationLogs
 ########################################
 #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
-dashboardUrl=http://192.168.10.204:7777/galaxy-service/service/log/v1/
+dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/
 trafficIpActive=trafficIpActive
 trafficProtocol=trafficProtocol
 trafficApp=trafficApp
@@ -367,7 +367,7 @@ user_region_placeholder=0
 user_region_split=;
 #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}))/(128)$
+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)$
@@ -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
@@ -527,4 +528,5 @@ log_time_end=2018-10-01 00:00:00
 area_tag=location
 isp_tag=isp
 mmFileDigestLog=mmFileDigestLogs
-ntcStreamMediaLog=ntcStreamMediaLogs
\ No newline at end of file
+ntcStreamMediaLog=ntcStreamMediaLogs
+ipsec_protocol=8
\ No newline at end of file
diff --git a/src/main/resources/sql/20181012/update_stream_region.sql b/src/main/resources/sql/20181015/20181012/update_stream_region.sql
similarity index 100%
rename from src/main/resources/sql/20181012/update_stream_region.sql
rename to src/main/resources/sql/20181015/20181012/update_stream_region.sql