diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java index c30aafb67..7350a30da 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java @@ -53,15 +53,13 @@ public class SpecificServiceHostCfgService extends BaseService{ public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) { SysUser user = UserUtils.getUser(); String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意 - String defaultIpMask = ""; - if(specificServiceHostCfg.getIpType().equals(4)){ - defaultIpMask = "255.255.255.255"; //255.255.255.255表示无掩码 - } + String defaultIpMask = "255.255.255.255";//255.255.255.255表示无掩码 if(specificServiceHostCfg.getIpType().equals(6)){ + defaultIp = "::"; //缺省:: defaultIpMask = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; //FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码 } String defaultPortMask = "65535"; //65535表示无掩码 - //ip地址默认 缺省0.0.0.0值表示任意 + //ip地址默认 Ipv4缺省0.0.0.0,ipv6缺省为:: if(StringUtil.isBlank(specificServiceHostCfg.getSrcIp())){ specificServiceHostCfg.setSrcIp(defaultIp); } diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 21807bcba..3c41725f8 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -72,7 +72,7 @@ label.errorShow { } }); return flagTypeSame; - },"请选择正确的数据类型"); + },""); //与下级是否一致 jQuery.validator.addMethod("childrenType",function(value,element){ var flagChildTypeSame=false; @@ -87,7 +87,7 @@ label.errorShow { } }); return flagChildTypeSame; - },"该配置包含下级配置,数据类型更改后与子类不一致"); + },""); //校验叶子节点有下级不得更改为叶子节点 jQuery.validator.addMethod("leafChange",function(value,element){ @@ -102,54 +102,19 @@ label.errorShow { } }); return flagLeafChange; - },"该配置包含下级配置,不得改为叶子节点"); + },""); $("#name").focus(); validateForm=$("#inputForm").validate({ rules: { 'itemCode':{ - required:true, remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}', - maxlength:64 - }, - 'itemValue':{ - required:true, - maxlength:64 - }, - 'itemType':{ - childrenType:true, - //remote:'${ctx}/basics/serviceDictInfo/ajaxChildrenType?parent=${serviceDictInfo.serviceDictId}', - typeSame:true - }, - 'isLeaf':{ - leafChange:true - }, - 'itemDesc':{ - maxlength:128 } - }, messages: { 'itemCode':{ - required:'', remote:'', - maxlength:'' - }, - 'itemValue':{ - required:'', - maxlength:'' - }, - 'itemType':{ - childrenType:'', - //remote:'', - typeSame:'' - }, - 'isLeaf':{ - leafChange:'' - }, - 'itemDesc':{ - maxlength:'' - } + } }, submitHandler: function(form){ @@ -227,7 +192,7 @@ label.errorShow {
- @@ -241,19 +206,19 @@ label.errorShow {
- +
- +
- + @@ -263,7 +228,7 @@ label.errorShow {
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 1ff282582..e4f8c8809 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -40,7 +40,7 @@ } }); return flag; - },"请选择正确的数据类型"); + },""); //校验叶子节点,有下级不得更改为叶子节点 jQuery.validator.addMethod("leafChange",function(value,element){ @@ -55,52 +55,26 @@ } }); return flag; - },"该配置包含下级配置,不得改为叶子节点"); + },""); $("#name").focus(); validateForm = $("#inputForm").validate({ rules: { 'itemCode':{ - required:true, - remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}', - maxlength:64 - }, - 'itemValue':{ - required:true, - maxlength:64 + remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}' }, 'itemType':{ - remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}', - typeSame:true - }, - 'isLeaf':{ - leafChange:true - }, - 'itemDesc':{ - maxlength:128 + remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}' } }, messages: { 'itemCode':{ - required:'', - remote:'', - maxlength:'' - }, - 'itemValue':{ - required:'', - maxlength:'' + remote:'' }, 'itemType':{ - remote:'', - typeSame:'' - }, - 'isLeaf':{ - leafChange:'' - }, - 'itemDesc':{ - maxlength:'' - } + remote:'' + } }, @@ -176,7 +150,7 @@
- @@ -190,13 +164,13 @@
- +
- +
@@ -206,7 +180,7 @@
- + @@ -217,7 +191,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 4971c0fd4..1e05e24a6 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -44,7 +44,7 @@ if(isinit){ confirmx("", url+"&mulitId="+mulitId); }else{ - top.$.jBox.tip("", ""); + top.$.jBox.tip("", ""); } }else{ top.$.jBox.tip("", ""); @@ -68,7 +68,7 @@ if(${fns:getUser().loginId=='admin'}){ confirmx("", url+"&sysDictId="+cked.val()); }else{ - top.$.jBox.tip("", ""); + top.$.jBox.tip("", ""); } } diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index 7615cecea..37bb1d7e9 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -8,24 +8,6 @@ -