From 3afd579dcfa668482e0da0688b5605f257dc299e Mon Sep 17 00:00:00 2001 From: bwh Date: Wed, 3 Jul 2019 00:48:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20xxl=5Fjob=5Flog=20?= =?UTF-8?q?=E4=B8=BB=E9=94=AEid=E7=B1=BB=E5=9E=8B=E4=B8=BA=20bigint(20)=20?= =?UTF-8?q?=EF=BC=8C=20=20=E9=98=B2=E6=AD=A2=20int(11)=20=E4=BD=8D?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=E5=AF=BC=E8=87=B4=E8=B0=83=E5=BA=A6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/db/tables_xxl_job.sql | 2 +- .../main/java/com/xxl/job/admin/core/model/XxlJobLog.java | 6 +++--- .../xxl/job/admin/core/thread/JobFailMonitorHelper.java | 4 ++-- .../main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java | 2 +- .../src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java | 8 ++++---- .../src/main/resources/mybatis-mapper/XxlJobLogMapper.xml | 4 ++-- .../xxl/job/admin/controller/AbstractSpringMvcTest.java | 7 ++++--- .../java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java | 6 ++++-- .../java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java | 6 ++++-- .../test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java | 8 +++++--- .../java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java | 6 ++++-- .../java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java | 2 +- .../test/java/com/xxl/job/admin/util/I18nUtilTest.java | 6 ++++-- .../src/main/java/com/xxl/job/core/biz/ExecutorBiz.java | 2 +- .../java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java | 2 +- .../com/xxl/job/core/biz/model/HandleCallbackParam.java | 6 +++--- .../java/com/xxl/job/core/biz/model/TriggerParam.java | 6 +++--- .../java/com/xxl/job/core/log/XxlJobFileAppender.java | 2 +- .../src/main/java/com/xxl/job/core/thread/JobThread.java | 4 ++-- 19 files changed, 50 insertions(+), 39 deletions(-) diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 2bed8e3d..71b441f1 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -30,7 +30,7 @@ CREATE TABLE `xxl_job_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `xxl_job_log` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `job_group` int(11) NOT NULL COMMENT '执行器主键ID', `job_id` int(11) NOT NULL COMMENT '任务，主键ID', `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java index c4ba0b0c..7d3072aa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java @@ -8,7 +8,7 @@ import java.util.Date; */ public class XxlJobLog { - private int id; + private long id; // job info private int jobGroup; @@ -34,11 +34,11 @@ public class XxlJobLog { // alarm info private int alarmStatus; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java index 7e1ac115..f5462d82 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java @@ -46,9 +46,9 @@ public class JobFailMonitorHelper { while (!toStop) { try { - List failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000); + List failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000); if (failLogIds!=null && !failLogIds.isEmpty()) { - for (int failLogId: failLogIds) { + for (long failLogId: failLogIds) { // lock log int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java index 9baacc12..6dcb35b0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java @@ -35,7 +35,7 @@ public interface XxlJobInfoDao { public int update(XxlJobInfo xxlJobInfo); - public int delete(@Param("id") int id); + public int delete(@Param("id") long id); public List getJobsByGroup(@Param("jobGroup") int jobGroup); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java index 9b632ec6..b4d93ed7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java @@ -31,9 +31,9 @@ public interface XxlJobLogDao { @Param("triggerTimeEnd") Date triggerTimeEnd, @Param("logStatus") int logStatus); - public XxlJobLog load(@Param("id") int id); + public XxlJobLog load(@Param("id") long id); - public int save(XxlJobLog xxlJobLog); + public long save(XxlJobLog xxlJobLog); public int updateTriggerInfo(XxlJobLog xxlJobLog); @@ -51,9 +51,9 @@ public interface XxlJobLogDao { @Param("clearBeforeTime") Date clearBeforeTime, @Param("clearBeforeNum") int clearBeforeNum); - public List findFailJobLogIds(@Param("pagesize") int pagesize); + public List findFailJobLogIds(@Param("pagesize") int pagesize); - public int updateAlarmStatus(@Param("logId") int logId, + public int updateAlarmStatus(@Param("logId") long logId, @Param("oldAlarmStatus") int oldAlarmStatus, @Param("newAlarmStatus") int newAlarmStatus); diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml index 39862495..fe0382c8 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml @@ -110,7 +110,7 @@ - SELECT FROM xxl_job_log AS t WHERE t.id = #{id} @@ -218,7 +218,7 @@ - SELECT id FROM `xxl_job_log` WHERE !( (trigger_code in (0, 200) and handle_code = 0) diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java index bb156206..b8cb6898 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java @@ -3,16 +3,17 @@ package com.xxl.job.admin.controller; import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -@WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath*:spring/*.xml"}) +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AbstractSpringMvcTest { @Autowired diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java index 5b99178f..a9387ac4 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java @@ -4,14 +4,16 @@ import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.dao.XxlJobGroupDao; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobGroupDaoTest { @Resource diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java index 13b5b3ff..fc87aef6 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java @@ -3,15 +3,17 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobInfo; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobInfoDaoTest { @Resource diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java index 1f6234db..3ab0caa3 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java @@ -3,16 +3,18 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobLog; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Map; -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobLogDaoTest { @Resource @@ -27,7 +29,7 @@ public class XxlJobLogDaoTest { log.setJobGroup(1); log.setJobId(1); - int ret1 = xxlJobLogDao.save(log); + long ret1 = xxlJobLogDao.save(log); XxlJobLog dto = xxlJobLogDao.load(log.getId()); log.setTriggerTime(new Date()); diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java index a4adc444..c262d2d8 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java @@ -4,14 +4,16 @@ import com.xxl.job.admin.core.model.XxlJobLogGlue; import com.xxl.job.admin.dao.XxlJobLogGlueDao; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobLogGlueDaoTest { @Resource diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java index 016c4f23..01adbd65 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; import java.util.List; @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class XxlJobRegistryDaoTest { @Resource diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java index 0d03790e..9d36e7f8 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java @@ -3,16 +3,18 @@ package com.xxl.job.admin.util; import com.xxl.job.admin.core.util.I18nUtil; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; /** * email util test * * @author xuxueli 2017-12-22 17:16:23 */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class I18nUtilTest { @Test diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java index 6051e095..deca9f20 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java @@ -37,7 +37,7 @@ public interface ExecutorBiz { * @param fromLineNum * @return */ - public ReturnT log(long logDateTim, int logId, int fromLineNum); + public ReturnT log(long logDateTim, long logId, int fromLineNum); /** * run diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java index e5b90b7a..c12a0fa2 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java @@ -58,7 +58,7 @@ public class ExecutorBizImpl implements ExecutorBiz { } @Override - public ReturnT log(long logDateTim, int logId, int fromLineNum) { + public ReturnT log(long logDateTim, long logId, int fromLineNum) { // log filename: logPath/yyyy-MM-dd/9999.log String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logDateTim), logId); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java index 895aaec4..a71473b5 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java @@ -8,19 +8,19 @@ import java.io.Serializable; public class HandleCallbackParam implements Serializable { private static final long serialVersionUID = 42L; - private int logId; + private long logId; private long logDateTim; private ReturnT executeResult; public HandleCallbackParam(){} - public HandleCallbackParam(int logId, long logDateTim, ReturnT executeResult) { + public HandleCallbackParam(long logId, long logDateTim, ReturnT executeResult) { this.logId = logId; this.logDateTim = logDateTim; this.executeResult = executeResult; } - public int getLogId() { + public long getLogId() { return logId; } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java index 69d69f6f..a711b044 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java @@ -15,7 +15,7 @@ public class TriggerParam implements Serializable{ private String executorBlockStrategy; private int executorTimeout; - private int logId; + private long logId; private long logDateTim; private String glueType; @@ -66,11 +66,11 @@ public class TriggerParam implements Serializable{ this.executorTimeout = executorTimeout; } - public int getLogId() { + public long getLogId() { return logId; } - public void setLogId(int logId) { + public void setLogId(long logId) { this.logId = logId; } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java index ff89001a..3fa8c4de 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java @@ -68,7 +68,7 @@ public class XxlJobFileAppender { * @param logId * @return */ - public static String makeLogFileName(Date triggerDate, int logId) { + public static String makeLogFileName(Date triggerDate, long logId) { // filePath/yyyy-MM-dd SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // avoid concurrent problem, can not be static diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java index ba0b21c0..866670ec 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java @@ -30,7 +30,7 @@ public class JobThread extends Thread{ private int jobId; private IJobHandler handler; private LinkedBlockingQueue triggerQueue; - private Set triggerLogIdSet; // avoid repeat trigger for the same TRIGGER_LOG_ID + private Set triggerLogIdSet; // avoid repeat trigger for the same TRIGGER_LOG_ID private volatile boolean toStop = false; private String stopReason; @@ -43,7 +43,7 @@ public class JobThread extends Thread{ this.jobId = jobId; this.handler = handler; this.triggerQueue = new LinkedBlockingQueue(); - this.triggerLogIdSet = Collections.synchronizedSet(new HashSet()); + this.triggerLogIdSet = Collections.synchronizedSet(new HashSet()); } public IJobHandler getHandler() { return handler;