diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 6140c00f5..6d5db4164 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -123,5 +123,12 @@ public class BaseStringCfg extends BaseCfg { public void setCfgKeywordsShowName(String cfgKeywordsShowName) { this.cfgKeywordsShowName = cfgKeywordsShowName; } + /** + * cfgKeywords + * @return cfgKeywords + */ + public String getCfgKeywords() { + return cfgKeywords; + } } diff --git a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java index 23cd39a5a..70cf20297 100644 --- a/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsDomainCfg.java @@ -16,6 +16,7 @@ package com.nis.domain.configuration; * @version V1.0 */ public class DnsDomainCfg extends ComplexkeywordCfg { + private static final String tableName="dns_domain_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -36,4 +37,14 @@ public class DnsDomainCfg extends ComplexkeywordCfg { this.isHexbin=0; this.district="QNAME"; } + + /** + * tablename + * @return tablename + */ + + public static String getTablename() { + return tableName; + } + } diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java index d8bb9e9a7..53f768927 100644 --- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java @@ -16,6 +16,7 @@ package com.nis.domain.configuration; * @version V1.0 */ public class HttpUrlCfg extends BaseStringCfg { + private static final String tableName="http_url_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -33,5 +34,13 @@ public class HttpUrlCfg extends BaseStringCfg { this.exprType=0; this.matchMethod=0; } + /** + * tablename + * @return tablename + */ + + public static String getTablename() { + return tableName; + } } diff --git a/src/main/java/com/nis/domain/configuration/IpPortCfg.java b/src/main/java/com/nis/domain/configuration/IpPortCfg.java index ece15c8c5..a298bcb5c 100644 --- a/src/main/java/com/nis/domain/configuration/IpPortCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpPortCfg.java @@ -36,8 +36,6 @@ public class IpPortCfg extends BaseIpCfg { } public void initDefaultValueImpl(){ initDefaultValue(); - this.portPattern=1; - this.port="0/0"; } /** * 此表固定写0 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 e4871fd32..bc8dd7324 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 @@ -17,10 +17,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.DnsDomainCfg; +import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.main.ConvertTool; import com.nis.util.Constants; import com.nis.web.controller.BaseController; +import com.nis.web.dao.configuration.StringCfgDao; /** * 白名单 @@ -33,8 +37,7 @@ public class WhiteListController extends BaseController{ @RequestMapping(value = {"ipList"}) @RequiresPermissions(value={"whitelist:config","whitelist:audit"},logical=Logical.OR) - public String ipList(Model model,String cfgName,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { - model.addAttribute("cfgName", cfgName); + public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(IpPortCfg.getTablename()); Page searchPage=new Page(request,response,"r"); Page page = ipCfgService.findPage(searchPage, cfg); @@ -42,6 +45,16 @@ public class WhiteListController extends BaseController{ initPageCondition(model,cfg); return "/cfg/whitelist/ipList"; } + @RequestMapping(value = {"domainList"}) + @RequiresPermissions(value={"whitelist:config","whitelist: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/whitelist/domainList"; + } @RequestMapping(value = {"ipForm"}) @RequiresPermissions(value={"whitelist:config"}) public String ipForm(Model model,String ids,BaseIpCfg entity) { @@ -60,7 +73,24 @@ public class WhiteListController extends BaseController{ return "/cfg/whitelist/ipForm"; } - + @RequestMapping(value = {"domainForm"}) + @RequiresPermissions(value={"whitelist:config"}) + public String domainForm(Model model,String ids,BaseStringCfg entity) { + if(StringUtils.isNotBlank(ids)){ + entity = stringCfgService.getStringCfgById(HttpUrlCfg.getTablename(),Long.parseLong(ids)); + } + initFormCondition(model,entity); + if(entity.getCfgId()!=null){ + model.addAttribute("_cfg", entity); + }else{ + HttpUrlCfg cfg=new HttpUrlCfg(); + cfg.initDefaultValue(); + cfg.setFunctionId(entity.getFunctionId()); + model.addAttribute("_cfg", cfg); + } + + return "/cfg/whitelist/domainForm"; + } @RequestMapping(value = {"saveOrUpdateIp"}) public String saveOrUpdateIp(Model model, IpPortCfg cfg) { cfg.setTableName(IpPortCfg.getTablename()); @@ -89,7 +119,34 @@ public class WhiteListController extends BaseController{ } return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId(); } - + @RequestMapping(value = {"saveOrUpdateDomain"}) + public String saveOrUpdateDomain(Model model, HttpUrlCfg cfg) { + cfg.setTableName(HttpUrlCfg.getTablename()); + logger.info("saveOrUpdateIp loaded"); + try{ + if(cfg.getCompileId()==null){ + int compileId=0; + cfg.setCompileId(compileId); + } + 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,null); + }else{//修改 + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(new Date()); + stringCfgService.updateStringCfg((BaseStringCfg)cfg,null,null,null); + } + addMessage(model,"save_success"); + }catch(Exception e){ + logger.error("保存失败",e); + addMessage(model,"save_failed"); + } + return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId(); + } @RequestMapping(value = {"deleteIp"}) @RequiresPermissions("whitelist:config") @@ -118,6 +175,33 @@ public class WhiteListController extends BaseController{ } return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+functionId; } + @RequestMapping(value = {"deleteDomain"}) + @RequiresPermissions("whitelist:config") + public String deleteDomain(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model) { + try{ + List cfgs=new ArrayList(); + Date date =new Date(); + if(StringUtils.isNotBlank(ids)){ + for(String idStr:ids.split(",")){ + if(StringUtils.isNotBlank(idStr)){ + BaseStringCfg cfg=new BaseStringCfg(); + cfg.setCfgId(Long.parseLong(idStr)); + cfg.setTableName(HttpUrlCfg.getTablename()); + cfg.setEditorId(cfg.getCurrentUser().getId()); + cfg.setEditTime(date); + cfg.setIsValid(Constants.VALID_DEL); + cfgs.add(cfg); + } + } + } + stringCfgService.deleteBatch(cfgs, StringCfgDao.class); + addMessage(model,"delete_success"); + }catch(Exception e){ + logger.error("删除失败", e); + addMessage(model,"delete_failed"); + } + return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+functionId; + } /** * * getCompileId(获取编译ID) diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 38ef81136..3f63d7a71 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -29,33 +29,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -65,7 +39,7 @@ CFG_ID, CFG_DESC, CFG_KEYWORDS,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, - ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,FUNCTION_ID + +
+ +
+ + + + + + + + + +
+

+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp new file mode 100644 index 000000000..179bebff7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -0,0 +1,259 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></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 }${cfg.cfgKeywords } + + + + + + + + + + + + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName }
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index a0872935b..a3ad6382b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -117,10 +117,81 @@ $(function(){
+
+
+
+ +
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
- +
-
-
-
- -
- - -
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index eec36a0dd..49068bcea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -6,10 +6,14 @@