修复代理(劫持、镜像、阻断、注入)菜单的bug

This commit is contained in:
wangwei
2019-05-26 16:09:19 +08:00
parent f2d29374da
commit 8472c6efcf
22 changed files with 81 additions and 83 deletions

View File

@@ -16,9 +16,9 @@ public class ProxyFileHijackCfg extends BaseCfg<ProxyFileHijackCfg>{
private String profileName;//名称,辅助记忆
@ExcelField(title="content_type",sort=3)
private String contentType;//填充HTTP content-type如“video/mp4” exe、apk
@ExcelField(title="path",sort=2)
@ExcelField(title="hijack_file_strategy",sort=2)
private String path;//储存路径
@ExcelField(title="content_name",sort=3)
@ExcelField(title="content_name",sort=4)
private String contentName;//内容格式
private int quote;//判断与其他菜单是否关联使用中

View File

@@ -8,30 +8,23 @@ public class ProxyFileInsertScriptCfg extends BaseCfg<ProxyFileInsertScriptCfg>{
private static final long serialVersionUID = 4705202662940705064L;
public String indexTable = "pxy_profile_insert_scripts";//对应表名
@ExcelField(title="profile_name",sort=1)
private String profileName;//名称,辅助记忆
@ExcelField(title="format ",sort=3)
private String cfgDesc;//名称,辅助记忆
@ExcelField(title="format",sort=3)
private String format;//css/js
@ExcelField(title="path",sort=2)
@ExcelField(title="file_insert_script",sort=2)
private String path;//储存路径
private int quote;//判断与其他菜单是否关联使用中
public int getQuote() {
return quote;
}
public void setQuote(int quote) {
this.quote = quote;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
public String getProfileName() {
return profileName;
public String getCfgDesc() {
return cfgDesc;
}
public void setProfileName(String profileName) {
this.profileName = profileName;
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
public String getFormat() {
return format;
@@ -44,5 +37,11 @@ public class ProxyFileInsertScriptCfg extends BaseCfg<ProxyFileInsertScriptCfg>{
}
public void setPath(String path) {
this.path = path;
}
}
public int getQuote() {
return quote;
}
public void setQuote(int quote) {
this.quote = quote;
}
}

View File

@@ -12,35 +12,34 @@ public class ProxyFileTrafficMirrorCfg extends BaseCfg<ProxyFileTrafficMirrorCfg
private static final long serialVersionUID = -5895958073449509268L;
public String indexTable = "pxy_profile_traffic_mirror";//对应表名
@ExcelField(title="profile_name",sort=1)
private String profileName;//名称,辅助记忆
@ExcelField(title="addr_list",sort=2)
@ExcelField(title="target_name",sort=1)
private String cfgDesc;//名称,辅助记忆
@ExcelField(title="mirror_addr_list",sort=3)
private String addrList;//目标表示列表
@ExcelField(title="addr_type",sort=3)
@ExcelField(title="mirror_addr_type",sort=2)
private String addrType;//目标表示类型
public String getAddrList() {
return addrList;
}
public void setAddrList(String addrList) {
this.addrList = addrList;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
public String getProfileName() {
return profileName;
public String getCfgDesc() {
return cfgDesc;
}
public void setProfileName(String profileName) {
this.profileName = profileName;
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
public String getAddrList() {
return addrList;
}
public void setAddrList(String addrList) {
this.addrList = addrList;
}
public String getAddrType() {
return addrType;
}
public void setAddrType(String addrType) {
this.addrType = addrType;
}
}
}

View File

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