Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
aboota
xxl-job
提交
78e13520
X
xxl-job
项目概览
aboota
/
xxl-job
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
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,发现更多精彩内容 >>
提交
78e13520
编写于
9月 24, 2018
作者:
许雪里
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
上级
39a07e72
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
49 addition
and
44 deletion
+49
-44
doc/XXL-JOB官方文档.md
doc/XXL-JOB官方文档.md
+1
-0
pom.xml
pom.xml
+14
-14
xxl-job-admin/pom.xml
xxl-job-admin/pom.xml
+3
-2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
...in/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
+4
-1
xxl-job-core/pom.xml
xxl-job-core/pom.xml
+27
-27
未找到文件。
doc/XXL-JOB官方文档.md
浏览文件 @
78e13520
...
@@ -1293,6 +1293,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
...
@@ -1293,6 +1293,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制;
-
37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制;
-
38、GLUE任务脚本字段类型调整,改为mediumtext类型,提高GLUE长度上限;
-
38、GLUE任务脚本字段类型调整,改为mediumtext类型,提高GLUE长度上限;
-
39、任务监控线程Log输出优化,运行中任务的监控Log改为debug级别,减少非核心日志量;
-
39、任务监控线程Log输出优化,运行中任务的监控Log改为debug级别,减少非核心日志量;
-
40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
### TODO LIST
### TODO LIST
-
1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
-
1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
...
...
pom.xml
浏览文件 @
78e13520
...
@@ -17,34 +17,34 @@
...
@@ -17,34 +17,34 @@
</modules>
</modules>
<properties>
<properties>
<javax.servlet-api.version>
3.
0.1
</javax.servlet-api.version>
<javax.servlet-api.version>
3.
1.0
</javax.servlet-api.version>
<j
sp-api.version>
2.2
</
jsp-api.version>
<j
avax.servlet.jsp-api.version>
2.3.3
</javax.servlet.
jsp-api.version>
<spring.version>
4.3.1
4
.RELEASE
</spring.version>
<spring.version>
4.3.1
9
.RELEASE
</spring.version>
<jackson.version>
2.9.
4
</jackson.version>
<jackson.version>
2.9.
6
</jackson.version>
<aspectjweaver.version>
1.8.13
</aspectjweaver.version>
<aspectjweaver.version>
1.8.13
</aspectjweaver.version>
<slf4j-api.version>
1.7.25
</slf4j-api.version>
<slf4j-api.version>
1.7.25
</slf4j-api.version>
<freemarker.version>
2.3.2
3
</freemarker.version>
<freemarker.version>
2.3.2
8
</freemarker.version>
<junit.version>
4.12
</junit.version>
<junit.version>
4.12
</junit.version>
<jetty-server.version>
9.2.2
4.v20180105
</jetty-server.version>
<jetty-server.version>
9.2.2
6.v20180806
</jetty-server.version>
<hessian.version>
4.0.51
</hessian.version>
<hessian.version>
4.0.51
</hessian.version>
<httpclient.version>
4.5.
5
</httpclient.version>
<httpclient.version>
4.5.
6
</httpclient.version>
<commons-exec.version>
1.3
</commons-exec.version>
<commons-exec.version>
1.3
</commons-exec.version>
<commons-collections4.version>
4.
1
</commons-collections4.version>
<commons-collections4.version>
4.
2
</commons-collections4.version>
<commons-lang3.version>
3.
7
</commons-lang3.version>
<commons-lang3.version>
3.
8.1
</commons-lang3.version>
<commons-email.version>
1.5
</commons-email.version>
<commons-email.version>
1.5
</commons-email.version>
<c3p0.version>
0.9.5.2
</c3p0.version>
<c3p0.version>
0.9.5.2
</c3p0.version>
<mysql-connector-java.version>
5.1.4
5
</mysql-connector-java.version>
<mysql-connector-java.version>
5.1.4
7
</mysql-connector-java.version>
<mybatis-spring.version>
1.3.
1
</mybatis-spring.version>
<mybatis-spring.version>
1.3.
2
</mybatis-spring.version>
<mybatis.version>
3.4.
5
</mybatis.version>
<mybatis.version>
3.4.
6
</mybatis.version>
<groovy-all.version>
2.4.1
3
</groovy-all.version>
<groovy-all.version>
2.4.1
5
</groovy-all.version>
<quartz.version>
2.3.0
</quartz.version>
<quartz.version>
2.3.0
</quartz.version>
<spring-boot.version>
1.5.1
0
.RELEASE
</spring-boot.version>
<spring-boot.version>
1.5.1
6
.RELEASE
</spring-boot.version>
</properties>
</properties>
<build>
<build>
...
...
xxl-job-admin/pom.xml
浏览文件 @
78e13520
...
@@ -53,9 +53,10 @@
...
@@ -53,9 +53,10 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
javax.servlet.jsp
</groupId>
<groupId>
javax.servlet.jsp
</groupId>
<artifactId>
jsp-api
</artifactId>
<artifactId>
j
avax.servlet.j
sp-api
</artifactId>
<version>
${jsp-api.version}
</version>
<version>
${j
avax.servlet.j
sp-api.version}
</version>
</dependency>
</dependency>
<!-- freemarker -->
<!-- freemarker -->
<dependency>
<dependency>
<groupId>
org.freemarker
</groupId>
<groupId>
org.freemarker
</groupId>
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
浏览文件 @
78e13520
package
com.xxl.job.admin.core.util
;
package
com.xxl.job.admin.core.util
;
import
freemarker.ext.beans.BeansWrapper
;
import
freemarker.ext.beans.BeansWrapper
;
import
freemarker.ext.beans.BeansWrapperBuilder
;
import
freemarker.template.Configuration
;
import
freemarker.template.TemplateHashModel
;
import
freemarker.template.TemplateHashModel
;
/**
/**
...
@@ -10,9 +12,10 @@ import freemarker.template.TemplateHashModel;
...
@@ -10,9 +12,10 @@ import freemarker.template.TemplateHashModel;
*/
*/
public
class
FtlUtil
{
public
class
FtlUtil
{
private
static
BeansWrapper
wrapper
=
new
BeansWrapperBuilder
(
Configuration
.
DEFAULT_INCOMPATIBLE_IMPROVEMENTS
).
build
();
//BeansWrapper.getDefaultInstance();
public
static
TemplateHashModel
generateStaticModel
(
String
packageName
)
{
public
static
TemplateHashModel
generateStaticModel
(
String
packageName
)
{
try
{
try
{
BeansWrapper
wrapper
=
BeansWrapper
.
getDefaultInstance
();
TemplateHashModel
staticModels
=
wrapper
.
getStaticModels
();
TemplateHashModel
staticModels
=
wrapper
.
getStaticModels
();
TemplateHashModel
fileStatics
=
(
TemplateHashModel
)
staticModels
.
get
(
packageName
);
TemplateHashModel
fileStatics
=
(
TemplateHashModel
)
staticModels
.
get
(
packageName
);
return
fileStatics
;
return
fileStatics
;
...
...
xxl-job-core/pom.xml
浏览文件 @
78e13520
...
@@ -15,15 +15,22 @@
...
@@ -15,15 +15,22 @@
<dependencies>
<dependencies>
<!-- servlet -->
<!-- servlet -->
<dependency>
<
!--<
dependency>
<groupId>javax.servlet</groupId>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
<version>${javax.servlet-api.version}</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<groupId>javax.servlet.jsp</groupId>
<artifactId>
jsp-api
</artifactId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>
${jsp-api.version}
</version>
<version>${javax.servlet.jsp-api.version}</version>
</dependency>-->
<!-- slf4j -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
${slf4j-api.version}
</version>
</dependency>
</dependency>
<!-- jetty -->
<!-- jetty -->
...
@@ -33,11 +40,11 @@
...
@@ -33,11 +40,11 @@
<version>
${jetty-server.version}
</version>
<version>
${jetty-server.version}
</version>
</dependency>
</dependency>
<!--
slf4j
-->
<!--
httpclient
-->
<dependency>
<dependency>
<groupId>
org.
slf4j
</groupId>
<groupId>
org.
apache.httpcomponents
</groupId>
<artifactId>
slf4j-api
</artifactId>
<artifactId>
httpclient
</artifactId>
<version>
${
slf4j-api
.version}
</version>
<version>
${
httpclient
.version}
</version>
</dependency>
</dependency>
<!-- hessian -->
<!-- hessian -->
...
@@ -47,39 +54,32 @@
...
@@ -47,39 +54,32 @@
<version>
${hessian.version}
</version>
<version>
${hessian.version}
</version>
</dependency>
</dependency>
<!--
jackson
-->
<!--
groovy-all
-->
<dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<groupId>
org.codehaus.groovy
</groupId>
<artifactId>
jackson-databind
</artifactId>
<artifactId>
groovy-all
</artifactId>
<version>
${
jackson
.version}
</version>
<version>
${
groovy-all
.version}
</version>
</dependency>
</dependency>
<!--
httpclient
-->
<!--
commons-exec
-->
<dependency>
<dependency>
<groupId>
org.apache.
httpcomponent
s
</groupId>
<groupId>
org.apache.
common
s
</groupId>
<artifactId>
httpclient
</artifactId>
<artifactId>
commons-exec
</artifactId>
<version>
${
httpclient
.version}
</version>
<version>
${
commons-exec
.version}
</version>
</dependency>
</dependency>
<!-- spring-context -->
<!-- spring-context -->
<dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
<version>
${spring.version}
</version>
</dependency>
</dependency>
<!-- groovy-all -->
<dependency>
<groupId>
org.codehaus.groovy
</groupId>
<artifactId>
groovy-all
</artifactId>
<version>
${groovy-all.version}
</version>
</dependency>
<!--
commons-exec
-->
<!--
jackson
-->
<dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
commons-exec
</artifactId>
<artifactId>
jackson-databind
</artifactId>
<version>
${
commons-exec
.version}
</version>
<version>
${
jackson
.version}
</version>
</dependency>
</dependency>
</dependencies>
</dependencies>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录