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

This commit is contained in:
fangshunjian
2018-08-23 15:39:34 +08:00
42 changed files with 1490 additions and 699 deletions

View File

@@ -314,6 +314,7 @@ http_req_hdr_region=NTC_HTTP_REQ_HDR
http_req_body_region=NTC_HTTP_REQ_BODY
http_res_hdr_region=NTC_HTTP_RES_HDR
http_res_body_region=NTC_HTTP_RES_BODY
ntc_subscribe_id=NTC_SUBSCRIBE_ID
http_url_region=NTC_HTTP_URL
http_redirect_url_region=PXY_CTRL_HTTP_URL
http_redirect_req_hdr_region=PXY_CTRL_HTTP_REQ_HDR

View File

@@ -0,0 +1,19 @@
INSERT INTO function_region_dict
()
VALUES
('subscribe_id', '0', '0,1', '0,1,2', '0,1,2,3', 174, 34, 2, 'NTC_SUBSCRIBE_ID', '', 'SSL SUBSCRIBE_ID配置', 1, NULL, NULL, NULL, NULL, 1, 2, '', '', '', '', '', '', 3);
INSERT INTO function_region_dict
()
VALUES
('subscribe_id', '0', '0,1', '0,1,2', '0,1,2,3', 175, 7, 2, 'NTC_SUBSCRIBE_ID', '', 'DNS SUBSCRIBE_ID配置', 1, NULL, NULL, NULL, NULL, 1, 2, '', '', '', '', '', '', 5);
INSERT INTO function_region_dict
()
VALUES
('subscribe_id', '0', '0,1', '0,1,2', '0,1,2,3', 176, 35, 3, 'NTC_SUBSCRIBE_ID', '', '邮件 SUBSCRIBE_ID配置', 1, NULL, NULL,NULL , NULL, 1, 2, '', '', '', '', '', '', 7);
INSERT INTO function_region_dict
()
VALUES
('subscribe_id', '0', '0,1', '0,1,2', '0,1,2,3', 177, 8, 3, 'NTC_SUBSCRIBE_ID', '', 'HTTP SUBSCRIBE_ID配置', 1, NULL, NULL,NULL , NULL, 1, 3, '', '', '', '', '', '', 7);

View File

@@ -0,0 +1,2 @@
UPDATE function_service_dict SET is_valid=0 WHERE service_id IN (1057,1058)
UPDATE sys_menu SET del_flag=0 WHERE function_id IN (302,303)