xxl-job 8.8修改bug

xxl-job-pg/pom.xml

@@ -25,9 +25,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <maven.test.skip>true</maven.test.skip>
 
@@ -64,6 +64,10 @@
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
     </dependencies>
 
 

xxl-job-pg/xxl-job-admin-pg/pom.xml

@@ -82,6 +82,7 @@
             <scope>compile</scope>
         </dependency>
 
+
     </dependencies>
 
     <build>

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/controller/JobCodeController.java

@@ -79,7 +79,7 @@ public class JobCodeController {
 
 		// log old code
 		XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
-		xxlJobLogGlue.setJobId(exists_jobInfo.getId());
+		xxlJobLogGlue.setJobId((int) exists_jobInfo.getId());
 		xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
 		xxlJobLogGlue.setGlueSource(glueSource);
 		xxlJobLogGlue.setGlueRemark(glueRemark);

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/controller/JobLogController.java

@@ -105,8 +105,8 @@ public class JobLogController {
 		}
 		
 		// page query
-		List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
-		int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
+		List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, (int) jobId, triggerTimeStart, triggerTimeEnd, logStatus);
+		int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, (int) jobId, triggerTimeStart, triggerTimeEnd, logStatus);
 		
 		// package result
 		Map<String, Object> maps = new HashMap<String, Object>();
