Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop Conflicts: src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
2018-12-05 09:41:05 +08:00
parent c02af9efb2 ebbf999cf7
commit 53555aa73a
70 changed files with 575 additions and 389 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -964,12 +964,12 @@ encrypted_tunnel_behavior_ratelimit=Behavior Identify Rate Limit
 encrypted_tunnel_behavior_monit=Behavior Identify Monitor
 encrypted_tunnel_behavior_drop=Behavior Identify Drop
 ip_protocol=IP Protocol
-MM_AV_IP=AV IP
-MM_PIC_IP=Picture IP
-MM_PIC_URL=Picture URL
-MM_AV_URL=AV URL
-INLINE_IP_CB=IP Drop
-MM_VOIP_IP=VoIP IP
+MM_AV_IP=IP
+MM_PIC_IP=IP
+MM_PIC_URL=URL
+MM_AV_URL=URL
+INLINE_IP_CB=IP
+MM_VOIP_IP=IP
 MM_VOIP_ACCOUNT=VoIP Account
 drop_ip=IP Drop
 loop_ip=IP Loop
@@ -1336,4 +1336,5 @@ address_pool_is_used=Address pool is used and cannot perform this operation!
 cgi_service_failed=Request CGI server failed
 available_ip=Available IP
 config_sync=Configuration Synchronization
-info_failed=Information Acquisition Failure
+info_failed=Information Acquisition Failure
+address_pool_ip_configuration=Address Pool IP Configuration
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1334,4 +1334,5 @@ address_pool_id=Address Pool ID
 log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 address_pool_is_used=Address pool is used and cannot perform this operation!
 available_ip=Available IP
-config_sync=Configuration Synchronization
+config_sync=Configuration Synchronization
+address_pool_ip_configuration=Address Pool IP Configuration
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1334,4 +1334,5 @@ address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD
 cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
 available_ip=\u53EF\u7528IP\u5730\u5740
 config_sync=\u914D\u7F6E\u540C\u6B65
-info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
+info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
+address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -567,4 +567,6 @@ userGet=UserGet
 userList=UserList
 ip_reuse_call_cgi_url=http://192.168.11.137:8090/command
 ipNumGet=IpNumGet
-allIpGet=AllIpGet
+allIpGet=AllIpGet
+#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5
+trafficBandwidthTrans=trafficBandwidthTrans
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -86,7 +86,7 @@
 	</service>
 	<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="邮件地址白名单">
    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
 	</service>
 	<!--<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
@@ -98,12 +98,12 @@
 	</service>-->
 	<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="邮件地址监测">
    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
 	</service>
    <service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵">
    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
 	</service>
 	
@@ -178,9 +178,9 @@
    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
    	<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
 	</service>
-	<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
+	<!-- <service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-	</service>
+	</service> -->
 	<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
    	<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"   userRegionPosition="0"></userRegion>
@@ -188,7 +188,8 @@
    	<userRegion regionKey="keyring_id" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
    	<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
 	</service>
-	<service id="521" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截白名单">
+	<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP或域名拦截白名单">
+    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
    	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
 	<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="域名拦截限速">
@@ -373,6 +374,8 @@
 	 
 	 <service id="65" functionId="400" serviceType="2" tableName="dns_res_strategy" className="DnsResStrategy"  desc="DNS响应策略"/>
 	 <service id="64" functionId="400" serviceType="2" tableName="dns_ip_cfg" className="DnsIpCfg"  desc="DNS欺骗IP"/>
+	 <service id="266" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景封堵"></service>
+	 <service id="394" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景监测"></service>
 	<!-- 回调类配置结束-->
    
 </serviceList>
--- a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
+++ b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
@@ -0,0 +1,7 @@
+#日志查询-串联设备链路号字典添加
+INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('147', '串联设备链路号', 'LINK', '串联设备链路号', 'user:管理员,2018-12-03 18:39:24edit', '2018-12-03 16:13:24', '2018-12-03 18:39:24', '1');
+
+
+#日志查询-出入口字典添加
+INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
+INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');
--- a/src/main/resources/sql/20181204/update_function_service_dict.sql
+++ b/src/main/resources/sql/20181204/update_function_service_dict.sql
@@ -0,0 +1,6 @@
+-- ftp
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 42 AND function_id = 51;
+-- mail地址
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 149 AND function_id = 37;
+-- mail高级
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 37 AND function_id = 35;
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -59,4 +59,8 @@ DELETE FROM app_ip_range_cfg;
 DELETE FROM app_string_feature_cfg;
 DELETE FROM pxy_obj_trusted_ca_crl;
 DELETE FROM pxy_obj_trusted_ca_cert;
-UPDATE specific_service_cfg SET group_id=0;
+UPDATE specific_service_cfg SET group_id=0;
+DELETE FROM ip_reuse_addr_pool;
+DELETE FROM ip_reuse_ip_cfg;
+DELETE FROM ip_reuse_policy_cfg;
+DELETE FROM user_manage;