From 1028cc0705461eb9a3ffb1adedc5cce5ada1c517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com> Date: Sat, 31 May 2025 09:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AliYunConfig.java | 8 +++---- .../contants/CommonConstants.java | 2 +- .../controller/MachineEnvController.java | 8 +++---- .../controller/MachineInfoController.java | 12 +++++----- .../controller/MachineProxyController.java | 10 ++++---- .../controller/SecretKeyController.java | 8 +++---- .../{ => machine}/dto/MachineEnvDTO.java | 2 +- .../{ => machine}/dto/MachineInfoDto.java | 4 ++-- .../{ => machine}/dto/MachineProxyDTO.java | 4 ++-- .../module/{ => machine}/dto/PageDto.java | 2 +- .../{ => machine}/dto/SecretKeyDto.java | 2 +- .../{ => machine}/entity/BaseEntity.java | 2 +- .../{ => machine}/entity/MachineEnv.java | 2 +- .../{ => machine}/entity/MachineInfo.java | 8 +++---- .../{ => machine}/entity/MachineProxy.java | 6 ++--- .../{ => machine}/entity/SecretKey.java | 2 +- .../enums/AuthenticationType.java | 2 +- .../module/{ => machine}/enums/CodeEnum.java | 2 +- .../{ => machine}/enums/ConnectionStatus.java | 2 +- .../enums/MachineInfoStatus.java | 2 +- .../{ => machine}/enums/MachineInfoType.java | 2 +- .../enums/MachineProxyStatus.java | 2 +- .../{ => machine}/enums/MachineProxyType.java | 2 +- .../enums/PermissionExceptionEnum.java | 2 +- .../enums/RequestExceptionEnum.java | 2 +- .../exception/ServiceException.java | 2 +- .../handler/ConnectionSession.java | 14 +++++------ .../mapper/MachineEnvMapper.java | 4 ++-- .../mapper/MachineInfoMapper.java | 4 ++-- .../mapper/MachineProxyMapper.java | 4 ++-- .../mapper/SecretServiceMapper.java | 4 ++-- .../{ => machine}/pojo/ErrorResponseData.java | 2 +- .../{ => machine}/pojo/ResponseData.java | 2 +- .../pojo/SuccessResponseData.java | 2 +- .../service/MachineEnvService.java | 8 +++---- .../service/MachineInfoService.java | 10 ++++---- .../service/MachineProxyService.java | 8 +++---- .../service/SecretKeyService.java | 8 +++---- .../service/impl/MachineEnvServiceImpl.java | 14 +++++------ .../service/impl/MachineProxyServiceImpl.java | 20 ++++++++-------- .../service/impl/MachineinfoServiceImpl.java | 24 +++++++++---------- .../service/impl/SecretKeyServiceImpl.java | 24 +++++++++---------- .../{ => machine}/utils/AliOssUtil.java | 10 ++++---- .../module/{ => machine}/utils/EnumUtils.java | 4 ++-- .../{ => machine}/utils/PageResult.java | 2 +- .../{ => machine}/utils/PropertyUtils.java | 2 +- 46 files changed, 136 insertions(+), 136 deletions(-) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/configuration/AliYunConfig.java (89%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/contants/CommonConstants.java (66%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/controller/MachineEnvController.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/controller/MachineInfoController.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/controller/MachineProxyController.java (90%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/controller/SecretKeyController.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/dto/MachineEnvDTO.java (96%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/dto/MachineInfoDto.java (86%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/dto/MachineProxyDTO.java (92%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/dto/PageDto.java (75%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/dto/SecretKeyDto.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/entity/BaseEntity.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/entity/MachineEnv.java (95%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/entity/MachineInfo.java (87%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/entity/MachineProxy.java (88%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/entity/SecretKey.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/AuthenticationType.java (87%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/CodeEnum.java (66%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/ConnectionStatus.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/MachineInfoStatus.java (86%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/MachineInfoType.java (86%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/MachineProxyStatus.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/MachineProxyType.java (87%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/PermissionExceptionEnum.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/enums/RequestExceptionEnum.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/exception/ServiceException.java (97%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/handler/ConnectionSession.java (98%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/mapper/MachineEnvMapper.java (70%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/mapper/MachineInfoMapper.java (66%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/mapper/MachineProxyMapper.java (70%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/mapper/SecretServiceMapper.java (67%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/pojo/ErrorResponseData.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/pojo/ResponseData.java (97%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/pojo/SuccessResponseData.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/MachineEnvService.java (81%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/MachineInfoService.java (89%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/MachineProxyService.java (83%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/SecretKeyService.java (80%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/impl/MachineEnvServiceImpl.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/impl/MachineProxyServiceImpl.java (93%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/impl/MachineinfoServiceImpl.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/service/impl/SecretKeyServiceImpl.java (88%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/utils/AliOssUtil.java (95%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/utils/EnumUtils.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/utils/PageResult.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/{ => machine}/utils/PropertyUtils.java (94%) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java similarity index 89% rename from modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java index de77c0f6..9a84250c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java @@ -1,6 +1,6 @@ -package cd.casic.module.configuration; +package cd.casic.module.machine.configuration; -import cd.casic.module.exception.ServiceException; +import cd.casic.module.machine.exception.ServiceException; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +//@Configuration @Getter public class AliYunConfig { private static final Logger logger = LoggerFactory.getLogger(AliYunConfig.class); @@ -24,7 +24,7 @@ public class AliYunConfig { @Value("${aliyun.oss.bucketName}") private String bucketName; - @Bean +// @Bean public OSS ossClient() { logger.info("OSS域名: {}", endpoint); logger.info("AccessKeyId: {}", accessKeyId); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java similarity index 66% rename from modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java index 78bd5b75..88528544 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java @@ -1,4 +1,4 @@ -package cd.casic.module.contants; +package cd.casic.module.machine.contants; public interface CommonConstants { String DEFAULT_PACKAGE_NAME = "com.casic"; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index 56d33a29..ff742a5d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -1,9 +1,9 @@ -package cd.casic.module.controller; +package cd.casic.module.machine.controller; -import cd.casic.module.dto.MachineEnvDTO; -import cd.casic.module.pojo.ResponseData; -import cd.casic.module.service.MachineEnvService; +import cd.casic.module.machine.service.MachineEnvService; +import cd.casic.module.machine.dto.MachineEnvDTO; +import cd.casic.module.machine.pojo.ResponseData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index e1cc026f..2fbc0c7f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,11 +1,11 @@ -package cd.casic.module.controller; +package cd.casic.module.machine.controller; -import cd.casic.module.dto.MachineInfoDto; -import cd.casic.module.entity.MachineInfo; -import cd.casic.module.pojo.ResponseData; -import cd.casic.module.pojo.SuccessResponseData; -import cd.casic.module.service.MachineInfoService; +import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.service.MachineInfoService; +import cd.casic.module.machine.dto.MachineInfoDto; +import cd.casic.module.machine.pojo.ResponseData; +import cd.casic.module.machine.pojo.SuccessResponseData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java similarity index 90% rename from modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 13d73147..2cf49368 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -1,9 +1,9 @@ -package cd.casic.module.controller; +package cd.casic.module.machine.controller; -import cd.casic.module.dto.MachineProxyDTO; -import cd.casic.module.pojo.ResponseData; -import cd.casic.module.pojo.SuccessResponseData; -import cd.casic.module.service.MachineProxyService; +import cd.casic.module.machine.service.MachineProxyService; +import cd.casic.module.machine.dto.MachineProxyDTO; +import cd.casic.module.machine.pojo.ResponseData; +import cd.casic.module.machine.pojo.SuccessResponseData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java similarity index 94% rename from modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 08678aba..ee70c9e5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,9 +1,9 @@ -package cd.casic.module.controller; +package cd.casic.module.machine.controller; -import cd.casic.module.dto.SecretKeyDto; -import cd.casic.module.pojo.ResponseData; -import cd.casic.module.service.SecretKeyService; +import cd.casic.module.machine.service.SecretKeyService; +import cd.casic.module.machine.dto.SecretKeyDto; +import cd.casic.module.machine.pojo.ResponseData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java similarity index 96% rename from modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java index 3d9cb004..abe15f3c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java @@ -1,4 +1,4 @@ -package cd.casic.module.dto; +package cd.casic.module.machine.dto; import lombok.*; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java similarity index 86% rename from modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java index b221ba15..0fbc2956 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java @@ -1,4 +1,4 @@ -package cd.casic.module.dto; +package cd.casic.module.machine.dto; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class MachineInfoDto extends PageDto { +public class MachineInfoDto extends cd.casic.module.machine.dto.PageDto { private Long id; private Date createDate; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java similarity index 92% rename from modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java index cadbb303..4d845864 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java @@ -1,5 +1,5 @@ -package cd.casic.module.dto; -import cd.casic.module.enums.MachineProxyStatus; +package cd.casic.module.machine.dto; +import cd.casic.module.machine.enums.MachineProxyStatus; import lombok.*; import java.io.Serializable; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java similarity index 75% rename from modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java index 0f65fc21..9940d98d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java @@ -1,4 +1,4 @@ -package cd.casic.module.dto; +package cd.casic.module.machine.dto; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java similarity index 94% rename from modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java index 0277928c..e5aa6c4e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java @@ -1,4 +1,4 @@ -package cd.casic.module.dto; +package cd.casic.module.machine.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java index d9063850..19669ab1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cd.casic.module.entity; +package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java similarity index 95% rename from modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java index 55d5fe4c..e43d77c6 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java @@ -1,4 +1,4 @@ -package cd.casic.module.entity; +package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java similarity index 87% rename from modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java index fd549461..2113812f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java @@ -1,10 +1,10 @@ -package cd.casic.module.entity; +package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import cd.casic.module.enums.AuthenticationType; -import cd.casic.module.enums.MachineInfoStatus; -import cd.casic.module.enums.MachineInfoType; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.MachineInfoStatus; +import cd.casic.module.machine.enums.MachineInfoType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java similarity index 88% rename from modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java index f3980add..14f1eb7b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java @@ -1,7 +1,7 @@ -package cd.casic.module.entity; +package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.*; -import cd.casic.module.enums.MachineInfoStatus; -import cd.casic.module.enums.MachineProxyType; +import cd.casic.module.machine.enums.MachineInfoStatus; +import cd.casic.module.machine.enums.MachineProxyType; import lombok.*; import java.io.Serializable; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java similarity index 94% rename from modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java index be540024..18d3b3f4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java @@ -1,4 +1,4 @@ -package cd.casic.module.entity; +package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java similarity index 87% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java index 241ac7d4..80eb092a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java similarity index 66% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java index ceb7e6c3..a6a4c1b4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; public interface CodeEnum { int getCode(); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java index 0495b7dc..5e3101fd 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java similarity index 86% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java index b2df12e0..df37b1dd 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java similarity index 86% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java index 6345cf1d..20084334 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java index 3722d146..7478e959 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java similarity index 87% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java index 7ffc7baa..b6de6358 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java index 062ed9d8..c98b9332 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java index efda271d..6f01b6f2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java @@ -1,4 +1,4 @@ -package cd.casic.module.enums; +package cd.casic.module.machine.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java similarity index 97% rename from modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java index 4a5d6bb0..a4f2a62e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java @@ -1,4 +1,4 @@ -package cd.casic.module.exception; +package cd.casic.module.machine.exception; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java similarity index 98% rename from modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index 8c7a8027..ddfa59d4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -1,12 +1,12 @@ -package cd.casic.module.handler; +package cd.casic.module.machine.handler; -import cd.casic.module.entity.MachineInfo; -import cd.casic.module.utils.AliOssUtil; -import cd.casic.module.entity.SecretKey; -import cd.casic.module.enums.AuthenticationType; -import cd.casic.module.enums.ConnectionStatus; -import cd.casic.module.service.SecretKeyService; +import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.utils.AliOssUtil; +import cd.casic.module.machine.entity.SecretKey; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.service.SecretKeyService; import com.jcraft.jsch.*; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java similarity index 70% rename from modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java index c965cfd1..9e2e7558 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java @@ -1,7 +1,7 @@ -package cd.casic.module.mapper; +package cd.casic.module.machine.mapper; -import cd.casic.module.entity.MachineEnv; +import cd.casic.module.machine.entity.MachineEnv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java similarity index 66% rename from modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java index eb0c310e..088d2760 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java @@ -1,6 +1,6 @@ -package cd.casic.module.mapper; +package cd.casic.module.machine.mapper; -import cd.casic.module.entity.MachineInfo; +import cd.casic.module.machine.entity.MachineInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java similarity index 70% rename from modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java index 2462e3b5..f372293f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java @@ -1,6 +1,6 @@ -package cd.casic.module.mapper; +package cd.casic.module.machine.mapper; +import cd.casic.module.machine.entity.MachineProxy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import cd.casic.module.entity.MachineProxy; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/SecretServiceMapper.java similarity index 67% rename from modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/SecretServiceMapper.java index 7edb76c4..9f074063 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/SecretServiceMapper.java @@ -1,7 +1,7 @@ -package cd.casic.module.mapper; +package cd.casic.module.machine.mapper; +import cd.casic.module.machine.entity.SecretKey; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import cd.casic.module.entity.SecretKey; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java index 2ed38d29..c9468b20 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java @@ -1,4 +1,4 @@ -package cd.casic.module.pojo; +package cd.casic.module.machine.pojo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java similarity index 97% rename from modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java index 221b6637..ad74cb81 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java @@ -1,4 +1,4 @@ -package cd.casic.module.pojo; +package cd.casic.module.machine.pojo; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java index 8644ba56..f2ecb844 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java @@ -1,4 +1,4 @@ -package cd.casic.module.pojo; +package cd.casic.module.machine.pojo; public class SuccessResponseData extends ResponseData { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java similarity index 81% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java index 7f7fd470..f27f980f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java @@ -1,8 +1,8 @@ -package cd.casic.module.service; +package cd.casic.module.machine.service; -import cd.casic.module.dto.MachineEnvDTO; -import cd.casic.module.entity.MachineEnv; -import cd.casic.module.utils.PageResult; +import cd.casic.module.machine.entity.MachineEnv; +import cd.casic.module.machine.dto.MachineEnvDTO; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java similarity index 89% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index c11df825..d4bc8a78 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -1,9 +1,9 @@ -package cd.casic.module.service; +package cd.casic.module.machine.service; -import cd.casic.module.dto.MachineInfoDto; -import cd.casic.module.entity.MachineInfo; -import cd.casic.module.enums.ConnectionStatus; -import cd.casic.module.utils.PageResult; +import cd.casic.module.machine.dto.MachineInfoDto; +import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java similarity index 83% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index 5b138e19..63b3c5e1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -1,7 +1,7 @@ -package cd.casic.module.service; -import cd.casic.module.dto.MachineProxyDTO; -import cd.casic.module.entity.MachineProxy; -import cd.casic.module.utils.PageResult; +package cd.casic.module.machine.service; +import cd.casic.module.machine.dto.MachineProxyDTO; +import cd.casic.module.machine.entity.MachineProxy; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java similarity index 80% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index dc8805d2..b0cae86a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -1,8 +1,8 @@ -package cd.casic.module.service; +package cd.casic.module.machine.service; -import cd.casic.module.dto.SecretKeyDto; -import cd.casic.module.entity.SecretKey; -import cd.casic.module.utils.PageResult; +import cd.casic.module.machine.entity.SecretKey; +import cd.casic.module.machine.dto.SecretKeyDto; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.core.io.InputStreamResource; import org.springframework.http.ResponseEntity; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index b4ccd4f8..3a5594d7 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -1,10 +1,10 @@ -package cd.casic.module.service.impl; -import cd.casic.module.dto.MachineEnvDTO; -import cd.casic.module.entity.MachineEnv; -import cd.casic.module.exception.ServiceException; -import cd.casic.module.mapper.MachineEnvMapper; -import cd.casic.module.service.MachineEnvService; -import cd.casic.module.utils.PageResult; +package cd.casic.module.machine.service.impl; +import cd.casic.module.machine.dto.MachineEnvDTO; +import cd.casic.module.machine.entity.MachineEnv; +import cd.casic.module.machine.exception.ServiceException; +import cd.casic.module.machine.mapper.MachineEnvMapper; +import cd.casic.module.machine.service.MachineEnvService; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index cc1e18ba..328516cf 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -1,13 +1,13 @@ -package cd.casic.module.service.impl; -import cd.casic.module.dto.MachineProxyDTO; -import cd.casic.module.entity.MachineProxy; -import cd.casic.module.enums.MachineProxyStatus; -import cd.casic.module.enums.MachineProxyType; -import cd.casic.module.exception.ServiceException; -import cd.casic.module.mapper.MachineProxyMapper; -import cd.casic.module.service.MachineProxyService; -import cd.casic.module.utils.EnumUtils; -import cd.casic.module.utils.PageResult; +package cd.casic.module.machine.service.impl; +import cd.casic.module.machine.dto.MachineProxyDTO; +import cd.casic.module.machine.entity.MachineProxy; +import cd.casic.module.machine.enums.MachineProxyStatus; +import cd.casic.module.machine.enums.MachineProxyType; +import cd.casic.module.machine.exception.ServiceException; +import cd.casic.module.machine.mapper.MachineProxyMapper; +import cd.casic.module.machine.service.MachineProxyService; +import cd.casic.module.machine.utils.EnumUtils; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java similarity index 94% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index d7762384..b5e74c34 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -1,16 +1,16 @@ -package cd.casic.module.service.impl; +package cd.casic.module.machine.service.impl; -import cd.casic.module.dto.MachineInfoDto; -import cd.casic.module.entity.MachineInfo; -import cd.casic.module.enums.AuthenticationType; -import cd.casic.module.enums.ConnectionStatus; -import cd.casic.module.enums.MachineInfoStatus; -import cd.casic.module.exception.ServiceException; -import cd.casic.module.handler.ConnectionSession; -import cd.casic.module.mapper.MachineInfoMapper; -import cd.casic.module.service.MachineInfoService; -import cd.casic.module.utils.EnumUtils; -import cd.casic.module.utils.PageResult; +import cd.casic.module.machine.handler.ConnectionSession; +import cd.casic.module.machine.mapper.MachineInfoMapper; +import cd.casic.module.machine.dto.MachineInfoDto; +import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.enums.MachineInfoStatus; +import cd.casic.module.machine.exception.ServiceException; +import cd.casic.module.machine.service.MachineInfoService; +import cd.casic.module.machine.utils.EnumUtils; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java similarity index 88% rename from modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index eb506864..7a8253ff 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -1,19 +1,19 @@ -package cd.casic.module.service.impl; +package cd.casic.module.machine.service.impl; -import cd.casic.module.dto.SecretKeyDto; -import cd.casic.module.entity.MachineInfo; -import cd.casic.module.entity.SecretKey; -import cd.casic.module.mapper.SecretServiceMapper; -import cd.casic.module.utils.AliOssUtil; -import cd.casic.module.utils.PageResult; +import cd.casic.module.machine.dto.SecretKeyDto; +import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.entity.SecretKey; +import cd.casic.module.machine.mapper.SecretServiceMapper; +import cd.casic.module.machine.utils.AliOssUtil; +import cd.casic.module.machine.utils.PageResult; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cd.casic.module.configuration.AliYunConfig; -import cd.casic.module.exception.ServiceException; -import cd.casic.module.service.MachineInfoService; -import cd.casic.module.service.SecretKeyService; +import cd.casic.module.machine.configuration.AliYunConfig; +import cd.casic.module.machine.exception.ServiceException; +import cd.casic.module.machine.service.MachineInfoService; +import cd.casic.module.machine.service.SecretKeyService; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public class SecretKeyServiceImpl extends ServiceImpl