diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index c91963265..e1d229f2d 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -46,7 +46,22 @@ public class BaseIpCfg extends BaseCfg { protected Integer portPattern; protected String srcPort; protected String destPort; + protected Long dnsStrategyId; + protected String groupName; + /** + * groupName + * @return groupName + */ + public String getGroupName() { + return groupName; + } + /** + * @param groupName the groupName to set + */ + public void setGroupName(String groupName) { + this.groupName = groupName; + } /** * 方向 */ @@ -227,6 +242,21 @@ public class BaseIpCfg extends BaseCfg { public void setDestPort(String destPort) { this.destPort = destPort; } + + /** + * dnsStrategyId + * @return dnsStrategyId + */ + + public Long getDnsStrategyId() { + return dnsStrategyId; + } + /** + * @param dnsStrategyId the dnsStrategyId to set + */ + public void setDnsStrategyId(Long dnsStrategyId) { + this.dnsStrategyId = dnsStrategyId; + } @Override public void initDefaultValue(){ super.initDefaultValue(); diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 963735c63..f99246955 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,6 +7,10 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + /** + * IP复用业务类型 + */ + public static final int SERVICE_IP_MULITIPLEX = Configurations.getIntProperty("service_ip_mulitiplex", 768); /** * 当前时区 */ diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java new file mode 100644 index 000000000..5d62b5c50 --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -0,0 +1,90 @@ +/** + *@Title: ControlController.java + *@Package com.nis.web.controller.configuration.proxy + *@Description TODO + *@author dell + *@date 2018年6月22日 下午4:35:42 + *@version 版本号 + */ +package com.nis.web.controller.configuration.manipulation; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.nis.domain.SysDataDictionaryItem; +import com.nis.domain.basics.PolicyGroupInfo; +import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.IpPortCfg; +import com.nis.util.DictUtils; +import com.nis.web.controller.configuration.CommonController; + +/** + * @ClassName: ControlController.java + * @Description: TODO + * @author (dell) + * @date 2018年6月22日 下午4:35:42 + * @version V1.0 + */ +@Controller +@RequestMapping("${adminPath}/manipulation/ipmulitiplex") +public class IpMultiplexController extends CommonController { + @RequestMapping(value = {"/list"}) + @RequiresPermissions(value={"ip:mulitiplex:config","ip:mulitiplex:audit"},logical=Logical.OR) + public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { + this._ipList(cfgName,model, cfg, request, response); + model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); + model.addAttribute("requiresPermissionPrefix","ip:mulitiplex"); + return "/cfg/common/ipList"; + } + @RequestMapping(value = {"/form"}) + @RequiresPermissions(value={"ip:mulitiplex:config"}) + public String ipForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { + this._ipForm(cfgName,model, ids, functionId, entity); + SysDataDictionaryItem dict=null; + List dictList= DictUtils.getDictList("POLICY_GROUP_TYPE"); + for(SysDataDictionaryItem di:dictList){ + if("ipmulitiplex_type".equals(di.getItemValue())){ + dict=di; + break; + } + } + if(dict!=null){ + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(Integer.parseInt(dict.getItemCode())); + model.addAttribute("policyGroups", policyGroups); + } + model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); + model.addAttribute("requiresPermissionPrefix","ip:mulitiplex"); + return "/cfg/common/ipForm"; + } + @RequestMapping(value = {"/saveOrUpdate"}) + public String saveOrUpdateIp(String cfgName,RedirectAttributes model, IpPortCfg cfg) { + this._saveOrUpdateIp(cfgName,model, cfg); + return "redirect:" + adminPath +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId(); + } + @RequestMapping(value = {"/delete"}) + @RequiresPermissions("ip:mulitiplex:config") + public String deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { + this._deleteIp(cfgName,ids, compileIds, functionId, model); + model.addAttribute("urlPrefix","/proxy/ipmulitiplex"); + model.addAttribute("requiresPermissionPrefix","ip:mulitiplex"); + return "redirect:" + adminPath +"/manipulation/ipmulitiplex/list?functionId="+functionId; + } + @RequestMapping(value = {"/audit"}) +// @RequiresPermissions("ip:mulitiplex:audit") + public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { + this._auditIp(cfgName,ids, cfg, redirectAttributes); + redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); + redirectAttributes.addAttribute("requiresPermissionPrefix","ip:mulitiplex"); + return "redirect:" + adminPath +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId(); + } +} diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index 4d6e431a3..561e9d7bd 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -39,7 +39,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:audit"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/manipulation/ratelimit"); + model.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); model.addAttribute("requiresPermissionPrefix","ip:ratelimit"); return "/cfg/common/ipList"; } @@ -47,7 +47,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit:audit"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/manipulation/ratelimit"); + model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); model.addAttribute("requiresPermissionPrefix","domain:ratelimit"); return "/cfg/common/domainList"; } @@ -55,7 +55,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions(value={"ip:ratelimit:config"}) public String ipForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName,model, ids, functionId, entity); - model.addAttribute("urlPrefix","/manipulation/ratelimit"); + model.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); model.addAttribute("requiresPermissionPrefix","ip:ratelimit"); return "/cfg/common/ipForm"; } @@ -63,7 +63,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions(value={"domain:ratelimit:config"}) public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); - model.addAttribute("urlPrefix","/manipulation/ratelimit"); + model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); model.addAttribute("requiresPermissionPrefix","domain:ratelimit"); return "/cfg/common/domainForm"; } @@ -81,7 +81,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions("ip:ratelimit:config") public String deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteIp(cfgName,ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/proxy/ratelimit"); + model.addAttribute("urlPrefix","/proxy/ratelimit/ip"); model.addAttribute("requiresPermissionPrefix","ip:ratelimit"); return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+functionId; } @@ -89,7 +89,7 @@ public class RatelimitController extends CommonController { @RequiresPermissions("domain:ratelimit:config") public String deleteDomain(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteDomain(cfgName, ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/manipulation/ratelimit"); + model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); model.addAttribute("requiresPermissionPrefix","domain:ratelimit"); return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+functionId; } @@ -97,7 +97,7 @@ public class RatelimitController extends CommonController { // @RequiresPermissions("ip:ratelimit:audit") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit"); + redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); redirectAttributes.addAttribute("requiresPermissionPrefix","ip:ratelimit"); return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+cfg.getFunctionId(); } @@ -105,7 +105,7 @@ public class RatelimitController extends CommonController { // @RequiresPermissions("domain:ratelimit:audit") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit"); + redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); redirectAttributes.addAttribute("requiresPermissionPrefix","domain:ratelimit"); return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+cfg.getFunctionId(); } 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 9774726a9..3c887eb94 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 @@ -129,7 +129,7 @@ public class WhiteListController extends BaseController{ }else{//修改 cfg.setEditorId(cfg.getCurrentUser().getId()); cfg.setEditTime(new Date()); - stringCfgService.updateStringCfg((BaseStringCfg)cfg,null,null,null); + stringCfgService.updateStringCfg((BaseStringCfg)cfg); } addMessage(model,"save_success"); }catch(Exception e){ diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index 33f476aa2..5c18abe25 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -39,7 +39,7 @@ public class ControlController extends CommonController { @RequiresPermissions(value={"control:ip:config","control:ip:audit"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/ip"); model.addAttribute("requiresPermissionPrefix","control:ip"); return "/cfg/common/ipList"; } @@ -47,7 +47,7 @@ public class ControlController extends CommonController { @RequiresPermissions(value={"control:domain:config","control:domain:audit"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/domain"); model.addAttribute("requiresPermissionPrefix","control:domain"); return "/cfg/common/domainList"; } @@ -55,7 +55,7 @@ public class ControlController extends CommonController { @RequiresPermissions(value={"control:ip:config"}) public String ipForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName,model, ids, functionId, entity); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/ip"); model.addAttribute("requiresPermissionPrefix","control:ip"); return "/cfg/common/ipForm"; } @@ -63,7 +63,7 @@ public class ControlController extends CommonController { @RequiresPermissions(value={"control:domain:config"}) public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/domain"); model.addAttribute("requiresPermissionPrefix","control:domain"); return "/cfg/common/domainForm"; } @@ -81,7 +81,7 @@ public class ControlController extends CommonController { @RequiresPermissions("control:ip:config") public String deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteIp(cfgName,ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/ip"); model.addAttribute("requiresPermissionPrefix","control:ip"); return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+functionId; } @@ -89,7 +89,7 @@ public class ControlController extends CommonController { @RequiresPermissions("config:domain:config") public String deleteDomain(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteDomain(cfgName, ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/proxy/control"); + model.addAttribute("urlPrefix","/proxy/control/domain"); model.addAttribute("requiresPermissionPrefix","control:domain"); return "redirect:" + adminPath +"/proxy/control/domain/list?functionId="+functionId; } @@ -97,7 +97,7 @@ public class ControlController extends CommonController { // @RequiresPermissions("control:ip:audit") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/proxy/control"); + redirectAttributes.addAttribute("urlPrefix","/proxy/control/ip"); redirectAttributes.addAttribute("requiresPermissionPrefix","control:ip"); return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId(); } @@ -105,7 +105,7 @@ public class ControlController extends CommonController { // @RequiresPermissions("control:domain:audit") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/proxy/control"); + redirectAttributes.addAttribute("urlPrefix","/proxy/control/domain"); redirectAttributes.addAttribute("requiresPermissionPrefix","control:domain"); return "redirect:" + adminPath +"/proxy/control/domain/list?functionId="+cfg.getFunctionId(); } 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 eb61e8519..3e4b9b939 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 @@ -29,7 +29,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions(value={"intercept:ip:config","intercept:ip:audit"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/ip"); model.addAttribute("requiresPermissionPrefix","intercept:ip"); return "/cfg/common/ipList"; } @@ -37,7 +37,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions(value={"intercept:domain:config","intercept:domain:audit"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/domain"); model.addAttribute("requiresPermissionPrefix","intercept:domain"); return "/cfg/common/domainList"; } @@ -45,7 +45,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions(value={"intercept:ip:config"}) public String ipForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName,model, ids, functionId, entity); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/ip"); model.addAttribute("requiresPermissionPrefix","intercept:ip"); return "/cfg/common/ipForm"; } @@ -53,7 +53,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions(value={"intercept:domain:config"}) public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/domain"); model.addAttribute("requiresPermissionPrefix","intercept:domain"); return "/cfg/common/domainForm"; } @@ -71,7 +71,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions("intercept:ip:config") public String deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteIp(cfgName,ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/ip"); model.addAttribute("requiresPermissionPrefix","intercept:ip"); return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId; } @@ -79,7 +79,7 @@ public class InterceptController extends CommonController{ @RequiresPermissions("intercept:domain:config") public String deleteDomain(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { this._deleteDomain(cfgName, ids, compileIds, functionId, model); - model.addAttribute("urlPrefix","/proxy/intercept"); + model.addAttribute("urlPrefix","/proxy/intercept/domain"); model.addAttribute("requiresPermissionPrefix","intercept:domain"); return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+functionId; } @@ -87,7 +87,7 @@ public class InterceptController extends CommonController{ // @RequiresPermissions("intercept:ip:audit") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/proxy/intercept"); + redirectAttributes.addAttribute("urlPrefix","/proxy/intercept/ip"); redirectAttributes.addAttribute("requiresPermissionPrefix","intercept:ip"); return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId(); } @@ -95,7 +95,7 @@ public class InterceptController extends CommonController{ // @RequiresPermissions("intercept:domain:audit") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); - redirectAttributes.addAttribute("urlPrefix","/proxy/intercept"); + redirectAttributes.addAttribute("urlPrefix","/proxy/intercept/domain"); redirectAttributes.addAttribute("requiresPermissionPrefix","intercept:domain"); return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+cfg.getFunctionId(); } diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java index 767b08a9e..46af2df89 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -11,6 +11,7 @@ import com.nis.web.dao.MyBatisDao; public interface PolicyGroupInfoDao extends CrudDao { List findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo); List findPolicyGroupInfos(); + List findPolicyGroupInfosByType(int groupType); PolicyGroupInfo getById(int id); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index 4733ac807..21707072b 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -66,6 +66,12 @@ FROM policy_group_info r where r.is_valid=1 + insert into policy_group_info( IS_VALID, diff --git a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml index 2e5cc4590..811ed51f7 100644 --- a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml @@ -121,6 +121,77 @@ #{cfgRegionCode,jdbcType=INTEGER} ) + + + + SELECT LAST_INSERT_ID() + + insert into area_ip_cfg ( + CFG_DESC, + 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, + function_id, + ip_type, + src_ip_address, + ip_pattern, + port_pattern, + src_port, + protocol, + protocol_id, + direction, + dest_port, + dest_ip_address, + cfg_type, + cfg_region_code + )values ( + #{cfgDesc,jdbcType=VARCHAR}, + #{action,jdbcType=INTEGER}, + 0, + 0, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, + #{editorId,jdbcType=INTEGER}, + #{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER}, + #{auditTime,jdbcType=TIMESTAMP}, + #{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER}, + #{compileId,jdbcType=INTEGER}, + #{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR}, + #{attribute,jdbcType=VARCHAR}, + #{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR}, + #{functionId,jdbcType=INTEGER}, + #{ipType,jdbcType=INTEGER}, + #{srcIpAddress,jdbcType=VARCHAR}, + #{ipPattern,jdbcType=INTEGER}, + #{portPattern,jdbcType=INTEGER}, + #{srcPort,jdbcType=VARCHAR}, + #{protocol,jdbcType=INTEGER}, + #{protocolId,jdbcType=INTEGER}, + #{direction,jdbcType=INTEGER}, + #{destPort,jdbcType=VARCHAR}, + #{destIpAddress,jdbcType=VARCHAR}, + #{cfgType,jdbcType=VARCHAR}, + #{cfgRegionCode,jdbcType=INTEGER} + ) + 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 dc4c458b4..553bafe0c 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -35,13 +35,13 @@ - - + + @@ -49,7 +49,7 @@ DIRECTION,PROTOCOL,PROTOCOL_ID,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,FUNCTION_ID,RATELIMIT + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID @@ -59,7 +59,8 @@ ${page.alias}.DIRECTION as direction,${page.alias}.PROTOCOL as protocol,${page.alias}.PROTOCOL_ID as protocolId,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit, ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime, ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify, - ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.RATELIMIT AS ratelimit + ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.RATELIMIT AS ratelimit, + ${page.alias}.DNS_STRATEGY_ID AS dnsStrategyId r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, @@ -67,7 +68,8 @@ r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, - r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.AREA_EFFECTIVE_IDS AS areaEffectiveIds,r.FUNCTION_ID as functionId,r.RATELIMIT AS ratelimit + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.AREA_EFFECTIVE_IDS AS areaEffectiveIds,r.FUNCTION_ID as functionId,r.RATELIMIT AS ratelimit, + r.DNS_STRATEGY_ID AS dnsStrategyId @@ -81,7 +83,7 @@ AUDITOR_ID,AUDIT_TIME,SERVICE_ID, REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE, CLASSIFY,ATTRIBUTE,LABLE, - AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT + AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID #{cfgDesc,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{cfgType,jdbcType=VARCHAR}, @@ -93,7 +95,8 @@ #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, - #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=INTEGER} + #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=INTEGER}, + #{dnsStrategyId,jdbcType=INTEGER} diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 6797181dc..959dcb50a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -55,7 +55,7 @@ <%-- --%> @@ -71,7 +71,7 @@
- + @@ -114,8 +114,8 @@
- - + + @@ -126,9 +126,9 @@
    -
    • -
    • -
    • +
    • +
    • +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index eefc5d7fa..2fae455fb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -41,7 +41,10 @@ $(function(){ $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); }, submitHandler: function(form){ - + if($("#dnsStrategyId")){ + $("#cfgRegionCode").val($("#cfgRegionCodeMaat").val()); + $("#cfgType").val($("#cfgTypeMaat").val()); + } //loading('onloading...'); form.submit(); }, @@ -67,7 +70,7 @@ $(function(){
-
+
@@ -145,6 +148,23 @@ $(function(){ <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + +
+
+
+ +
+ +
+
+
+
+ <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 11cf0088f..3aa30ba30 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -63,12 +63,16 @@ - + + + + +