From a7738d2addd184ed97e9b6510e870015cca50bce 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 17:23:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module}/configuration/AliYunConfig.java | 4 ++-- .../module}/contants/CommonConstants.java | 2 +- .../controller/MachineEnvController.java | 8 +++---- .../controller/MachineInfoController.java | 13 +++++----- .../controller/MachineProxyController.java | 12 +++++----- .../controller/SecretKeyController.java | 8 +++---- .../casic/module}/dto/MachineEnvDTO.java | 2 +- .../casic/module}/dto/MachineInfoDto.java | 2 +- .../casic/module}/dto/MachineProxyDTO.java | 4 ++-- .../casic/module}/dto/PageDto.java | 2 +- .../casic/module}/dto/SecretKeyDto.java | 2 +- .../casic/module}/entity/BaseEntity.java | 2 +- .../casic/module}/entity/MachineEnv.java | 2 +- .../casic/module}/entity/MachineInfo.java | 8 +++---- .../casic/module}/entity/MachineProxy.java | 6 ++--- .../casic/module}/entity/SecretKey.java | 2 +- .../module}/enums/AuthenticationType.java | 2 +- .../casic/module}/enums/CodeEnum.java | 2 +- .../casic/module}/enums/ConnectionStatus.java | 2 +- .../module}/enums/MachineInfoStatus.java | 2 +- .../casic/module}/enums/MachineInfoType.java | 2 +- .../module}/enums/MachineProxyStatus.java | 2 +- .../casic/module}/enums/MachineProxyType.java | 2 +- .../enums/PermissionExceptionEnum.java | 2 +- .../module}/enums/RequestExceptionEnum.java | 2 +- .../module}/exception/ServiceException.java | 2 +- .../module}/handler/ConnectionSession.java | 14 +++++------ .../module}/mapper/MachineEnvMapper.java | 4 ++-- .../module}/mapper/MachineInfoMapper.java | 4 ++-- .../module}/mapper/MachineProxyMapper.java | 4 ++-- .../module}/mapper/SecretServiceMapper.java | 4 ++-- .../casic/module}/pojo/ErrorResponseData.java | 2 +- .../casic/module}/pojo/ResponseData.java | 2 +- .../module}/pojo/SuccessResponseData.java | 2 +- .../module}/service/MachineEnvService.java | 10 ++++---- .../module}/service/MachineInfoService.java | 11 ++++----- .../module}/service/MachineProxyService.java | 9 ++++--- .../module}/service/SecretKeyService.java | 8 +++---- .../service/impl/MachineEnvServiceImpl.java | 15 ++++++------ .../service/impl/MachineProxyServiceImpl.java | 20 ++++++++-------- .../service/impl/MachineinfoServiceImpl.java | 24 +++++++++---------- .../service/impl/SecretKeyServiceImpl.java | 22 ++++++++--------- .../casic/module}/utils/AliOssUtil.java | 6 ++--- .../casic/module}/utils/EnumUtils.java | 4 ++-- .../casic/module}/utils/PageResult.java | 2 +- .../casic/module}/utils/PropertyUtils.java | 2 +- 46 files changed, 131 insertions(+), 137 deletions(-) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/configuration/AliYunConfig.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/contants/CommonConstants.java (70%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/controller/MachineEnvController.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/controller/MachineInfoController.java (94%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/controller/MachineProxyController.java (89%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/controller/SecretKeyController.java (94%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/dto/MachineEnvDTO.java (97%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/dto/MachineInfoDto.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/dto/MachineProxyDTO.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/dto/PageDto.java (78%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/dto/SecretKeyDto.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/entity/BaseEntity.java (94%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/entity/MachineEnv.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/entity/MachineInfo.java (88%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/entity/MachineProxy.java (89%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/entity/SecretKey.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/AuthenticationType.java (89%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/CodeEnum.java (69%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/ConnectionStatus.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/MachineInfoStatus.java (88%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/MachineInfoType.java (88%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/MachineProxyStatus.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/MachineProxyType.java (89%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/PermissionExceptionEnum.java (92%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/enums/RequestExceptionEnum.java (94%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/exception/ServiceException.java (97%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/handler/ConnectionSession.java (98%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/mapper/MachineEnvMapper.java (73%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/mapper/MachineInfoMapper.java (69%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/mapper/MachineProxyMapper.java (73%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/mapper/SecretServiceMapper.java (70%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/pojo/ErrorResponseData.java (94%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/pojo/ResponseData.java (98%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/pojo/SuccessResponseData.java (93%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/MachineEnvService.java (78%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/MachineInfoService.java (91%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/MachineProxyService.java (84%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/SecretKeyService.java (82%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/impl/MachineEnvServiceImpl.java (93%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/impl/MachineProxyServiceImpl.java (93%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/impl/MachineinfoServiceImpl.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/service/impl/SecretKeyServiceImpl.java (90%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/utils/AliOssUtil.java (96%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/utils/EnumUtils.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/utils/PageResult.java (95%) rename modules/module-ci-machine/src/main/java/{com/casic/machine => cd/casic/module}/utils/PropertyUtils.java (95%) diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java index f4bef0f9..de77c0f6 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/configuration/AliYunConfig.java @@ -1,9 +1,9 @@ -package com.casic.machine.configuration; +package cd.casic.module.configuration; +import cd.casic.module.exception.ServiceException; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; -import com.casic.machine.exception.ServiceException; import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java similarity index 70% rename from modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java index 520088c4..78bd5b75 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/contants/CommonConstants.java @@ -1,4 +1,4 @@ -package com.casic.machine.contants; +package cd.casic.module.contants; public interface CommonConstants { String DEFAULT_PACKAGE_NAME = "com.casic"; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java index c644f8ec..56d33a29 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineEnvController.java @@ -1,9 +1,9 @@ -package com.casic.machine.controller; +package cd.casic.module.controller; -import com.casic.machine.dto.MachineEnvDTO; -import com.casic.machine.pojo.ResponseData; -import com.casic.machine.service.MachineEnvService; +import cd.casic.module.dto.MachineEnvDTO; +import cd.casic.module.pojo.ResponseData; +import cd.casic.module.service.MachineEnvService; 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/com/casic/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java similarity index 94% rename from modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java index 73c27f42..e1cc026f 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineInfoController.java @@ -1,12 +1,11 @@ -package com.casic.machine.controller; +package cd.casic.module.controller; -import com.casic.machine.dto.MachineInfoDto; -import com.casic.machine.entity.MachineInfo; - -import com.casic.machine.pojo.ResponseData; -import com.casic.machine.pojo.SuccessResponseData; -import com.casic.machine.service.MachineInfoService; +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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java similarity index 89% rename from modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java index 3dff31a1..13d73147 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/MachineProxyController.java @@ -1,9 +1,9 @@ -package com.casic.machine.controller; +package cd.casic.module.controller; -import com.casic.machine.dto.MachineProxyDTO; -import com.casic.machine.pojo.ResponseData; -import com.casic.machine.pojo.SuccessResponseData; -import com.casic.machine.service.MachineProxyService; +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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -23,7 +23,7 @@ import java.util.List; public class MachineProxyController { @Resource - private MachineProxyService machineProxyService; + private MachineProxyService machineProxyService; @PostMapping("/register") @Operation(summary ="注册新的机器代理") diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java similarity index 94% rename from modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java index 3c705925..08678aba 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/controller/SecretKeyController.java @@ -1,9 +1,9 @@ -package com.casic.machine.controller; +package cd.casic.module.controller; -import com.casic.machine.dto.SecretKeyDto; -import com.casic.machine.pojo.ResponseData; -import com.casic.machine.service.SecretKeyService; +import cd.casic.module.dto.SecretKeyDto; +import cd.casic.module.pojo.ResponseData; +import cd.casic.module.service.SecretKeyService; 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/com/casic/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java similarity index 97% rename from modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java index c9947fbd..3d9cb004 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineEnvDTO.java @@ -1,4 +1,4 @@ -package com.casic.machine.dto; +package cd.casic.module.dto; import lombok.*; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java index 6317b1d4..b221ba15 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineInfoDto.java @@ -1,4 +1,4 @@ -package com.casic.machine.dto; +package cd.casic.module.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java index 4c528f7b..cadbb303 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/MachineProxyDTO.java @@ -1,5 +1,5 @@ -package com.casic.machine.dto; -import com.casic.machine.enums.MachineProxyStatus; +package cd.casic.module.dto; +import cd.casic.module.enums.MachineProxyStatus; import lombok.*; import java.io.Serializable; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java similarity index 78% rename from modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java index 2ab2ed4f..0f65fc21 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/PageDto.java @@ -1,4 +1,4 @@ -package com.casic.machine.dto; +package cd.casic.module.dto; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java index bbf5e576..0277928c 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/dto/SecretKeyDto.java @@ -1,4 +1,4 @@ -package com.casic.machine.dto; +package cd.casic.module.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java similarity index 94% rename from modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java index a39bc47d..d9063850 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.casic.machine.entity; +package cd.casic.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java index bebab106..55d5fe4c 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineEnv.java @@ -1,4 +1,4 @@ -package com.casic.machine.entity; +package cd.casic.module.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java similarity index 88% rename from modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java index 09214af6..fd549461 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineInfo.java @@ -1,10 +1,10 @@ -package com.casic.machine.entity; +package cd.casic.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.machine.enums.AuthenticationType; -import com.casic.machine.enums.MachineInfoStatus; -import com.casic.machine.enums.MachineInfoType; +import cd.casic.module.enums.AuthenticationType; +import cd.casic.module.enums.MachineInfoStatus; +import cd.casic.module.enums.MachineInfoType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java similarity index 89% rename from modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java index e5d6a892..f3980add 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/MachineProxy.java @@ -1,7 +1,7 @@ -package com.casic.machine.entity; +package cd.casic.module.entity; import com.baomidou.mybatisplus.annotation.*; -import com.casic.machine.enums.MachineInfoStatus; -import com.casic.machine.enums.MachineProxyType; +import cd.casic.module.enums.MachineInfoStatus; +import cd.casic.module.enums.MachineProxyType; import lombok.*; import java.io.Serializable; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java index 28cdc168..be540024 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/entity/SecretKey.java @@ -1,4 +1,4 @@ -package com.casic.machine.entity; +package cd.casic.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java similarity index 89% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java index 8619db9a..241ac7d4 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/AuthenticationType.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java similarity index 69% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java index 9de22617..ceb7e6c3 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/CodeEnum.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; public interface CodeEnum { int getCode(); diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java index 74bf030f..0495b7dc 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/ConnectionStatus.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java similarity index 88% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java index 327805e8..b2df12e0 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoStatus.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java similarity index 88% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java index 4b4b8797..6345cf1d 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineInfoType.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java index 7a6e75f0..3722d146 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyStatus.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java similarity index 89% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java index 00070ca1..7ffc7baa 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/MachineProxyType.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java similarity index 92% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java index 8de82b08..062ed9d8 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/PermissionExceptionEnum.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java similarity index 94% rename from modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java index 8098e6ba..efda271d 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/enums/RequestExceptionEnum.java @@ -1,4 +1,4 @@ -package com.casic.machine.enums; +package cd.casic.module.enums; import lombok.AllArgsConstructor; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java similarity index 97% rename from modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java index 5a556971..4a5d6bb0 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.casic.machine.exception; +package cd.casic.module.exception; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java similarity index 98% rename from modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java index 75453805..8c7a8027 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/handler/ConnectionSession.java @@ -1,12 +1,12 @@ -package com.casic.machine.handler; +package cd.casic.module.handler; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.entity.SecretKey; -import com.casic.machine.enums.AuthenticationType; -import com.casic.machine.enums.ConnectionStatus; -import com.casic.machine.service.SecretKeyService; -import com.casic.machine.utils.AliOssUtil; +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 com.jcraft.jsch.*; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java similarity index 73% rename from modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java index 0f9c9103..c965cfd1 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineEnvMapper.java @@ -1,9 +1,9 @@ -package com.casic.machine.mapper; +package cd.casic.module.mapper; +import cd.casic.module.entity.MachineEnv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.machine.entity.MachineEnv; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java similarity index 69% rename from modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java index de10b533..eb0c310e 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineInfoMapper.java @@ -1,7 +1,7 @@ -package com.casic.machine.mapper; +package cd.casic.module.mapper; +import cd.casic.module.entity.MachineInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.machine.entity.MachineInfo; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java similarity index 73% rename from modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java index 0b4db053..2462e3b5 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/MachineProxyMapper.java @@ -1,6 +1,6 @@ -package com.casic.machine.mapper; +package cd.casic.module.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.machine.entity.MachineProxy; +import cd.casic.module.entity.MachineProxy; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java similarity index 70% rename from modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java index 92880756..7edb76c4 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/mapper/SecretServiceMapper.java @@ -1,7 +1,7 @@ -package com.casic.machine.mapper; +package cd.casic.module.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.machine.entity.SecretKey; +import cd.casic.module.entity.SecretKey; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java similarity index 94% rename from modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java index c8770b11..2ed38d29 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ErrorResponseData.java @@ -1,4 +1,4 @@ -package com.casic.machine.pojo; +package cd.casic.module.pojo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java similarity index 98% rename from modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java index 8947527b..221b6637 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/ResponseData.java @@ -1,4 +1,4 @@ -package com.casic.machine.pojo; +package cd.casic.module.pojo; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java similarity index 93% rename from modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java index c4b05040..8644ba56 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/pojo/SuccessResponseData.java @@ -1,4 +1,4 @@ -package com.casic.machine.pojo; +package cd.casic.module.pojo; public class SuccessResponseData extends ResponseData { diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java similarity index 78% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java index 206177ea..7f7fd470 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineEnvService.java @@ -1,12 +1,10 @@ -package com.casic.machine.service; +package cd.casic.module.service; +import cd.casic.module.dto.MachineEnvDTO; +import cd.casic.module.entity.MachineEnv; +import cd.casic.module.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.machine.dto.MachineEnvDTO; -import com.casic.machine.entity.MachineEnv; -import com.casic.machine.utils.PageResult; -import org.springframework.web.bind.annotation.RequestBody; - import java.util.List; /** diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java similarity index 91% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java index 75cc3271..c11df825 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineInfoService.java @@ -1,12 +1,11 @@ -package com.casic.machine.service; +package cd.casic.module.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 com.baomidou.mybatisplus.extension.service.IService; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.dto.MachineInfoDto; -import com.casic.machine.enums.ConnectionStatus; -import com.casic.machine.utils.PageResult; - import java.util.List; import java.util.Map; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java similarity index 84% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java index 5fa094d1..5b138e19 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/MachineProxyService.java @@ -1,10 +1,9 @@ -package com.casic.machine.service; +package cd.casic.module.service; +import cd.casic.module.dto.MachineProxyDTO; +import cd.casic.module.entity.MachineProxy; +import cd.casic.module.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.machine.dto.MachineProxyDTO; -import com.casic.machine.entity.MachineProxy; -import com.casic.machine.utils.PageResult; - import java.util.List; import java.util.Map; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java similarity index 82% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java index 720e61be..dc8805d2 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/SecretKeyService.java @@ -1,9 +1,9 @@ -package com.casic.machine.service; +package cd.casic.module.service; +import cd.casic.module.dto.SecretKeyDto; +import cd.casic.module.entity.SecretKey; +import cd.casic.module.utils.PageResult; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.machine.entity.SecretKey; -import com.casic.machine.dto.SecretKeyDto; -import com.casic.machine.utils.PageResult; import org.springframework.core.io.InputStreamResource; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java similarity index 93% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java index 4e8147e8..b4ccd4f8 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineEnvServiceImpl.java @@ -1,19 +1,18 @@ -package com.casic.machine.service.impl; +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; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.machine.dto.MachineEnvDTO; -import com.casic.machine.entity.MachineEnv; -import com.casic.machine.exception.ServiceException; -import com.casic.machine.mapper.MachineEnvMapper; -import com.casic.machine.service.MachineEnvService; -import com.casic.machine.utils.PageResult; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java similarity index 93% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java index d42e550d..cc1e18ba 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineProxyServiceImpl.java @@ -1,18 +1,18 @@ -package com.casic.machine.service.impl; +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; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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 com.casic.machine.dto.MachineProxyDTO; -import com.casic.machine.entity.MachineProxy; -import com.casic.machine.enums.MachineProxyStatus; -import com.casic.machine.enums.MachineProxyType; -import com.casic.machine.exception.ServiceException; -import com.casic.machine.mapper.MachineProxyMapper; -import com.casic.machine.service.MachineProxyService; -import com.casic.machine.utils.EnumUtils; -import com.casic.machine.utils.PageResult; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java index e1f6705d..d7762384 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/MachineinfoServiceImpl.java @@ -1,21 +1,21 @@ -package com.casic.machine.service.impl; +package cd.casic.module.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.dto.MachineInfoDto; -import com.casic.machine.enums.AuthenticationType; -import com.casic.machine.enums.ConnectionStatus; -import com.casic.machine.enums.MachineInfoStatus; -import com.casic.machine.exception.ServiceException; -import com.casic.machine.handler.ConnectionSession; -import com.casic.machine.mapper.MachineInfoMapper; -import com.casic.machine.service.MachineInfoService; -import com.casic.machine.utils.EnumUtils; -import com.casic.machine.utils.PageResult; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java similarity index 90% rename from modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java index ba1b3bcd..eb506864 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/service/impl/SecretKeyServiceImpl.java @@ -1,19 +1,19 @@ -package com.casic.machine.service.impl; +package cd.casic.module.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.machine.configuration.AliYunConfig; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.entity.SecretKey; -import com.casic.machine.dto.SecretKeyDto; -import com.casic.machine.exception.ServiceException; -import com.casic.machine.mapper.SecretServiceMapper; -import com.casic.machine.service.MachineInfoService; -import com.casic.machine.service.SecretKeyService; -import com.casic.machine.utils.AliOssUtil; -import com.casic.machine.utils.PageResult; +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 jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/AliOssUtil.java similarity index 96% rename from modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/utils/AliOssUtil.java index ecdc549c..a9b64c85 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/AliOssUtil.java @@ -1,9 +1,9 @@ -package com.casic.machine.utils; +package cd.casic.module.utils; import com.aliyun.oss.OSS; import com.aliyun.oss.model.OSSObject; -import com.casic.machine.configuration.AliYunConfig; -import com.casic.machine.exception.ServiceException; +import cd.casic.module.configuration.AliYunConfig; +import cd.casic.module.exception.ServiceException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/EnumUtils.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/utils/EnumUtils.java index c04a345d..31d47f38 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/EnumUtils.java @@ -1,7 +1,7 @@ -package com.casic.machine.utils; +package cd.casic.module.utils; -import com.casic.machine.enums.CodeEnum; +import cd.casic.module.enums.CodeEnum; public class EnumUtils { /** diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/PageResult.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/utils/PageResult.java index 69d43a23..f1e27d04 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/PageResult.java @@ -1,4 +1,4 @@ -package com.casic.machine.utils; +package cd.casic.module.utils; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/PropertyUtils.java similarity index 95% rename from modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/utils/PropertyUtils.java index baf17d1f..6bdc59da 100644 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/utils/PropertyUtils.java @@ -1,4 +1,4 @@ -package com.casic.machine.utils; +package cd.casic.module.utils; import io.micrometer.common.util.StringUtils;