@@ -220,7 +220,7 @@ public class JobLogController {
 
 		List<Long> logIds = null;
 		do {
-			logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000);
+			logIds = xxlJobLogDao.findClearLogIds(jobGroup, (int) jobId, clearBeforeTime, clearBeforeNum, 1000);
 			if (logIds!=null && logIds.size()>0) {
 				xxlJobLogDao.clearLog(logIds);
 			}

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobGroup.java

@@ -9,7 +9,7 @@ import java.util.List;
  */
 public class XxlJobGroup {
 
-    private long id;
+    private int id;
     private String appname;
     private String title;
     private int addressType;        // 执行器地址类型：0=自动注册、1=手动录入
@@ -28,7 +28,7 @@ public class XxlJobGroup {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(int id) {
         this.id = id;
     }
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobInfo.java

@@ -9,9 +9,9 @@ import java.util.Date;
  */
 public class XxlJobInfo {
 	
-	private long id;				// 主键ID
+	private int id;				// 主键ID
 	
-	private long jobGroup;		// 执行器主键ID
+	private int jobGroup;		// 执行器主键ID
 	private String jobCron;		// 任务执行CRON表达式
 	private String jobDesc;
 	
@@ -44,7 +44,7 @@ public class XxlJobInfo {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 
@@ -52,7 +52,7 @@ public class XxlJobInfo {
 		return jobGroup;
 	}
 
-	public void setJobGroup(long jobGroup) {
+	public void setJobGroup(int jobGroup) {
 		this.jobGroup = jobGroup;
 	}
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobLog.java

@@ -8,11 +8,11 @@ import java.util.Date;
  */
 public class XxlJobLog {
 	
-	private long id;
+	private int id;
 	
 	// job info
-	private long jobGroup;
-	private long jobId;
+	private int jobGroup;
+	private int jobId;
 
 	// execute info
 	private String executorAddress;
@@ -38,7 +38,7 @@ public class XxlJobLog {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 
@@ -46,7 +46,7 @@ public class XxlJobLog {
 		return jobGroup;
 	}
 
-	public void setJobGroup(long jobGroup) {
+	public void setJobGroup(int jobGroup) {
 		this.jobGroup = jobGroup;
 	}
 
@@ -54,7 +54,7 @@ public class XxlJobLog {
 		return jobId;
 	}
 
-	public void setJobId(long jobId) {
+	public void setJobId(int jobId) {
 		this.jobId = jobId;
 	}
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobLogGlue.java

@@ -8,8 +8,8 @@ import java.util.Date;
  */
 public class XxlJobLogGlue {
 	
-	private long id;
-	private long jobId;				// 任务主键ID
+	private int id;
+	private int jobId;				// 任务主键ID
 	private String glueType;		// GLUE类型	#org.poem.glue.GlueTypeEnum
 	private String glueSource;
 	private String glueRemark;
@@ -20,7 +20,7 @@ public class XxlJobLogGlue {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 
@@ -28,7 +28,7 @@ public class XxlJobLogGlue {
 		return jobId;
 	}
 
-	public void setJobId(long jobId) {
+	public void setJobId(int jobId) {
 		this.jobId = jobId;
 	}
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobLogReport.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 public class XxlJobLogReport {
 
-    private long id;
+    private int id;
 
     private Date triggerDay;
 
@@ -16,7 +16,7 @@ public class XxlJobLogReport {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(int id) {
         this.id = id;
     }
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobRegistry.java

@@ -7,7 +7,7 @@ import java.util.Date;
  */
 public class XxlJobRegistry {
 
-    private long id;
+    private int id;
     private String registryGroup;
     private String registryKey;
     private String registryValue;
@@ -17,7 +17,7 @@ public class XxlJobRegistry {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(int id) {
         this.id = id;
     }
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/model/XxlJobUser.java

@@ -7,7 +7,7 @@ import org.springframework.util.StringUtils;
  */
 public class XxlJobUser {
 	
-	private long id;
+	private int id;
 	private String username;		// 账号
 	private String password;		// 密码
 	private int role;				// 角色：0-普通用户、1-管理员
@@ -17,7 +17,7 @@ public class XxlJobUser {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/route/strategy/ExecutorRouteBusyover.java

@@ -23,7 +23,7 @@ public class ExecutorRouteBusyover extends ExecutorRouter {
             ReturnT<String> idleBeatResult = null;
             try {
                 ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(address);
-                idleBeatResult = executorBiz.idleBeat(new IdleBeatParam(triggerParam.getJobId()));
+                idleBeatResult = executorBiz.idleBeat(new IdleBeatParam((int) triggerParam.getJobId()));
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);
                 idleBeatResult = new ReturnT<String>(ReturnT.FAIL_CODE, ""+e );

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/thread/JobFailMonitorHelper.java

@@ -43,7 +43,7 @@ public class JobFailMonitorHelper {
 							for (long failLogId: failLogIds) {
 
 								// lock log
-								int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
+								int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus((int) failLogId, 0, -1);
 								if (lockRet < 1) {
 									continue;
 								}
@@ -67,7 +67,7 @@ public class JobFailMonitorHelper {
 									newAlarmStatus = 1;
 								}
 
-								XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, -1, newAlarmStatus);
+								XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus((int) failLogId, -1, newAlarmStatus);
 							}
 						}
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/thread/JobLosedMonitorHelper.java

@@ -46,7 +46,7 @@ public class JobLosedMonitorHelper {
 							for (Long logId: losedJobIds) {
 
 								XxlJobLog jobLog = new XxlJobLog();
-								jobLog.setId(logId);
+								jobLog.setId(Math.toIntExact(logId));
 
 								jobLog.setHandleTime(new Date());
 								jobLog.setHandleCode(ReturnT.FAIL_CODE);

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/core/trigger/XxlJobTrigger.java

@@ -118,8 +118,8 @@ public class XxlJobTrigger {
 
         // 1、save log-id
         XxlJobLog jobLog = new XxlJobLog();
-        jobLog.setJobGroup(jobInfo.getJobGroup());
-        jobLog.setJobId(jobInfo.getId());
+        jobLog.setJobGroup((int) jobInfo.getJobGroup());
+        jobLog.setJobId((int) jobInfo.getId());
         jobLog.setTriggerTime(new Date());
         jobLog.setExecutorFailRetryCount(0);
         jobLog.setId(SnowFlake.genLongId());

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/dao/XxlJobLogDao.java

@@ -19,14 +19,14 @@ public interface XxlJobLogDao {
 	public List<XxlJobLog> pageList(@Param("offset") int offset,
 									@Param("pagesize") int pagesize,
 									@Param("jobGroup") long jobGroup,
-									@Param("jobId") long jobId,
+									@Param("jobId") int jobId,
 									@Param("triggerTimeStart") Date triggerTimeStart,
 									@Param("triggerTimeEnd") Date triggerTimeEnd,
 									@Param("logStatus") int logStatus);
 	public int pageListCount(@Param("offset") int offset,
 							 @Param("pagesize") int pagesize,
 							 @Param("jobGroup") long jobGroup,
-							 @Param("jobId") long jobId,
+							 @Param("jobId") int jobId,
 							 @Param("triggerTimeStart") Date triggerTimeStart,
 							 @Param("triggerTimeEnd") Date triggerTimeEnd,
 							 @Param("logStatus") int logStatus);
@@ -39,13 +39,13 @@ public interface XxlJobLogDao {
 
 	public int updateHandleInfo(XxlJobLog xxlJobLog);
 	
-	public int delete(@Param("jobId") long jobId);
+	public int delete(@Param("jobId") int jobId);
 
 	public Map<String, Object> findLogReport(@Param("from") Date from,
 											 @Param("to") Date to);
 
 	public List<Long> findClearLogIds(@Param("jobGroup") long jobGroup,
-									  @Param("jobId") long jobId,
+									  @Param("jobId") int jobId,
 									  @Param("clearBeforeTime") Date clearBeforeTime,
 									  @Param("clearBeforeNum") int clearBeforeNum,
 									  @Param("pagesize") int pagesize);
@@ -53,7 +53,7 @@ public interface XxlJobLogDao {
 
 	public List<Long> findFailJobLogIds(@Param("pagesize") int pagesize);
 
-	public int updateAlarmStatus(@Param("logId") long logId,
+	public int updateAlarmStatus(@Param("logId") int logId,
 								 @Param("oldAlarmStatus") int oldAlarmStatus,
 								 @Param("newAlarmStatus") int newAlarmStatus);
 

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/dao/XxlJobRegistryDao.java

@@ -26,7 +26,7 @@ public interface XxlJobRegistryDao {
                               @Param("registryValue") String registryValue,
                               @Param("updateTime") Date updateTime);
 
-    public int registrySave(@Param("id") Long id,
+    public int registrySave(@Param("id") int id,
                             @Param("registryGroup") String registryGroup,
                             @Param("registryKey") String registryKey,
                             @Param("registryValue") String registryValue,

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/service/impl/AdminBizImpl.java

@@ -142,7 +142,7 @@ public class AdminBizImpl implements AdminBiz {
 
         int ret = xxlJobRegistryDao.registryUpdate(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date());
         if (ret < 1) {
-            xxlJobRegistryDao.registrySave(SnowFlake.genLongId(), registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date());
+            xxlJobRegistryDao.registrySave((int) SnowFlake.genLongId(), registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date());
 
             // fresh
             freshGroupRegistryInfo(registryParam);

xxl-job-pg/xxl-job-admin-pg/src/main/java/org/poem/service/impl/XxlJobServiceImpl.java

@@ -212,7 +212,7 @@ public class XxlJobServiceImpl implements XxlJobService {
 			}
 		}
 
-		exists_jobInfo.setJobGroup(jobInfo.getJobGroup());
+		exists_jobInfo.setJobGroup((int) jobInfo.getJobGroup());
 		exists_jobInfo.setJobCron(jobInfo.getJobCron());
 		exists_jobInfo.setJobDesc(jobInfo.getJobDesc());
 		exists_jobInfo.setAuthor(jobInfo.getAuthor());
@@ -241,7 +241,7 @@ public class XxlJobServiceImpl implements XxlJobService {
 		}
 
 		xxlJobInfoDao.delete(id);
-		xxlJobLogDao.delete(id);
+		xxlJobLogDao.delete((int) id);
 		xxlJobLogGlueDao.deleteByJobId(id);
 		return ReturnT.SUCCESS;
 	}

xxl-job-pg/xxl-job-admin-pg/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml

@@ -19,7 +19,7 @@
 		t.update_time
 	</sql>
 
-	<select id="findDead" parameterType="java.util.HashMap" resultType="java.lang.Long" >
+	<select id="findDead" parameterType="java.util.HashMap" resultType="java.lang.Integer" >
 		SELECT t.id
 		FROM xxl_job_registry AS t
 		WHERE t.update_time <![CDATA[ < ]]> ((select NOW())-INTERVAL &apos;  ${timeout} SEC &apos; )

xxl-job-pg/xxl-job-core-pg/src/main/java/org/poem/biz/model/IdleBeatParam.java

@@ -10,18 +10,18 @@ public class IdleBeatParam implements Serializable {
 
     public IdleBeatParam() {
     }
-    public IdleBeatParam(Long jobId) {
+    public IdleBeatParam(int jobId) {
         this.jobId = jobId;
     }
 
-    private Long jobId;
+    private int jobId;
 
 
-    public Long getJobId() {
+    public int getJobId() {
         return jobId;
     }
 
-    public void setJobId(Long jobId) {
+    public void setJobId(int jobId) {
         this.jobId = jobId;
     }
 

xxl-job-pg/xxl-job-core-pg/src/main/java/org/poem/util/SnowFlake.java

@@ -104,8 +104,8 @@ public class SnowFlake {
         return Long.toString(snowFlake.nextId());
     }
 
-    public static Long genLongId() {
-        return snowFlake.nextId();
+    public static int genLongId() {
+        return (int) snowFlake.nextId();
     }
 
 }

xxl-job-pg/xxl-job-springboot-example/src/main/java/org/poem/jobhandler/SampleXxlJob.java

@@ -45,6 +45,7 @@ public class SampleXxlJob {
         System.out.println("==================");
         return ReturnT.SUCCESS;
     }
+
     /**
      * 1、简单任务示例（Bean模式）
      */