From 062161826efee3630e66d483241df9f1b9af03fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Fri, 24 May 2019 10:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E6=8E=A7=E5=A2=9E=E5=8A=A0=E4=B8=BAad?=
 =?UTF-8?q?min=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90sql=EF=BC=8C=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E6=97=A7=E7=9A=84=E5=AD=97=E5=85=B8=E5=92=8C=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95sql=E3=80=82=20=E5=8E=BB=E6=8E=89=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84json=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/CommonPolicyService.java  |  4 ++--
 .../resources/sql/20190521/http_manipulation.sql    | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
index 849619cd9..b1616bcdd 100644
--- a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
+++ b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
@@ -421,7 +421,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 			
 			//调用服务接口下发配置数据
 			String json=gsonToJson(notAuditList);
-			logger.debug("批量下发配置参数："+json);
+			//logger.debug("批量下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
 			logger.warn("批量下发响应信息："+result.getMsg());
@@ -528,7 +528,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 			
 			//调用服务接口取消配置
 			String json=gsonToJson(auditList);
-			logger.debug("批量下发配置参数："+json);
+			//logger.debug("批量下发配置参数："+json);
 			if(!StringUtil.isEmpty(auditList)) {
 				logger.warn("批量配置取消个数："+auditList.size());
 			}
diff --git a/src/main/resources/sql/20190521/http_manipulation.sql b/src/main/resources/sql/20190521/http_manipulation.sql
index 90336e7b2..0ce72718b 100644
--- a/src/main/resources/sql/20190521/http_manipulation.sql
+++ b/src/main/resources/sql/20190521/http_manipulation.sql
@@ -14,3 +14,16 @@ INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_re
 INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('215', '', '6', 'PXY_CTRL_HTTP_RES_BODY', 'HTTP应答内容管控配置', '1', '1', '2', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '0,1', '0,1,2,3', '', '0,1,2', '1', '', '', '', '', '', '5', '1');
 INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('215', '', '1', 'PXY_CTRL_IP', 'HTTP IP管控配置', '1', '1', '1', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '', '', '4,6', '', '', '1,2,3;1,2,3', '1,2;1,2', '0', '0,6,17', '1,2,3,4', '6', '1');
 INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('215', '', '3', 'PXY_CTRL_SUBSCRIBE_ID', 'proxy SUBSCRIBE字符串配置', '1', '1', '2', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', 'subscribe_id', '0', '3', '', '0', '0', '', '', '', '', '', '7', '0');
+
+
+#为admin角色分配操控菜单权限
+insert into  sys_privilege (PRIVILEGE_MASTER,PRIVILEGE_MASTER_VALUE,PRIVILEGE_ACCESS,PRIVILEGE_ACCESS_VALUE,PRIVILEGE_OPERATION ) select 'ROLE',r.id,1000,m.id,1 from sys_role r,sys_menu m where r.name='admin' and m.code in ('http_manipulation');
+
+#TODO 删除service、region字典*****************确认是否删除server_conf.xml
+#update function_region_dict set is_Valid=0 where function_id in(207,208,209) and is_valid=1;
+#update function_service_dict set is_Valid=0 where function_id in(207,208,209) and is_valid=1;
+#TODO 删除非ceiec用户之外的replace、redirect、block（配置、日志、统计）权限*****************此步骤需要确认
+#delete from sys_privilege t where t.PRIVILEGE_ACCESS_VALUE in(SELECT id FROM sys_menu WHERE CODE IN ('http_block','http_redirect','http_replace') AND IS_SHOW=1 AND del_flag=1) and t.PRIVILEGE_MASTER_VALUE <> 1;
+
+#TODO 需要确认旧的数据是否需要更新为最新需求格式，提供更新SQL.
+