Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
粉色的八爪鱼
xxl-job
提交
22762856
X
xxl-job
项目概览
粉色的八爪鱼
/
xxl-job
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
xxl-job
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
22762856
编写于
10月 30, 2020
作者:
X
xueli.xue
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
调度中心页面交互优化:用户管理模块密码列取消;多处表达autocomplete取消;执行器管理模块XSS拦截校验等;
上级
57702ec2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
6 deletion
+25
-6
doc/XXL-JOB官方文档.md
doc/XXL-JOB官方文档.md
+2
-0
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
...java/com/xxl/job/admin/controller/JobGroupController.java
+10
-0
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java
...ain/java/com/xxl/job/admin/controller/UserController.java
+7
-0
xxl-job-admin/src/main/resources/static/js/user.index.1.js
xxl-job-admin/src/main/resources/static/js/user.index.1.js
+1
-1
xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
.../src/main/resources/templates/jobgroup/jobgroup.index.ftl
+2
-2
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl
...in/src/main/resources/templates/jobinfo/jobinfo.index.ftl
+3
-3
未找到文件。
doc/XXL-JOB官方文档.md
浏览文件 @
22762856
...
...
@@ -2062,9 +2062,11 @@ data: post-data
-
16、调度中心组件加载顺序优化,修复极端情况下调度组件初始慢导致的调度失败问题;
-
17、执行器注册线程优化,修复极端情况下初始化失败时导致NPE问题;
-
18、执行器Commandhandler示例任务优化,修复极端情况下脚本进程挂起问题;
-
19、调度中心页面交互优化:用户管理模块密码列取消;多处表达autocomplete取消;执行器管理模块XSS拦截校验等;
-
19、[ING]任务触发参数优化:支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等;
-
20、[ING]任务 misfire 策略:忽略、补偿一次、补偿最近10次……等;
-
21、[规划中]执行器注册,异步写入;
-
22、[规划中]默认开启访问令牌鉴权;
### 7.32 版本 v2.3.0 Release Notes[规划中]
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
浏览文件 @
22762856
...
...
@@ -68,13 +68,23 @@ public class JobGroupController {
if
(
xxlJobGroup
.
getAppname
().
length
()<
4
||
xxlJobGroup
.
getAppname
().
length
()>
64
)
{
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_appname_length"
)
);
}
if
(
xxlJobGroup
.
getAppname
().
contains
(
">"
)
||
xxlJobGroup
.
getAppname
().
contains
(
"<"
))
{
return
new
ReturnT
<
String
>(
500
,
"AppName"
+
I18nUtil
.
getString
(
"system_unvalid"
)
);
}
if
(
xxlJobGroup
.
getTitle
()==
null
||
xxlJobGroup
.
getTitle
().
trim
().
length
()==
0
)
{
return
new
ReturnT
<
String
>(
500
,
(
I18nUtil
.
getString
(
"system_please_input"
)
+
I18nUtil
.
getString
(
"jobgroup_field_title"
))
);
}
if
(
xxlJobGroup
.
getTitle
().
contains
(
">"
)
||
xxlJobGroup
.
getTitle
().
contains
(
"<"
))
{
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_title"
)+
I18nUtil
.
getString
(
"system_unvalid"
)
);
}
if
(
xxlJobGroup
.
getAddressType
()!=
0
)
{
if
(
xxlJobGroup
.
getAddressList
()==
null
||
xxlJobGroup
.
getAddressList
().
trim
().
length
()==
0
)
{
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_addressType_limit"
)
);
}
if
(
xxlJobGroup
.
getAddressList
().
contains
(
">"
)
||
xxlJobGroup
.
getAddressList
().
contains
(
"<"
))
{
return
new
ReturnT
<
String
>(
500
,
I18nUtil
.
getString
(
"jobgroup_field_registryList"
)+
I18nUtil
.
getString
(
"system_unvalid"
)
);
}
String
[]
addresss
=
xxlJobGroup
.
getAddressList
().
split
(
","
);
for
(
String
item:
addresss
)
{
if
(
item
==
null
||
item
.
trim
().
length
()==
0
)
{
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java
浏览文件 @
22762856
...
...
@@ -56,6 +56,13 @@ public class UserController {
List
<
XxlJobUser
>
list
=
xxlJobUserDao
.
pageList
(
start
,
length
,
username
,
role
);
int
list_count
=
xxlJobUserDao
.
pageListCount
(
start
,
length
,
username
,
role
);
// filter
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
for
(
XxlJobUser
item:
list
)
{
item
.
setPassword
(
null
);
}
}
// package result
Map
<
String
,
Object
>
maps
=
new
HashMap
<
String
,
Object
>();
maps
.
put
(
"recordsTotal"
,
list_count
);
// 总记录数
...
...
xxl-job-admin/src/main/resources/static/js/user.index.1.js
浏览文件 @
22762856
...
...
@@ -33,7 +33,7 @@ $(function() {
},
{
"
data
"
:
'
password
'
,
"
visible
"
:
tru
e
,
"
visible
"
:
fals
e
,
"
width
"
:
'
20%
'
,
"
render
"
:
function
(
data
,
type
,
row
)
{
return
'
*********
'
;
...
...
xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
浏览文件 @
22762856
...
...
@@ -28,13 +28,13 @@
<div
class=
"col-xs-3"
>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
AppName
</span>
<input
type=
"text"
class=
"form-control"
id=
"appname"
autocomplete=
"on"
placeholder=
"${I18n.system_please_input}AppName"
>
<input
type=
"text"
class=
"form-control"
id=
"appname"
placeholder=
"${I18n.system_please_input}AppName"
>
</div>
</div>
<div
class=
"col-xs-3"
>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
${I18n.jobgroup_field_title}
</span>
<input
type=
"text"
class=
"form-control"
id=
"title"
autocomplete=
"on"
placeholder=
"${I18n.jobgroup_field_title}"
>
<input
type=
"text"
class=
"form-control"
id=
"title"
placeholder=
"${I18n.jobgroup_field_title}"
>
</div>
</div>
<div
class=
"col-xs-2"
>
...
...
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl
浏览文件 @
22762856
...
...
@@ -46,17 +46,17 @@
</div>
<div
class=
"col-xs-2"
>
<div
class=
"input-group"
>
<input
type=
"text"
class=
"form-control"
id=
"jobDesc"
autocomplete=
"on"
placeholder=
"${I18n.system_please_input}${I18n.jobinfo_field_jobdesc}"
>
<input
type=
"text"
class=
"form-control"
id=
"jobDesc"
placeholder=
"${I18n.system_please_input}${I18n.jobinfo_field_jobdesc}"
>
</div>
</div>
<div
class=
"col-xs-2"
>
<div
class=
"input-group"
>
<input
type=
"text"
class=
"form-control"
id=
"executorHandler"
autocomplete=
"on"
placeholder=
"${I18n.system_please_input}JobHandler"
>
<input
type=
"text"
class=
"form-control"
id=
"executorHandler"
placeholder=
"${I18n.system_please_input}JobHandler"
>
</div>
</div>
<div
class=
"col-xs-2"
>
<div
class=
"input-group"
>
<input
type=
"text"
class=
"form-control"
id=
"author"
autocomplete=
"on"
placeholder=
"${I18n.system_please_input}${I18n.jobinfo_field_author}"
>
<input
type=
"text"
class=
"form-control"
id=
"author"
placeholder=
"${I18n.system_please_input}${I18n.jobinfo_field_author}"
>
</div>
</div>
<div
class=
"col-xs-1"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录