From 7a57d6658c1f754ea1909ff70f3aecf61173b29f Mon Sep 17 00:00:00 2001
From: even <827656971@qq.com>
Date: Sun, 1 Jun 2025 18:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cd/casic/module/execute/docker/DockerClientFactory.java     | 2 +-
 .../cd/casic/module/execute/docker/dao/DockerEndpointDao.java   | 2 +-
 .../service/resource/impl/ResourceManagerServiceImpl.java       | 2 +-
 .../src/main/java/cd/casic/server/OpsServerApplication.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/DockerClientFactory.java b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/DockerClientFactory.java
index cc3696e5..ff23c4d5 100644
--- a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/DockerClientFactory.java
+++ b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/DockerClientFactory.java
@@ -29,7 +29,7 @@ import static java.lang.String.format;
 @Component
 public class DockerClientFactory implements CommandLineRunner {
 
-    @Resource
+    @Resource(type = DockerEndpointDao.class)
     private DockerEndpointDao dockerEndpointDao;
     @Getter
     private final Map<String, DockerClient> clientGroup = new ConcurrentHashMap<>();
diff --git a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dao/DockerEndpointDao.java b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dao/DockerEndpointDao.java
index 02c7bb71..a6e6c57a 100644
--- a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dao/DockerEndpointDao.java
+++ b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dao/DockerEndpointDao.java
@@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date: 2025/5/26 10:33
  * @version: 1.0
  */
-@Mapper
+//@Mapper
 public interface DockerEndpointDao extends BaseMapperX<DockerEndpointDo> {
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
index d08887cf..181a945d 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
@@ -50,7 +50,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
     @Resource
     private PipResourceMachineDao machineDao;
 
-    @Resource
+    @Autowired
     private PipResourceDockerEndpointDao dockerEndpointDao;
 
     @Resource
diff --git a/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java b/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java
index 89a928cd..006a842d 100644
--- a/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java
+++ b/ops-server/src/main/java/cd/casic/server/OpsServerApplication.java
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScans;
 
 @SuppressWarnings("SpringComponentScan")
 @ComponentScan({"cd.casic"})
-@MapperScan(basePackages = "cd.casic.ci.**.dal")
+@MapperScan(basePackages = {"cd.casic.**.dal","cd.casic.**.dao"})
 @SpringBootApplication(scanBasePackages = {"${ops.info.base-package}.server", "${ops.info.base-package}.module"})
 public class OpsServerApplication {