diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index d995d1eaf..9981c3d29 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -223,7 +223,6 @@ public class ServiceDictInfoController extends BaseController { * @param response * @return */ - @RequiresPermissions("user") @ResponseBody @RequestMapping(value = "treeData") public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index d8379797c..82c6471e0 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -221,7 +221,6 @@ public class SysDictInfoController extends BaseController { * @param response * @return */ - @RequiresPermissions("user") @ResponseBody @RequestMapping(value = "treeData") public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index 4ada24610..3b31db9fe 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -134,7 +134,7 @@ public class SpecificServiceCfgController extends BaseController { || specificServiceCfg.getParent().getSpecServiceId() == 0) { SpecificServiceCfg parent = new SpecificServiceCfg(); parent.setSpecServiceId(0); - parent.setSpecServiceName("根节点"); + parent.setSpecServiceName("root_node"); specificServiceCfg.setParent(parent); } model.addAttribute("specificServiceCfg", specificServiceCfg); @@ -157,10 +157,10 @@ public class SpecificServiceCfgController extends BaseController { RedirectAttributes redirectAttributes,Integer oldId) { try { specificServiceCfgService.saveOrUpdate(specificServiceCfg,oldId); - addMessage(redirectAttributes, "保存成功"); + addMessage(redirectAttributes, "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "保存失败!"); + addMessage(redirectAttributes, "save_failed"); } return "redirect:" + adminPath + "/specific/specificServiceCfg/list"; } @@ -177,10 +177,10 @@ public class SpecificServiceCfgController extends BaseController { public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){ try{ specificServiceCfgService.delete(mulitId); - addMessage(redirectAttributes,"删除成功"); + addMessage(redirectAttributes,"delete_success"); }catch (Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"删除失败"); + addMessage(redirectAttributes,"delete_failed"); } return "redirect:"+adminPath+"/specific/specificServiceCfg/list"; @@ -193,7 +193,6 @@ public class SpecificServiceCfgController extends BaseController { * @param response * @return */ - @RequiresPermissions("user") @ResponseBody @RequestMapping(value = "treeData") public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response){ @@ -201,7 +200,7 @@ public class SpecificServiceCfgController extends BaseController { Map map2 = Maps.newHashMap(); map2.put("id", 0); map2.put("pId", 0); - map2.put("name","根节点"); + map2.put("name","root_node"); //map2.put("placeholder","0"); mapList.add(map2); List list = specificServiceCfgService.findAllSpecificServiceCfg(new SpecificServiceCfg(),""); diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java index 075082734..704ea754a 100644 --- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -170,7 +170,7 @@ public class ServiceDictInfoService extends BaseService{ * 新增或修改业务字典表(添加层级改变) * @param serviceDictInfo */ - @Transactional + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(ServiceDictInfo serviceDictInfo) { if(serviceDictInfo.getParent()==null ||(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()==null) @@ -237,7 +237,7 @@ public class ServiceDictInfoService extends BaseService{ * 删除 * @param serviceDictInfo */ - @Transactional(readOnly = false) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void deleteDict(String mulitId) { String[] ids = mulitId.split(","); diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index b62ef2c68..c71841b04 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -145,6 +145,7 @@ public class SysDictInfoService extends BaseService{ * 新增或修改生效范围字典表 * @param sysDictInfo */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(SysDictInfo sysDictInfo) { if(sysDictInfo.getParent()==null ||(sysDictInfo.getParent()!=null&&sysDictInfo.getParent().getSysDictId()==null) @@ -215,7 +216,7 @@ public class SysDictInfoService extends BaseService{ * 删除 * @param sysDictInfo */ - @Transactional(readOnly = false) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void deleteDict(String mulitId) { String[] ids = mulitId.split(","); for(String id:ids){ diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java index ebdb221e2..4e94fdd51 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java @@ -3,8 +3,10 @@ package com.nis.web.service.specific; import java.util.Date; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.beust.jcommander.internal.Lists; import com.nis.domain.Page; @@ -59,6 +61,7 @@ public class SpecificServiceCfgService extends BaseService{ * 保存或修改 * @param specificServiceCfg */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(SpecificServiceCfg specificServiceCfg, Integer oldId) { if(specificServiceCfg.getGroupId()==null){ specificServiceCfg.setGroupId(0); @@ -88,8 +91,10 @@ public class SpecificServiceCfgService extends BaseService{ /** * 删除 * @param specificServiceCfg + * @throws Exception */ - public void delete(String mulitId) { + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void delete(String mulitId){ String[] ids = mulitId.split(","); for(String id:ids){ if (!id.equals("")) { 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 db8a99307..c30aafb67 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java @@ -3,9 +3,11 @@ package com.nis.web.service.specific; import java.util.Date; import java.util.List; + import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.nis.domain.Page; import com.nis.domain.SysUser; @@ -47,6 +49,7 @@ public class SpecificServiceHostCfgService extends BaseService{ * 新增或修改 * @param specificServiceHostCfg */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) { SysUser user = UserUtils.getUser(); String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意 @@ -112,6 +115,7 @@ public class SpecificServiceHostCfgService extends BaseService{ * 删除 * @param mulitId */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(String mulitId) { String[] ids = mulitId.split(","); for(String hostId:ids){ diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index fe5c6bb3e..093806843 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -130,7 +130,16 @@ ssl_feature_monitor=ssl feature monitor ssl_sni_monitor=ssl sni monitor ssl_address_monitor=ssl address monitor specific_service_host_cfg=specific service host cfg - +original_remain_monitor=original packet remain monitor +ip_multi_domain_monitor=IP multi domain monitor +website_multi_domain_monitor=website multi domain monitor +request_header_monitor=request header domain monitor +response_header_monitor=response header domian monitor +ip_website_keyword_monitor=IP+website keyword monitor +request_header_keyword_monitor=request header domain keyword monitor +response_header_keyword_monitor=response header domain keyword monitor +mail_multi_monitor=mail multi domain monitor +mail_key_monitor=mail keyword monitor #============menu end====================== #============yewu begin====================== @@ -340,6 +349,6 @@ protocol_id=protocol ID protocol_name=protocol name group_id=group ID input_protocol_id=please enter protocol ID -input_integer=please enter integer +input_integer=please enter right integer protocol_desc=protocol description #==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4597af09f..5e3e1fd78 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -126,7 +126,19 @@ ssl_feature_monitor=SSL\u8bc1\u4e66\u7279\u5f81\u76d1\u6d4b ssl_sni_monitor=SSL\uff08SNI\uff09\u76d1\u6d4b ssl_address_monitor=SSL\u5730\u5740\u76d1\u6d4b specific_service_host_cfg=\u7279\u5b9a\u670d\u52a1\u670d\u52a1\u5668IP\u7ba1\u7406 - +original_remain_monitor=\u539f\u59cb\u5305\u7559\u5b58\u76d1\u6d4b +ip_multi_domain_monitor=IP\u5730\u5740\u591a\u57df\u76d1\u6d4b +website_multi_domain_monitor=\u7f51\u7ad9\u591a\u57df\u76d1\u6d4b +request_header_monitor=\u8bf7\u6c42\u5934\u57df\u76d1\u6d4b +response_header_monitor=\u5e94\u7b54\u5934\u57df\u76d1\u6d4b +ip_website_keyword_monitor=IP+\u7f51\u9875\u5173\u952e\u5b57\u76d1\u6d4b +request_header_keyword_monitor=\u8bf7\u6c42\u5934\u57df\u5173\u952e\u5b57\u76d1\u6d4b +response_header_keyword_monitor=\u5e94\u7b54\u5934\u57df\u5173\u952e\u5b57\u76d1\u6d4b +mail_multi_monitor=\u90ae\u4ef6\u591a\u57df\u76d1\u6d4b +mail_key_monitor=\u90ae\u4ef6\u5173\u952e\u5b57\u76d1\u6d4b +file_transfer_multi_monitor=\u6587\u4ef6\u4f20\u8f93\u591a\u57df\u76d1\u6d4b +ftp_multi_monitor=FTP\u591a\u57df\u76d1\u6d4b +ssl_multi_monitor=SSL\u591a\u57df\u76d1\u6d4b #==========menu end===================== #==========yewu zidian begin===================== @@ -335,6 +347,6 @@ protocol_id=\u534f\u8baeID protocol_name=\u534f\u8bae\u540d\u79f0 group_id=maat\u7aef\u914d\u7f6e\u5206\u7ec4ID input_protocol_id=\u8bf7\u8f93\u5165\u534f\u8baeID -input_integer=\u8bf7\u8f93\u5165\u6574\u6570 +input_integer=\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u6574\u6570\u503c protocol_desc=\u534f\u8bae\u63cf\u8ff0 #==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index b374af6e0..1affa6256 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -134,10 +134,12 @@ 'itemCode':{ //isLevelNoSure:true, required:true, - remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}' + remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}', + maxlength:64 }, 'itemValue':{ - required:true + required:true, + maxlength:64 }, 'itemType':{ typeSame:true, @@ -146,6 +148,9 @@ 'isLeaf':{ leafChange:true //leafHasTree:true + }, + 'itemDesc':{ + maxlength:128 } }, @@ -156,10 +161,12 @@ 'itemCode':{ //isLevelNoSure:"选择此配置上下层级数将超过四级", required:'', - remote:'' + remote:'', + maxlength:'' }, 'itemValue':{ - required:'' + required:'', + maxlength:'' }, 'itemType':{ typeSame:'', @@ -168,15 +175,14 @@ 'isLeaf':{ leafChange:'' //leafHasTree:'该配置上级为根节点,不得设为叶子节点' - } + }, + 'itemDesc':{ + maxlength:'' + } }, submitHandler: function(form){ - var is_level_wrong=errorShow(); - if(!is_level_wrong){ - return false; - $(".errorShow").show(); - } + errorShow(); loading(''); form.submit(); }, @@ -258,7 +264,7 @@
- +
@@ -286,7 +292,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 05f507c17..d2737afc4 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -149,7 +149,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index a0c77b625..db461d22c 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -108,10 +108,12 @@ }, 'itemCode':{ required:true, - remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}' + remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}', + maxlength:64 }, 'itemValue':{ - required:true + required:true, + maxlength:64 }, 'itemType':{ typeSame:true, @@ -120,6 +122,9 @@ 'isLeaf':{ leafChange:true //leafHasTree:true + }, + 'itemDesc':{ + maxlength:128 } }, @@ -129,10 +134,12 @@ }, 'itemCode':{ required:'', - remote:'' + remote:'', + maxlength:'' }, 'itemValue':{ - required:'' + required:'', + maxlength:'' }, 'itemType':{ typeSame:'', @@ -141,7 +148,11 @@ 'isLeaf':{ leafChange:'' //leafHasTree:'该配置上级为根节点,不得设为叶子节点' - } + }, + 'itemDesc':{ + maxlength:'' + } + }, submitHandler: function(form){ @@ -225,7 +236,7 @@
- +
@@ -260,7 +271,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index d43e26d13..69496e598 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -152,7 +152,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index b838a183f..49ed57d22 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -8,7 +8,7 @@