mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

启动问题修复

Browse Source
This commit is contained in:
even 2025-06-01 18:21:04 +08:00
parent 41a0e2cf9f
commit 7a57d6658c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/DockerClientFactory.java
View File

@ -29,7 +29,7 @@ import static java.lang.String.format;
@Component @Component
public class DockerClientFactory implements CommandLineRunner { public class DockerClientFactory implements CommandLineRunner {
@Resource @Resource(type = DockerEndpointDao.class)
private DockerEndpointDao dockerEndpointDao; private DockerEndpointDao dockerEndpointDao;
@Getter @Getter
private final Map<String, DockerClient> clientGroup = new ConcurrentHashMap<>(); private final Map<String, DockerClient> clientGroup = new ConcurrentHashMap<>();

2
modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dao/DockerEndpointDao.java
View File

@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
* @date: 2025/5/26 10:33 * @date: 2025/5/26 10:33
* @version: 1.0 * @version: 1.0
*/ */
@Mapper //@Mapper
public interface DockerEndpointDao extends BaseMapperX<DockerEndpointDo> { public interface DockerEndpointDao extends BaseMapperX<DockerEndpointDo> {
} }

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
View File

@ -50,7 +50,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
@Resource @Resource
private PipResourceMachineDao machineDao; private PipResourceMachineDao machineDao;
@Resource @Autowired
private PipResourceDockerEndpointDao dockerEndpointDao; private PipResourceDockerEndpointDao dockerEndpointDao;
@Resource @Resource

2
ops-server/src/main/java/cd/casic/server/OpsServerApplication.java
View File

@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScans;
@SuppressWarnings("SpringComponentScan") @SuppressWarnings("SpringComponentScan")
@ComponentScan({"cd.casic"}) @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"}) @SpringBootApplication(scanBasePackages = {"${ops.info.base-package}.server", "${ops.info.base-package}.module"})
public class OpsServerApplication { public class OpsServerApplication {