From 623a1fdd0917130e0c672ba66e8fcc6f4e7aee7c Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 8 Jun 2018 15:21:04 +0800
Subject: [PATCH] =?UTF-8?q?ftp=E3=80=81mail=E3=80=81website=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=AE=A1=E6=A0=B8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8maat=E9=85=8D=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/configuration/FileTransferCfgService.java  | 2 +-
 .../com/nis/web/service/configuration/MailCfgService.java  | 2 +-
 .../nis/web/service/configuration/WebsiteCfgService.java   | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 8923ad4c6..d16566e91 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -282,7 +282,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			String json=gsonToJson(maatBean);
 			logger.info("ftp配置下发配置参数："+json);
 			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("ftp配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index 445bf64ee..401e6cb71 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -307,7 +307,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 			String json=gsonToJson(maatBean);
 			logger.info("mail配置下发配置参数："+json);
 			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("mail配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 256563206..b652daf72 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -417,7 +417,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			String json=gsonToJson(maatBean);
 			logger.info("http配置下发配置参数："+json);
 			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("http配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
@@ -631,7 +631,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			String json=gsonToJson(maatBean);
 			logger.info("ssl配置下发配置参数："+json);
 			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("ssl配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
@@ -812,6 +812,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			cfg.setTableName(IpPortCfg.getTablename());
 			websiteCfgDao.auditCfg(cfg);
 			if(isAudit==1){
+				entity.setAreaEffectiveIds("0");
 				Map<String,List> map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList);
 				groupRelationList=map.get("groupList");
 				ipRegionList=map.get("dstList");
@@ -868,7 +869,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			String json=gsonToJson(maatBean);
 			logger.info("dns配置下发配置参数："+json);
 			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 			logger.info("dns配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){