diff --git a/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java index 3c3b1d848..5a21e4dc8 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java @@ -16,9 +16,9 @@ public class ProxyFileHijackCfg extends BaseCfg{ 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;//判断与其他菜单是否关联使用中 diff --git a/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java index 0f8b22203..369a07bf2 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java @@ -8,30 +8,23 @@ public class ProxyFileInsertScriptCfg extends BaseCfg{ 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{ } public void setPath(String path) { this.path = path; - } + } + public int getQuote() { + return quote; + } + public void setQuote(int quote) { + this.quote = quote; + } } diff --git a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java index 567fa1bd0..b191a77b7 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java @@ -12,35 +12,34 @@ public class ProxyFileTrafficMirrorCfg extends BaseCfg> addrList; + private Map addrList; @Expose private String addrContent; @Expose @@ -79,10 +79,10 @@ public class ProxyFileTrafficMirrorCfgAudit { public void setProfileName(String profileName) { this.profileName = profileName; } - public Map> getAddrList() { + public Map getAddrList() { return addrList; } - public void setAddrList(Map> addrList) { + public void setAddrList(Map addrList) { this.addrList = addrList; } public String getAddrContent() { @@ -102,5 +102,5 @@ public class ProxyFileTrafficMirrorCfgAudit { } public void setOpUser(Long opUser) { this.opUser = opUser; - } + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 1a7952151..c9d61adff 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -307,7 +307,13 @@ public class FileTransferCfgController extends BaseController { logger.info("获取文件摘要响应信息：" + result); } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity, result, areaCfgIds); - addMessage(redirectAttributes, "success", "save_success"); + //配置仅保存 + if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } } catch (MaatConvertException e) { logger.error("文件摘要配置下发失败：",e); addMessage(redirectAttributes, "error", "request_service_failed"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileHijackController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileHijackController.java index 69589ea5f..898a8e69e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/FileHijackController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileHijackController.java @@ -117,7 +117,7 @@ public class FileHijackController extends CommonController{ } @RequestMapping(value = {"delete"}) - @RequiresPermissions(value={"proxy:fileStrategy:config"}) + @RequiresPermissions(value={"proxy:fileHijack:config"}) public String delete(Integer isAudit, Integer isValid, String ids, Integer functionId, Model model, @ModelAttribute("cfg")ProxyFileHijackCfg cfg, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes){ try { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileInsertScriptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileInsertScriptController.java index 6535b8819..e662d7be6 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/FileInsertScriptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileInsertScriptController.java @@ -91,7 +91,13 @@ public class FileInsertScriptController extends CommonController{ } } proxyFileInsertScriptService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"success","save_success"); + //配置仅保存 + if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } }catch(Exception e){ logger.error("信息保存失败",e); if(e instanceof MaatConvertException) { @@ -205,10 +211,7 @@ public class FileInsertScriptController extends CommonController{ pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = proxyFileInsertScriptService.findPage(pageInfo, entity); ipLists = page.getList(); - } - for (int i = 0; i < ipLists.size(); i++) { - ipLists.get(i).setProfileName(ipLists.get(i).getCfgDesc()); - } + } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), ProxyFileInsertScriptCfg.class); String cfgIndexInfoNoExport = ",config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileTrafficMirrorController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileTrafficMirrorController.java index da859f89f..c28921f65 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/FileTrafficMirrorController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileTrafficMirrorController.java @@ -85,7 +85,13 @@ public class FileTrafficMirrorController extends CommonController { logger.info("注入脚本文件上传响应信息："+JsonMapper.toJsonString(result)); } proxyFileTrafficMirrorService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"success","save_success"); + //配置仅保存 + if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } }catch(Exception e){ logger.error("信息保存失败",e); if(e instanceof MaatConvertException) { @@ -194,7 +200,7 @@ public class FileTrafficMirrorController extends CommonController { ipLists = proxyFileTrafficMirrorService.findByList(ids); } else { entity.setTableName(IpPortCfg.getTablename()); - Page pageInfo = new Page(request, response, "r"); + Page pageInfo = new Page(request, response, "a"); pageInfo.setPageNo(1); pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); Page page = proxyFileTrafficMirrorService.findPage(pageInfo, entity); diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml index e7dab4156..7c8cdc621 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml @@ -88,10 +88,8 @@ - - + AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml index c782efba2..b625e7311 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml @@ -88,10 +88,8 @@ - - - AND a.IS_AUDIT in(${batchAuditValue}) - + + AND a.IS_AUDIT in(${batchAuditValue}) diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml index f97457041..b27bcb154 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml @@ -90,10 +90,8 @@ - - - AND a.IS_AUDIT in(${batchAuditValue}) - + + AND a.IS_AUDIT in(${batchAuditValue}) diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml index 841eb2166..b24aa1c30 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml @@ -90,10 +90,8 @@ - - + AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml index 96503b280..c18975173 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml @@ -87,10 +87,8 @@ - - - AND a.IS_AUDIT in(${batchAuditValue}) - + + AND a.IS_AUDIT in(${batchAuditValue}) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 06e2d7109..0650ed86e 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3223,7 +3223,7 @@ public abstract class BaseService { public static ProxyFileTrafficMirrorCfgAudit convertCallBackProxyFileTrafficMirror(ProxyFileTrafficMirrorCfg cfg) { ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit(); Map map = new HashMap(); - map.put(cfg.getAddrType(),Arrays.asList(cfg.getAddrList().split(","))); + map.put(cfg.getAddrType(),cfg.getAddrList()); fileTemp.setId(Long.valueOf(cfg.getCompileId())); fileTemp.setCfgId(cfg.getCompileId()); fileTemp.setProfileId(cfg.getCompileId()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4ab5934a7..21fdfda48 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1531,7 +1531,6 @@ https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=Hijack File profile_name=Profile Name file_insert_script=File Insert Script -disk_path=disk_path format=Format file_quote_disable_delete=File quote Disable Delete target_type=Target Type diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 34928983c..a5bbea898 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1534,7 +1534,6 @@ https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=\u0417\u0430\u0445\u0432\u0430\u0442 \u0444\u0430\u0439\u043B profile_name=Profile Name file_insert_script=File Insert Script -disk_path=disk_path format=Format file_quote_disable_delete=File quote Disable Delete mac=MAC diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e34fca1b4..07e8f2498 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1532,7 +1532,6 @@ https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=\u52AB\u6301\u6587\u4EF6 profile_name=\u6587\u4EF6\u540D\u79F0 file_insert_script=\u6CE8\u5165\u811A\u672C\u6587\u4EF6 -disk_path=\u50A8\u5B58\u8DEF\u5F84 format=\u683C\u5F0F file_quote_disable_delete=\u6587\u4EF6\u88AB\u5F15\u7528 \u4E0D\u53EF\u5220\u9664 vlan=\u865A\u62DF\u5C40\u57DF\u7F51 diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/list.jsp index de5f8ecf4..2e5109bf3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/list.jsp @@ -293,10 +293,10 @@ - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileInsertScript/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileInsertScript/list.jsp index 20769255e..1836e5655 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileInsertScript/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileInsertScript/list.jsp @@ -292,8 +292,8 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp index c4046492e..b770a0a0f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp @@ -282,9 +282,8 @@ - - - <%-- --%> + + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/form.jsp index 9caa8d3fc..287e9ae05 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/form.jsp @@ -174,8 +174,7 @@ word-break:break-all; *
- diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp index da2e4340c..baa60745f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp @@ -299,10 +299,10 @@ - - - - + + + +