From 1b456bec416f99a68a2a116d00eecbc70d0f7639 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 22 Jun 2018 16:30:59 +0800 Subject: [PATCH] =?UTF-8?q?(1)=E5=9F=9F=E5=90=8D=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=20(2)IP=E7=B1=BB=E9=85=8D=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E7=B1=BB=E6=80=A7=E8=B4=A8=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4=20(3)=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6keyword=5Fexpr=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4,java=E4=B8=AD*=E6=9C=89=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E5=90=AB=E4=B9=89=EF=BC=8C=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E7=94=A8=E5=8F=8C=E6=96=9C=E6=9D=A0=E8=BD=AC=E4=B9=89=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ntc/IpController.java | 8 +- .../ntc/WhiteListController.java | 2 +- .../proxy/InterceptController.java | 106 +++++- .../nis/web/dao/configuration/IpCfgDao.java | 4 +- .../nis/web/dao/configuration/IpCfgDao.xml | 4 +- .../web/dao/configuration/StringCfgDao.java | 11 + .../web/dao/configuration/StringCfgDao.xml | 5 +- .../service/configuration/IpCfgService.java | 10 +- .../configuration/StringCfgService.java | 184 +++++++++ src/main/resources/nis.properties | 2 +- .../webapp/WEB-INF/views/cfg/iplist/list.jsp | 62 ++- .../WEB-INF/views/cfg/proxy/domainForm.jsp | 253 +++++++++++++ .../WEB-INF/views/cfg/proxy/domainList.jsp | 357 ++++++++++++++++++ .../webapp/WEB-INF/views/cfg/proxy/ipList.jsp | 62 ++- 14 files changed, 1020 insertions(+), 50 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/proxy/domainForm.jsp create mode 100644 src/main/webapp/WEB-INF/views/cfg/proxy/domainList.jsp diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index e50626287..a38bf07ff 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -43,13 +43,13 @@ public class IpController extends BaseController{ } @RequestMapping(value = {"form"}) @RequiresPermissions(value={"iplist:config"}) - public String form(Model model,String ids,BaseIpCfg entity) { + public String form(Model model,String ids,Integer functionId,BaseIpCfg entity) { if(StringUtils.isNotBlank(ids)){ entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids)); } if(entity.getCfgId()!=null){ - List areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(), String.valueOf(entity.getCompileId())); - model.addAttribute("areaCfgs", areaCfg); +// List areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId())); +// model.addAttribute("areaCfgs", areaCfg); model.addAttribute("_cfg", entity); initUpdateFormCondition(model,entity); }else{ @@ -106,7 +106,7 @@ public class IpController extends BaseController{ for(String id:ids.split(",")){ Long.parseLong(id); } - List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids); + List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids); Date date=new Date(); for(BaseIpCfg bean:beans){ bean.setTableName(IpPortCfg.getTablename()); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 5567746b5..9774726a9 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -170,7 +170,7 @@ public class WhiteListController extends BaseController{ for(String id:ids.split(",")){ Long.parseLong(id); } - List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids); + List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids); Date date=new Date(); for(BaseIpCfg bean:beans){ bean.setTableName(IpPortCfg.getTablename()); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index a2175041b..3f00e25be 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -43,15 +43,25 @@ public class InterceptController extends BaseController{ initPageCondition(model,cfg); return "/cfg/proxy/ipList"; } + @RequestMapping(value = {"/domain/list"}) + @RequiresPermissions(value={"intercept:domain:config","intercept:domain:audit"},logical=Logical.OR) + public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { + cfg.setTableName(HttpUrlCfg.getTablename()); + Page searchPage=new Page(request,response,"r"); + Page page = stringCfgService.findPage(searchPage, cfg); + model.addAttribute("page", page); + initPageCondition(model,cfg); + return "/cfg/proxy/domainList"; + } @RequestMapping(value = {"/ip/form"}) @RequiresPermissions(value={"intercept:ip:config"}) - public String ipForm(Model model,String ids,BaseIpCfg entity) { + public String ipForm(Model model,String ids,Integer functionId,BaseIpCfg entity) { if(StringUtils.isNotBlank(ids)){ entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids)); } if(entity.getCfgId()!=null){ - List areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(), String.valueOf(entity.getCompileId())); - model.addAttribute("areaCfgs", areaCfg); +// List areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId())); +// model.addAttribute("areaCfgs", areaCfg); model.addAttribute("_cfg", entity); initUpdateFormCondition(model,entity); }else{ @@ -65,6 +75,27 @@ public class InterceptController extends BaseController{ return "/cfg/proxy/ipForm"; } + @RequestMapping(value = {"/domain/form"}) + @RequiresPermissions(value={"intercept:domain:config"}) + public String domainForm(Model model,String ids,Integer functionId,BaseStringCfg entity) { + if(StringUtils.isNotBlank(ids)){ + entity = stringCfgService.getStringCfgById(HttpUrlCfg.getTablename(),Long.parseLong(ids)); + } + if(entity.getCfgId()!=null){ +// List areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId())); +// model.addAttribute("areaCfgs", areaCfg); + model.addAttribute("_cfg", entity); + initUpdateFormCondition(model,entity); + }else{ + HttpUrlCfg cfg=new HttpUrlCfg(); + cfg.initDefaultValue(); + cfg.setFunctionId(entity.getFunctionId()); + model.addAttribute("_cfg", cfg); + initFormCondition(model,entity); + } + + return "/cfg/proxy/domainForm"; + } @RequestMapping(value = {"/ip/saveOrUpdate"}) public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) { Date date=new Date(); @@ -89,8 +120,32 @@ public class InterceptController extends BaseController{ } return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId(); } + @RequestMapping(value = {"/domain/saveOrUpdate"}) + public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) { + cfg.setTableName(HttpUrlCfg.getTablename()); + logger.info("saveOrUpdateDomain loaded"); + try{ + Date date=new Date(); + cfg.setIsValid(Constants.VALID_NO); + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + if(cfg.getCfgId()==null){//新增 + cfg.setCreatorId(cfg.getCurrentUser().getId()); + cfg.setCreateTime(date); + stringCfgService.addStringCfg((BaseStringCfg)cfg); + }else{//修改 + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + stringCfgService.updateStringCfg((BaseStringCfg)cfg); + } + addMessage(model,"save_success"); + }catch(Exception e){ + logger.error("保存失败",e); + addMessage(model,"save_failed"); + } + return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+cfg.getFunctionId(); + } @RequestMapping(value = {"/ip/delete"}) - @RequiresPermissions("iplist:config") + @RequiresPermissions("intercept:ip:config") public String deleteIp(String ids,String compileIds,Integer functionId,RedirectAttributes model) { try{ ipCfgService.deleteIp(ids,compileIds,functionId.intValue()); @@ -101,6 +156,18 @@ public class InterceptController extends BaseController{ } return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId; } + @RequestMapping(value = {"/domain/delete"}) + @RequiresPermissions("intercept:domain:config") + public String deleteDomain(String ids,String compileIds,Integer functionId,RedirectAttributes model) { + try{ + stringCfgService.deleteDomain(ids,compileIds,functionId.intValue()); + addMessage(model,"delete_success"); + }catch(Exception e){ + logger.error("删除失败", e); + addMessage(model,"delete_failed"); + } + return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+functionId; + } @RequestMapping(value = {"/ip/audit"}) // @RequiresPermissions("intercept:ip:audit") public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { @@ -108,7 +175,7 @@ public class InterceptController extends BaseController{ for(String id:ids.split(",")){ Long.parseLong(id); } - List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids); + List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids); Date date=new Date(); for(BaseIpCfg bean:beans){ bean.setTableName(IpPortCfg.getTablename()); @@ -121,11 +188,38 @@ public class InterceptController extends BaseController{ addMessage(redirectAttributes,"audit_success"); }catch(MaatConvertException e){ logger.error("审核失败", e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason()); }catch(Exception e){ logger.error("审核失败", e); addMessage(redirectAttributes, "audit_failed"); } return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId(); } + @RequestMapping(value = {"/domain/audit"}) +// @RequiresPermissions("intercept:domain:audit") + public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { + try{ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + List beans=stringCfgService.getListByCfgId(HttpUrlCfg.getTablename(),ids); + Date date=new Date(); + for(BaseStringCfg bean:beans){ + bean.setTableName(HttpUrlCfg.getTablename()); + bean.setAuditorId(bean.getCurrentUser().getId()); + bean.setAuditTime(date); + bean.setIsAudit(cfg.getIsAudit()); + bean.setIsValid(cfg.getIsValid()); + stringCfgService.auditDomain(bean); + } + addMessage(redirectAttributes,"audit_success"); + }catch(MaatConvertException e){ + logger.error("审核失败", e); + addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason()); + }catch(Exception e){ + logger.error("审核失败", e); + addMessage(redirectAttributes, "audit_failed"); + } + return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+cfg.getFunctionId(); + } } diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index f5d2a9b25..c193bd533 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -18,8 +18,8 @@ public interface IpCfgDao extends CrudDao{ public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; public BaseIpCfg get(BaseIpCfg entity) ; public List findList(BaseIpCfg entity) ; - public List getListByCfgId(@Param("tableName")String tableName,@Param("ids")String ids) ; - public List getListByComileId(@Param("tableName")String tableName,@Param("ids")String ids) ; + public List getListByCfgId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ; + public List getListByComileId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ; public int insert(BaseIpCfg entity) ; public int update(BaseIpCfg entity) ; public int updateValid(BaseIpCfg entity) ; diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 32a078831..dc4c458b4 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -118,12 +118,12 @@ + + + + + + + + + + + + + + + + + + +
+

