Procházet zdrojové kódy

调度中心与执行器通讯规范为双向restful,方便跨语言,以及第三方执行器实现;通讯组件xxl-rpc方案调整为Jetty+Gson方案;

xuxueli před 4 roky
rodič
revize
6343f4b030

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java

@@ -66,7 +66,7 @@ public class JobGroupController {
 			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
 		}
 		if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appName_length") );
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
 		}
 		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
 			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
@@ -95,7 +95,7 @@ public class JobGroupController {
 			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
 		}
 		if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appName_length") );
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
 		}
 		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
 			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );

+ 2 - 2
xxl-job-admin/src/main/resources/i18n/message_en.properties

@@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=Manually registration type, the machine address
 jobgroup_field_registryList=machine address
 jobgroup_field_registryList_unvalid=registry machine address is illegal
 jobgroup_field_registryList_placeholder=Please enter the machine address, if there are more than one comma separated
-jobgroup_field_appName_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen.
-jobgroup_field_appName_length=AppName length is limited to 4~64
+jobgroup_field_appname_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen.
+jobgroup_field_appname_length=AppName length is limited to 4~64
 jobgroup_field_title_length=Title length is limited to 4~12
 jobgroup_field_order_digits=Please enter a positive integer
 jobgroup_field_orderrange=Order is limited to 1~1000

+ 2 - 2
xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties

@@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=手动录入注册方式,机器地址不可
 jobgroup_field_registryList=机器地址
 jobgroup_field_registryList_unvalid=机器地址格式非法
 jobgroup_field_registryList_placeholder=请输入执行器地址列表,多地址逗号分隔
-jobgroup_field_appName_limit=限制以小写字母开头,由小写字母、数字和中划线组成
-jobgroup_field_appName_length=AppName长度限制为4~64
+jobgroup_field_appname_limit=限制以小写字母开头,由小写字母、数字和中划线组成
+jobgroup_field_appname_length=AppName长度限制为4~64
 jobgroup_field_title_length=名称长度限制为4~12
 jobgroup_field_order_digits=请输入整数
 jobgroup_field_orderrange=取值范围为1~1000

+ 2 - 2
xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties

@@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=手動登錄注冊方式,機器地址不可
 jobgroup_field_registryList=機器地址
 jobgroup_field_registryList_unvalid=機器地址格式非法
 jobgroup_field_registryList_placeholder=請輸入執行器地址列表,多個地址請以逗號分隔
-jobgroup_field_appName_limit=限制以小寫字母開頭,由小寫字母、數字和中划線組成
-jobgroup_field_appName_length=AppName長度限制為4~64
+jobgroup_field_appname_limit=限制以小寫字母開頭,由小寫字母、數字和中划線組成
+jobgroup_field_appname_length=AppName長度限制為4~64
 jobgroup_field_title_length=名稱長度限制為4~12
 jobgroup_field_order_digits=請輸入整數
 jobgroup_field_orderrange=取值範圍為1~1000

+ 5 - 5
xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js

@@ -186,7 +186,7 @@ $(function() {
 		var length = value.length;
 		var valid = /^[a-z][a-zA-Z0-9-]*$/;
 		return this.optional(element) || valid.test(value);
-	}, I18n.jobgroup_field_appName_limit );
+	}, I18n.jobgroup_field_appname_limit );
 
 	$('.add').on('click', function(){
 		$('#addModal').modal({backdrop: false, keyboard: false}).modal('show');
@@ -209,8 +209,8 @@ $(function() {
 		messages : {
 			appName : {
 				required : I18n.system_please_input+"AppName",
-				rangelength: I18n.jobgroup_field_appName_length ,
-				myValid01: I18n.jobgroup_field_appName_limit
+				rangelength: I18n.jobgroup_field_appname_length ,
+				myValid01: I18n.jobgroup_field_appname_limit
 			},
 			title : {
 				required : I18n.system_please_input + I18n.jobgroup_field_title ,
@@ -306,8 +306,8 @@ $(function() {
 		messages : {
             appName : {
                 required : I18n.system_please_input+"AppName",
-                rangelength: I18n.jobgroup_field_appName_length ,
-                myValid01: I18n.jobgroup_field_appName_limit
+                rangelength: I18n.jobgroup_field_appname_length ,
+                myValid01: I18n.jobgroup_field_appname_limit
             },
             title : {
                 required : I18n.system_please_input + I18n.jobgroup_field_title ,