Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
ip_payload功能新增
This commit is contained in:
duandongmei
2018-09-30 10:01:52 +08:00
84 changed files with 2932 additions and 1130 deletions

View File

@@ -0,0 +1,4 @@
update function_service_dict set function_id=212 where dict_id=110;
update function_region_dict set function_id=212 where dict_id=167;
INSERT INTO function_region_dict VALUES
('', '', '', '', '', 230, 212, 1, 'PXY_INTERCEPT_IP', '', 'IP PAYLOAD', 1, NULL, NULL, NULL, NULL, 1, 1, '4,6', '1,2,3', '1,2', '0', '17,1', '1,2', 1);