From 5410bd437495a25d0fda0c68cefbc04bb0a54bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com> Date: Fri, 30 May 2025 16:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E5=88=B0ops-pro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 56 ++++--------------- .../machine/configuration/AliYunConfig.java | 0 .../machine/contants/CommonConstants.java | 0 .../controller/MachineEnvController.java | 0 .../controller/MachineInfoController.java | 0 .../controller/MachineProxyController.java | 0 .../controller/SecretKeyController.java | 0 .../com/casic/machine/dto/MachineEnvDTO.java | 0 .../com/casic/machine/dto/MachineInfoDto.java | 0 .../casic/machine/dto/MachineProxyDTO.java | 0 .../java/com/casic/machine/dto/PageDto.java | 0 .../com/casic/machine/dto/SecretKeyDto.java | 0 .../com/casic/machine/entity/BaseEntity.java | 0 .../com/casic/machine/entity/MachineEnv.java | 1 - .../com/casic/machine/entity/MachineInfo.java | 1 - .../casic/machine/entity/MachineProxy.java | 0 .../com/casic/machine/entity/SecretKey.java | 0 .../machine/enums/AuthenticationType.java | 0 .../com/casic/machine/enums/CodeEnum.java | 0 .../casic/machine/enums/ConnectionStatus.java | 0 .../machine/enums/MachineInfoStatus.java | 0 .../casic/machine/enums/MachineInfoType.java | 0 .../machine/enums/MachineProxyStatus.java | 0 .../casic/machine/enums/MachineProxyType.java | 0 .../enums/PermissionExceptionEnum.java | 0 .../machine/enums/RequestExceptionEnum.java | 0 .../machine/exception/ServiceException.java | 0 .../machine/handler/ConnectionSession.java | 0 .../handler/GlobalExceptionHandler.java | 0 .../machine/mapper/MachineEnvMapper.java | 0 .../machine/mapper/MachineInfoMapper.java | 0 .../machine/mapper/MachineProxyMapper.java | 0 .../machine/mapper/SecretServiceMapper.java | 0 .../casic/machine/pojo/ErrorResponseData.java | 0 .../com/casic/machine/pojo/ResponseData.java | 0 .../machine/pojo/SuccessResponseData.java | 0 .../machine/service/MachineEnvService.java | 0 .../machine/service/MachineInfoService.java | 0 .../machine/service/MachineProxyService.java | 0 .../machine/service/SecretKeyService.java | 0 .../service/impl/MachineEnvServiceImpl.java | 2 +- .../service/impl/MachineProxyServiceImpl.java | 0 .../service/impl/MachineinfoServiceImpl.java | 0 .../service/impl/SecretKeyServiceImpl.java | 0 .../com/casic/machine/utils/AliOssUtil.java | 0 .../com/casic/machine/utils/EnumUtils.java | 0 .../com/casic/machine/utils/PageResult.java | 0 .../casic/machine/utils/PropertyUtils.java | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application.yml | 0 .../resources}/sql/resource_management.sql | 0 .../impl/MachineEnvServiceImplTest.java | 0 .../impl/MachineProxyServiceImplTest.java | 0 .../impl/MachineinfoServiceImplTest.java | 1 - .../impl/SecretKeyServiceImplTest.java | 0 modules/pom.xml | 1 + ops-server/pom.xml | 5 ++ 57 files changed, 19 insertions(+), 48 deletions(-) rename modules/{ee/machine-management-module => module-ci-machine}/pom.xml (57%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/configuration/AliYunConfig.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/contants/CommonConstants.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/controller/MachineEnvController.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/controller/MachineInfoController.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/controller/MachineProxyController.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/controller/SecretKeyController.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/dto/MachineEnvDTO.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/dto/MachineInfoDto.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/dto/MachineProxyDTO.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/dto/PageDto.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/dto/SecretKeyDto.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/entity/BaseEntity.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/entity/MachineEnv.java (97%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/entity/MachineInfo.java (96%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/entity/MachineProxy.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/entity/SecretKey.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/AuthenticationType.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/CodeEnum.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/ConnectionStatus.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/MachineInfoStatus.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/MachineInfoType.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/MachineProxyStatus.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/MachineProxyType.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/exception/ServiceException.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/handler/ConnectionSession.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/pojo/ErrorResponseData.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/pojo/ResponseData.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/pojo/SuccessResponseData.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/MachineEnvService.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/MachineInfoService.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/MachineProxyService.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/SecretKeyService.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java (99%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/utils/AliOssUtil.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/utils/EnumUtils.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/utils/PageResult.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/java/com/casic/machine/utils/PropertyUtils.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/resources/application-dev.yml (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/main/resources/application.yml (100%) rename modules/{ee => module-ci-machine/src/main/resources}/sql/resource_management.sql (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java (100%) rename modules/{ee/machine-management-module => module-ci-machine}/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java (99%) rename modules/{ee/machine-management-module => module-ci-machine}/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java (100%) diff --git a/modules/ee/machine-management-module/pom.xml b/modules/module-ci-machine/pom.xml similarity index 57% rename from modules/ee/machine-management-module/pom.xml rename to modules/module-ci-machine/pom.xml index c7fdd84a..2c5ec881 100644 --- a/modules/ee/machine-management-module/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -3,42 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 3.3.13-SNAPSHOT - + cd.casic.boot + modules + ${revision} - machine-management-module - 0.0.1-SNAPSHOT - machine - machine - - - - - - - - - - - - - - - 17 - + + module-ci-machine + + jar + ${revision} + ${project.artifactId} + - org.springframework.boot - spring-boot-starter-web + cd.casic.boot + commons - - org.springframework.boot - spring-boot-starter - com.aliyun.oss @@ -60,11 +42,6 @@ 0.1.55 - - mysql - mysql-connector-java - 8.0.33 - org.projectlombok lombok @@ -89,13 +66,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/configuration/AliYunConfig.java b/modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/configuration/AliYunConfig.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/contants/CommonConstants.java b/modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/contants/CommonConstants.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineEnvController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineInfoController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineProxyController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/SecretKeyController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineEnvDTO.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineInfoDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineProxyDTO.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/PageDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/PageDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/SecretKeyDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/BaseEntity.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/BaseEntity.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java similarity index 97% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java index 39ccede8..bebab106 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.*; import java.io.Serializable; -import java.util.Date; /** * 环境变量实体类 diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java similarity index 96% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java index 27acf407..09214af6 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java @@ -1,6 +1,5 @@ package com.casic.machine.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.casic.machine.enums.AuthenticationType; diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineProxy.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/SecretKey.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/AuthenticationType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/AuthenticationType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/CodeEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/CodeEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/ConnectionStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/exception/ServiceException.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/ConnectionSession.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java b/modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ErrorResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ErrorResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/SuccessResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/SuccessResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineEnvService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineInfoService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineProxyService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/SecretKeyService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java similarity index 99% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java index 52a1315e..4e8147e8 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.Date; + import java.util.List; import java.util.stream.Collectors; diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/AliOssUtil.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/AliOssUtil.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/EnumUtils.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/EnumUtils.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PageResult.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PageResult.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PropertyUtils.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PropertyUtils.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java diff --git a/modules/ee/machine-management-module/src/main/resources/application-dev.yml b/modules/module-ci-machine/src/main/resources/application-dev.yml similarity index 100% rename from modules/ee/machine-management-module/src/main/resources/application-dev.yml rename to modules/module-ci-machine/src/main/resources/application-dev.yml diff --git a/modules/ee/machine-management-module/src/main/resources/application.yml b/modules/module-ci-machine/src/main/resources/application.yml similarity index 100% rename from modules/ee/machine-management-module/src/main/resources/application.yml rename to modules/module-ci-machine/src/main/resources/application.yml diff --git a/modules/ee/sql/resource_management.sql b/modules/module-ci-machine/src/main/resources/sql/resource_management.sql similarity index 100% rename from modules/ee/sql/resource_management.sql rename to modules/module-ci-machine/src/main/resources/sql/resource_management.sql diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java similarity index 99% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java index d63a6ab0..5842c47c 100644 --- a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java @@ -16,7 +16,6 @@ import org.springframework.test.context.jdbc.Sql; import org.springframework.transaction.annotation.Transactional; import java.util.Collections; -import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java diff --git a/modules/pom.xml b/modules/pom.xml index 6b1d1d77..d5849dd3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -14,6 +14,7 @@ module-infra-biz module-system-api module-system-biz + module-ci-machine modules diff --git a/ops-server/pom.xml b/ops-server/pom.xml index 1c4d2f4f..d3f33ed9 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -25,6 +25,11 @@ module-system-biz ${revision} + + cd.casic.boot + module-ci-machine + ${revision} + cd.casic.boot