+ +

+ <%-- <%@include file="/WEB-INF/include/form/stringInfo.jsp" %> --%> +
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ + + +
+
+
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> + <%@include file="/WEB-INF/include/form/basicInfo.jsp"%> +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/domainList.jsp new file mode 100644 index 000000000..80bfbf3a2 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/domainList.jsp @@ -0,0 +1,357 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="domain_intercept"></spring:message> + + + + +
+ + +

+ + +

+
+
+
+
+
+
+ + + + + + + + +
+
+ + + + + + + +
+ +
+ +
+
+ + + + + + +
+ + + +
+
+
+ + + +
+
+ + + + + + +
+ +
    +
    • +
    • +
    • +
+
+ + href="javascript:;"> + + +
+
+ + + +
+
+
+
+ + +
+
+
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
+
+
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
+
+
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
+
+
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
+
+
+
+ + +
+
+ + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + +
${status.index+1 }${cfg.cfgDesc } + + ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} + + + + + + + ${cfg.exprType} + + + + + + + + + + + + + + + + + + + + + + ${cfg.requestName } + + + + + + + + + + + + + + + + ${fns:abbr(classify,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(attribute,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(lableInfo,20)} + + + + + + + + + + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName }
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/ipList.jsp index a8fd29272..4657e497c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/ipList.jsp @@ -279,27 +279,61 @@ ${cfg.requestName } - - - - ${fl.itemValue}, - + + + + + + + + + + + + - + + ${fns:abbr(classify,20)} + - - - ${xz.itemValue}, + + + + + + + + + + + + - + + ${fns:abbr(attribute,20)} + - - - ${lable.itemValue}, + + + + + + + + + + + + - + + ${fns:abbr(lableInfo,20)} + <%-- ${cfg.areaEffectiveIds } --%>