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

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

@@ -4,8 +4,8 @@ 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.admin.mapper.XxlJobInfoMapper;
+import com.xxl.job.admin.mapper.XxlJobLogGlueMapper;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.glue.GlueTypeEnum;
 import jakarta.annotation.Resource;
@@ -28,9 +28,9 @@ import java.util.List;
 public class JobCodeController {
 	
 	@Resource
-	private XxlJobInfoDao xxlJobInfoDao;
+	private XxlJobInfoMapper xxlJobInfoDao;
 	@Resource
-	private XxlJobLogGlueDao xxlJobLogGlueDao;
+	private XxlJobLogGlueMapper xxlJobLogGlueDao;
 
 	@RequestMapping
 	public String index(HttpServletRequest request, Model model, @RequestParam("jobId") int jobId) {

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

@@ -4,9 +4,9 @@ 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.admin.mapper.XxlJobGroupMapper;
+import com.xxl.job.admin.mapper.XxlJobInfoMapper;
+import com.xxl.job.admin.mapper.XxlJobRegistryMapper;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.RegistryConfig;
 import jakarta.annotation.Resource;
@@ -28,11 +28,11 @@ import java.util.*;
 public class JobGroupController {
 
 	@Resource
-	public XxlJobInfoDao xxlJobInfoDao;
+	public XxlJobInfoMapper xxlJobInfoDao;
 	@Resource
-	public XxlJobGroupDao xxlJobGroupDao;
+	public XxlJobGroupMapper xxlJobGroupDao;
 	@Resource
-	private XxlJobRegistryDao xxlJobRegistryDao;
+	private XxlJobRegistryMapper xxlJobRegistryDao;
 
 	@RequestMapping
 	@PermissionLimit(adminuser = true)

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

@@ -10,7 +10,7 @@ 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.mapper.XxlJobGroupMapper;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
@@ -38,7 +38,7 @@ public class JobInfoController {
 	private static Logger logger = LoggerFactory.getLogger(JobInfoController.class);
 
 	@Resource
-	private XxlJobGroupDao xxlJobGroupDao;
+	private XxlJobGroupMapper xxlJobGroupDao;
 	@Resource
 	private XxlJobService xxlJobService;
 	

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

@@ -8,9 +8,9 @@ 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.admin.mapper.XxlJobGroupMapper;
+import com.xxl.job.admin.mapper.XxlJobInfoMapper;
+import com.xxl.job.admin.mapper.XxlJobLogMapper;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.KillParam;
 import com.xxl.job.core.biz.model.LogParam;
@@ -44,11 +44,11 @@ public class JobLogController {
 	private static Logger logger = LoggerFactory.getLogger(JobLogController.class);
 
 	@Resource
-	private XxlJobGroupDao xxlJobGroupDao;
+	private XxlJobGroupMapper xxlJobGroupDao;
 	@Resource
-	public XxlJobInfoDao xxlJobInfoDao;
+	public XxlJobInfoMapper xxlJobInfoDao;
 	@Resource
-	public XxlJobLogDao xxlJobLogDao;
+	public XxlJobLogMapper xxlJobLogDao;
 
 	@RequestMapping
 	public String index(HttpServletRequest request, Model model, @RequestParam(value = "jobId", required = false, defaultValue = "0") Integer jobId) {

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

@@ -1,8 +1,8 @@
 package com.xxl.job.admin.controller.biz;
 
 import com.xxl.job.admin.annotation.PermissionLimit;
-import com.xxl.job.admin.mapper.XxlJobGroupDao;
-import com.xxl.job.admin.mapper.XxlJobUserDao;
+import com.xxl.job.admin.mapper.XxlJobGroupMapper;
+import com.xxl.job.admin.mapper.XxlJobUserMapper;
 import com.xxl.job.admin.model.XxlJobGroup;
 import com.xxl.job.admin.model.XxlJobUser;
 import com.xxl.job.admin.util.I18nUtil;
@@ -30,9 +30,9 @@ import java.util.Map;
 public class JobUserController {
 
     @Resource
-    private XxlJobUserDao xxlJobUserDao;
+    private XxlJobUserMapper xxlJobUserDao;
     @Resource
-    private XxlJobGroupDao xxlJobGroupDao;
+    private XxlJobGroupMapper xxlJobGroupDao;
 
     @RequestMapping
     @PermissionLimit(adminuser = true)

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

@@ -10,7 +10,7 @@ import java.util.List;
  * Created by xuxueli on 16/9/30.
  */
 @Mapper
-public interface XxlJobGroupDao {
+public interface XxlJobGroupMapper {
 
     public List<XxlJobGroup> findAll();
 

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @author xuxueli 2016-1-12 18:03:45
  */
 @Mapper
-public interface XxlJobInfoDao {
+public interface XxlJobInfoMapper {
 
 	public List<XxlJobInfo> pageList(@Param("offset") int offset,
 									 @Param("pagesize") int pagesize,

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

@@ -11,7 +11,7 @@ import java.util.List;
  * @author xuxueli 2016-5-19 18:04:56
  */
 @Mapper
-public interface XxlJobLogGlueDao {
+public interface XxlJobLogGlueMapper {
 	
 	public int save(XxlJobLogGlue xxlJobLogGlue);
 	

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

@@ -13,7 +13,7 @@ import java.util.Map;
  * @author xuxueli 2016-1-12 18:03:06
  */
 @Mapper
-public interface XxlJobLogDao {
+public interface XxlJobLogMapper {
 
 	// exist jobId not use jobGroup, not exist use jobGroup
 	public List<XxlJobLog> pageList(@Param("offset") int offset,

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @author xuxueli 2019-11-22
  */
 @Mapper
-public interface XxlJobLogReportDao {
+public interface XxlJobLogReportMapper {
 
 	public int save(XxlJobLogReport xxlJobLogReport);
 

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

@@ -11,7 +11,7 @@ import java.util.List;
  * Created by xuxueli on 16/9/30.
  */
 @Mapper
-public interface XxlJobRegistryDao {
+public interface XxlJobRegistryMapper {
 
     public List<Integer> findDead(@Param("timeout") int timeout,
                                   @Param("nowTime") Date nowTime);

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

@@ -9,7 +9,7 @@ import java.util.List;
  * @author xuxueli 2019-05-04 16:44:59
  */
 @Mapper
-public interface XxlJobUserDao {
+public interface XxlJobUserMapper {
 
 	public List<XxlJobUser> pageList(@Param("offset") int offset,
                                      @Param("pagesize") int pagesize,

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

@@ -73,15 +73,15 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
     // dao, service
 
     @Resource
-    private XxlJobLogDao xxlJobLogDao;
+    private XxlJobLogMapper xxlJobLogDao;
     @Resource
-    private XxlJobInfoDao xxlJobInfoDao;
+    private XxlJobInfoMapper xxlJobInfoDao;
     @Resource
-    private XxlJobRegistryDao xxlJobRegistryDao;
+    private XxlJobRegistryMapper xxlJobRegistryDao;
     @Resource
-    private XxlJobGroupDao xxlJobGroupDao;
+    private XxlJobGroupMapper xxlJobGroupDao;
     @Resource
-    private XxlJobLogReportDao xxlJobLogReportDao;
+    private XxlJobLogReportMapper xxlJobLogReportDao;
     @Resource
     private JavaMailSender mailSender;
     @Resource
@@ -130,23 +130,23 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
         return logretentiondays;
     }
 
-    public XxlJobLogDao getXxlJobLogDao() {
+    public XxlJobLogMapper getXxlJobLogDao() {
         return xxlJobLogDao;
     }
 
-    public XxlJobInfoDao getXxlJobInfoDao() {
+    public XxlJobInfoMapper getXxlJobInfoDao() {
         return xxlJobInfoDao;
     }
 
-    public XxlJobRegistryDao getXxlJobRegistryDao() {
+    public XxlJobRegistryMapper getXxlJobRegistryDao() {
         return xxlJobRegistryDao;
     }
 
-    public XxlJobGroupDao getXxlJobGroupDao() {
+    public XxlJobGroupMapper getXxlJobGroupDao() {
         return xxlJobGroupDao;
     }
 
-    public XxlJobLogReportDao getXxlJobLogReportDao() {
+    public XxlJobLogReportMapper getXxlJobLogReportDao() {
         return xxlJobLogReportDao;
     }
 

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

@@ -1,6 +1,6 @@
 package com.xxl.job.admin.service.impl;
 
-import com.xxl.job.admin.mapper.XxlJobUserDao;
+import com.xxl.job.admin.mapper.XxlJobUserMapper;
 import com.xxl.job.admin.model.XxlJobUser;
 import com.xxl.job.admin.util.CookieUtil;
 import com.xxl.job.admin.util.I18nUtil;
@@ -23,7 +23,7 @@ public class LoginService {
     public static final String LOGIN_IDENTITY_KEY = "XXL_JOB_LOGIN_IDENTITY";
 
     @Resource
-    private XxlJobUserDao xxlJobUserDao;
+    private XxlJobUserMapper xxlJobUserDao;
 
 
     // ---------------------- token tool ----------------------

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

@@ -35,15 +35,15 @@ public class XxlJobServiceImpl implements XxlJobService {
 	private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class);
 
 	@Resource
-	private XxlJobGroupDao xxlJobGroupDao;
+	private XxlJobGroupMapper xxlJobGroupDao;
 	@Resource
-	private XxlJobInfoDao xxlJobInfoDao;
+	private XxlJobInfoMapper xxlJobInfoDao;
 	@Resource
-	public XxlJobLogDao xxlJobLogDao;
+	public XxlJobLogMapper xxlJobLogDao;
 	@Resource
-	private XxlJobLogGlueDao xxlJobLogGlueDao;
+	private XxlJobLogGlueMapper xxlJobLogGlueDao;
 	@Resource
-	private XxlJobLogReportDao xxlJobLogReportDao;
+	private XxlJobLogReportMapper xxlJobLogReportDao;
 	
 	@Override
 	public Map<String, Object> pageList(int start, int length, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobGroupDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobGroupMapper">
 	
 	<resultMap id="XxlJobGroup" type="com.xxl.job.admin.model.XxlJobGroup" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobInfoDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobInfoMapper">
 
 	<resultMap id="XxlJobInfo" type="com.xxl.job.admin.model.XxlJobInfo" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobLogGlueDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogGlueMapper">
 	
 	<resultMap id="XxlJobLogGlue" type="com.xxl.job.admin.model.XxlJobLogGlue" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobLogDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogMapper">
 	
 	<resultMap id="XxlJobLog" type="com.xxl.job.admin.model.XxlJobLog" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobLogReportDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogReportMapper">
 	
 	<resultMap id="XxlJobLogReport" type="com.xxl.job.admin.model.XxlJobLogReport" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobRegistryDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobRegistryMapper">
 	
 	<resultMap id="XxlJobRegistry" type="com.xxl.job.admin.model.XxlJobRegistry" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 <?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.mapper.XxlJobUserDao">
+<mapper namespace="com.xxl.job.admin.mapper.XxlJobUserMapper">
 
 	<resultMap id="XxlJobUser" type="com.xxl.job.admin.model.XxlJobUser" >
 		<result column="id" property="id" />

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

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.dao;
 
 import com.xxl.job.admin.model.XxlJobGroup;
-import com.xxl.job.admin.mapper.XxlJobGroupDao;
+import com.xxl.job.admin.mapper.XxlJobGroupMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,7 +13,7 @@ import java.util.List;
 public class XxlJobGroupDaoTest {
 
     @Resource
-    private XxlJobGroupDao xxlJobGroupDao;
+    private XxlJobGroupMapper xxlJobGroupDao;
 
     @Test
     public void test(){

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

@@ -3,7 +3,7 @@ package com.xxl.job.admin.dao;
 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 com.xxl.job.admin.mapper.XxlJobInfoMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -18,7 +18,7 @@ public class XxlJobInfoDaoTest {
 	private static Logger logger = LoggerFactory.getLogger(XxlJobInfoDaoTest.class);
 	
 	@Resource
-	private XxlJobInfoDao xxlJobInfoDao;
+	private XxlJobInfoMapper xxlJobInfoDao;
 	
 	@Test
 	public void pageList(){

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

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.dao;
 
 import com.xxl.job.admin.model.XxlJobLog;
-import com.xxl.job.admin.mapper.XxlJobLogDao;
+import com.xxl.job.admin.mapper.XxlJobLogMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,7 +13,7 @@ import java.util.List;
 public class XxlJobLogDaoTest {
 
     @Resource
-    private XxlJobLogDao xxlJobLogDao;
+    private XxlJobLogMapper xxlJobLogDao;
 
     @Test
     public void test(){

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

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.dao;
 
 import com.xxl.job.admin.model.XxlJobLogGlue;
-import com.xxl.job.admin.mapper.XxlJobLogGlueDao;
+import com.xxl.job.admin.mapper.XxlJobLogGlueMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,7 +13,7 @@ import java.util.List;
 public class XxlJobLogGlueDaoTest {
 
     @Resource
-    private XxlJobLogGlueDao xxlJobLogGlueDao;
+    private XxlJobLogGlueMapper xxlJobLogGlueDao;
 
     @Test
     public void test(){

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

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.dao;
 
 import com.xxl.job.admin.model.XxlJobRegistry;
-import com.xxl.job.admin.mapper.XxlJobRegistryDao;
+import com.xxl.job.admin.mapper.XxlJobRegistryMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 public class XxlJobRegistryDaoTest {
 
     @Resource
-    private XxlJobRegistryDao xxlJobRegistryDao;
+    private XxlJobRegistryMapper xxlJobRegistryDao;
 
     @Test
     public void test(){