diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 7131aa19a..756422b52 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
+black=black
+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..87b77a81d 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
+black=black
+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..34f007de2 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
+black=\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..74c2916cf 100644
--- a/src/main/webapp/WEB-INF/views/systemService/form.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp
@@ -29,20 +29,20 @@
},
messages: {
'serviceName':{
- required:'必填项'
+ required:''
},
'serviceId':{
- required:'必填项',
- remote:'重复的serviceId'
+ required:'',
+ remote:''+'serviceId'
},
'action':{
- required:'必填项'
+ required:''
},
'serviceType':{
- required:'必填项'
+ required:''
},
'serviceDesc':{
- required:'必填项'
+ required:''
}
},
submitHandler: function(form){
@@ -57,7 +57,7 @@
}
}
if (flag) {
- loading('正在提交,请稍等...');
+ loading('LOADING...');
$("[disabled=disabled]").attr("disabled", false);
form.submit();
} else {
@@ -67,7 +67,7 @@
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
- $("#messageBox").text("输入有误,请先更正。");
+ $("#messageBox").text("");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
error.appendTo(element.parent().parent());
} else {
@@ -91,7 +91,7 @@
$("#addBtn").attr("disabled", true);
} else if ($(obj).val() == '1') {
if ($(".table-list").length > 1) {
- alert("单域业务只能关联一个表");
+ alert('');
$(obj).val(v);
} else if ($(".table-list").length == 1) {
$("#addBtn").attr("disabled", true);
@@ -102,7 +102,7 @@
$("#addBtn").attr("disabled", false);
} else if ($(obj).val() == '3') {
if ($(".table-list").length > 1) {
- alert("特定服务只能关联一个表");
+ alert('');
$(obj).val(v);
} else if ($(".table-list").length == 1) {
$("#addBtn").attr("disabled", true);
@@ -156,25 +156,25 @@
'
' +
'' +
'' +
- '*表名: ' +
+ '*'+''+': ' +
' ' +
- '*表类型: ' +
+ '*'+''+': ' +
' ' +
'' +
' ' +
- '*MAAT表名: ' +
+ '*MAAT '+''+': ' +
'' +
'
' +
'' +
- '*表描述: ' +
+ '*'+''+': ' +
'' +
- '' +
+ '' +
'
' +
''
);
@@ -200,11 +200,11 @@
-
+
- 系统业务管理
+
@@ -212,7 +212,7 @@
@@ -224,46 +224,46 @@
@@ -301,14 +301,14 @@