diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index e995a0877..76d6d8c20 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -29,8 +29,6 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/systemService") public class SystemServiceController extends BaseController { - //TODO 异常处理 - @ModelAttribute public SystemServiceInfo get(Long id) { if (!StringUtil.isEmpty(id)){ @@ -119,9 +117,14 @@ public class SystemServiceController extends BaseController { @RequestMapping(value = "delete") public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { systemServiceService.deleteService(systemServiceInfo); - Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); - model.addAttribute("page", page); - addMessage(model, "删除成功"); + try { + Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); + model.addAttribute("page", page); + addMessage(model, "删除成功"); + } catch (Exception e) { + addMessage(model, "删除失败:" + e.getMessage()); + e.printStackTrace(); + } return "/systemService/list"; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7131aa19a..e88811496 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor examine_manage=examine manage audit_manage=audit manage log_search=log search - +sysService_manage=system service manage +service_manage=service type manage +system_service_manage=system service type manage #============menu end====================== #============yewu begin====================== @@ -140,4 +142,35 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord -#==========message end===================== \ No newline at end of file +#==========message end===================== + +#==========yewuliexingguanli begin===================== +act=action +block=block +monitor=monitor +block_white_list=block white list +monitor_white_list=monitor white list +block_monitor_white_list=block monitor white list +grey_list=grey list +type=type +single_domain=single domain +multi_domain=multi domain +special_service=special service +service_name=service name +service_id=service ID +repeat=repeat +enter_error=enter a error +single_service_message=single domain services can only associate one table +special_service_message=special services can only associate one table +table_name=table name +table_type=table type +string=string +number=number +strong_string=strong string +table_des=table_describe +detail=detail +datebase_table=datebase table +fill_all=fill in all +describe=describe +back=back +#==========yewuliexingguanli end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 7169f6d87..e706d890d 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor examine_manage=examine manage audit_manage=audit manage log_search=log search - +sysService_manage=system service manage +service_manage=service type manage +system_service_manage=system service type manage #============menu end====================== #============yewu begin====================== @@ -140,4 +142,35 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord -#==========message end===================== \ No newline at end of file +#==========message end===================== + +#==========yewuliexingguanli begin===================== +act=action +block=block +monitor=monitor +block_white_list=block white list +monitor_white_list=monitor white list +block_monitor_white_list=block monitor white list +grey_list=grey list +type=type +single_domain=single domain +multi_domain=multi domain +special_service=special service +service_name=service name +service_id=service ID +repeat=repeat +enter_error=enter a error +single_service_message=single domain services can only associate one table +special_service_message=special services can only associate one table +table_name=table name +table_type=table type +string=string +number=number +strong_string=strong string +table_des=table_describe +detail=detail +datebase_table=datebase table +fill_all=fill in all +describe=describe +back=back +#==========yewuliexingguanli 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 fd0eb3da3..e8cb48922 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -87,7 +87,9 @@ audit_manage=\u5ba1\u8ba1\u7ba1\u7406 log_search=\u65e5\u5fd7\u68c0\u7d22 text_control=\u6587\u672c\u5e38\u89c4\u7ba1\u63a7 text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b - +sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406 +service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406 +system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406 #==========menu end===================== #==========yewu zidian begin===================== @@ -139,4 +141,35 @@ confirm_message=\u786e\u5b9a\u5417\uff1f fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 -#==========message end===================== \ No newline at end of file +#==========message end===================== + +#==========yewuliexingguanli begin===================== +act=\u52a8\u4f5c +block=\u963b\u65ad +monitor=\u76d1\u6d4b +block_white_list=\u5c01\u5835\u767d\u540d\u5355 +monitor_white_list=\u76d1\u6d4b\u767d\u540d\u5355 +block_monitor_white_list=\u5c01\u5835\u76d1\u6d4b\u767d\u540d\u5355 +grey_list=\u7070\u540d\u5355 +type=\u7c7b\u578b +single_domain=\u5355\u57df +multi_domain=\u591a\u57df +special_service=\u7279\u5b9a\u670d\u52a1 +service_name=\u4e1a\u52a1\u540d\u79f0 +service_id=\u4e1a\u52a1ID +repeat=\u91cd\u590d +enter_error=\u8f93\u5165\u9519\u8bef +single_service_message=\u5355\u57df\u4e1a\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868 +special_service_message=\u7279\u5b9a\u670d\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868 +table_name=\u8868\u540d +table_type=\u8868\u7c7b\u578b +string=\u5b57\u7b26\u4e32 +number=\u6570\u503c +strong_string=\u589e\u5f3a\u5b57\u7b26\u4e32 +table_des=\u8868\u63cf\u8ff0 +detail=\u8be6\u60c5 +datebase_table=\u6570\u636e\u5e93\u8868 +fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5 +describe=\u63cf\u8ff0 +back=\u8fd4\u56de +#==========yewuliexingguanli end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index 03ed0d6e5..8b098b37c 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -8,6 +8,7 @@