gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复镜像菜单addrList下发格式

Browse Source
This commit is contained in:
wangwei
2019-05-27 16:19:44 +08:00
parent 733cd55636
commit 72fee91228
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
View File

@@ -24,7 +24,7 @@ public class ProxyFileTrafficMirrorCfgAudit {
@Expose @Expose
private String profileName; private String profileName;
@Expose @Expose
private Map<String,String> addrList; private String addrList;
@Expose @Expose
private String addrContent; private String addrContent;
@Expose @Expose
@@ -79,10 +79,10 @@ public class ProxyFileTrafficMirrorCfgAudit {
public void setProfileName(String profileName) { public void setProfileName(String profileName) {
this.profileName = profileName; this.profileName = profileName;
} }
public Map<String, String> getAddrList() { public String getAddrList() {
return addrList; return addrList;
} }
public void setAddrList(Map<String, String> addrList) { public void setAddrList(String addrList) {
this.addrList = addrList; this.addrList = addrList;
} }
public String getAddrContent() { public String getAddrContent() {

6
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -3222,13 +3222,13 @@ public abstract class BaseService {
//流量转发目的地址 //流量转发目的地址
public static ProxyFileTrafficMirrorCfgAudit convertCallBackProxyFileTrafficMirror(ProxyFileTrafficMirrorCfg cfg) { public static ProxyFileTrafficMirrorCfgAudit convertCallBackProxyFileTrafficMirror(ProxyFileTrafficMirrorCfg cfg) {
ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit(); ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit();
Map map = new HashMap<String,List>(); Map map = new HashMap<String,List<String>>();
map.put(cfg.getAddrType(),cfg.getAddrList()); map.put(cfg.getAddrType(),Arrays.asList(cfg.getAddrList().split(",")));
fileTemp.setId(Long.valueOf(cfg.getCompileId())); fileTemp.setId(Long.valueOf(cfg.getCompileId()));
fileTemp.setCfgId(cfg.getCompileId()); fileTemp.setCfgId(cfg.getCompileId());
fileTemp.setProfileId(cfg.getCompileId()); fileTemp.setProfileId(cfg.getCompileId());
fileTemp.setProfileName(keywordsEscape(cfg.getCfgDesc())); fileTemp.setProfileName(keywordsEscape(cfg.getCfgDesc()));
fileTemp.setAddrList(map); fileTemp.setAddrList(gsonToJson(map));
fileTemp.setAddrContent(cfg.getAddrList()); fileTemp.setAddrContent(cfg.getAddrList());
fileTemp.setAddrType(cfg.getAddrType()); fileTemp.setAddrType(cfg.getAddrType());
fileTemp.setAction(cfg.getAction()); fileTemp.setAction(cfg.getAction());