From ef858413b92ed91304cb735ffba93a381036e375 Mon Sep 17 00:00:00 2001
From: Hope Li <1278288511@qq.com>
Date: Mon, 2 Jun 2025 10:15:03 +0800
Subject: [PATCH] 0602  ljc

---
 .../ci/process/dal/req/resource/ResourceReq.java     |  4 ++--
 .../process/dal/resp/resource/ResourceFindResp.java  |  4 ++--
 .../resource/impl/ResourceManagerServiceImpl.java    | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java
index 115910e2..250186ce 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java
@@ -3,7 +3,7 @@ package cd.casic.ci.process.dal.req.resource;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
-import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
+import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
 import lombok.Data;
 
 @Data
@@ -36,7 +36,7 @@ public class ResourceReq {
 
     private PipResourceMachine resourceMachine;
 
-    private PipelineDockerEndpoint dockerEndpoint;
+    private DockerEndpointDo dockerEndpoint;
 
     private PipResourceK8S pipResourceK8S;
 
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java
index f1614ef4..806c5a1c 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java
@@ -3,7 +3,7 @@ package cd.casic.ci.process.dal.resp.resource;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
-import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
+import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
 import lombok.Data;
 
 @Data
@@ -54,7 +54,7 @@ public class ResourceFindResp {
 
     private PipResourceMachine resourceMachine;
 
-    private PipelineDockerEndpoint dockerEndpoint;
+    private DockerEndpointDo dockerEndpoint;
 
     private PipResourceK8S pipResourceK8S;
 
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 22937330..72730d03 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
@@ -5,7 +5,6 @@ import cd.casic.ci.process.dal.req.resource.ResourceReq;
 import cd.casic.ci.process.dal.resp.resource.ResourceFindResp;
 import cd.casic.ci.process.process.converter.ResourceConverter;
 import cd.casic.ci.process.process.dal.pipeline.PipResourceCloudDao;
-import cd.casic.ci.process.process.dal.pipeline.PipResourceDockerEndpointDao;
 import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao;
 import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao;
 import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao;
@@ -13,13 +12,14 @@ import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
 import cd.casic.ci.process.process.dataObject.resource.PipResourceManager;
-import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
 import cd.casic.ci.process.process.service.resource.ResourceManagerService;
 import cd.casic.framework.commons.exception.ServiceException;
 import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
 import cd.casic.framework.commons.pojo.PageResult;
 import cd.casic.framework.security.dal.user.AdminUserDO;
 import cd.casic.framework.tenant.core.service.AdminUserServiceImpl;
+import cd.casic.module.execute.docker.dao.DockerEndpointDao;
+import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,7 +50,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
     private PipResourceMachineDao machineDao;
 
     @Resource
-    private PipResourceDockerEndpointDao dockerEndpointDao;
+    private DockerEndpointDao dockerEndpointDao;
 
     @Resource
     private PipResourceK8SDao k8SDao;
@@ -82,7 +82,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
             pipResourceManager.setK8sId(pipResourceK8S.getId());
         }
         if (!ObjectUtils.isEmpty(resourceReq.getDockerEndpoint())) {
-            PipelineDockerEndpoint dockerEndpoint = resourceReq.getDockerEndpoint();
+            DockerEndpointDo dockerEndpoint = resourceReq.getDockerEndpoint();
             dockerEndpointDao.insert(dockerEndpoint);
 
             pipResourceManager.setDockerId(dockerEndpoint.getId());
@@ -158,7 +158,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
             temp.setK8sId(pipResourceK8S.getId());
         }
         if (!ObjectUtils.isEmpty(resourceReq.getDockerEndpoint())) {
-            PipelineDockerEndpoint dockerEndpoint = resourceReq.getDockerEndpoint();
+            DockerEndpointDo dockerEndpoint = resourceReq.getDockerEndpoint();
             dockerEndpointDao.insert(dockerEndpoint);
 
             temp.setDockerId(dockerEndpoint.getId());
@@ -289,7 +289,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
             resourceFindResp.setPipResourceK8S(pipResourceK8S);
         }
         if (!StringUtils.isEmpty(resourceFindResp.getDockerId())) {
-            PipelineDockerEndpoint dockerEndpoint = dockerEndpointDao.selectById(resourceFindResp.getDockerId());
+            DockerEndpointDo dockerEndpoint = dockerEndpointDao.selectById(resourceFindResp.getDockerId());
             resourceFindResp.setDockerEndpoint(dockerEndpoint);
         }
         if (!StringUtils.isEmpty(resourceFindResp.getCloudId())) {