diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index 300f5227b..5fb39f261 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -173,7 +173,8 @@ group_id, compile_Id, cfg_region_code, - user_region + user_region, + port )values ( #{cfgId,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR}, @@ -202,8 +203,8 @@ #{groupId, jdbcType=INTEGER}, #{compileId,jdbcType=INTEGER}, #{cfgRegionCode,jdbcType=INTEGER}, - #{userRegion,jdbcType=VARCHAR} - + #{userRegion,jdbcType=VARCHAR}, + #{port,jdbcType=VARCHAR} ) @@ -261,6 +262,9 @@ port=#{port, jdbcType=VARCHAR}, + + direction=#{direction, jdbcType=INTEGER}, + ip_type=#{ipType, jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java index 1b2f13cea..b7b8630e6 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java @@ -89,7 +89,6 @@ public class PxyObjSpoofingIpPoolService extends BaseService{ setAreaEffectiveIds(entity); //新增 if(StringUtil.isEmpty(entity.getCfgId())){ - entity.initDefaultValue(); entity.setCreatorId(UserUtils.getUser().getId()); entity.setCreateTime(createTime); //调用服务接口获取compileId diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp index 87b48bdcc..7abc1c023 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp @@ -18,7 +18,10 @@ $(function(){ }); */ if("${_cfg.groupType}" == 4){ - $("#asnNo").parents(".form-group").removeClass("hidden"); + $(".asnNo").removeClass("hidden"); + } + if("${_cfg.groupType}" == 6){ + $(".groupType").removeClass("hidden"); } /* $("#groupType").on("change",function(){ if($(this).val() != 4){ @@ -36,6 +39,12 @@ $(function(){ } }, submitHandler: function(form){ + if("${_cfg.groupType}" == 4){ + $(".asnNo").removeClass("hidden"); + } + if("${_cfg.groupType}" == 6){ + $("#asnNo").val($(".groupType").find("#asnNo").val()); + } loading('onloading...'); form.submit(); }, @@ -115,13 +124,30 @@ $(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index 5c1b28b69..c7cc37df9 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -264,6 +264,9 @@ + <%-- + + --%> @@ -282,14 +285,31 @@ - - - - + + + + + + + + + + + + ${cfg.asnNo} + <%-- + + + + ${ipTypeC.itemValue } + + + + --%> ${fns:abbr(cfg.description,20)} ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp index ab72302e6..fe68ca6d2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp @@ -14,6 +14,12 @@ $(function(){ $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); }, submitHandler: function(form){ + var groupType = $("#group").find("option:selected").attr("groupType"); + if(groupType==0){//snat + $("#direction").val(2); + }else{//dnat + $("#direction").val(1); + } loading('onloading...'); form.submit(); }, @@ -46,7 +52,7 @@ $(function(){ - + @@ -83,10 +89,9 @@ $(function(){
- - +
@@ -130,8 +135,7 @@ $(function(){