From 3fa9eaceb9be64b69811cf072739a01081236f41 Mon Sep 17 00:00:00 2001
From: srzou <srzou@outlook.com>
Date: Mon, 14 Apr 2025 23:25:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.5.0):=20=E5=A2=9E=E5=8A=A0jobLog?=
 =?UTF-8?q?=E5=8F=8AretryLog=E6=8E=A5=E5=8F=A3=EF=BC=9B=E5=8F=8A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/access/JobLogAccess.java       |  5 ++++
 .../datasource/access/RetryLogAccess.java     |  5 ++++
 .../access/log/AbstractLogAccess.java         | 14 ---------
 .../access/log/JobLogMessageAccess.java       |  8 ++---
 .../access/log/RetryTaskLogMessageAccess.java |  4 +--
 .../access/log/config/LogConfig.java          | 29 +++++++++++++++++++
 6 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java
 create mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java
 delete mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java
 create mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java

diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java
new file mode 100644
index 000000000..74239c81c
--- /dev/null
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java
@@ -0,0 +1,5 @@
+package com.aizuda.snailjob.template.datasource.access;
+
+
+public interface JobLogAccess<T> extends LogAccess<T>{
+}
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java
new file mode 100644
index 000000000..702c09654
--- /dev/null
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java
@@ -0,0 +1,5 @@
+package com.aizuda.snailjob.template.datasource.access;
+
+
+public interface RetryLogAccess<T> extends LogAccess<T>{
+}
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java
deleted file mode 100644
index de1214c85..000000000
--- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.aizuda.snailjob.template.datasource.access.log;
-
-import com.aizuda.snailjob.template.datasource.access.LogAccess;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author opensnail
- * @date 2025-03-30
- */
-public abstract class AbstractLogAccess<T> implements LogAccess<T> {
-}
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java
index d121e0183..6d2d7c089 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java
@@ -1,6 +1,6 @@
 package com.aizuda.snailjob.template.datasource.access.log;
 
-import com.aizuda.snailjob.template.datasource.access.LogAccess;
+import com.aizuda.snailjob.template.datasource.access.JobLogAccess;
 import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum;
 import com.aizuda.snailjob.template.datasource.enums.OperationTypeEnum;
 import com.aizuda.snailjob.template.datasource.persistence.dataobject.common.*;
@@ -13,8 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.*;
@@ -29,11 +27,9 @@ import static com.aizuda.snailjob.template.datasource.utils.DbUtils.getDbType;
  * @author opensnail
  * @date 2025-03-30
  */
-@Component
 @Slf4j
-//@ConditionalOnMissingBean(LogAccess.class)
 @RequiredArgsConstructor
-public class JobLogMessageAccess extends AbstractLogAccess<JobLogMessageDO> {
+public class JobLogMessageAccess implements JobLogAccess<JobLogMessageDO> {
     private final JobLogMessageMapper jobLogMessageMapper;
     private final JobTaskBatchMapper jobTaskBatchMapper;
 
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java
index 457091a7e..709d56033 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java
@@ -1,5 +1,6 @@
 package com.aizuda.snailjob.template.datasource.access.log;
 
+import com.aizuda.snailjob.template.datasource.access.RetryLogAccess;
 import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum;
 import com.aizuda.snailjob.template.datasource.enums.OperationTypeEnum;
 import com.aizuda.snailjob.template.datasource.persistence.dataobject.common.*;
@@ -20,8 +21,7 @@ import static com.aizuda.snailjob.template.datasource.utils.DbUtils.getDbType;
  * @author opensnail
  * @date 2025-03-29
  */
-@Component
-public class RetryTaskLogMessageAccess extends AbstractLogAccess<RetryTaskLogMessageDO> {
+public class RetryTaskLogMessageAccess implements RetryLogAccess<RetryTaskLogMessageDO> {
 
 
     @Override
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java
new file mode 100644
index 000000000..3c93f620a
--- /dev/null
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java
@@ -0,0 +1,29 @@
+package com.aizuda.snailjob.template.datasource.access.log.config;
+
+import com.aizuda.snailjob.template.datasource.access.JobLogAccess;
+import com.aizuda.snailjob.template.datasource.access.RetryLogAccess;
+import com.aizuda.snailjob.template.datasource.access.log.JobLogMessageAccess;
+import com.aizuda.snailjob.template.datasource.access.log.RetryTaskLogMessageAccess;
+import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.JobLogMessageDO;
+import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.RetryTaskLogMessageDO;
+import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper;
+import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class LogConfig {
+
+    @ConditionalOnMissingBean
+    @Bean
+    public JobLogAccess<JobLogMessageDO> defaultJobLogAccess(JobLogMessageMapper jobLogMessageMapper, JobTaskBatchMapper jobTaskBatchMapper) {
+        return new JobLogMessageAccess(jobLogMessageMapper, jobTaskBatchMapper);
+    }
+
+    @ConditionalOnMissingBean
+    @Bean
+    public RetryLogAccess<RetryTaskLogMessageDO> defaultRetryLogAccess() {
+        return new RetryTaskLogMessageAccess();
+    }
+}