Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
6042011d
提交
6042011d
authored
12月 23, 2017
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
项目依赖升级,如spring、jackson等;
上级
029e3b4a
显示空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
82 行增加
和
87 行删除
+82
-87
XXL-JOB官方文档.md
doc/XXL-JOB官方文档.md
+1
-0
pom.xml
pom.xml
+14
-15
pom.xml
xxl-job-admin/pom.xml
+33
-37
IndexController.java
...in/java/com/xxl/job/admin/controller/IndexController.java
+1
-1
JobGroupController.java
...java/com/xxl/job/admin/controller/JobGroupController.java
+1
-1
JobLogController.java
...n/java/com/xxl/job/admin/controller/JobLogController.java
+2
-2
CookieInterceptor.java
...l/job/admin/controller/interceptor/CookieInterceptor.java
+1
-1
XxlJobGroup.java
...c/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java
+1
-1
JobFailMonitorHelper.java
...a/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
+1
-1
JobRegistryMonitorHelper.java
...m/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
+2
-2
XxlJobTrigger.java
...in/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
+1
-1
JobKeyUtil.java
...src/main/java/com/xxl/job/admin/core/util/JobKeyUtil.java
+1
-1
AdminBizImpl.java
...ain/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
+1
-1
XxlJobServiceImpl.java
...ava/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+4
-4
applicationcontext-base.xml
...min/src/main/resources/spring/applicationcontext-base.xml
+2
-2
applicationcontext-xxl-job-admin.xml
...ain/resources/spring/applicationcontext-xxl-job-admin.xml
+2
-2
springmvc-context.xml
...job-admin/src/main/resources/spring/springmvc-context.xml
+3
-3
XxlJobLogDaoTest.java
.../src/test/java/com/xxl/job/dao/impl/XxlJobLogDaoTest.java
+1
-1
pom.xml
xxl-job-core/pom.xml
+3
-3
JacksonUtil.java
...core/src/main/java/com/xxl/job/core/util/JacksonUtil.java
+5
-6
applicationcontext-xxl-job.xml
...-spring/src/main/resources/applicationcontext-xxl-job.xml
+2
-2
没有找到文件。
doc/XXL-JOB官方文档.md
浏览文件 @
6042011d
...
@@ -1082,6 +1082,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
...
@@ -1082,6 +1082,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
17、告警邮件样式优化;邮件组件调整为commons-email简化邮件操作;
-
17、告警邮件样式优化;邮件组件调整为commons-email简化邮件操作;
-
18、任务列表界面,左侧菜单合并时样式错乱问题修复;
-
18、任务列表界面,左侧菜单合并时样式错乱问题修复;
-
19、执行器地址录入交互优化,地址长度扩展支持至512位,支持大规模执行器集群配置;
-
19、执行器地址录入交互优化,地址长度扩展支持至512位,支持大规模执行器集群配置;
-
20、项目依赖升级,如spring、jackson等;
### TODO LIST
### TODO LIST
...
...
pom.xml
浏览文件 @
6042011d
...
@@ -20,32 +20,31 @@
...
@@ -20,32 +20,31 @@
<javax.servlet-api.version>
3.0.1
</javax.servlet-api.version>
<javax.servlet-api.version>
3.0.1
</javax.servlet-api.version>
<jsp-api.version>
2.2
</jsp-api.version>
<jsp-api.version>
2.2
</jsp-api.version>
<spring.version>
3.2.18
.RELEASE
</spring.version>
<spring.version>
4.3.13
.RELEASE
</spring.version>
<jackson
-mapper-asl.version>
1.9.13
</jackson-mapper-asl
.version>
<jackson
.version>
2.9.3
</jackson
.version>
<aspectjweaver.version>
1.8.
7
</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
0
</freemarker.version>
<freemarker.version>
2.3.2
3
</freemarker.version>
<junit.version>
4.1
1
</junit.version>
<junit.version>
4.1
2
</junit.version>
<jetty-server.version>
9.2.22.v20170606
</jetty-server.version>
<jetty-server.version>
9.2.22.v20170606
</jetty-server.version>
<hessian.version>
4.0.
38
</hessian.version>
<hessian.version>
4.0.
51
</hessian.version>
<httpclient.version>
4.
3.6
</httpclient.version>
<httpclient.version>
4.
5.4
</httpclient.version>
<commons-exec.version>
1.3
</commons-exec.version>
<commons-exec.version>
1.3
</commons-exec.version>
<commons-
beanutils.version>
1.9.2
</commons-beanutils
.version>
<commons-
collections4.version>
4.1
</commons-collections4
.version>
<commons-lang
.version>
2.6
</commons-lang
.version>
<commons-lang
3.version>
3.7
</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.
29
</mysql-connector-java.version>
<mysql-connector-java.version>
5.1.
45
</mysql-connector-java.version>
<mybatis-spring.version>
1.
2.2
</mybatis-spring.version>
<mybatis-spring.version>
1.
3.1
</mybatis-spring.version>
<mybatis.version>
3.
2.8
</mybatis.version>
<mybatis.version>
3.
4.5
</mybatis.version>
<groovy-all.version>
2.4.5
</groovy-all.version>
<groovy-all.version>
2.4.13
</groovy-all.version>
<mail.version>
1.4.6
</mail.version>
<quartz.version>
2.3.0
</quartz.version>
<quartz.version>
2.3.0
</quartz.version>
<spring-boot.version>
1.5.
6
.RELEASE
</spring-boot.version>
<spring-boot.version>
1.5.
9
.RELEASE
</spring-boot.version>
</properties>
</properties>
<build>
<build>
...
...
xxl-job-admin/pom.xml
浏览文件 @
6042011d
...
@@ -40,18 +40,22 @@
...
@@ -40,18 +40,22 @@
</dependency>
</dependency>
<!-- jackson (support spring json) -->
<!-- jackson (support spring json) -->
<dependency>
<dependency>
<groupId>
org.codehaus.jackson
</groupId>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-
mapper-asl
</artifactId>
<artifactId>
jackson-
databind
</artifactId>
<version>
${jackson
-mapper-asl
.version}
</version>
<version>
${jackson.version}
</version>
</dependency>
</dependency>
<!-- s
lf4j
-->
<!-- s
ervlet
-->
<dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<groupId>
javax.servlet
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<artifactId>
javax.servlet-api
</artifactId>
<version>
${slf4j-api.version}
</version>
<version>
${javax.servlet-api.version}
</version>
</dependency>
<dependency>
<groupId>
javax.servlet.jsp
</groupId>
<artifactId>
jsp-api
</artifactId>
<version>
${jsp-api.version}
</version>
</dependency>
</dependency>
<!-- freemarker -->
<!-- freemarker -->
<dependency>
<dependency>
<groupId>
org.freemarker
</groupId>
<groupId>
org.freemarker
</groupId>
...
@@ -59,37 +63,37 @@
...
@@ -59,37 +63,37 @@
<version>
${freemarker.version}
</version>
<version>
${freemarker.version}
</version>
</dependency>
</dependency>
<!--
commons-beanutils
-->
<!--
slf4j
-->
<dependency>
<dependency>
<groupId>
commons-beanutils
</groupId>
<groupId>
org.slf4j
</groupId>
<artifactId>
commons-beanutils
</artifactId>
<artifactId>
slf4j-log4j12
</artifactId>
<version>
${
commons-beanutils
.version}
</version>
<version>
${
slf4j-api
.version}
</version>
</dependency>
</dependency>
<!--
commons-lang
-->
<!--
junit
-->
<dependency>
<dependency>
<groupId>
commons-lang
</groupId>
<groupId>
junit
</groupId>
<artifactId>
commons-lang
</artifactId>
<artifactId>
junit
</artifactId>
<version>
${commons-lang.version}
</version>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
</dependency>
<!--
servlet
-->
<!--
commons-collections4
-->
<dependency>
<dependency>
<groupId>
javax.servlet
</groupId>
<groupId>
org.apache.commons
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<artifactId>
commons-collections4
</artifactId>
<version>
${
javax.servlet-api
.version}
</version>
<version>
${
commons-collections4
.version}
</version>
</dependency>
</dependency>
<!-- commons-lang3 -->
<dependency>
<dependency>
<groupId>
javax.servlet.jsp
</groupId>
<groupId>
org.apache.commons
</groupId>
<artifactId>
jsp-api
</artifactId>
<artifactId>
commons-lang3
</artifactId>
<version>
${
jsp-api
.version}
</version>
<version>
${
commons-lang3
.version}
</version>
</dependency>
</dependency>
<!-- commons-email -->
<!-- junit -->
<dependency>
<dependency>
<groupId>
junit
</groupId>
<groupId>
org.apache.commons
</groupId>
<artifactId>
junit
</artifactId>
<artifactId>
commons-email
</artifactId>
<version>
${junit.version}
</version>
<version>
${commons-email.version}
</version>
<scope>
test
</scope>
</dependency>
</dependency>
<!-- c3p0 -->
<!-- c3p0 -->
...
@@ -116,7 +120,6 @@
...
@@ -116,7 +120,6 @@
<version>
${mybatis.version}
</version>
<version>
${mybatis.version}
</version>
</dependency>
</dependency>
<!-- httpclient -->
<!-- httpclient -->
<dependency>
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<groupId>
org.apache.httpcomponents
</groupId>
...
@@ -124,13 +127,6 @@
...
@@ -124,13 +127,6 @@
<version>
${httpclient.version}
</version>
<version>
${httpclient.version}
</version>
</dependency>
</dependency>
<!-- commons-email -->
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-email
</artifactId>
<version>
${commons-email.version}
</version>
</dependency>
<!-- quartz :quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
<!-- quartz :quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
<dependency>
<dependency>
<groupId>
org.quartz-scheduler
</groupId>
<groupId>
org.quartz-scheduler
</groupId>
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java
浏览文件 @
6042011d
...
@@ -5,7 +5,7 @@ import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
...
@@ -5,7 +5,7 @@ import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
import
com.xxl.job.admin.core.util.PropertiesUtil
;
import
com.xxl.job.admin.core.util.PropertiesUtil
;
import
com.xxl.job.admin.service.XxlJobService
;
import
com.xxl.job.admin.service.XxlJobService
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.springframework.beans.propertyeditors.CustomDateEditor
;
import
org.springframework.beans.propertyeditors.CustomDateEditor
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.ui.Model
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
浏览文件 @
6042011d
...
@@ -4,7 +4,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
...
@@ -4,7 +4,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
import
com.xxl.job.admin.dao.XxlJobGroupDao
;
import
com.xxl.job.admin.dao.XxlJobGroupDao
;
import
com.xxl.job.admin.dao.XxlJobInfoDao
;
import
com.xxl.job.admin.dao.XxlJobInfoDao
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.ui.Model
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
浏览文件 @
6042011d
...
@@ -11,8 +11,8 @@ import com.xxl.job.core.biz.ExecutorBiz;
...
@@ -11,8 +11,8 @@ import com.xxl.job.core.biz.ExecutorBiz;
import
com.xxl.job.core.biz.model.LogResult
;
import
com.xxl.job.core.biz.model.LogResult
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.rpc.netcom.NetComClientProxy
;
import
com.xxl.job.core.rpc.netcom.NetComClientProxy
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang
3
.time.DateUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java
浏览文件 @
6042011d
...
@@ -6,7 +6,7 @@ import javax.servlet.http.Cookie;
...
@@ -6,7 +6,7 @@ import javax.servlet.http.Cookie;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang
3
.ArrayUtils
;
import
org.springframework.web.servlet.ModelAndView
;
import
org.springframework.web.servlet.ModelAndView
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java
浏览文件 @
6042011d
package
com
.
xxl
.
job
.
admin
.
core
.
model
;
package
com
.
xxl
.
job
.
admin
.
core
.
model
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
浏览文件 @
6042011d
...
@@ -8,7 +8,7 @@ import com.xxl.job.admin.core.util.JobKeyUtil;
...
@@ -8,7 +8,7 @@ import com.xxl.job.admin.core.util.JobKeyUtil;
import
com.xxl.job.admin.core.util.MailUtil
;
import
com.xxl.job.admin.core.util.MailUtil
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.handler.IJobHandler
;
import
com.xxl.job.core.handler.IJobHandler
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections
4
.CollectionUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
浏览文件 @
6042011d
...
@@ -4,8 +4,8 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
...
@@ -4,8 +4,8 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
import
com.xxl.job.admin.core.model.XxlJobRegistry
;
import
com.xxl.job.admin.core.model.XxlJobRegistry
;
import
com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler
;
import
com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler
;
import
com.xxl.job.core.enums.RegistryConfig
;
import
com.xxl.job.core.enums.RegistryConfig
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections
4
.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
浏览文件 @
6042011d
...
@@ -12,7 +12,7 @@ import com.xxl.job.core.biz.model.ReturnT;
...
@@ -12,7 +12,7 @@ import com.xxl.job.core.biz.model.ReturnT;
import
com.xxl.job.core.biz.model.TriggerParam
;
import
com.xxl.job.core.biz.model.TriggerParam
;
import
com.xxl.job.core.enums.ExecutorBlockStrategyEnum
;
import
com.xxl.job.core.enums.ExecutorBlockStrategyEnum
;
import
com.xxl.job.core.util.IpUtil
;
import
com.xxl.job.core.util.IpUtil
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections
4
.CollectionUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JobKeyUtil.java
浏览文件 @
6042011d
package
com
.
xxl
.
job
.
admin
.
core
.
util
;
package
com
.
xxl
.
job
.
admin
.
core
.
util
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
/**
/**
* job key util
* job key util
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
浏览文件 @
6042011d
...
@@ -15,7 +15,7 @@ import com.xxl.job.core.biz.model.HandleCallbackParam;
...
@@ -15,7 +15,7 @@ import com.xxl.job.core.biz.model.HandleCallbackParam;
import
com.xxl.job.core.biz.model.RegistryParam
;
import
com.xxl.job.core.biz.model.RegistryParam
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.handler.IJobHandler
;
import
com.xxl.job.core.handler.IJobHandler
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.quartz.SchedulerException
;
import
org.quartz.SchedulerException
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
浏览文件 @
6042011d
...
@@ -14,10 +14,10 @@ import com.xxl.job.admin.service.XxlJobService;
...
@@ -14,10 +14,10 @@ import com.xxl.job.admin.service.XxlJobService;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.enums.ExecutorBlockStrategyEnum
;
import
com.xxl.job.core.enums.ExecutorBlockStrategyEnum
;
import
com.xxl.job.core.glue.GlueTypeEnum
;
import
com.xxl.job.core.glue.GlueTypeEnum
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections
4
.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang
3
.time.DateUtils
;
import
org.apache.commons.lang.time.FastDateFormat
;
import
org.apache.commons.lang
3
.time.FastDateFormat
;
import
org.quartz.CronExpression
;
import
org.quartz.CronExpression
;
import
org.quartz.SchedulerException
;
import
org.quartz.SchedulerException
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
...
xxl-job-admin/src/main/resources/spring/applicationcontext-base.xml
浏览文件 @
6042011d
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:context=
"http://www.springframework.org/schema/context"
xmlns:context=
"http://www.springframework.org/schema/context"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans
-3.0
.xsd
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context
-3.0
.xsd"
>
http://www.springframework.org/schema/context/spring-context.xsd"
>
<context:component-scan
base-package=
"com.xxl.job.admin.service, com.xxl.job.admin.dao"
/>
<context:component-scan
base-package=
"com.xxl.job.admin.service, com.xxl.job.admin.dao"
/>
...
...
xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml
浏览文件 @
6042011d
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx=
"http://www.springframework.org/schema/tx"
xmlns:tx=
"http://www.springframework.org/schema/tx"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans
-3.0
.xsd
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx
-3.0
.xsd"
>
http://www.springframework.org/schema/tx/spring-tx.xsd"
>
<bean
id=
"propertyConfigurer"
class=
"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
>
<bean
id=
"propertyConfigurer"
class=
"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
>
...
...
xxl-job-admin/src/main/resources/spring/springmvc-context.xml
浏览文件 @
6042011d
...
@@ -4,11 +4,11 @@
...
@@ -4,11 +4,11 @@
xmlns:mvc=
"http://www.springframework.org/schema/mvc"
xmlns:mvc=
"http://www.springframework.org/schema/mvc"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans
-3.0.xsd
http://www.springframework.org/schema/beans/spring-beans
.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context
-3.0
.xsd
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc
-3.0
.xsd"
>
http://www.springframework.org/schema/mvc/spring-mvc.xsd"
>
<mvc:annotation-driven
/>
<mvc:annotation-driven
/>
<context:component-scan
base-package=
"com.xxl.job.admin.controller"
/>
<context:component-scan
base-package=
"com.xxl.job.admin.controller"
/>
...
...
xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogDaoTest.java
浏览文件 @
6042011d
...
@@ -2,7 +2,7 @@ package com.xxl.job.dao.impl;
...
@@ -2,7 +2,7 @@ package com.xxl.job.dao.impl;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.dao.XxlJobLogDao
;
import
com.xxl.job.admin.dao.XxlJobLogDao
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang
3
.time.DateUtils
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.ContextConfiguration
;
...
...
xxl-job-core/pom.xml
浏览文件 @
6042011d
...
@@ -49,9 +49,9 @@
...
@@ -49,9 +49,9 @@
<!-- jackson -->
<!-- jackson -->
<dependency>
<dependency>
<groupId>
org.codehaus.jackson
</groupId>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-
mapper-asl
</artifactId>
<artifactId>
jackson-
databind
</artifactId>
<version>
${jackson
-mapper-asl
.version}
</version>
<version>
${jackson.version}
</version>
</dependency>
</dependency>
<!-- httpclient -->
<!-- httpclient -->
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/JacksonUtil.java
浏览文件 @
6042011d
package
com
.
xxl
.
job
.
core
.
util
;
package
com
.
xxl
.
job
.
core
.
util
;
import
com.fasterxml.jackson.core.JsonGenerationException
;
import
org.codehaus.jackson.JsonGenerationException
;
import
com.fasterxml.jackson.core.JsonParseException
;
import
org.codehaus.jackson.JsonParseException
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
org.codehaus.jackson.map.JsonMappingException
;
import
com.fasterxml.jackson.databind.JsonMappingException
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.codehaus.jackson.type.TypeReference
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
浏览文件 @
6042011d
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:context=
"http://www.springframework.org/schema/context"
xmlns:context=
"http://www.springframework.org/schema/context"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans
-3.0
.xsd
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context
-3.0
.xsd"
>
http://www.springframework.org/schema/context/spring-context.xsd"
>
<bean
id=
"propertyConfigurer"
class=
"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
>
<bean
id=
"propertyConfigurer"
class=
"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
>
<property
name=
"fileEncoding"
value=
"utf-8"
/>
<property
name=
"fileEncoding"
value=
"utf-8"
/>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论