From 72fee91228172e7494b806c8057e5e9b1a17f3b2 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 27 May 2019 16:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=95=9C=E5=83=8F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95addrList=E4=B8=8B=E5=8F=91=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/callback/ProxyFileTrafficMirrorCfgAudit.java   | 8 ++++----
 src/main/java/com/nis/web/service/BaseService.java        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
index 7ae43caf6..8b946db84 100644
--- a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
+++ b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
@@ -24,7 +24,7 @@ public class ProxyFileTrafficMirrorCfgAudit {
 	@Expose
 	private String profileName;
 	@Expose
-	private Map<String,String> addrList;
+	private String addrList;
 	@Expose
 	private String addrContent;
 	@Expose
@@ -78,11 +78,11 @@ public class ProxyFileTrafficMirrorCfgAudit {
 	}
 	public void setProfileName(String profileName) {
 		this.profileName = profileName;
-	}
-	public Map<String, String> getAddrList() {
+	}	
+	public String getAddrList() {
 		return addrList;
 	}
-	public void setAddrList(Map<String, String> addrList) {
+	public void setAddrList(String addrList) {
 		this.addrList = addrList;
 	}
 	public String getAddrContent() {
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 473b630d3..478eb580a 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -3221,14 +3221,14 @@ public abstract class BaseService {
 	}
 	//流量转发目的地址
 	public static ProxyFileTrafficMirrorCfgAudit convertCallBackProxyFileTrafficMirror(ProxyFileTrafficMirrorCfg cfg) {
-		ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit();
-		Map map = new HashMap<String,List>();
-		map.put(cfg.getAddrType(),cfg.getAddrList());
+		ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit();		
+		Map map = new HashMap<String,List<String>>();
+		map.put(cfg.getAddrType(),Arrays.asList(cfg.getAddrList().split(",")));
 		fileTemp.setId(Long.valueOf(cfg.getCompileId()));
 		fileTemp.setCfgId(cfg.getCompileId());
 		fileTemp.setProfileId(cfg.getCompileId());		
 		fileTemp.setProfileName(keywordsEscape(cfg.getCfgDesc()));
-		fileTemp.setAddrList(map);
+		fileTemp.setAddrList(gsonToJson(map));
 		fileTemp.setAddrContent(cfg.getAddrList());
 		fileTemp.setAddrType(cfg.getAddrType());
 		fileTemp.setAction(cfg.getAction());