Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
6343f4b0
提交
6343f4b0
authored
4月 11, 2020
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
调度中心与执行器通讯规范为双向restful,方便跨语言,以及第三方执行器实现;通讯组件xxl-rpc方案调整为Jetty+Gson方案;
上级
0e1eb6cb
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
13 行增加
和
13 行删除
+13
-13
JobGroupController.java
...java/com/xxl/job/admin/controller/JobGroupController.java
+2
-2
message_en.properties
xxl-job-admin/src/main/resources/i18n/message_en.properties
+2
-2
message_zh_CN.properties
...ob-admin/src/main/resources/i18n/message_zh_CN.properties
+2
-2
message_zh_TC.properties
...ob-admin/src/main/resources/i18n/message_zh_TC.properties
+2
-2
jobgroup.index.1.js
...ob-admin/src/main/resources/static/js/jobgroup.index.1.js
+5
-5
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
浏览文件 @
6343f4b0
...
...
@@ -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_app
N
ame_length"
)
);
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_app
n
ame_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_app
N
ame_length"
)
);
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_app
n
ame_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"
))
);
...
...
xxl-job-admin/src/main/resources/i18n/message_en.properties
浏览文件 @
6343f4b0
...
...
@@ -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_app
N
ame_limit
=
Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen.
jobgroup_field_app
N
ame_length
=
AppName length is limited to 4~64
jobgroup_field_app
n
ame_limit
=
Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen.
jobgroup_field_app
n
ame_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
...
...
xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
浏览文件 @
6343f4b0
...
...
@@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=手动录入注册方式,机器地址不可
jobgroup_field_registryList
=
机器地址
jobgroup_field_registryList_unvalid
=
机器地址格式非法
jobgroup_field_registryList_placeholder
=
请输入执行器地址列表,多地址逗号分隔
jobgroup_field_app
N
ame_limit
=
限制以小写字母开头,由小写字母、数字和中划线组成
jobgroup_field_app
N
ame_length
=
AppName长度限制为4~64
jobgroup_field_app
n
ame_limit
=
限制以小写字母开头,由小写字母、数字和中划线组成
jobgroup_field_app
n
ame_length
=
AppName长度限制为4~64
jobgroup_field_title_length
=
名称长度限制为4~12
jobgroup_field_order_digits
=
请输入整数
jobgroup_field_orderrange
=
取值范围为1~1000
...
...
xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
浏览文件 @
6343f4b0
...
...
@@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=手動登錄注冊方式,機器地址不可
jobgroup_field_registryList
=
機器地址
jobgroup_field_registryList_unvalid
=
機器地址格式非法
jobgroup_field_registryList_placeholder
=
請輸入執行器地址列表,多個地址請以逗號分隔
jobgroup_field_app
N
ame_limit
=
限制以小寫字母開頭,由小寫字母、數字和中划線組成
jobgroup_field_app
N
ame_length
=
AppName長度限制為4~64
jobgroup_field_app
n
ame_limit
=
限制以小寫字母開頭,由小寫字母、數字和中划線組成
jobgroup_field_app
n
ame_length
=
AppName長度限制為4~64
jobgroup_field_title_length
=
名稱長度限制為4~12
jobgroup_field_order_digits
=
請輸入整數
jobgroup_field_orderrange
=
取值範圍為1~1000
...
...
xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
浏览文件 @
6343f4b0
...
...
@@ -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_app
N
ame_limit
);
},
I18n
.
jobgroup_field_app
n
ame_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_app
N
ame_length
,
myValid01
:
I18n
.
jobgroup_field_app
N
ame_limit
rangelength
:
I18n
.
jobgroup_field_app
n
ame_length
,
myValid01
:
I18n
.
jobgroup_field_app
n
ame_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_app
N
ame_length
,
myValid01
:
I18n
.
jobgroup_field_app
N
ame_limit
rangelength
:
I18n
.
jobgroup_field_app
n
ame_length
,
myValid01
:
I18n
.
jobgroup_field_app
n
ame_limit
},
title
:
{
required
:
I18n
.
system_please_input
+
I18n
.
jobgroup_field_title
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论