diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index b752d0659..6e3221bcc 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -60,10 +60,11 @@ public class AvContentController extends BaseController { @ModelAttribute("voipAccountIds")String voipAccountIds){ try{ avContentCfgService.saveOrUpdateAvVoip(cfg,voipIpIds,voipAccountIds); + addMessage(model,"save_success"); }catch(Exception e){ logger.error("voip信息保存失败",e); e.printStackTrace(); - addMessage(model,"save_voip_failed"); + addMessage(model,"save_failed"); } return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId(); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index c014a9f6d..8dafbddb0 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -554,4 +554,11 @@ notfound_page=not found page no_permission=permission denied param_error=param error,server can't analyze request_service_failed=request server failed -request_error=request error \ No newline at end of file +request_error=request error +av_voip_ip_title=voip Ip +av_voip_account_title=voip Account +ip_pattern=ip Pattern +port_pattern=port Pattern +port_mask=port Mask +ip_range=ip Range +ip_subnet=Subnet \ 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 6733dc3a3..a94d90ebe 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -380,4 +380,11 @@ notfound_page=not found page no_permission=permission denied param_error=param error,server can't analyze request_service_failed=request server failed -request_error=request error \ No newline at end of file +request_error=request error +av_voip_ip_title=voip Ip +av_voip_account_title=voip Account +ip_pattern=ip Pattern +port_pattern=port Pattern +port_mask=port Mask +ip_range=ip Range +ip_subnet=Subnet \ 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 87402523c..bd9d275e6 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -556,12 +556,12 @@ no_permission=\u6743\u9650\u4E0D\u8DB3 param_error=\u53C2\u6570\u6709\u8BEF\uFF0C\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790\u3002 request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25 request_error=\u8BF7\u6C42\u9519\u8BEF -av_voip_ip_title=VoIP IP -av_voip_account_title=VoIP\u8D26\u53F7 -ip_pattern=IP \u683C\u5F0F +av_voip_ip_title=voip Ip +av_voip_account_title=voip\u8D26\u53F7 +ip_pattern=ip \u683C\u5F0F port_pattern=\u7AEF\u53E3\u683C\u5F0F port_mask=port Mask -ip_range=IP Range +ip_range=ip Range ip_subnet=Subnet http_ip_title=HTTP IP\u914D\u7F6E http_url_title=HTTP URL \u914D\u7F6E diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index 79e419b4a..6ce612d88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -13,7 +13,19 @@ border:1px solid #eeeeee