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

This commit is contained in:
zhangwei
2018-12-03 17:48:25 +08:00
2 changed files with 12 additions and 0 deletions

View File

@@ -138,6 +138,7 @@ public class IpMultiplexService extends BaseService{
params.put("service", cfg.getServiceId());
params.put("isValid", 1);
params.put("opTime", auditTime);
params.put("translateParam", "byconn=10");
params.put("effectiveRange", areaEffectiveIds);
List list = Lists.newArrayList();
@@ -168,6 +169,7 @@ public class IpMultiplexService extends BaseService{
params.put("service", cfg.getServiceId());
params.put("isValid", 0);
params.put("opTime", auditTime);
params.put("translateParam", "byconn=10");
params.put("effectiveRange", areaEffectiveIds);
List list = Lists.newArrayList();

View File

@@ -0,0 +1,10 @@
-- 地址池
UPDATE function_service_dict SET service_id = 834 WHERE dict_id = 142 AND function_id = 633;
-- SNAT策略
UPDATE function_service_dict SET service_id = 835,`action` = 80 WHERE dict_id = 80 AND function_id = 300;
-- DNAT策略
UPDATE function_service_dict SET service_id = 836,`action` = 80 WHERE dict_id = 143 AND function_id = 304;
ALTER TABLE ip_reuse_policy_cfg ADD do_log INT(11) COMMENT '是否记录结构化日志1是 2否';