项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
This commit is contained in:
parent
39a07e722f
commit
78e135200c
|
@ -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、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
|
||||||
|
|
28
pom.xml
28
pom.xml
|
@ -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>
|
||||||
<jsp-api.version>2.2</jsp-api.version>
|
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
|
||||||
|
|
||||||
<spring.version>4.3.14.RELEASE</spring.version>
|
<spring.version>4.3.19.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.23</freemarker.version>
|
<freemarker.version>2.3.28</freemarker.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.12</junit.version>
|
||||||
|
|
||||||
<jetty-server.version>9.2.24.v20180105</jetty-server.version>
|
<jetty-server.version>9.2.26.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.45</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.47</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.13</groovy-all.version>
|
<groovy-all.version>2.4.15</groovy-all.version>
|
||||||
<quartz.version>2.3.0</quartz.version>
|
<quartz.version>2.3.0</quartz.version>
|
||||||
|
|
||||||
<spring-boot.version>1.5.10.RELEASE</spring-boot.version>
|
<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -53,9 +53,10 @@
|
||||||
</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>
|
</dependency>
|
||||||
|
|
||||||
<!-- freemarker -->
|
<!-- freemarker -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.freemarker</groupId>
|
<groupId>org.freemarker</groupId>
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
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;
|
||||||
*/
|
*/
|
||||||
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;
|
||||||
|
|
|
@ -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 @@
|
||||||
<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,27 +54,6 @@
|
||||||
<version>${hessian.version}</version>
|
<version>${hessian.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- jackson -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
|
||||||
<artifactId>jackson-databind</artifactId>
|
|
||||||
<version>${jackson.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- httpclient -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
<version>${httpclient.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- spring-context -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-context</artifactId>
|
|
||||||
<version>${spring.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- groovy-all -->
|
<!-- groovy-all -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
|
@ -82,6 +68,20 @@
|
||||||
<version>${commons-exec.version}</version>
|
<version>${commons-exec.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- spring-context -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context</artifactId>
|
||||||
|
<version>${spring.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- jackson -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
<version>${jackson.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
Loading…
Reference in New Issue