Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
33d92fcc
authored
Oct 22, 2019
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Cron在线生成工具:任务新增、编辑框通过组件在线生成Cron表达式
parent
15f1dcf4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
5 deletions
doc/XXL-JOB官方文档.md
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
xxl-job-admin/src/main/resources/i18n/message.properties
xxl-job-admin/src/main/resources/i18n/message_en.properties
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl
doc/XXL-JOB官方文档.md
View file @
33d92fcc
## 《分
布式任务调度平台XXL-JOB》
## 《分
布式任务调度平台XXL-JOB》
...
@@ -1547,7 +1547,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
...
@@ -1547,7 +1547,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
9、任务触发组件加载顺序调整,避免小概率情况下组件随机加载顺序导致的I18N的NPE问题。
-
9、任务触发组件加载顺序调整,避免小概率情况下组件随机加载顺序导致的I18N的NPE问题。
-
10、项目依赖升级至较新稳定版本,如spring、spring-boot、mybatis、slf4j、groovy等等;
-
10、项目依赖升级至较新稳定版本,如spring、spring-boot、mybatis、slf4j、groovy等等;
-
11、JobThread自销毁优化,避免并发触发导致triggerQueue中任务丢失问题;
-
11、JobThread自销毁优化,避免并发触发导致triggerQueue中任务丢失问题;
-
12、Cron在线生成工具:任务新增、编辑框通过组件在线生成Cron表达式
[
ING,国际化待完善
]
;
-
12、Cron在线生成工具:任务新增、编辑框通过组件在线生成Cron表达式;
-
13、Cron执行时间查询:支持通过界面在线查看后续连续5次执行时间
[
ING,交互待完善
]
;
-
13、Cron执行时间查询:支持通过界面在线查看后续连续5次执行时间
[
ING,交互待完善
]
;
-
14、
[
ING
]
xxl-rpc服务端线程优化,降低线程内存开销;
-
14、
[
ING
]
xxl-rpc服务端线程优化,降低线程内存开销;
-
15、
[
ING
]
调度日志优化:支持设置日志保留天数,过期日志天维度记录报表,并清理;调度报表汇总实时数据和报表;
-
15、
[
ING
]
调度日志优化:支持设置日志保留天数,过期日志天维度记录报表,并清理;调度报表汇总实时数据和报表;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
View file @
33d92fcc
...
@@ -44,9 +44,9 @@ public class JobInfoController {
...
@@ -44,9 +44,9 @@ public class JobInfoController {
public
String
index
(
HttpServletRequest
request
,
Model
model
,
@RequestParam
(
required
=
false
,
defaultValue
=
"-1"
)
int
jobGroup
)
{
public
String
index
(
HttpServletRequest
request
,
Model
model
,
@RequestParam
(
required
=
false
,
defaultValue
=
"-1"
)
int
jobGroup
)
{
// 枚举-字典
// 枚举-字典
model
.
addAttribute
(
"ExecutorRouteStrategyEnum"
,
ExecutorRouteStrategyEnum
.
values
());
// 路由策略-列表
model
.
addAttribute
(
"ExecutorRouteStrategyEnum"
,
ExecutorRouteStrategyEnum
.
values
());
// 路由策略-列表
model
.
addAttribute
(
"GlueTypeEnum"
,
GlueTypeEnum
.
values
());
// Glue类型-字典
model
.
addAttribute
(
"GlueTypeEnum"
,
GlueTypeEnum
.
values
());
// Glue类型-字典
model
.
addAttribute
(
"ExecutorBlockStrategyEnum"
,
ExecutorBlockStrategyEnum
.
values
());
// 阻塞处理策略-字典
model
.
addAttribute
(
"ExecutorBlockStrategyEnum"
,
ExecutorBlockStrategyEnum
.
values
());
// 阻塞处理策略-字典
// 执行器列表
// 执行器列表
List
<
XxlJobGroup
>
jobGroupList_all
=
xxlJobGroupDao
.
findAll
();
List
<
XxlJobGroup
>
jobGroupList_all
=
xxlJobGroupDao
.
findAll
();
...
...
xxl-job-admin/src/main/resources/i18n/message.properties
View file @
33d92fcc
admin_name
=
任务调度中心
admin_name
=
任务调度中心
admin_name_full
=
分布式任务调度平台XXL-JOB
admin_name_full
=
分布式任务调度平台XXL-JOB
admin_version
=
2.1.1-SNAPSHOT
admin_version
=
2.1.1-SNAPSHOT
admin_i18n
=
## system
## system
system_tips
=
系统提示
system_tips
=
系统提示
...
...
xxl-job-admin/src/main/resources/i18n/message_en.properties
View file @
33d92fcc
admin_name
=
Scheduling Center
admin_name
=
Scheduling Center
admin_name_full
=
Distributed Task Scheduling Platform XXL-JOB
admin_name_full
=
Distributed Task Scheduling Platform XXL-JOB
admin_version
=
2.1.1-SNAPSHOT
admin_version
=
2.1.1-SNAPSHOT
admin_i18n
=
en
## system
## system
system_tips
=
System message
system_tips
=
System message
...
...
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
0 → 100755
View file @
33d92fcc
This diff is collapsed.
Click to expand it.
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl
View file @
33d92fcc
...
@@ -428,7 +428,7 @@ exit 0
...
@@ -428,7 +428,7 @@ exit 0
<!-- moment -->
<!-- moment -->
<script
src=
"${request.contextPath}/static/adminlte/bower_components/moment/moment.min.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/bower_components/moment/moment.min.js"
></script>
<
#
--
cronGen
--
>
<
#
--
cronGen
--
>
<script
src=
"${request.contextPath}/static/plugins/cronGen/cronGen.js"
></script>
<script
src=
"${request.contextPath}/static/plugins/cronGen/cronGen
<#if I18n.admin_i18n?default('')?length gt 0 >_${I18n.admin_i18n}</#if>
.js"
></script>
<script
src=
"${request.contextPath}/static/js/jobinfo.index.1.js"
></script>
<script
src=
"${request.contextPath}/static/js/jobinfo.index.1.js"
></script>
</body>
</body>
</html>
</html>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment