项目结构重构，提升可维护性与易读性；

doc/XXL-JOB官方文档.md

@@ -2556,8 +2556,8 @@ public void execute() {
 - 10、【优化】调度中心系统日志调整，支持启动时指定 -DLOG_HOME 参数自定义日志位置；同时优化日志格式提升易读性；
 - 11、【新增】GLUE模式(Python) 扩展，可选 "GLUE(Python3)" 或 "GLUE(Python2)" 两种模式，分别支持 python3/2 多版本；  
 - 12、【优化】任务Bean扫描规则调整，过滤冗余不必要扫描，避免系统组件提前初始化；
-- 
-- 13、【ING】底层组件移除单例写法，汇总factory统一管理；
+- 13、【重构】项目结构重构，提升可维护性与易读性；
+
 - 14、【ING】登录安全升级，密码加密处理算法从Md5改为Sha256；
 ```
 // 1、用户表password字段需要调整长度，执行如下命令
@@ -2570,6 +2570,9 @@ UPDATE xxl_conf_user t SET t.password = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5
 - 2、【规划中】登录认证重构，规范登录态以及权限认证逻辑，提升系统安全；登陆态Token生成逻辑优化，混淆登陆时间属性，降低token泄漏风险；
 
 
+### 7.41 版本 v3.2.1 Release Notes[规划中]
+- 1、【ING】底层组件移除单例写法，汇总factory统一管理；
+
 
 ### TODO LIST
 - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。

xxl-job-admin/src/main/java/com/xxl/job/admin/annotation/PermissionLimit.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.controller.annotation;
+package com.xxl.job.admin.annotation;
 
 
 import java.lang.annotation.ElementType;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java

@@ -1,6 +1,6 @@
 package com.xxl.job.admin.controller;
 
-import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.annotation.PermissionLimit;
 import com.xxl.job.admin.service.impl.LoginService;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.core.biz.model.ReturnT;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.controller;
+package com.xxl.job.admin.controller.biz;
 
-import com.xxl.job.admin.controller.annotation.PermissionLimit;
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.annotation.PermissionLimit;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
 import com.xxl.job.core.biz.AdminBiz;
 import com.xxl.job.core.biz.model.HandleCallbackParam;
 import com.xxl.job.core.biz.model.RegistryParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java

@@ -1,11 +1,11 @@
-package com.xxl.job.admin.controller;
-
-import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLogGlue;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobInfoDao;
-import com.xxl.job.admin.dao.XxlJobLogGlueDao;
+package com.xxl.job.admin.controller.biz;
+
+import com.xxl.job.admin.web.interceptor.PermissionInterceptor;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLogGlue;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.XxlJobInfoDao;
+import com.xxl.job.admin.mapper.XxlJobLogGlueDao;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.glue.GlueTypeEnum;
 import jakarta.annotation.Resource;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java

@@ -1,12 +1,12 @@
-package com.xxl.job.admin.controller;
-
-import com.xxl.job.admin.controller.annotation.PermissionLimit;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobRegistry;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobGroupDao;
-import com.xxl.job.admin.dao.XxlJobInfoDao;
-import com.xxl.job.admin.dao.XxlJobRegistryDao;
+package com.xxl.job.admin.controller.biz;
+
+import com.xxl.job.admin.annotation.PermissionLimit;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobRegistry;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.XxlJobGroupDao;
+import com.xxl.job.admin.mapper.XxlJobInfoDao;
+import com.xxl.job.admin.mapper.XxlJobRegistryDao;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.RegistryConfig;
 import jakarta.annotation.Resource;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java

@@ -1,16 +1,16 @@
-package com.xxl.job.admin.controller;
-
-import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
-import com.xxl.job.admin.core.exception.XxlJobException;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobUser;
-import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
-import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum;
-import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum;
-import com.xxl.job.admin.core.thread.JobScheduleHelper;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobGroupDao;
+package com.xxl.job.admin.controller.biz;
+
+import com.xxl.job.admin.web.interceptor.PermissionInterceptor;
+import com.xxl.job.admin.scheduler.exception.XxlJobException;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobUser;
+import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.XxlJobGroupDao;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java

@@ -1,16 +1,16 @@
-package com.xxl.job.admin.controller;
-
-import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
-import com.xxl.job.admin.core.complete.XxlJobCompleter;
-import com.xxl.job.admin.core.exception.XxlJobException;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobGroupDao;
-import com.xxl.job.admin.dao.XxlJobInfoDao;
-import com.xxl.job.admin.dao.XxlJobLogDao;
+package com.xxl.job.admin.controller.biz;
+
+import com.xxl.job.admin.web.interceptor.PermissionInterceptor;
+import com.xxl.job.admin.scheduler.complete.XxlJobCompleter;
+import com.xxl.job.admin.scheduler.exception.XxlJobException;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.XxlJobGroupDao;
+import com.xxl.job.admin.mapper.XxlJobInfoDao;
+import com.xxl.job.admin.mapper.XxlJobLogDao;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.KillParam;
 import com.xxl.job.core.biz.model.LogParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java

@@ -1,12 +1,12 @@
-package com.xxl.job.admin.controller;
-
-import com.xxl.job.admin.controller.annotation.PermissionLimit;
-import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobUser;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobGroupDao;
-import com.xxl.job.admin.dao.XxlJobUserDao;
+package com.xxl.job.admin.controller.biz;
+
+import com.xxl.job.admin.annotation.PermissionLimit;
+import com.xxl.job.admin.web.interceptor.PermissionInterceptor;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobUser;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.XxlJobGroupDao;
+import com.xxl.job.admin.mapper.XxlJobUserDao;
 import com.xxl.job.core.biz.model.ReturnT;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobGroup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.model.XxlJobLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobLogGlue;
+import com.xxl.job.admin.model.XxlJobLogGlue;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobLogReport;
+import com.xxl.job.admin.model.XxlJobLogReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.model.XxlJobRegistry;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserDao.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.dao;
+package com.xxl.job.admin.mapper;
 
-import com.xxl.job.admin.core.model.XxlJobUser;
+import com.xxl.job.admin.model.XxlJobUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.Date;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.Date;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.Date;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.Date;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import java.util.Date;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.model;
+package com.xxl.job.admin.model;
 
 import org.springframework.util.StringUtils;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.core.alarm;
+package com.xxl.job.admin.scheduler.alarm;
 
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
 
 /**
  * @author xuxueli 2020-01-19

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.core.alarm;
+package com.xxl.job.admin.scheduler.alarm;
 
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java

@@ -1,11 +1,11 @@
-package com.xxl.job.admin.core.alarm.impl;
-
-import com.xxl.job.admin.core.alarm.JobAlarm;
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.util.I18nUtil;
+package com.xxl.job.admin.scheduler.alarm.impl;
+
+import com.xxl.job.admin.scheduler.alarm.JobAlarm;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.model.ReturnT;
 import jakarta.mail.internet.MimeMessage;
 import org.slf4j.Logger;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/XxlJobCompleter.java

@@ -1,11 +1,11 @@
-package com.xxl.job.admin.core.complete;
-
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
-import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
-import com.xxl.job.admin.core.util.I18nUtil;
+package com.xxl.job.admin.scheduler.complete;
+
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.scheduler.thread.JobTriggerPoolHelper;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobContext;
 import org.slf4j.Logger;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/conf/XxlJobAdminConfig.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.conf;
+package com.xxl.job.admin.scheduler.conf;
 
-import com.xxl.job.admin.core.alarm.JobAlarmer;
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.dao.*;
+import com.xxl.job.admin.scheduler.alarm.JobAlarmer;
+import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.mapper.*;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.cron;
+package com.xxl.job.admin.scheduler.cron;
 
 import java.io.Serializable;
 import java.text.ParseException;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.exception;
+package com.xxl.job.admin.scheduler.exception;
 
 /**
  * @author xuxueli 2019-05-04 23:19:29

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.core.route;
+package com.xxl.job.admin.scheduler.route;
 
-import com.xxl.job.admin.core.route.strategy.*;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.route.strategy.*;
+import com.xxl.job.admin.util.I18nUtil;
 
 /**
  * Created by xuxueli on 17/3/10.

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.route;
+package com.xxl.job.admin.scheduler.route;
 
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.core.route.ExecutorRouter;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.IdleBeatParam;
 import com.xxl.job.core.biz.model.ReturnT;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.core.route.ExecutorRouter;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.route.strategy;
+package com.xxl.job.admin.scheduler.route.strategy;
 
-import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.scheduler.route.ExecutorRouter;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/MisfireStrategyEnum.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.scheduler;
+package com.xxl.job.admin.scheduler.scheduler;
 
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.util.I18nUtil;
 
 /**
  * @author xuxueli 2020-10-29 21:11:23

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/ScheduleTypeEnum.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.scheduler;
+package com.xxl.job.admin.scheduler.scheduler;
 
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.util.I18nUtil;
 
 /**
  * @author xuxueli 2020-10-29 21:11:23

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/scheduler/XxlJobScheduler.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.scheduler;
+package com.xxl.job.admin.scheduler.scheduler;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.thread.*;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.scheduler.thread.*;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.client.ExecutorBizClient;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java

@@ -1,9 +1,9 @@
-package com.xxl.job.admin.core.thread;
+package com.xxl.job.admin.scheduler.thread;
 
-import com.xxl.job.admin.core.complete.XxlJobCompleter;
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.complete.XxlJobCompleter;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.model.HandleCallbackParam;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.util.DateUtil;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailMonitorHelper.java

@@ -1,10 +1,10 @@
-package com.xxl.job.admin.core.thread;
+package com.xxl.job.admin.scheduler.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.util.I18nUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.core.thread;
+package com.xxl.job.admin.scheduler.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobLogReport;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobLogReport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.thread;
+package com.xxl.job.admin.scheduler.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobRegistry;
 import com.xxl.job.core.biz.model.RegistryParam;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.RegistryConfig;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java

@@ -1,11 +1,11 @@
-package com.xxl.job.admin.core.thread;
-
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.cron.CronExpression;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum;
-import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum;
-import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
+package com.xxl.job.admin.scheduler.thread;
+
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.scheduler.cron.CronExpression;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.core.thread;
+package com.xxl.job.admin.scheduler.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
-import com.xxl.job.admin.core.trigger.XxlJobTrigger;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.scheduler.trigger.XxlJobTrigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.trigger;
+package com.xxl.job.admin.scheduler.trigger;
 
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.util.I18nUtil;
 
 /**
  * trigger type enum

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/XxlJobTrigger.java

@@ -1,12 +1,12 @@
-package com.xxl.job.admin.core.trigger;
-
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLog;
-import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.core.util.I18nUtil;
+package com.xxl.job.admin.scheduler.trigger;
+
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java

@@ -1,8 +1,8 @@
 package com.xxl.job.admin.service;
 
 
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobUser;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobUser;
 import com.xxl.job.core.biz.model.ReturnT;
 
 import java.util.Date;

xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.service.impl;
 
-import com.xxl.job.admin.core.thread.JobCompleteHelper;
-import com.xxl.job.admin.core.thread.JobRegistryHelper;
+import com.xxl.job.admin.scheduler.thread.JobCompleteHelper;
+import com.xxl.job.admin.scheduler.thread.JobRegistryHelper;
 import com.xxl.job.core.biz.AdminBiz;
 import com.xxl.job.core.biz.model.HandleCallbackParam;
 import com.xxl.job.core.biz.model.RegistryParam;

xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java

@@ -1,10 +1,10 @@
 package com.xxl.job.admin.service.impl;
 
-import com.xxl.job.admin.core.model.XxlJobUser;
-import com.xxl.job.admin.core.util.CookieUtil;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.core.util.JacksonUtil;
-import com.xxl.job.admin.dao.XxlJobUserDao;
+import com.xxl.job.admin.model.XxlJobUser;
+import com.xxl.job.admin.util.CookieUtil;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.util.JacksonUtil;
+import com.xxl.job.admin.mapper.XxlJobUserDao;
 import com.xxl.job.core.biz.model.ReturnT;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;

xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

@@ -1,18 +1,18 @@
 package com.xxl.job.admin.service.impl;
 
-import com.xxl.job.admin.core.cron.CronExpression;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.model.XxlJobLogReport;
-import com.xxl.job.admin.core.model.XxlJobUser;
-import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
-import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum;
-import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum;
-import com.xxl.job.admin.core.thread.JobScheduleHelper;
-import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
-import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
-import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.*;
+import com.xxl.job.admin.scheduler.cron.CronExpression;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.model.XxlJobLogReport;
+import com.xxl.job.admin.model.XxlJobUser;
+import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;
+import com.xxl.job.admin.scheduler.thread.JobTriggerPoolHelper;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.util.I18nUtil;
+import com.xxl.job.admin.mapper.*;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;

xxl-job-admin/src/main/java/com/xxl/job/admin/util/CookieUtil.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.util;
+package com.xxl.job.admin.util;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;

xxl-job-admin/src/main/java/com/xxl/job/admin/util/FtlUtil.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.util;
+package com.xxl.job.admin.util;
 
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.ext.beans.BeansWrapperBuilder;

xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java

@@ -1,6 +1,6 @@
-package com.xxl.job.admin.core.util;
+package com.xxl.job.admin.util;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;

xxl-job-admin/src/main/java/com/xxl/job/admin/util/JacksonUtil.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.util;
+package com.xxl.job.admin.util;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonParseException;

xxl-job-admin/src/main/java/com/xxl/job/admin/util/LocalCacheUtil.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.core.util;
+package com.xxl.job.admin.util;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/CookieInterceptor.java

@@ -1,7 +1,7 @@
-package com.xxl.job.admin.controller.interceptor;
+package com.xxl.job.admin.web.interceptor;
 
-import com.xxl.job.admin.core.util.FtlUtil;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.util.FtlUtil;
+import com.xxl.job.admin.util.I18nUtil;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/PermissionInterceptor.java

@@ -1,9 +1,9 @@
-package com.xxl.job.admin.controller.interceptor;
+package com.xxl.job.admin.web.interceptor;
 
-import com.xxl.job.admin.controller.annotation.PermissionLimit;
-import com.xxl.job.admin.core.model.XxlJobGroup;
-import com.xxl.job.admin.core.model.XxlJobUser;
-import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.annotation.PermissionLimit;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobUser;
+import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.admin.service.impl.LoginService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;

xxl-job-admin/src/main/java/com/xxl/job/admin/web/interceptor/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.controller.interceptor;
+package com.xxl.job.admin.web.interceptor;
 
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Configuration;

xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebErrorPageRegistrar.java

@@ -1,4 +1,4 @@
-package com.xxl.job.admin.controller.resolver;
+package com.xxl.job.admin.web.resolver;
 
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.ErrorPageRegistrar;

xxl-job-admin/src/main/java/com/xxl/job/admin/web/resolver/WebExceptionResolver.java

@@ -1,8 +1,8 @@
-package com.xxl.job.admin.controller.resolver;
+package com.xxl.job.admin.web.resolver;
 
-import com.xxl.job.admin.core.exception.XxlJobException;
+import com.xxl.job.admin.scheduler.exception.XxlJobException;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.admin.core.util.JacksonUtil;
+import com.xxl.job.admin.util.JacksonUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobGroupDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobGroupDao">
 	
-	<resultMap id="XxlJobGroup" type="com.xxl.job.admin.core.model.XxlJobGroup" >
+	<resultMap id="XxlJobGroup" type="com.xxl.job.admin.model.XxlJobGroup" >
 		<result column="id" property="id" />
 	    <result column="app_name" property="appname" />
 	    <result column="title" property="title" />
@@ -34,12 +34,12 @@
 		ORDER BY t.app_name, t.title, t.id ASC
 	</select>
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`)
 		values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} );
 	</insert>
 
-	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobGroup" >
+	<update id="update" parameterType="com.xxl.job.admin.model.XxlJobGroup" >
 		UPDATE xxl_job_group
 		SET `app_name` = #{appname},
 			`title` = #{title},

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobInfoDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobInfoDao">
 
-	<resultMap id="XxlJobInfo" type="com.xxl.job.admin.core.model.XxlJobInfo" >
+	<resultMap id="XxlJobInfo" type="com.xxl.job.admin.model.XxlJobInfo" >
 		<result column="id" property="id" />
 
 		<result column="job_group" property="jobGroup" />
@@ -111,7 +111,7 @@
 		</trim>
 	</select>
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_info (
 			job_group,
 			job_desc,
@@ -173,7 +173,7 @@
 		WHERE t.id = #{id}
 	</select>
 
-	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" >
+	<update id="update" parameterType="com.xxl.job.admin.model.XxlJobInfo" >
 		UPDATE xxl_job_info
 		SET
 			job_group = #{jobGroup},
@@ -228,7 +228,7 @@
 		LIMIT #{pagesize}
 	</select>
 
-	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo"  >
+	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.model.XxlJobInfo"  >
 		UPDATE xxl_job_info
 		SET
 			trigger_last_time = #{triggerLastTime},

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobLogGlueDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogGlueDao">
 	
-	<resultMap id="XxlJobLogGlue" type="com.xxl.job.admin.core.model.XxlJobLogGlue" >
+	<resultMap id="XxlJobLogGlue" type="com.xxl.job.admin.model.XxlJobLogGlue" >
 		<result column="id" property="id" />
 	    <result column="job_id" property="jobId" />
 		<result column="glue_type" property="glueType" />
@@ -23,7 +23,7 @@
 		t.update_time
 	</sql>
 	
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_logglue (
 			`job_id`,
 			`glue_type`,

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobLogDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogDao">
 	
-	<resultMap id="XxlJobLog" type="com.xxl.job.admin.core.model.XxlJobLog" >
+	<resultMap id="XxlJobLog" type="com.xxl.job.admin.model.XxlJobLog" >
 		<result column="id" property="id" />
 
 		<result column="job_group" property="jobGroup" />
@@ -117,7 +117,7 @@
 	</select>
 
 	
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_log (
 			`job_group`,
 			`job_id`,

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobLogReportDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogReportDao">
 	
-	<resultMap id="XxlJobLogReport" type="com.xxl.job.admin.core.model.XxlJobLogReport" >
+	<resultMap id="XxlJobLogReport" type="com.xxl.job.admin.model.XxlJobLogReport" >
 		<result column="id" property="id" />
 	    <result column="trigger_day" property="triggerDay" />
 		<result column="running_count" property="runningCount" />
@@ -19,7 +19,7 @@
 		t.fail_count
 	</sql>
 	
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_log_report (
 			`trigger_day`,
 			`running_count`,

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobRegistryDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobRegistryDao">
 	
-	<resultMap id="XxlJobRegistry" type="com.xxl.job.admin.core.model.XxlJobRegistry" >
+	<resultMap id="XxlJobRegistry" type="com.xxl.job.admin.model.XxlJobRegistry" >
 		<result column="id" property="id" />
 	    <result column="registry_group" property="registryGroup" />
 	    <result column="registry_key" property="registryKey" />

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xxl.job.admin.dao.XxlJobUserDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobUserDao">
 
-	<resultMap id="XxlJobUser" type="com.xxl.job.admin.core.model.XxlJobUser" >
+	<resultMap id="XxlJobUser" type="com.xxl.job.admin.model.XxlJobUser" >
 		<result column="id" property="id" />
 		<result column="username" property="username" />
 	    <result column="password" property="password" />
@@ -53,7 +53,7 @@
 		WHERE t.username = #{username}
 	</select>
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobUser" useGeneratedKeys="true" keyProperty="id" >
+	<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobUser" useGeneratedKeys="true" keyProperty="id" >
 		INSERT INTO xxl_job_user (
 			username,
 			password,
@@ -67,7 +67,7 @@
 		);
 	</insert>
 
-	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobUser" >
+	<update id="update" parameterType="com.xxl.job.admin.model.XxlJobUser" >
 		UPDATE xxl_job_user
 		SET
 			<if test="password != null and password != ''">

xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java

@@ -1,6 +1,6 @@
 package com.xxl.job.admin.core.util;
 
-import com.xxl.job.admin.core.cron.CronExpression;
+import com.xxl.job.admin.scheduler.cron.CronExpression;
 import com.xxl.job.core.util.DateUtil;
 import org.junit.jupiter.api.Test;
 

xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java

@@ -1,11 +1,12 @@
 package com.xxl.job.admin.core.util;
 
+import com.xxl.job.admin.util.JacksonUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.xxl.job.admin.core.util.JacksonUtil.writeValueAsString;
+import static com.xxl.job.admin.util.JacksonUtil.writeValueAsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class JacksonUtilTest {

xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java

@@ -1,6 +1,7 @@
 package com.xxl.job.admin.dao;
 
-import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.model.XxlJobGroup;
+import com.xxl.job.admin.mapper.XxlJobGroupDao;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java

@@ -1,8 +1,9 @@
 package com.xxl.job.admin.dao;
 
-import com.xxl.job.admin.core.model.XxlJobInfo;
-import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum;
-import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.mapper.XxlJobInfoDao;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;

xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java

@@ -1,6 +1,7 @@
 package com.xxl.job.admin.dao;
 
-import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.model.XxlJobLog;
+import com.xxl.job.admin.mapper.XxlJobLogDao;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java

@@ -1,6 +1,7 @@
 package com.xxl.job.admin.dao;
 
-import com.xxl.job.admin.core.model.XxlJobLogGlue;
+import com.xxl.job.admin.model.XxlJobLogGlue;
+import com.xxl.job.admin.mapper.XxlJobLogGlueDao;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java

@@ -1,6 +1,7 @@
 package com.xxl.job.admin.dao;
 
-import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.model.XxlJobRegistry;
+import com.xxl.job.admin.mapper.XxlJobRegistryDao;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java

@@ -1,6 +1,5 @@
 package com.xxl.job.admin.util;
 
-import com.xxl.job.admin.core.util.I18nUtil;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;