From 6e317f9b8cf6482cc3cf79e2098c87cb9d2037f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Fri, 30 May 2025 14:08:16 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 3 + .idea/encodings.xml | 1 + .idea/jarRepositories.xml | 10 +- .idea/misc.xml | 1 + .../machine-management-module/.gitattributes | 2 + .../ee/machine-management-module/.gitignore | 33 + modules/ee/machine-management-module/mvnw | 259 ++++++++ modules/ee/machine-management-module/mvnw.cmd | 149 +++++ modules/ee/machine-management-module/pom.xml | 101 +++ .../machine/configuration/AliYunConfig.java | 39 ++ .../machine/contants/CommonConstants.java | 5 + .../controller/MachineEnvController.java | 69 ++ .../controller/MachineInfoController.java | 126 ++++ .../controller/MachineProxyController.java | 71 ++ .../controller/SecretKeyController.java | 75 +++ .../com/casic/machine/dto/MachineEnvDTO.java | 45 ++ .../com/casic/machine/dto/MachineInfoDto.java | 44 ++ .../casic/machine/dto/MachineProxyDTO.java | 43 ++ .../java/com/casic/machine/dto/PageDto.java | 10 + .../com/casic/machine/dto/SecretKeyDto.java | 36 + .../com/casic/machine/entity/BaseEntity.java | 28 + .../com/casic/machine/entity/MachineEnv.java | 54 ++ .../com/casic/machine/entity/MachineInfo.java | 66 ++ .../casic/machine/entity/MachineProxy.java | 69 ++ .../com/casic/machine/entity/SecretKey.java | 32 + .../machine/enums/AuthenticationType.java | 16 + .../com/casic/machine/enums/CodeEnum.java | 7 + .../casic/machine/enums/ConnectionStatus.java | 22 + .../machine/enums/MachineInfoStatus.java | 16 + .../casic/machine/enums/MachineInfoType.java | 16 + .../machine/enums/MachineProxyStatus.java | 22 + .../casic/machine/enums/MachineProxyType.java | 17 + .../enums/PermissionExceptionEnum.java | 19 + .../machine/enums/RequestExceptionEnum.java | 19 + .../machine/exception/ServiceException.java | 52 ++ .../machine/handler/ConnectionSession.java | 615 ++++++++++++++++++ .../handler/GlobalExceptionHandler.java | 183 ++++++ .../machine/mapper/MachineEnvMapper.java | 14 + .../machine/mapper/MachineInfoMapper.java | 9 + .../machine/mapper/MachineProxyMapper.java | 11 + .../machine/mapper/SecretServiceMapper.java | 9 + .../casic/machine/pojo/ErrorResponseData.java | 26 + .../com/casic/machine/pojo/ResponseData.java | 72 ++ .../machine/pojo/SuccessResponseData.java | 16 + .../machine/service/MachineEnvService.java | 42 ++ .../machine/service/MachineInfoService.java | 89 +++ .../machine/service/MachineProxyService.java | 52 ++ .../machine/service/SecretKeyService.java | 28 + .../service/impl/MachineEnvServiceImpl.java | 175 +++++ .../service/impl/MachineProxyServiceImpl.java | 186 ++++++ .../service/impl/MachineinfoServiceImpl.java | 341 ++++++++++ .../service/impl/SecretKeyServiceImpl.java | 133 ++++ .../com/casic/machine/utils/AliOssUtil.java | 113 ++++ .../com/casic/machine/utils/EnumUtils.java | 50 ++ .../com/casic/machine/utils/PageResult.java | 45 ++ .../casic/machine/utils/PropertyUtils.java | 35 + .../src/main/resources/application-dev.yml | 14 + .../src/main/resources/application.yml | 37 ++ .../impl/MachineEnvServiceImplTest.java | 184 ++++++ .../impl/MachineProxyServiceImplTest.java | 222 +++++++ .../impl/MachineinfoServiceImplTest.java | 177 +++++ .../impl/SecretKeyServiceImplTest.java | 218 +++++++ 62 files changed, 4668 insertions(+), 5 deletions(-) create mode 100644 modules/ee/machine-management-module/.gitattributes create mode 100644 modules/ee/machine-management-module/.gitignore create mode 100644 modules/ee/machine-management-module/mvnw create mode 100644 modules/ee/machine-management-module/mvnw.cmd create mode 100644 modules/ee/machine-management-module/pom.xml create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/configuration/AliYunConfig.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/contants/CommonConstants.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineEnvController.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineInfoController.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineProxyController.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/SecretKeyController.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineEnvDTO.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineInfoDto.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineProxyDTO.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/PageDto.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/SecretKeyDto.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/BaseEntity.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineProxy.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/SecretKey.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/AuthenticationType.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/CodeEnum.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/ConnectionStatus.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoStatus.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoType.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyStatus.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyType.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/exception/ServiceException.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/ConnectionSession.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ErrorResponseData.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ResponseData.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/SuccessResponseData.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineEnvService.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineInfoService.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineProxyService.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/SecretKeyService.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/AliOssUtil.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/EnumUtils.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PageResult.java create mode 100644 modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PropertyUtils.java create mode 100644 modules/ee/machine-management-module/src/main/resources/application-dev.yml create mode 100644 modules/ee/machine-management-module/src/main/resources/application.yml create mode 100644 modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java create mode 100644 modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java create mode 100644 modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java create mode 100644 modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0f3f9116..8516a15e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + @@ -53,6 +54,7 @@ + @@ -69,6 +71,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index bbfbfb10..066dfae5 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -39,6 +39,7 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 0a0608cd..1945c076 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,16 +1,16 @@ - - + + diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/configuration/AliYunConfig.java b/modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/configuration/AliYunConfig.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/configuration/AliYunConfig.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/contants/CommonConstants.java b/modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/contants/CommonConstants.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/contants/CommonConstants.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineEnvController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineEnvController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineInfoController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineInfoController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/MachineProxyController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/MachineProxyController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/controller/SecretKeyController.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/controller/SecretKeyController.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineEnvDTO.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineEnvDTO.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineInfoDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineInfoDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/MachineProxyDTO.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/MachineProxyDTO.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/PageDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/PageDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/PageDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/dto/SecretKeyDto.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/dto/SecretKeyDto.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/BaseEntity.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/BaseEntity.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/BaseEntity.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java similarity index 97% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java index 39ccede8..bebab106 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.*; import java.io.Serializable; -import java.util.Date; /** * 环境变量实体类 diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java similarity index 96% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java index 27acf407..09214af6 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java @@ -1,6 +1,5 @@ package com.casic.machine.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.casic.machine.enums.AuthenticationType; diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/MachineProxy.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineProxy.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/entity/SecretKey.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/entity/SecretKey.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/AuthenticationType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/AuthenticationType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/AuthenticationType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/CodeEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/CodeEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/CodeEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/ConnectionStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/ConnectionStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineInfoType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineInfoType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyStatus.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyStatus.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/MachineProxyType.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/MachineProxyType.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/PermissionExceptionEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/enums/RequestExceptionEnum.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/exception/ServiceException.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/exception/ServiceException.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/ConnectionSession.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/handler/ConnectionSession.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java b/modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineEnvMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineInfoMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/MachineProxyMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/mapper/SecretServiceMapper.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ErrorResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ErrorResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ErrorResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/ResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/ResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/SuccessResponseData.java b/modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/pojo/SuccessResponseData.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/pojo/SuccessResponseData.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineEnvService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineEnvService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineInfoService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineInfoService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/MachineProxyService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/MachineProxyService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/SecretKeyService.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/SecretKeyService.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java similarity index 99% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java index 52a1315e..4e8147e8 100644 --- a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.Date; + import java.util.List; import java.util.stream.Collectors; diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineProxyServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineinfoServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/SecretKeyServiceImpl.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/AliOssUtil.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/AliOssUtil.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/AliOssUtil.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/EnumUtils.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/EnumUtils.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/EnumUtils.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PageResult.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PageResult.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/PageResult.java diff --git a/modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PropertyUtils.java b/modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java similarity index 100% rename from modules/ee/machine-management-module/src/main/java/com/casic/machine/utils/PropertyUtils.java rename to modules/module-ci-machine/src/main/java/com/casic/machine/utils/PropertyUtils.java diff --git a/modules/ee/machine-management-module/src/main/resources/application-dev.yml b/modules/module-ci-machine/src/main/resources/application-dev.yml similarity index 100% rename from modules/ee/machine-management-module/src/main/resources/application-dev.yml rename to modules/module-ci-machine/src/main/resources/application-dev.yml diff --git a/modules/ee/machine-management-module/src/main/resources/application.yml b/modules/module-ci-machine/src/main/resources/application.yml similarity index 100% rename from modules/ee/machine-management-module/src/main/resources/application.yml rename to modules/module-ci-machine/src/main/resources/application.yml diff --git a/modules/ee/sql/resource_management.sql b/modules/module-ci-machine/src/main/resources/sql/resource_management.sql similarity index 100% rename from modules/ee/sql/resource_management.sql rename to modules/module-ci-machine/src/main/resources/sql/resource_management.sql diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java similarity index 99% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java index d63a6ab0..5842c47c 100644 --- a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java @@ -16,7 +16,6 @@ import org.springframework.test.context.jdbc.Sql; import org.springframework.transaction.annotation.Transactional; import java.util.Collections; -import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java similarity index 100% rename from modules/ee/machine-management-module/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java rename to modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java diff --git a/modules/pom.xml b/modules/pom.xml index 6b1d1d77..d5849dd3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -14,6 +14,7 @@ module-infra-biz module-system-api module-system-biz + module-ci-machine modules diff --git a/ops-server/pom.xml b/ops-server/pom.xml index 1c4d2f4f..d3f33ed9 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -25,6 +25,11 @@ module-system-biz ${revision} + + cd.casic.boot + module-ci-machine + ${revision} + cd.casic.boot From db95a112bce9f7a19d5192c3cfc24ddeb2483195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com> Date: Fri, 30 May 2025 16:37:31 +0800 Subject: [PATCH 04/46] =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine-management-module/.gitattributes | 2 - .../ee/machine-management-module/.gitignore | 33 --- modules/ee/machine-management-module/mvnw | 259 ------------------ modules/ee/machine-management-module/mvnw.cmd | 149 ---------- .../src/main/resources/application-dev.yml | 14 - .../src/main/resources/application.yml | 37 --- 6 files changed, 494 deletions(-) delete mode 100644 modules/ee/machine-management-module/.gitattributes delete mode 100644 modules/ee/machine-management-module/.gitignore delete mode 100644 modules/ee/machine-management-module/mvnw delete mode 100644 modules/ee/machine-management-module/mvnw.cmd delete mode 100644 modules/module-ci-machine/src/main/resources/application-dev.yml delete mode 100644 modules/module-ci-machine/src/main/resources/application.yml diff --git a/modules/ee/machine-management-module/.gitattributes b/modules/ee/machine-management-module/.gitattributes deleted file mode 100644 index 3b41682a..00000000 --- a/modules/ee/machine-management-module/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -/mvnw text eol=lf -*.cmd text eol=crlf diff --git a/modules/ee/machine-management-module/.gitignore b/modules/ee/machine-management-module/.gitignore deleted file mode 100644 index 549e00a2..00000000 --- a/modules/ee/machine-management-module/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/modules/ee/machine-management-module/mvnw b/modules/ee/machine-management-module/mvnw deleted file mode 100644 index 19529ddf..00000000 --- a/modules/ee/machine-management-module/mvnw +++ /dev/null @@ -1,259 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Optional ENV vars -# ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output -# ---------------------------------------------------------------------------- - -set -euf -[ "${MVNW_VERBOSE-}" != debug ] || set -x - -# OS specific support. -native_path() { printf %s\\n "$1"; } -case "$(uname)" in -CYGWIN* | MINGW*) - [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" - native_path() { cygpath --path --windows "$1"; } - ;; -esac - -# set JAVACMD and JAVACCMD -set_java_home() { - # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched - if [ -n "${JAVA_HOME-}" ]; then - if [ -x "$JAVA_HOME/jre/sh/java" ]; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - JAVACCMD="$JAVA_HOME/jre/sh/javac" - else - JAVACMD="$JAVA_HOME/bin/java" - JAVACCMD="$JAVA_HOME/bin/javac" - - if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then - echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 - echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 - return 1 - fi - fi - else - JAVACMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v java - )" || : - JAVACCMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v javac - )" || : - - if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then - echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 - return 1 - fi - fi -} - -# hash string like Java String::hashCode -hash_string() { - str="${1:-}" h=0 - while [ -n "$str" ]; do - char="${str%"${str#?}"}" - h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) - str="${str#?}" - done - printf %x\\n $h -} - -verbose() { :; } -[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } - -die() { - printf %s\\n "$1" >&2 - exit 1 -} - -trim() { - # MWRAPPER-139: - # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. - # Needed for removing poorly interpreted newline sequences when running in more - # exotic environments such as mingw bash on Windows. - printf "%s" "${1}" | tr -d '[:space:]' -} - -# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties -while IFS="=" read -r key value; do - case "${key-}" in - distributionUrl) distributionUrl=$(trim "${value-}") ;; - distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; - esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" - -case "${distributionUrl##*/}" in -maven-mvnd-*bin.*) - MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ - case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in - *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; - :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; - :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; - :Linux*x86_64*) distributionPlatform=linux-amd64 ;; - *) - echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 - distributionPlatform=linux-amd64 - ;; - esac - distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" - ;; -maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; -esac - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" -distributionUrlName="${distributionUrl##*/}" -distributionUrlNameMain="${distributionUrlName%.*}" -distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" -MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" - -exec_maven() { - unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : - exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" -} - -if [ -d "$MAVEN_HOME" ]; then - verbose "found existing MAVEN_HOME at $MAVEN_HOME" - exec_maven "$@" -fi - -case "${distributionUrl-}" in -*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; -*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; -esac - -# prepare tmp dir -if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then - clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } - trap clean HUP INT TERM EXIT -else - die "cannot create temp dir" -fi - -mkdir -p -- "${MAVEN_HOME%/*}" - -# Download and Install Apache Maven -verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -verbose "Downloading from: $distributionUrl" -verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -# select .zip or .tar.gz -if ! command -v unzip >/dev/null; then - distributionUrl="${distributionUrl%.zip}.tar.gz" - distributionUrlName="${distributionUrl##*/}" -fi - -# verbose opt -__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' -[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v - -# normalize http auth -case "${MVNW_PASSWORD:+has-password}" in -'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; -has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; -esac - -if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then - verbose "Found wget ... using wget" - wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" -elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then - verbose "Found curl ... using curl" - curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" -elif set_java_home; then - verbose "Falling back to use Java to download" - javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" - targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" - cat >"$javaSource" <<-END - public class Downloader extends java.net.Authenticator - { - protected java.net.PasswordAuthentication getPasswordAuthentication() - { - return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); - } - public static void main( String[] args ) throws Exception - { - setDefault( new Downloader() ); - java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); - } - } - END - # For Cygwin/MinGW, switch paths to Windows format before running javac and java - verbose " - Compiling Downloader.java ..." - "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" - verbose " - Running Downloader.java ..." - "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" -fi - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -if [ -n "${distributionSha256Sum-}" ]; then - distributionSha256Result=false - if [ "$MVN_CMD" = mvnd.sh ]; then - echo "Checksum validation is not supported for maven-mvnd." >&2 - echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - elif command -v shasum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - fi - if [ $distributionSha256Result = false ]; then - echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 - echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 - exit 1 - fi -fi - -# unzip and move -if command -v unzip >/dev/null; then - unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" -else - tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" -fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" - -clean || : -exec_maven "$@" diff --git a/modules/ee/machine-management-module/mvnw.cmd b/modules/ee/machine-management-module/mvnw.cmd deleted file mode 100644 index 249bdf38..00000000 --- a/modules/ee/machine-management-module/mvnw.cmd +++ /dev/null @@ -1,149 +0,0 @@ -<# : batch portion -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- - -@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) -@SET __MVNW_CMD__= -@SET __MVNW_ERROR__= -@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% -@SET PSModulePath= -@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( - IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) -) -@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% -@SET __MVNW_PSMODULEP_SAVE= -@SET __MVNW_ARG0_NAME__= -@SET MVNW_USERNAME= -@SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) -@echo Cannot start maven from wrapper >&2 && exit /b 1 -@GOTO :EOF -: end batch / begin powershell #> - -$ErrorActionPreference = "Stop" -if ($env:MVNW_VERBOSE -eq "true") { - $VerbosePreference = "Continue" -} - -# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties -$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl -if (!$distributionUrl) { - Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" -} - -switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { - "maven-mvnd-*" { - $USE_MVND = $true - $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" - $MVN_CMD = "mvnd.cmd" - break - } - default { - $USE_MVND = $false - $MVN_CMD = $script -replace '^mvnw','mvn' - break - } -} - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" -} -$distributionUrlName = $distributionUrl -replace '^.*/','' -$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" -if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" -} -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' -$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" - -if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { - Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" - Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" - exit $? -} - -if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { - Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" -} - -# prepare tmp dir -$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile -$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" -$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null -trap { - if ($TMP_DOWNLOAD_DIR.Exists) { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } - } -} - -New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null - -# Download and Install Apache Maven -Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -Write-Verbose "Downloading from: $distributionUrl" -Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -$webclient = New-Object System.Net.WebClient -if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { - $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) -} -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum -if ($distributionSha256Sum) { - if ($USE_MVND) { - Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." - } - Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash - if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { - Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." - } -} - -# unzip and move -Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null -try { - Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null -} catch { - if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { - Write-Error "fail to move MAVEN_HOME" - } -} finally { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } -} - -Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/modules/module-ci-machine/src/main/resources/application-dev.yml b/modules/module-ci-machine/src/main/resources/application-dev.yml deleted file mode 100644 index 96186bbf..00000000 --- a/modules/module-ci-machine/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: machine-management-module - -# datasource: -# driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/resource_management?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false -# username: -# password: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/resource_management?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false - username: root - password: 031219 diff --git a/modules/module-ci-machine/src/main/resources/application.yml b/modules/module-ci-machine/src/main/resources/application.yml deleted file mode 100644 index 4dbe3c6d..00000000 --- a/modules/module-ci-machine/src/main/resources/application.yml +++ /dev/null @@ -1,37 +0,0 @@ -spring: - application: - name: machine-management-module - - profiles: - active: dev - -mybatis-plus: - mapper-locations: classpath:/mapper/*.xml - type-aliases-package: com.casic.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - map-underscore-to-camel-case: true - -logging: - pattern: - console: '%d{HH:mm:ss.SSS} %clr(%-5level) --- [%-15thread] %cyan(%-50logger{50}):%msg%n' - -server: - port: 10111 - -#SpringDoc访问路径 -springdoc.swagger-ui.path: /api-docs.html - - -aliyun: - oss: - # OSS 服务的访问域名 - endpoint: "zyj031219.xin" - # 访问密钥 ID - accessKeyId: "LTAI5tKnFb95ytubCbYfmf5g" - # 访问密钥 Secret - accessKeySecret: "EDtyMKuu5MtViiMoDgAYkWL0JV34AF" - # 存储空间名称 - bucketName: "zyjtest031219" - - From 1d8a1f6eb93f92ab619cb800d62bccd78288e9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com> Date: Fri, 30 May 2025 16:57:03 +0800 Subject: [PATCH 05/46] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=97=A0=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GlobalExceptionHandler.java | 183 ------------------ 1 file changed, 183 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java diff --git a/modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java b/modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java deleted file mode 100644 index ce247f4b..00000000 --- a/modules/module-ci-machine/src/main/java/com/casic/machine/handler/GlobalExceptionHandler.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.casic.machine.handler; - - -import com.casic.machine.contants.CommonConstants; -import com.casic.machine.enums.PermissionExceptionEnum; -import com.casic.machine.enums.RequestExceptionEnum; -import com.casic.machine.pojo.ErrorResponseData; -import com.casic.machine.pojo.ResponseData; -import jakarta.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.annotation.Order; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; -import org.springframework.web.HttpMediaTypeNotSupportedException; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.MissingServletRequestParameterException; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.NoHandlerFoundException; - -import javax.naming.AuthenticationException; -import java.util.stream.Collectors; - -@Order(-200) -@ControllerAdvice -public class GlobalExceptionHandler { - - Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class); - - /** - * 请求参数异常 - */ - @ExceptionHandler(MissingServletRequestParameterException.class) - @ResponseBody - public ResponseData handleMissingParameterException(MissingServletRequestParameterException e) { - logger.error("请求参数异常{}", e.getMessage()); - return renderErrorJson( - 500, - String.format("缺少请求参数{%s},类型为{%s}", e.getParameterName(), e.getParameterType()), - e - ); - } - - /** - * 拦截参数格式传递异常 - */ - @ExceptionHandler(HttpMessageNotReadableException.class) - @ResponseBody - public ResponseData handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { - logger.error("参数格式传递异常{}",e.getMessage()); - return renderErrorJson( - RequestExceptionEnum.REQUEST_JSON_ERROR.getCode(), - RequestExceptionEnum.REQUEST_JSON_ERROR.getMessage(), - e - ); - } - - /** - * 拦截不支持媒体类型异常 - */ - @ExceptionHandler(HttpMediaTypeNotSupportedException.class) - @ResponseBody - public ResponseData handleHttpMediaTypeNotSupportedException(HttpMediaTypeNotSupportedException e) { - logger.error("不支持媒体类型异常{}",e.getMessage()); - return renderErrorJson( - RequestExceptionEnum.REQUEST_TYPE_NOT_JSON.getCode(), - RequestExceptionEnum.REQUEST_TYPE_NOT_JSON.getMessage(), - e - ); - } - - /** - * 拦截请求方法异常 - */ - @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - @ResponseBody - public ResponseData handleHttpRequestMethodNotSupportedException(HttpServletRequest httpServletRequest) { - if ("GET".equalsIgnoreCase(httpServletRequest.getMethod())) { - logger.error("请求方法异常{}",RequestExceptionEnum.REQUEST_METHOD_NOT_POST.getMessage()); - return renderErrorJson( - RequestExceptionEnum.REQUEST_METHOD_NOT_POST.getCode(), - RequestExceptionEnum.REQUEST_METHOD_NOT_POST.getMessage(), - null - ); - } - if("POST".equalsIgnoreCase(httpServletRequest.getMethod())) { - logger.error("请求方法异常{}",RequestExceptionEnum.REQUEST_METHOD_NOT_GET.getMessage()); - return renderErrorJson( - RequestExceptionEnum.REQUEST_METHOD_NOT_GET.getCode(), - RequestExceptionEnum.REQUEST_METHOD_NOT_GET.getMessage(), - null - ); - } - return null; - } - - /** - * 拦截资源找不到的运行时异常 - */ - @ExceptionHandler(NoHandlerFoundException.class) - @ResponseBody - public ResponseData handleNoHandlerFoundException(NoHandlerFoundException e) { - logger.error("资源不存在异常{}",e.getMessage()); - return renderErrorJson( - PermissionExceptionEnum.URL_NOT_EXIST.getCode(), - PermissionExceptionEnum.NO_PERMISSION.getMessage(), - e - ); - } - - /** - * 拦截参数校验错误异常,JSON传参 - */ - @ExceptionHandler(MethodArgumentNotValidException.class) - @ResponseBody - public ResponseData handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { - logger.error("拦截参数校验错误异常,JSON传参{}",e.getMessage()); - return renderErrorJson( - RequestExceptionEnum.PARAM_ERROR.getCode(), - getArgNotValidMessage(e.getBindingResult()), - e - ); - } - - /** - * 拦截认证失败异常 - */ - @ExceptionHandler(AuthenticationException.class) - @ResponseBody - public ResponseData handleAuthenticationException(AuthenticationException e) { - logger.error("拦截认证失败异常{}",e.getMessage()); - return renderErrorJson( - 500, - e.getMessage(), - e - ); - } - - /* - * 渲染异常Json - */ - private ErrorResponseData renderErrorJson(int code, String msg,Throwable e) { - if (e != null) { - StackTraceElement[] stackTrace = e.getStackTrace(); - - //默认的异常类全路径为第一条异常堆栈信息的 - String exceptionClassTotalName = stackTrace[0].toString(); - - //遍历所有堆栈信息，找到cd.casic开头的第一条异常信息 - for (StackTraceElement stackTraceElement : stackTrace) { - if (stackTraceElement.toString().contains(CommonConstants.DEFAULT_PACKAGE_NAME)) { - exceptionClassTotalName = stackTraceElement.toString(); - break; - } - } - ErrorResponseData error = ResponseData.error(code, msg); - error.setExceptionClazz(exceptionClassTotalName); - return error; - }else { - return ResponseData.error(code, msg); - } - } - - /** - * 获取请求参数不正确的提示信息 - * 多个信息，拼接成用逗号分隔的形式 - */ - private String getArgNotValidMessage(BindingResult bindingResult) { - if (bindingResult == null) { - return ""; - } - - //多个错误用逗号分隔 - return bindingResult.getAllErrors().stream() - .map(ObjectError::getDefaultMessage) - .collect(Collectors.joining(",")); - } - -} 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 06/46] =?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; 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 07/46] =?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 Date: Sat, 31 May 2025 14:16:20 +0800 Subject: [PATCH 08/46] =?UTF-8?q?controller=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=EF=BC=8C=E6=9C=BA=E5=99=A8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 30 +- .../controller/MachineInfoController.java | 74 +-- .../controller/MachineProxyController.java | 37 +- .../controller/SecretKeyController.java | 39 +- .../module/machine/dto/MachineEnvDTO.java | 2 +- .../module/machine/dto/MachineProxyDTO.java | 2 + .../impl/MachineEnvServiceImplTest.java | 368 +++++++-------- .../impl/MachineProxyServiceImplTest.java | 444 +++++++++--------- .../impl/MachineinfoServiceImplTest.java | 352 +++++++------- .../impl/SecretKeyServiceImplTest.java | 436 ++++++++--------- 10 files changed, 904 insertions(+), 880 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index ff742a5d..48a1ec8e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/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.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; 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; @@ -13,6 +13,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; +import static cd.casic.framework.commons.pojo.CommonResult.success; + /** * 环境变量控制器 @@ -28,42 +30,44 @@ public class MachineEnvController { @PostMapping("/add") @Operation(summary = "新增环境变量") - public ResponseData add(@RequestBody MachineEnvDTO machineEnvDTO) { - return machineEnvService.add(machineEnvDTO) ? ResponseData.success() : ResponseData.error("新增机器的环境变量失败"); + public CommonResult add(@RequestBody MachineEnvDTO machineEnvDTO) { + machineEnvService.add(machineEnvDTO); + return success(true); } @PutMapping("/update") @Operation(summary = "修改环境变量") - public ResponseData update(@RequestBody MachineEnvDTO machineEnvDTO) { - return machineEnvService.update(machineEnvDTO) ? ResponseData.success() : ResponseData.error("修改环境变量失败"); + public CommonResult update(@RequestBody MachineEnvDTO machineEnvDTO) { + machineEnvService.update(machineEnvDTO); + return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除机器的环境变量") - public ResponseData deleteByMachineId( + public CommonResult deleteByMachineId( @RequestParam Long machineId) { machineEnvService.deleteByMachineId(machineId); - return ResponseData.success(); + return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器环境变量") - public ResponseData deleteList(@RequestParam List ids){ + public CommonResult deleteList(@RequestParam List ids){ machineEnvService.deleteList(ids); - return ResponseData.success(); + return success(true); } @GetMapping("/listByMachineId") @Operation(summary = "获取机器的环境变量") - public ResponseData getByMachineId( + public CommonResult getByMachineId( @RequestParam Long machineId) { - return ResponseData.success(machineEnvService.getByMachineId(machineId)); + return success(machineEnvService.getByMachineId(machineId)); } @PostMapping("/list") @Operation(summary ="获取环境变量列表") - public ResponseData list(@RequestBody MachineEnvDTO machineEnvDTO) { - return ResponseData.success(machineEnvService.listEnv(machineEnvDTO)); + public CommonResult list(@RequestBody MachineEnvDTO machineEnvDTO) { + return success(machineEnvService.listEnv(machineEnvDTO)); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 2fbc0c7f..bbd14eca 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,10 +1,10 @@ package cd.casic.module.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; 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; @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import static cd.casic.framework.commons.pojo.CommonResult.success; + @RestController @Tag(name = "机器信息管理") @RequestMapping("/api/machineInfo") @@ -23,103 +25,111 @@ public class MachineInfoController { @PostMapping("/add") @Operation(summary = "新增机器信息") - public ResponseData add(@RequestBody MachineInfoDto machineInfoDto) { - return machineInfoService.addMachineInfo(machineInfoDto) ? ResponseData.success() : ResponseData.error("新增失败"); + public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { + machineInfoService.addMachineInfo(machineInfoDto); + return success(true); } @GetMapping("/list") @Operation(summary = "获取机器信息列表") - public ResponseData list(@RequestBody MachineInfoDto machineInfoDto) { - return SuccessResponseData.success(machineInfoService.listMachineInfo(machineInfoDto)); + public CommonResult list(@RequestBody MachineInfoDto machineInfoDto) { + return success(machineInfoService.listMachineInfo(machineInfoDto)); } @PutMapping("/update") @Operation(summary = "编辑机器信息") - public ResponseData update(@RequestBody MachineInfoDto machineInfoDto) { - return machineInfoService.updateMachineInfo(machineInfoDto) ? ResponseData.success() : ResponseData.error("更新失败"); + public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { + machineInfoService.updateMachineInfo(machineInfoDto); + return success(true); } @PutMapping("/updateStatus") @Operation(summary = "机器启用/停用") - public ResponseData updateStatus(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("status") String status) { - return machineInfoService.updateStatus(machineInfoId, status) ? ResponseData.success() : ResponseData.error("更新状态失败"); + public CommonResult updateStatus(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("status") String status) { + machineInfoService.updateStatus(machineInfoId, status); + return success(true); } @PutMapping("/bindingSecretKey") @Operation(summary = "绑定密钥") - public ResponseData bindingSecretKey(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("secretKeyId") Long secretKeyId) { - return machineInfoService.bindingSecretKey(machineInfoId, secretKeyId) ? ResponseData.success() : ResponseData.error("绑定失败"); + public CommonResult bindingSecretKey(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("secretKeyId") Long secretKeyId) { + machineInfoService.bindingSecretKey(machineInfoId, secretKeyId); + return success(true); } @DeleteMapping("/delete") @Operation(summary = "机器信息删除") - public ResponseData delete(@RequestParam("machineInfoId") Long machineInfoId) { + public CommonResult delete(@RequestParam("machineInfoId") Long machineInfoId) { machineInfoService.deleteMachineInfo(machineInfoId); - return ResponseData.success(); + return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器信息") - public ResponseData deleteList(@RequestParam("machineInfoId") List machineInfoIds) { + public CommonResult deleteList(@RequestParam("machineInfoId") List machineInfoIds) { machineInfoService.deleteList(machineInfoIds); - return ResponseData.success(); + return success(true); } @PostMapping("/test") @Operation(summary = "测试机器连接") - public ResponseData testConnection(@RequestBody MachineInfo machineInfo) { - boolean result = machineInfoService.testConnection(machineInfo); - return ResponseData.success(); + public CommonResult testConnection(@RequestBody MachineInfo machineInfo) { + machineInfoService.testConnection(machineInfo); + return success(true); } @GetMapping("/status/{machineName}") @Operation(summary = "获取机器连接状态") - public ResponseData getConnectionStatus(@PathVariable String machineName) { - return ResponseData.success(machineInfoService.getConnectionStatus(machineName)); + public CommonResult getConnectionStatus(@PathVariable String machineName) { + return success(machineInfoService.getConnectionStatus(machineName)); } @GetMapping("/status/all") @Operation(summary = "获取所有机器连接状态") - public ResponseData getAllConnectionStatus() { - return ResponseData.success(machineInfoService.getAllConnectionStatus()); + public CommonResult getAllConnectionStatus() { + return success(machineInfoService.getAllConnectionStatus()); } @PostMapping("/connect") @Operation(summary = "建立机器连接") - public ResponseData connect(@RequestBody MachineInfo machineInfo) { - return ResponseData.success(machineInfoService.connect(machineInfo)); + public CommonResult connect(@RequestBody MachineInfo machineInfo) { + return success(machineInfoService.connect(machineInfo)); } @PostMapping("/disconnect/{sessionId}") @Operation(summary = "断开机器连接") - public ResponseData disconnect(@PathVariable String sessionId) { - return ResponseData.success(machineInfoService.disconnect(sessionId)); + public CommonResult disconnect(@PathVariable String sessionId) { + machineInfoService.disconnect(sessionId); + return success(true); } @PostMapping("/execute/{sessionId}") @Operation(summary = "执行远程命令") - public ResponseData executeCommand( + public CommonResult executeCommand( @PathVariable String sessionId, @RequestBody String command) { - return ResponseData.success(machineInfoService.executeCommand(sessionId, command)); + + return success(machineInfoService.executeCommand(sessionId, command)); } @PostMapping("/upload/{sessionId}") @Operation(summary = "上传文件到远程机器") - public ResponseData uploadFile( + public CommonResult uploadFile( @PathVariable String sessionId, @RequestParam String localFilePath, @RequestParam String remoteFilePath) { - return ResponseData.success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); + machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath); + return success(true); } @PostMapping("/download/{sessionId}") @Operation(summary = "从远程机器下载文件") - public ResponseData downloadFile( + public CommonResult downloadFile( @PathVariable String sessionId, @RequestParam String remoteFilePath, @RequestParam String localFilePath) { - return ResponseData.success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); + machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath); + return success(true); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 2cf49368..fdb991fc 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -1,9 +1,8 @@ package cd.casic.module.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; 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; @@ -13,6 +12,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import static cd.casic.framework.commons.pojo.CommonResult.success; + /** * 机器代理控制器 */ @@ -27,45 +28,49 @@ public class MachineProxyController { @PostMapping("/register") @Operation(summary ="注册新的机器代理") - public ResponseData register(@RequestBody MachineProxyDTO machineProxyDTO) { - return machineProxyService.register(machineProxyDTO) ? ResponseData.success() :ResponseData.error("注册新的机器代理失败"); + public CommonResult register(@RequestBody MachineProxyDTO machineProxyDTO) { + machineProxyService.register(machineProxyDTO); + return success(true); } @GetMapping("/list") @Operation(summary ="获取代理") - public ResponseData list(MachineProxyDTO machineProxyDTO) { - return ResponseData.success(machineProxyService.list(machineProxyDTO)); + public CommonResult list(MachineProxyDTO machineProxyDTO) { + return success(machineProxyService.list(machineProxyDTO)); } @PutMapping("/updateStatus") @Operation(summary ="更新代理状态") - public ResponseData updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { - return machineProxyService.updateStatus(machineProxyDTO) ? ResponseData.success() : ResponseData.error("更新代理状态失败"); + public CommonResult updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { + machineProxyService.updateStatus(machineProxyDTO); + return success(true); } @PostMapping("/receiptHeartbeat") @Operation(summary ="接收代理心跳") - public ResponseData heartbeat(@RequestBody MachineProxyDTO machineProxyDTO) { - return machineProxyService.heartbeat(machineProxyDTO) ? ResponseData.success() :ResponseData.error("接收代理心跳失败"); + public CommonResult heartbeat(@RequestBody MachineProxyDTO machineProxyDTO) { + machineProxyService.heartbeat(machineProxyDTO); + return success(true); } @GetMapping("/statistics/status") @Operation(summary ="获取所有代理的状态统计") - public ResponseData getStatusStatistics() { - return ResponseData.success(machineProxyService.getStatusStatistics()); + public CommonResult getStatusStatistics() { + return success(machineProxyService.getStatusStatistics()); } @PutMapping("/updateConfig") @Operation(summary ="更新代理配置") - public ResponseData updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { - return machineProxyService.updateConfig(machineProxyDTO) ? ResponseData.success() : ResponseData.error("更新代理配置失败"); + public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { + machineProxyService.updateConfig(machineProxyDTO); + return success(true); } @DeleteMapping("/batch") @Operation(summary ="批量删除代理") - public ResponseData deleteBatch(@RequestBody List ids) { + public CommonResult deleteBatch(@RequestBody List ids) { machineProxyService.delete(ids); - return new SuccessResponseData(); + return success(true); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index ee70c9e5..1c328838 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,14 +1,11 @@ package cd.casic.module.machine.controller; - - +import cd.casic.framework.commons.pojo.CommonResult; 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; import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -22,6 +19,8 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; +import static cd.casic.framework.commons.pojo.CommonResult.success; + @RestController @RequestMapping("/api/secretKey") @Tag(name = "密钥管理") @@ -31,45 +30,49 @@ public class SecretKeyController { @PostMapping(value = "/add", consumes = "multipart/form-data") @Operation(summary ="新增密钥") - public ResponseData add(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { - return secretKeyService.addSecretKey(secretKeyDto, file) ? ResponseData.success() : ResponseData.error("新增密钥失败"); + public CommonResult add(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { + secretKeyService.addSecretKey(secretKeyDto, file); + return success(true); } @PutMapping("/bindingMachine") @Operation(summary ="绑定机器") - public ResponseData bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { + public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { secretKeyService.bindingMachine(secretKeyId, machineInfoIds); - return ResponseData.success(); + return success(true); } @PutMapping("/update") @Operation(summary ="编辑密钥信息") - public ResponseData update(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { - return secretKeyService.updateSecretKey(secretKeyDto, file) ? ResponseData.success() : ResponseData.error("编辑密钥信息失败"); + public CommonResult update(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { + secretKeyService.updateSecretKey(secretKeyDto, file); + return success(true); } @DeleteMapping("/delete") @Operation(summary ="删除密钥") - public ResponseData delete(@RequestParam("secretKeyId") Long secretKeyId) { - return secretKeyService.deleteSecretKey(secretKeyId) ? ResponseData.success() : ResponseData.error("删除密钥"); + public CommonResult delete(@RequestParam("secretKeyId") Long secretKeyId) { + secretKeyService.deleteSecretKey(secretKeyId); + return success(true); } @DeleteMapping("/deleteList") @Operation(summary ="批量删除密钥") - public ResponseData deleteList(@RequestParam("secretKeyId") List secretKeyIds) { - return secretKeyService.deleteList(secretKeyIds) ? ResponseData.success() : ResponseData.error("批量删除密钥"); + public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { + secretKeyService.deleteList(secretKeyIds); + return success(true); } @GetMapping("/list") @Operation(summary ="获取密钥信息列表") - public ResponseData list(@RequestBody SecretKeyDto secretKeyDto) { - return ResponseData.success(secretKeyService.listSecretKey(secretKeyDto)); + public CommonResult list(@RequestBody SecretKeyDto secretKeyDto) { + return success(secretKeyService.listSecretKey(secretKeyDto)); } @GetMapping("/downloadSecretKeyFile") @Operation(summary ="下载密钥文件") - public ResponseEntity downloadSecretKeyFile(@RequestParam("secretKeyId") Long secretKeyId) { - return secretKeyService.downloadSecretKeyFile(secretKeyId); + public CommonResult downloadSecretKeyFile(@RequestParam("secretKeyId") Long secretKeyId) { + return success(secretKeyService.downloadSecretKeyFile(secretKeyId).getBody()); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java index abe15f3c..212fd38a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java @@ -21,7 +21,7 @@ public class MachineEnvDTO extends PageDto implements Serializable { private String envValue; private Boolean sensitive; private String description; - private Long machineInfoId; + private Long machineId; private Date createDate; private Date updateDate; private String sortField; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java index 4d845864..dcac8f76 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java @@ -27,6 +27,8 @@ public class MachineProxyDTO extends PageDto implements Serializable { private String description; private String hostIp; private String sshPort; + private Date createDate; + private Date updateDate; /** * 计算代理是否在线 diff --git a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java index 96e711d1..1084407f 100644 --- a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineEnvServiceImplTest.java @@ -1,184 +1,184 @@ -package com.casic.machine.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.casic.commons.exception.ServiceException; -import com.casic.commons.utils.PageResult; -import com.casic.machine.dto.MachineEnvDTO; -import com.casic.machine.entity.MachineEnv; -import com.casic.machine.mapper.MachineEnvMapper; -import com.casic.machine.service.MachineEnvService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; - -@SpringBootTest -@Transactional -@Rollback(value = true) // 测试后回滚数据 -@Sql(scripts = {"classpath:sql/machine_env_test_data.sql"}) // 初始化测试数据（可选） -public class MachineEnvServiceImplTest { - - @Autowired - private MachineEnvService machineEnvService; - - @Autowired - private MachineEnvMapper machineEnvMapper; - - private MachineEnvDTO validDto; - private MachineEnvDTO invalidKeyDto; - private Long existingMachineId; - private Long nonExistingMachineId; - - @BeforeEach - public void setUp() { - // 准备测试数据 - existingMachineId = 1L; // 假设数据库中存在ID为1的机器环境变量 - nonExistingMachineId = 999L; // 不存在的机器ID - - // 有效测试数据 - validDto = new MachineEnvDTO(); - validDto.setMachineInfoId(existingMachineId); - validDto.setEnvKey("TEST_ENV_KEY"); - validDto.setEnvValue("test-value"); - validDto.setSensitive(true); - - // 无效Key测试数据（包含非法字符） - invalidKeyDto = new MachineEnvDTO(); - invalidKeyDto.setMachineInfoId(existingMachineId); - invalidKeyDto.setEnvKey("test-env-key"); // 包含'-'，不符合正则 - invalidKeyDto.setEnvValue("test-value"); - } - - // ==================== 更新环境变量测试 ==================== - @Test - void testUpdateEnv_ValidData_ShouldSucceed() { - // 执行更新（假设数据库中已存在machineId=1的记录） - boolean result = machineEnvService.update(validDto); - - // 验证结果 - assertTrue(result); - - // 检查数据库数据是否更新 - MachineEnv updatedEnv = machineEnvMapper.selectOne( - new LambdaQueryWrapper().eq(MachineEnv::getMachineId, existingMachineId) - ); - assertNotNull(updatedEnv); - assertEquals(validDto.getEnvKey(), updatedEnv.getEnvKey()); - assertEquals(validDto.getEnvValue(), updatedEnv.getEnvValue()); - assertEquals(validDto.getSensitive(), updatedEnv.getSensitive()); - } - - @Test - void testUpdateEnv_NullDto_ShouldThrowException() { - - MachineEnvDTO machineEnvDTO = new MachineEnvDTO(); - assertThrows(ServiceException.class, () -> { - machineEnvService.update(machineEnvDTO); - }, "环境变量不能为空"); - } - - @Test - void testUpdateEnv_InvalidKey_ShouldThrowException() { - assertThrows(ServiceException.class, () -> { - machineEnvService.update(invalidKeyDto); - }, "环境变量键不合法"); - } - - @Test - void testUpdateEnv_SensitiveKey_ShouldMarkAsSensitive() { - MachineEnvDTO sensitiveDto = new MachineEnvDTO(); - sensitiveDto.setMachineInfoId(existingMachineId); - sensitiveDto.setEnvKey("DB_PASSWORD"); // 包含敏感词 - sensitiveDto.setEnvValue("secret"); - - machineEnvService.update(sensitiveDto); - - MachineEnv env = machineEnvMapper.selectOne( - new LambdaQueryWrapper().eq(MachineEnv::getMachineId, existingMachineId) - ); - assertTrue(env.getSensitive()); - } - - // ==================== 删除环境变量测试 ==================== - @Test - void testDeleteByMachineId_ExistingId_ShouldSucceed() { - machineEnvService.deleteByMachineId(existingMachineId); - MachineEnv env = machineEnvMapper.selectById(existingMachineId); - assertNull(env); - } - - @Test - void testDeleteByMachineId_NonExistingId_ShouldDoNothing() { - machineEnvService.deleteByMachineId(nonExistingMachineId); - // 不抛出异常，静默处理 - } - - // ==================== 根据机器ID查询测试 ==================== - @Test - void testGetByMachineId_ExistingId_ShouldReturnDto() { - MachineEnvDTO dto = machineEnvService.getByMachineId(existingMachineId); - assertNotNull(dto); - assertEquals(existingMachineId, dto.getMachineInfoId()); - } - - @Test - void testGetByMachineId_NonExistingId_ShouldReturnNull() { - MachineEnvDTO dto = machineEnvService.getByMachineId(nonExistingMachineId); - assertNull(dto); - } - - // ==================== 列表查询测试 ==================== - @Test - void testListEnv_Pagination_ShouldReturnValidPage() { - MachineEnvDTO queryDto = new MachineEnvDTO(); - queryDto.setPageIndex(1); - queryDto.setPageSize(10); - queryDto.setEnvKey("TEST"); // 假设测试数据中存在包含"TEST"的键 - - PageResult pageResult = machineEnvService.listEnv(queryDto); - - assertNotNull(pageResult.getList()); - assertTrue(pageResult.getTotal() >= 0); - assertEquals(1, pageResult.getPageNum()); - } - - @Test - void testListEnv_SortByCreateTime_ShouldBeOrdered() { - MachineEnvDTO queryDto = new MachineEnvDTO(); - queryDto.setSortField("createTime"); - queryDto.setSortDirection("desc"); - - PageResult pageResult = machineEnvService.listEnv(queryDto); - - List list = pageResult.getList(); - if (!list.isEmpty()) { - Date prevDate = list.get(0).getCreateDate(); - for (int i = 1; i < list.size(); i++) { - Date currDate = list.get(i).getCreateDate(); - assertTrue(currDate.before(prevDate) || currDate.equals(prevDate), "排序应为降序"); - prevDate = currDate; - } - } - } - - // ==================== 批量删除测试 ==================== - @Test - void testDeleteList_ValidIds_ShouldDeleteBatch() { - // 假设测试数据中有ID为1和2的记录 - List ids = List.of(1L, 2L); - machineEnvService.deleteList(ids); - - long count = machineEnvMapper.selectCount(new LambdaQueryWrapper().in(MachineEnv::getId, ids)); - assertEquals(0, count); - } - - -} \ No newline at end of file +//package com.casic.machine.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.casic.commons.exception.ServiceException; +//import com.casic.commons.utils.PageResult; +//import com.casic.machine.dto.MachineEnvDTO; +//import com.casic.machine.entity.MachineEnv; +//import com.casic.machine.mapper.MachineEnvMapper; +//import com.casic.machine.service.MachineEnvService; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.annotation.Rollback; +//import org.springframework.test.context.jdbc.Sql; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.Date; +//import java.util.List; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//@SpringBootTest +//@Transactional +//@Rollback(value = true) // 测试后回滚数据 +//@Sql(scripts = {"classpath:sql/machine_env_test_data.sql"}) // 初始化测试数据（可选） +//public class MachineEnvServiceImplTest { +// +// @Autowired +// private MachineEnvService machineEnvService; +// +// @Autowired +// private MachineEnvMapper machineEnvMapper; +// +// private MachineEnvDTO validDto; +// private MachineEnvDTO invalidKeyDto; +// private Long existingMachineId; +// private Long nonExistingMachineId; +// +// @BeforeEach +// public void setUp() { +// // 准备测试数据 +// existingMachineId = 1L; // 假设数据库中存在ID为1的机器环境变量 +// nonExistingMachineId = 999L; // 不存在的机器ID +// +// // 有效测试数据 +// validDto = new MachineEnvDTO(); +// validDto.setMachineInfoId(existingMachineId); +// validDto.setEnvKey("TEST_ENV_KEY"); +// validDto.setEnvValue("test-value"); +// validDto.setSensitive(true); +// +// // 无效Key测试数据（包含非法字符） +// invalidKeyDto = new MachineEnvDTO(); +// invalidKeyDto.setMachineInfoId(existingMachineId); +// invalidKeyDto.setEnvKey("test-env-key"); // 包含'-'，不符合正则 +// invalidKeyDto.setEnvValue("test-value"); +// } +// +// // ==================== 更新环境变量测试 ==================== +// @Test +// void testUpdateEnv_ValidData_ShouldSucceed() { +// // 执行更新（假设数据库中已存在machineId=1的记录） +// boolean result = machineEnvService.update(validDto); +// +// // 验证结果 +// assertTrue(result); +// +// // 检查数据库数据是否更新 +// MachineEnv updatedEnv = machineEnvMapper.selectOne( +// new LambdaQueryWrapper().eq(MachineEnv::getMachineId, existingMachineId) +// ); +// assertNotNull(updatedEnv); +// assertEquals(validDto.getEnvKey(), updatedEnv.getEnvKey()); +// assertEquals(validDto.getEnvValue(), updatedEnv.getEnvValue()); +// assertEquals(validDto.getSensitive(), updatedEnv.getSensitive()); +// } +// +// @Test +// void testUpdateEnv_NullDto_ShouldThrowException() { +// +// MachineEnvDTO machineEnvDTO = new MachineEnvDTO(); +// assertThrows(ServiceException.class, () -> { +// machineEnvService.update(machineEnvDTO); +// }, "环境变量不能为空"); +// } +// +// @Test +// void testUpdateEnv_InvalidKey_ShouldThrowException() { +// assertThrows(ServiceException.class, () -> { +// machineEnvService.update(invalidKeyDto); +// }, "环境变量键不合法"); +// } +// +// @Test +// void testUpdateEnv_SensitiveKey_ShouldMarkAsSensitive() { +// MachineEnvDTO sensitiveDto = new MachineEnvDTO(); +// sensitiveDto.setMachineInfoId(existingMachineId); +// sensitiveDto.setEnvKey("DB_PASSWORD"); // 包含敏感词 +// sensitiveDto.setEnvValue("secret"); +// +// machineEnvService.update(sensitiveDto); +// +// MachineEnv env = machineEnvMapper.selectOne( +// new LambdaQueryWrapper().eq(MachineEnv::getMachineId, existingMachineId) +// ); +// assertTrue(env.getSensitive()); +// } +// +// // ==================== 删除环境变量测试 ==================== +// @Test +// void testDeleteByMachineId_ExistingId_ShouldSucceed() { +// machineEnvService.deleteByMachineId(existingMachineId); +// MachineEnv env = machineEnvMapper.selectById(existingMachineId); +// assertNull(env); +// } +// +// @Test +// void testDeleteByMachineId_NonExistingId_ShouldDoNothing() { +// machineEnvService.deleteByMachineId(nonExistingMachineId); +// // 不抛出异常，静默处理 +// } +// +// // ==================== 根据机器ID查询测试 ==================== +// @Test +// void testGetByMachineId_ExistingId_ShouldReturnDto() { +// MachineEnvDTO dto = machineEnvService.getByMachineId(existingMachineId); +// assertNotNull(dto); +// assertEquals(existingMachineId, dto.getMachineInfoId()); +// } +// +// @Test +// void testGetByMachineId_NonExistingId_ShouldReturnNull() { +// MachineEnvDTO dto = machineEnvService.getByMachineId(nonExistingMachineId); +// assertNull(dto); +// } +// +// // ==================== 列表查询测试 ==================== +// @Test +// void testListEnv_Pagination_ShouldReturnValidPage() { +// MachineEnvDTO queryDto = new MachineEnvDTO(); +// queryDto.setPageIndex(1); +// queryDto.setPageSize(10); +// queryDto.setEnvKey("TEST"); // 假设测试数据中存在包含"TEST"的键 +// +// PageResult pageResult = machineEnvService.listEnv(queryDto); +// +// assertNotNull(pageResult.getList()); +// assertTrue(pageResult.getTotal() >= 0); +// assertEquals(1, pageResult.getPageNum()); +// } +// +// @Test +// void testListEnv_SortByCreateTime_ShouldBeOrdered() { +// MachineEnvDTO queryDto = new MachineEnvDTO(); +// queryDto.setSortField("createTime"); +// queryDto.setSortDirection("desc"); +// +// PageResult pageResult = machineEnvService.listEnv(queryDto); +// +// List list = pageResult.getList(); +// if (!list.isEmpty()) { +// Date prevDate = list.get(0).getCreateDate(); +// for (int i = 1; i < list.size(); i++) { +// Date currDate = list.get(i).getCreateDate(); +// assertTrue(currDate.before(prevDate) || currDate.equals(prevDate), "排序应为降序"); +// prevDate = currDate; +// } +// } +// } +// +// // ==================== 批量删除测试 ==================== +// @Test +// void testDeleteList_ValidIds_ShouldDeleteBatch() { +// // 假设测试数据中有ID为1和2的记录 +// List ids = List.of(1L, 2L); +// machineEnvService.deleteList(ids); +// +// long count = machineEnvMapper.selectCount(new LambdaQueryWrapper().in(MachineEnv::getId, ids)); +// assertEquals(0, count); +// } +// +// +//} \ No newline at end of file diff --git a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java index 5831eca3..b97de2c6 100644 --- a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineProxyServiceImplTest.java @@ -1,222 +1,222 @@ -package com.casic.machine.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.casic.commons.exception.ServiceException; -import com.casic.commons.utils.EnumUtils; -import com.casic.commons.utils.PageResult; -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.mapper.MachineProxyMapper; -import com.casic.machine.service.MachineProxyService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -import static org.junit.jupiter.api.Assertions.*; - -@SpringBootTest -@Transactional -@Rollback(true) -@Sql(scripts = {"classpath:sql/machine_proxy_test_data.sql"}) -public class MachineProxyServiceImplTest { - - @Autowired - private MachineProxyService machineProxyService; - - @Autowired - private MachineProxyMapper machineProxyMapper; - - private MachineProxyDTO validProxyDTO; - private Long existingProxyId; - private Long nonExistingProxyId; - - @BeforeEach - public void setUp() { - // 初始化测试数据（假设 SQL 脚本已插入一条状态为 OFFLINE 的代理） - existingProxyId = 1L; - nonExistingProxyId = 999L; - - // 有效代理 DTO - validProxyDTO = new MachineProxyDTO(); - validProxyDTO.setProxyType(MachineProxyType.SOCKS5.getMessage()); - validProxyDTO.setHostIp("192.168.1.100"); - validProxyDTO.setSshPort("22"); - validProxyDTO.setUsername("test_user"); - validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); - } - - // ============================== 注册代理测试 ============================== - @Test - void testRegister_ValidData_ShouldSucceed() { - // 执行注册 - boolean result = machineProxyService.register(validProxyDTO); - assertTrue(result, "注册失败"); - - // 使用 Lambda 表达式查询（推荐） - MachineProxy proxy = machineProxyMapper.selectOne( - new LambdaQueryWrapper() - .eq(MachineProxy::getHostIp, validProxyDTO.getHostIp()) - ); - - // 断言数据存在 - assertNotNull(proxy, "代理记录未写入数据库"); - assertEquals(MachineProxyType.SOCKS5.getCode(), proxy.getProxyTypeCode()); - assertEquals(MachineProxyStatus.INSTALLING.getCode(), proxy.getStatusCode()); - assertEquals(validProxyDTO.getHostIp(), proxy.getHostIp(), "IP 地址不一致"); - } - - // ============================== 更新状态测试 ============================== - @Test - void testUpdateStatus_ExistingProxy_ShouldUpdateStatus() { - // 准备数据：查询现有代理（状态为 OFFLINE） - MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); - assertEquals(MachineProxyStatus.OFFLINE.getCode(), proxy.getStatusCode()); - - // 执行状态更新为 ONLINE - validProxyDTO.setId(existingProxyId); - validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); - boolean result = machineProxyService.updateStatus(validProxyDTO); - - // 验证结果 - assertTrue(result); - proxy = machineProxyMapper.selectById(existingProxyId); - assertEquals(MachineProxyStatus.ONLINE.getCode(), proxy.getStatusCode()); - } - - @Test - void testUpdateStatus_NullDto_ShouldThrowException() { - assertThrows(ServiceException.class, () -> { - machineProxyService.updateStatus(null); - }, "MachineProxyDTO对象为空"); - } - - // ============================== 心跳测试 ============================== - @Test - void testHeartbeat_ValidData_ShouldUpdateVersionAndStatus() { - // 准备数据：现有代理状态为 OFFLINE，版本为 1.0.0 - MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); - assertEquals("1.0.0", proxy.getVersion()); - assertEquals(MachineProxyStatus.OFFLINE.getCode(), proxy.getStatusCode()); - - // 发送心跳，更新版本和状态 - validProxyDTO.setId(existingProxyId); - validProxyDTO.setVersion("2.0.0"); - validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); - machineProxyService.heartbeat(validProxyDTO); - - // 验证结果 - proxy = machineProxyMapper.selectById(existingProxyId); - assertEquals("2.0.0", proxy.getVersion()); - assertEquals(MachineProxyStatus.ONLINE.getCode(), proxy.getStatusCode()); - } - - // ============================== 状态统计测试 ============================== - @Test - void testGetStatusStatistics_ShouldReturnValidCounts() { - // 假设测试数据中有 OFFLINE(1)、INSTALLING(1)、ONLINE(1) 三种状态 - Map stats = machineProxyService.getStatusStatistics(); - - // 验证统计结果 - assertEquals(3, stats.size()); - assertTrue(stats.containsKey(MachineProxyStatus.OFFLINE.getMessage())); - assertTrue(stats.containsKey(MachineProxyStatus.INSTALLING.getMessage())); - assertTrue(stats.containsKey(MachineProxyStatus.ONLINE.getMessage())); - assertEquals(1L, stats.get(MachineProxyStatus.OFFLINE.getMessage())); - } - - // ============================== 更新配置测试 ============================== - @Test - void testUpdateConfig_ValidConfig_ShouldSucceed() { - // 准备数据：现有代理配置为空 - MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); - assertNull(proxy.getConfig()); - - // 更新配置 - validProxyDTO.setId(existingProxyId); - validProxyDTO.setConfig("{\"port\": 8080}"); - boolean result = machineProxyService.updateConfig(validProxyDTO); - - // 验证结果 - assertTrue(result); - proxy = machineProxyMapper.selectById(existingProxyId); - assertEquals("{\"port\": 8080}", proxy.getConfig()); - } - - // ============================== 删除代理测试 ============================== - @Test - void testDelete_OfflineProxy_ShouldDeleteSuccessfully() { - // 准备数据：状态为 OFFLINE 的代理 ID - List ids = Collections.singletonList(existingProxyId); - machineProxyService.delete(ids); - - // 验证删除 - MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); - assertNull(proxy); - } - - @Test - void testDelete_OnlineProxy_ShouldThrowException() { - // 先将代理状态改为 ONLINE - MachineProxy onlineProxy = new MachineProxy(); - onlineProxy.setId(existingProxyId); - onlineProxy.setStatusCode(MachineProxyStatus.ONLINE.getCode()); - machineProxyMapper.updateById(onlineProxy); - - // 执行删除 - List ids = Collections.singletonList(existingProxyId); - assertThrows(IllegalArgumentException.class, () -> { - machineProxyService.delete(ids); - }, "以下代理处于在线状态，无法删除: 1"); - } - - // ============================== 列表查询测试 ============================== - @Test - void testList_WithStatusFilter_ShouldReturnMatchedRecords() { - // 查询状态为 OFFLINE 的代理 - MachineProxyDTO queryDto = new MachineProxyDTO(); - queryDto.setStatus(MachineProxyStatus.OFFLINE.getMessage()); - - PageResult pageResult = machineProxyService.list(queryDto); - - // 验证结果 - assertFalse(pageResult.getList().isEmpty()); - pageResult.getList().forEach(dto -> - assertEquals(MachineProxyStatus.OFFLINE.getMessage(), dto.getStatus()) - ); - } - - @Test - void testList_WithHostIpFilter_ShouldReturnMatchedRecords() { - // 假设测试数据中存在 host_ip 为 "192.168.1.1" 的代理 - MachineProxyDTO queryDto = new MachineProxyDTO(); - queryDto.setHostIp("192.168.1.1"); - - PageResult pageResult = machineProxyService.list(queryDto); - - // 验证结果 - assertFalse(pageResult.getList().isEmpty()); - pageResult.getList().forEach(dto -> - assertEquals("192.168.1.1", dto.getHostIp()) - ); - } - - // ============================== 辅助方法测试 ============================== - @Test - void testEnumUtils_ConvertCodeToMessage() { - // 验证代理类型枚举转换 - String typeMessage = EnumUtils.getEnumByCode(MachineProxyType.HTTP.getCode(), MachineProxyType.class).getMessage(); - assertEquals("HTTP", typeMessage); - - // 验证状态枚举转换 - String statusMessage = EnumUtils.getEnumByCode(MachineProxyStatus.INSTALLING.getCode(), MachineProxyStatus.class).getMessage(); - assertEquals("安装中", statusMessage); - } -} \ No newline at end of file +//package com.casic.machine.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.casic.commons.exception.ServiceException; +//import com.casic.commons.utils.EnumUtils; +//import com.casic.commons.utils.PageResult; +//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.mapper.MachineProxyMapper; +//import com.casic.machine.service.MachineProxyService; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.annotation.Rollback; +//import org.springframework.test.context.jdbc.Sql; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.*; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//@SpringBootTest +//@Transactional +//@Rollback(true) +//@Sql(scripts = {"classpath:sql/machine_proxy_test_data.sql"}) +//public class MachineProxyServiceImplTest { +// +// @Autowired +// private MachineProxyService machineProxyService; +// +// @Autowired +// private MachineProxyMapper machineProxyMapper; +// +// private MachineProxyDTO validProxyDTO; +// private Long existingProxyId; +// private Long nonExistingProxyId; +// +// @BeforeEach +// public void setUp() { +// // 初始化测试数据（假设 SQL 脚本已插入一条状态为 OFFLINE 的代理） +// existingProxyId = 1L; +// nonExistingProxyId = 999L; +// +// // 有效代理 DTO +// validProxyDTO = new MachineProxyDTO(); +// validProxyDTO.setProxyType(MachineProxyType.SOCKS5.getMessage()); +// validProxyDTO.setHostIp("192.168.1.100"); +// validProxyDTO.setSshPort("22"); +// validProxyDTO.setUsername("test_user"); +// validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); +// } +// +// // ============================== 注册代理测试 ============================== +// @Test +// void testRegister_ValidData_ShouldSucceed() { +// // 执行注册 +// boolean result = machineProxyService.register(validProxyDTO); +// assertTrue(result, "注册失败"); +// +// // 使用 Lambda 表达式查询（推荐） +// MachineProxy proxy = machineProxyMapper.selectOne( +// new LambdaQueryWrapper() +// .eq(MachineProxy::getHostIp, validProxyDTO.getHostIp()) +// ); +// +// // 断言数据存在 +// assertNotNull(proxy, "代理记录未写入数据库"); +// assertEquals(MachineProxyType.SOCKS5.getCode(), proxy.getProxyTypeCode()); +// assertEquals(MachineProxyStatus.INSTALLING.getCode(), proxy.getStatusCode()); +// assertEquals(validProxyDTO.getHostIp(), proxy.getHostIp(), "IP 地址不一致"); +// } +// +// // ============================== 更新状态测试 ============================== +// @Test +// void testUpdateStatus_ExistingProxy_ShouldUpdateStatus() { +// // 准备数据：查询现有代理（状态为 OFFLINE） +// MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); +// assertEquals(MachineProxyStatus.OFFLINE.getCode(), proxy.getStatusCode()); +// +// // 执行状态更新为 ONLINE +// validProxyDTO.setId(existingProxyId); +// validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); +// boolean result = machineProxyService.updateStatus(validProxyDTO); +// +// // 验证结果 +// assertTrue(result); +// proxy = machineProxyMapper.selectById(existingProxyId); +// assertEquals(MachineProxyStatus.ONLINE.getCode(), proxy.getStatusCode()); +// } +// +// @Test +// void testUpdateStatus_NullDto_ShouldThrowException() { +// assertThrows(ServiceException.class, () -> { +// machineProxyService.updateStatus(null); +// }, "MachineProxyDTO对象为空"); +// } +// +// // ============================== 心跳测试 ============================== +// @Test +// void testHeartbeat_ValidData_ShouldUpdateVersionAndStatus() { +// // 准备数据：现有代理状态为 OFFLINE，版本为 1.0.0 +// MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); +// assertEquals("1.0.0", proxy.getVersion()); +// assertEquals(MachineProxyStatus.OFFLINE.getCode(), proxy.getStatusCode()); +// +// // 发送心跳，更新版本和状态 +// validProxyDTO.setId(existingProxyId); +// validProxyDTO.setVersion("2.0.0"); +// validProxyDTO.setStatus(MachineProxyStatus.ONLINE.getMessage()); +// machineProxyService.heartbeat(validProxyDTO); +// +// // 验证结果 +// proxy = machineProxyMapper.selectById(existingProxyId); +// assertEquals("2.0.0", proxy.getVersion()); +// assertEquals(MachineProxyStatus.ONLINE.getCode(), proxy.getStatusCode()); +// } +// +// // ============================== 状态统计测试 ============================== +// @Test +// void testGetStatusStatistics_ShouldReturnValidCounts() { +// // 假设测试数据中有 OFFLINE(1)、INSTALLING(1)、ONLINE(1) 三种状态 +// Map stats = machineProxyService.getStatusStatistics(); +// +// // 验证统计结果 +// assertEquals(3, stats.size()); +// assertTrue(stats.containsKey(MachineProxyStatus.OFFLINE.getMessage())); +// assertTrue(stats.containsKey(MachineProxyStatus.INSTALLING.getMessage())); +// assertTrue(stats.containsKey(MachineProxyStatus.ONLINE.getMessage())); +// assertEquals(1L, stats.get(MachineProxyStatus.OFFLINE.getMessage())); +// } +// +// // ============================== 更新配置测试 ============================== +// @Test +// void testUpdateConfig_ValidConfig_ShouldSucceed() { +// // 准备数据：现有代理配置为空 +// MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); +// assertNull(proxy.getConfig()); +// +// // 更新配置 +// validProxyDTO.setId(existingProxyId); +// validProxyDTO.setConfig("{\"port\": 8080}"); +// boolean result = machineProxyService.updateConfig(validProxyDTO); +// +// // 验证结果 +// assertTrue(result); +// proxy = machineProxyMapper.selectById(existingProxyId); +// assertEquals("{\"port\": 8080}", proxy.getConfig()); +// } +// +// // ============================== 删除代理测试 ============================== +// @Test +// void testDelete_OfflineProxy_ShouldDeleteSuccessfully() { +// // 准备数据：状态为 OFFLINE 的代理 ID +// List ids = Collections.singletonList(existingProxyId); +// machineProxyService.delete(ids); +// +// // 验证删除 +// MachineProxy proxy = machineProxyMapper.selectById(existingProxyId); +// assertNull(proxy); +// } +// +// @Test +// void testDelete_OnlineProxy_ShouldThrowException() { +// // 先将代理状态改为 ONLINE +// MachineProxy onlineProxy = new MachineProxy(); +// onlineProxy.setId(existingProxyId); +// onlineProxy.setStatusCode(MachineProxyStatus.ONLINE.getCode()); +// machineProxyMapper.updateById(onlineProxy); +// +// // 执行删除 +// List ids = Collections.singletonList(existingProxyId); +// assertThrows(IllegalArgumentException.class, () -> { +// machineProxyService.delete(ids); +// }, "以下代理处于在线状态，无法删除: 1"); +// } +// +// // ============================== 列表查询测试 ============================== +// @Test +// void testList_WithStatusFilter_ShouldReturnMatchedRecords() { +// // 查询状态为 OFFLINE 的代理 +// MachineProxyDTO queryDto = new MachineProxyDTO(); +// queryDto.setStatus(MachineProxyStatus.OFFLINE.getMessage()); +// +// PageResult pageResult = machineProxyService.list(queryDto); +// +// // 验证结果 +// assertFalse(pageResult.getList().isEmpty()); +// pageResult.getList().forEach(dto -> +// assertEquals(MachineProxyStatus.OFFLINE.getMessage(), dto.getStatus()) +// ); +// } +// +// @Test +// void testList_WithHostIpFilter_ShouldReturnMatchedRecords() { +// // 假设测试数据中存在 host_ip 为 "192.168.1.1" 的代理 +// MachineProxyDTO queryDto = new MachineProxyDTO(); +// queryDto.setHostIp("192.168.1.1"); +// +// PageResult pageResult = machineProxyService.list(queryDto); +// +// // 验证结果 +// assertFalse(pageResult.getList().isEmpty()); +// pageResult.getList().forEach(dto -> +// assertEquals("192.168.1.1", dto.getHostIp()) +// ); +// } +// +// // ============================== 辅助方法测试 ============================== +// @Test +// void testEnumUtils_ConvertCodeToMessage() { +// // 验证代理类型枚举转换 +// String typeMessage = EnumUtils.getEnumByCode(MachineProxyType.HTTP.getCode(), MachineProxyType.class).getMessage(); +// assertEquals("HTTP", typeMessage); +// +// // 验证状态枚举转换 +// String statusMessage = EnumUtils.getEnumByCode(MachineProxyStatus.INSTALLING.getCode(), MachineProxyStatus.class).getMessage(); +// assertEquals("安装中", statusMessage); +// } +//} \ No newline at end of file diff --git a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java index 5842c47c..e4e22680 100644 --- a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java @@ -1,176 +1,176 @@ -package com.casic.machine.service.impl; - -import com.casic.commons.exception.ServiceException; -import com.casic.machine.dto.MachineInfoDto; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.enums.AuthenticationType; -import com.casic.machine.enums.ConnectionStatus; -import com.casic.machine.enums.MachineInfoStatus; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collections; - -import static org.junit.jupiter.api.Assertions.*; - -@SpringBootTest -@Transactional -@Rollback(true) -@Sql(scripts = {"classpath:sql/machine_info_test_data.sql"}) -public class MachineinfoServiceImplTest { - - @Autowired - private MachineinfoServiceImpl machineInfoService; - - private MachineInfoDto validMachineInfoDto; - private Long existingMachineId; - private Long nonExistingMachineId; - - @BeforeEach - public void setUp() { - // 初始化测试数据（假设 SQL 脚本已插入一条状态为 ENABLE 的机器） - existingMachineId = 1L; - nonExistingMachineId = 999L; - - // 有效机器信息 DTO - validMachineInfoDto = new MachineInfoDto(); - validMachineInfoDto.setName("Test Machine"); - validMachineInfoDto.setHostIp("192.168.1.101"); - validMachineInfoDto.setSshPort("22"); - validMachineInfoDto.setUsername("testuser"); - validMachineInfoDto.setAuthenticationType(AuthenticationType.PASSWORD.getMessage()); - validMachineInfoDto.setStatus(MachineInfoStatus.ENABLE.getMessage()); - } - - // ======================= 新增机器测试 ======================= - @Test - void testAddMachineInfo_ValidData_ShouldSucceed() { - boolean result = machineInfoService.addMachineInfo(validMachineInfoDto); - assertTrue(result); - - // 验证数据库存在记录 - MachineInfo machineInfo = machineInfoService.getById(validMachineInfoDto.getId()); - assertNotNull(machineInfo); - assertEquals(validMachineInfoDto.getHostIp(), machineInfo.getHostIp()); - assertEquals(AuthenticationType.PASSWORD.getCode(), machineInfo.getAuthenticationTypeCode()); - } - - @Test - void testAddMachineInfo_NullDto_ShouldThrowException() { - assertThrows(ServiceException.class, () -> { - machineInfoService.addMachineInfo(null); - }, "机器信息为空"); - } - - // ======================= 列表查询测试 ======================= - @Test - void testListMachineInfo_WithStatusFilter_ShouldReturnValidRecords() { - MachineInfoDto queryDto = new MachineInfoDto(); - queryDto.setStatus(MachineInfoStatus.ENABLE.getMessage()); - - var pageResult = machineInfoService.listMachineInfo(queryDto); - assertFalse(pageResult.getList().isEmpty()); - pageResult.getList().forEach(dto -> - assertEquals(MachineInfoStatus.ENABLE.getMessage(), dto.getStatus()) - ); - } - - @Test - void testListMachineInfo_WithHostIpFilter_ShouldFilterRecords() { - MachineInfoDto queryDto = new MachineInfoDto(); - queryDto.setHostIp("192.168.1.100"); // 假设测试数据中的 IP - - var pageResult = machineInfoService.listMachineInfo(queryDto); - assertFalse(pageResult.getList().isEmpty()); - pageResult.getList().forEach(dto -> - assertTrue(dto.getHostIp().contains("192.168.1.100")) - ); - } - - // ======================= 更新机器状态测试 ======================= - @Test - void testUpdateStatus_ValidId_ShouldUpdateStatus() { - boolean result = machineInfoService.updateStatus(existingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); - assertTrue(result); - - MachineInfo machineInfo = machineInfoService.getById(existingMachineId); - assertEquals(MachineInfoStatus.UN_ENABLE.getCode(), machineInfo.getStatus()); - } - - @Test - void testUpdateStatus_NonExistingId_ShouldFail() { - boolean result = machineInfoService.updateStatus(nonExistingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); - assertFalse(result); - } - - // ======================= 连接测试 ======================= - @Test - void testTestConnection_EnabledMachine_ShouldSucceed() { - MachineInfo machineInfo = machineInfoService.getById(existingMachineId); - assertTrue(machineInfoService.testConnection(machineInfo)); - } - - @Test - void testTestConnection_DisabledMachine_ShouldThrowException() { - // 先禁用机器 - machineInfoService.updateStatus(existingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); - MachineInfo disabledMachine = machineInfoService.getById(existingMachineId); - - assertThrows(RuntimeException.class, () -> { - machineInfoService.testConnection(disabledMachine); - }, "机器不可用"); - } - - // ======================= 会话管理测试 ======================= - @Test - void testConnect_NewMachine_ShouldCreateSession() { - MachineInfo machineInfo = machineInfoService.getById(existingMachineId); - String sessionId = machineInfoService.connect(machineInfo); - - assertNotNull(sessionId); - assertTrue(sessionId.startsWith("session-")); - assertEquals(ConnectionStatus.CONNECTING, machineInfoService.getConnectionStatus(machineInfo.getName())); - } - - - - // ======================= 删除机器测试 ======================= - @Test - void testDeleteMachineInfo_EnabledMachine_ShouldDelete() { - machineInfoService.deleteMachineInfo(existingMachineId); - assertNull(machineInfoService.getById(existingMachineId)); - } - - @Test - void testDeleteList_ValidIds_ShouldDeleteBatch() { - machineInfoService.deleteList(Collections.singletonList(existingMachineId)); - var list = machineInfoService.list(); - assertFalse(list.contains(existingMachineId)); - } - - // ======================= 辅助功能测试 ======================= - @Test - void testAuthenticationTypeConversion() { - validMachineInfoDto.setAuthenticationType(AuthenticationType.SECRET_KEY.getMessage()); - MachineInfo machineInfo = new MachineInfo(); - BeanUtils.copyProperties(validMachineInfoDto, machineInfo); - - assertEquals(AuthenticationType.SECRET_KEY.getCode(), machineInfo.getAuthenticationTypeCode()); - } - - @Test - void testGetAllConnectionStatus_ShouldReturnStatusMap() { - MachineInfo machineInfo = machineInfoService.getById(existingMachineId); - machineInfoService.connect(machineInfo); - - var statusMap = machineInfoService.getAllConnectionStatus(); - assertFalse(statusMap.isEmpty()); - assertTrue(statusMap.containsValue(ConnectionStatus.CONNECTING)); - } -} \ No newline at end of file +//package com.casic.machine.service.impl; +// +//import com.casic.commons.exception.ServiceException; +//import com.casic.machine.dto.MachineInfoDto; +//import com.casic.machine.entity.MachineInfo; +//import com.casic.machine.enums.AuthenticationType; +//import com.casic.machine.enums.ConnectionStatus; +//import com.casic.machine.enums.MachineInfoStatus; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.BeanUtils; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.annotation.Rollback; +//import org.springframework.test.context.jdbc.Sql; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.Collections; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//@SpringBootTest +//@Transactional +//@Rollback(true) +//@Sql(scripts = {"classpath:sql/machine_info_test_data.sql"}) +//public class MachineinfoServiceImplTest { +// +// @Autowired +// private MachineinfoServiceImpl machineInfoService; +// +// private MachineInfoDto validMachineInfoDto; +// private Long existingMachineId; +// private Long nonExistingMachineId; +// +// @BeforeEach +// public void setUp() { +// // 初始化测试数据（假设 SQL 脚本已插入一条状态为 ENABLE 的机器） +// existingMachineId = 1L; +// nonExistingMachineId = 999L; +// +// // 有效机器信息 DTO +// validMachineInfoDto = new MachineInfoDto(); +// validMachineInfoDto.setName("Test Machine"); +// validMachineInfoDto.setHostIp("192.168.1.101"); +// validMachineInfoDto.setSshPort("22"); +// validMachineInfoDto.setUsername("testuser"); +// validMachineInfoDto.setAuthenticationType(AuthenticationType.PASSWORD.getMessage()); +// validMachineInfoDto.setStatus(MachineInfoStatus.ENABLE.getMessage()); +// } +// +// // ======================= 新增机器测试 ======================= +// @Test +// void testAddMachineInfo_ValidData_ShouldSucceed() { +// boolean result = machineInfoService.addMachineInfo(validMachineInfoDto); +// assertTrue(result); +// +// // 验证数据库存在记录 +// MachineInfo machineInfo = machineInfoService.getById(validMachineInfoDto.getId()); +// assertNotNull(machineInfo); +// assertEquals(validMachineInfoDto.getHostIp(), machineInfo.getHostIp()); +// assertEquals(AuthenticationType.PASSWORD.getCode(), machineInfo.getAuthenticationTypeCode()); +// } +// +// @Test +// void testAddMachineInfo_NullDto_ShouldThrowException() { +// assertThrows(ServiceException.class, () -> { +// machineInfoService.addMachineInfo(null); +// }, "机器信息为空"); +// } +// +// // ======================= 列表查询测试 ======================= +// @Test +// void testListMachineInfo_WithStatusFilter_ShouldReturnValidRecords() { +// MachineInfoDto queryDto = new MachineInfoDto(); +// queryDto.setStatus(MachineInfoStatus.ENABLE.getMessage()); +// +// var pageResult = machineInfoService.listMachineInfo(queryDto); +// assertFalse(pageResult.getList().isEmpty()); +// pageResult.getList().forEach(dto -> +// assertEquals(MachineInfoStatus.ENABLE.getMessage(), dto.getStatus()) +// ); +// } +// +// @Test +// void testListMachineInfo_WithHostIpFilter_ShouldFilterRecords() { +// MachineInfoDto queryDto = new MachineInfoDto(); +// queryDto.setHostIp("192.168.1.100"); // 假设测试数据中的 IP +// +// var pageResult = machineInfoService.listMachineInfo(queryDto); +// assertFalse(pageResult.getList().isEmpty()); +// pageResult.getList().forEach(dto -> +// assertTrue(dto.getHostIp().contains("192.168.1.100")) +// ); +// } +// +// // ======================= 更新机器状态测试 ======================= +// @Test +// void testUpdateStatus_ValidId_ShouldUpdateStatus() { +// boolean result = machineInfoService.updateStatus(existingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); +// assertTrue(result); +// +// MachineInfo machineInfo = machineInfoService.getById(existingMachineId); +// assertEquals(MachineInfoStatus.UN_ENABLE.getCode(), machineInfo.getStatus()); +// } +// +// @Test +// void testUpdateStatus_NonExistingId_ShouldFail() { +// boolean result = machineInfoService.updateStatus(nonExistingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); +// assertFalse(result); +// } +// +// // ======================= 连接测试 ======================= +// @Test +// void testTestConnection_EnabledMachine_ShouldSucceed() { +// MachineInfo machineInfo = machineInfoService.getById(existingMachineId); +// assertTrue(machineInfoService.testConnection(machineInfo)); +// } +// +// @Test +// void testTestConnection_DisabledMachine_ShouldThrowException() { +// // 先禁用机器 +// machineInfoService.updateStatus(existingMachineId, MachineInfoStatus.UN_ENABLE.getMessage()); +// MachineInfo disabledMachine = machineInfoService.getById(existingMachineId); +// +// assertThrows(RuntimeException.class, () -> { +// machineInfoService.testConnection(disabledMachine); +// }, "机器不可用"); +// } +// +// // ======================= 会话管理测试 ======================= +// @Test +// void testConnect_NewMachine_ShouldCreateSession() { +// MachineInfo machineInfo = machineInfoService.getById(existingMachineId); +// String sessionId = machineInfoService.connect(machineInfo); +// +// assertNotNull(sessionId); +// assertTrue(sessionId.startsWith("session-")); +// assertEquals(ConnectionStatus.CONNECTING, machineInfoService.getConnectionStatus(machineInfo.getName())); +// } +// +// +// +// // ======================= 删除机器测试 ======================= +// @Test +// void testDeleteMachineInfo_EnabledMachine_ShouldDelete() { +// machineInfoService.deleteMachineInfo(existingMachineId); +// assertNull(machineInfoService.getById(existingMachineId)); +// } +// +// @Test +// void testDeleteList_ValidIds_ShouldDeleteBatch() { +// machineInfoService.deleteList(Collections.singletonList(existingMachineId)); +// var list = machineInfoService.list(); +// assertFalse(list.contains(existingMachineId)); +// } +// +// // ======================= 辅助功能测试 ======================= +// @Test +// void testAuthenticationTypeConversion() { +// validMachineInfoDto.setAuthenticationType(AuthenticationType.SECRET_KEY.getMessage()); +// MachineInfo machineInfo = new MachineInfo(); +// BeanUtils.copyProperties(validMachineInfoDto, machineInfo); +// +// assertEquals(AuthenticationType.SECRET_KEY.getCode(), machineInfo.getAuthenticationTypeCode()); +// } +// +// @Test +// void testGetAllConnectionStatus_ShouldReturnStatusMap() { +// MachineInfo machineInfo = machineInfoService.getById(existingMachineId); +// machineInfoService.connect(machineInfo); +// +// var statusMap = machineInfoService.getAllConnectionStatus(); +// assertFalse(statusMap.isEmpty()); +// assertTrue(statusMap.containsValue(ConnectionStatus.CONNECTING)); +// } +//} \ No newline at end of file diff --git a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java index 86adb12e..7b02c7cb 100644 --- a/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java +++ b/modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/SecretKeyServiceImplTest.java @@ -1,218 +1,218 @@ -package com.casic.machine.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.commons.exception.ServiceException; -import com.casic.commons.utils.AliOssUtil; -import com.casic.machine.entity.MachineInfo; -import com.casic.machine.entity.SecretKey; -import com.casic.machine.dto.SecretKeyDto; -import com.casic.machine.mapper.SecretServiceMapper; -import com.casic.machine.service.MachineInfoService; -import com.jayway.jsonpath.internal.Utils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.springframework.beans.BeanUtils; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.util.ReflectionTestUtils; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.Collections; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -@SuppressWarnings("unchecked") -public class SecretKeyServiceImplTest { - - @InjectMocks - private SecretKeyServiceImpl secretKeyService; - - @Mock - private AliOssUtil aliOssUtil; - - @Mock - private SecretServiceMapper secretServiceMapper; - - @Mock - private MachineInfoService machineInfoService; - - private SecretKeyDto validSecretKeyDto; - private MockMultipartFile mockFile; - private final Long TEST_SECRET_KEY_ID = 1L; - private final String TEST_FILE_NAME = "test_key.pem"; - private final String TEST_PATH = "https://bucket.endpoint/test_key.pem"; - - @BeforeEach - public void setUp() throws IOException { - MockitoAnnotations.openMocks(this); - validSecretKeyDto = new SecretKeyDto(); - validSecretKeyDto.setName("Test Key"); - validSecretKeyDto.setDescription("Test secret key"); - - // 创建模拟文件 - byte[] fileContent = "test content".getBytes(); - mockFile = new MockMultipartFile( - "file", - TEST_FILE_NAME, - "application/octet-stream", - new ByteArrayInputStream(fileContent) - ); - - // 模拟 OSS 工具返回值 - when(aliOssUtil.save(any(MockMultipartFile.class))).thenReturn(TEST_FILE_NAME); - - } - - // ======================= 新增密钥测试 ======================= - @Test - void testAddSecretKey_ValidData_ShouldSucceed() throws IOException { - // 执行新增 - boolean result = secretKeyService.addSecretKey(validSecretKeyDto, mockFile); - - // 验证 OSS 保存调用 - verify(aliOssUtil, times(1)).save(mockFile); - - // 验证实体属性 - SecretKey savedKey = new SecretKey(); - BeanUtils.copyProperties(validSecretKeyDto, savedKey); - savedKey.setFileName(TEST_FILE_NAME); - savedKey.setPath(TEST_PATH); - - // 验证 Mapper 调用 - verify(secretServiceMapper, times(1)).insert(savedKey); - assertTrue(result); - } - - @Test - void testAddSecretKey_NullFile_ShouldThrowException() { - assertThrows(ServiceException.class, () -> { - secretKeyService.addSecretKey(validSecretKeyDto, null); - }, "文件为空"); - } - - // ======================= 绑定机器测试 ======================= - @Test - void testBindingMachine_ValidIds_ShouldUpdateMachine() { - // 模拟机器列表 - List machineIds = Collections.singletonList(1L); - when(machineInfoService.listByIds(machineIds)).thenReturn(Collections.singletonList(new MachineInfo())); - - secretKeyService.bindingMachine(TEST_SECRET_KEY_ID, machineIds); - - // 验证机器信息更新 - verify(machineInfoService, times(1)).listByIds(machineIds); - machineIds.forEach(id -> { - verify(machineInfoService, times(1)).update(any()); - }); - } - - // ======================= 更新密钥测试 ======================= - @Test - void testUpdateSecretKey_WithNewFile_ShouldUpdatePath() throws IOException { - MockMultipartFile newFile = new MockMultipartFile( - "file", - "new_key.pem", - "application/octet-stream", - new ByteArrayInputStream("new content".getBytes()) - ); - when(aliOssUtil.save(newFile)).thenReturn("new_key.pem"); - - validSecretKeyDto.setId(TEST_SECRET_KEY_ID); - boolean result = secretKeyService.updateSecretKey(validSecretKeyDto, newFile); - - // 验证 OSS 调用和路径更新 - verify(aliOssUtil, times(1)).save(newFile); - SecretKey updatedKey = new SecretKey(); - BeanUtils.copyProperties(validSecretKeyDto, updatedKey); - updatedKey.setFileName("new_key.pem"); - updatedKey.setPath("https://bucket.endpoint/new_key.pem"); - verify(secretServiceMapper, times(1)).updateById(updatedKey); - assertTrue(result); - } - - // ======================= 删除密钥测试 ======================= - @Test - void testDeleteSecretKey_ValidId_ShouldDeleteFileAndRecord() { - SecretKey secretKey = new SecretKey(); - secretKey.setId(TEST_SECRET_KEY_ID); - secretKey.setFileName(TEST_FILE_NAME); - when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); - - boolean result = secretKeyService.deleteSecretKey(TEST_SECRET_KEY_ID); - - // 验证 OSS 删除和 Mapper 调用 - verify(aliOssUtil, times(1)).deleteFile(TEST_FILE_NAME); - verify(secretServiceMapper, times(1)).deleteById(TEST_SECRET_KEY_ID); - assertTrue(result); - } - - // ======================= 列表查询测试 ======================= - @Test - void testListSecretKey_WithNameFilter_ShouldReturnMatchedRecords() { - SecretKeyDto queryDto = new SecretKeyDto(); - queryDto.setName("Test"); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like("name", "Test"); - - when(secretServiceMapper.selectPage(any(), any())).thenReturn(new Page<>()); - - secretKeyService.listSecretKey(queryDto); - verify(secretServiceMapper, times(1)).selectPage(any(), wrapper); - } - - // ======================= 文件下载测试 ======================= - @Test - void testDownloadSecretKeyFile_ValidId_ShouldReturnResponseEntity() throws IOException { - SecretKey secretKey = new SecretKey(); - secretKey.setFileName(TEST_FILE_NAME); - when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); - InputStreamResource inputStreamResource = new InputStreamResource( - new ByteArrayInputStream("test content".getBytes()) - ); - when(aliOssUtil.downloadFile(TEST_FILE_NAME)).thenReturn( - ResponseEntity.ok(inputStreamResource) - ); - - ResponseEntity response = secretKeyService.downloadSecretKeyFile(TEST_SECRET_KEY_ID); - assertNotNull(response); - assertEquals("test content", Utils.toString(response.getBody().getInputStream())); - } - - // ======================= 批量删除测试 ======================= - @Test - void testDeleteList_ValidIds_ShouldSubmitAsyncDelete() { - List ids = Collections.singletonList(TEST_SECRET_KEY_ID); - SecretKey secretKey = new SecretKey(); - secretKey.setFileName(TEST_FILE_NAME); - when(secretServiceMapper.selectBatchIds(ids)).thenReturn(Collections.singletonList(secretKey)); - - secretKeyService.deleteList(ids); - - // 验证异步任务提交 - verify(secretKeyService.FILE_DELETE_EXECUTOR, times(1)).execute(any(Runnable.class)); - verify(secretServiceMapper, times(1)).deleteBatchIds(ids); - } - - // ======================= 异常处理测试 ======================= - @Test - void testDeleteSecretKey_FileDeleteFailed_ShouldThrowException() { - aliOssUtil.deleteFile(TEST_FILE_NAME); - SecretKey secretKey = new SecretKey(); - secretKey.setId(TEST_SECRET_KEY_ID); - secretKey.setFileName(TEST_FILE_NAME); - when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); - - assertThrows(ServiceException.class, () -> { - secretKeyService.deleteSecretKey(TEST_SECRET_KEY_ID); - }, "删除文件失败"); - } -} \ No newline at end of file +//package com.casic.machine.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.casic.commons.exception.ServiceException; +//import com.casic.commons.utils.AliOssUtil; +//import com.casic.machine.entity.MachineInfo; +//import com.casic.machine.entity.SecretKey; +//import com.casic.machine.dto.SecretKeyDto; +//import com.casic.machine.mapper.SecretServiceMapper; +//import com.casic.machine.service.MachineInfoService; +//import com.jayway.jsonpath.internal.Utils; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.MockitoAnnotations; +//import org.springframework.beans.BeanUtils; +//import org.springframework.core.io.InputStreamResource; +//import org.springframework.http.ResponseEntity; +//import org.springframework.mock.web.MockMultipartFile; +//import org.springframework.test.util.ReflectionTestUtils; +// +//import java.io.ByteArrayInputStream; +//import java.io.IOException; +//import java.util.Collections; +//import java.util.List; +// +//import static org.junit.jupiter.api.Assertions.*; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.*; +// +//@SuppressWarnings("unchecked") +//public class SecretKeyServiceImplTest { +// +// @InjectMocks +// private SecretKeyServiceImpl secretKeyService; +// +// @Mock +// private AliOssUtil aliOssUtil; +// +// @Mock +// private SecretServiceMapper secretServiceMapper; +// +// @Mock +// private MachineInfoService machineInfoService; +// +// private SecretKeyDto validSecretKeyDto; +// private MockMultipartFile mockFile; +// private final Long TEST_SECRET_KEY_ID = 1L; +// private final String TEST_FILE_NAME = "test_key.pem"; +// private final String TEST_PATH = "https://bucket.endpoint/test_key.pem"; +// +// @BeforeEach +// public void setUp() throws IOException { +// MockitoAnnotations.openMocks(this); +// validSecretKeyDto = new SecretKeyDto(); +// validSecretKeyDto.setName("Test Key"); +// validSecretKeyDto.setDescription("Test secret key"); +// +// // 创建模拟文件 +// byte[] fileContent = "test content".getBytes(); +// mockFile = new MockMultipartFile( +// "file", +// TEST_FILE_NAME, +// "application/octet-stream", +// new ByteArrayInputStream(fileContent) +// ); +// +// // 模拟 OSS 工具返回值 +// when(aliOssUtil.save(any(MockMultipartFile.class))).thenReturn(TEST_FILE_NAME); +// +// } +// +// // ======================= 新增密钥测试 ======================= +// @Test +// void testAddSecretKey_ValidData_ShouldSucceed() throws IOException { +// // 执行新增 +// boolean result = secretKeyService.addSecretKey(validSecretKeyDto, mockFile); +// +// // 验证 OSS 保存调用 +// verify(aliOssUtil, times(1)).save(mockFile); +// +// // 验证实体属性 +// SecretKey savedKey = new SecretKey(); +// BeanUtils.copyProperties(validSecretKeyDto, savedKey); +// savedKey.setFileName(TEST_FILE_NAME); +// savedKey.setPath(TEST_PATH); +// +// // 验证 Mapper 调用 +// verify(secretServiceMapper, times(1)).insert(savedKey); +// assertTrue(result); +// } +// +// @Test +// void testAddSecretKey_NullFile_ShouldThrowException() { +// assertThrows(ServiceException.class, () -> { +// secretKeyService.addSecretKey(validSecretKeyDto, null); +// }, "文件为空"); +// } +// +// // ======================= 绑定机器测试 ======================= +// @Test +// void testBindingMachine_ValidIds_ShouldUpdateMachine() { +// // 模拟机器列表 +// List machineIds = Collections.singletonList(1L); +// when(machineInfoService.listByIds(machineIds)).thenReturn(Collections.singletonList(new MachineInfo())); +// +// secretKeyService.bindingMachine(TEST_SECRET_KEY_ID, machineIds); +// +// // 验证机器信息更新 +// verify(machineInfoService, times(1)).listByIds(machineIds); +// machineIds.forEach(id -> { +// verify(machineInfoService, times(1)).update(any()); +// }); +// } +// +// // ======================= 更新密钥测试 ======================= +// @Test +// void testUpdateSecretKey_WithNewFile_ShouldUpdatePath() throws IOException { +// MockMultipartFile newFile = new MockMultipartFile( +// "file", +// "new_key.pem", +// "application/octet-stream", +// new ByteArrayInputStream("new content".getBytes()) +// ); +// when(aliOssUtil.save(newFile)).thenReturn("new_key.pem"); +// +// validSecretKeyDto.setId(TEST_SECRET_KEY_ID); +// boolean result = secretKeyService.updateSecretKey(validSecretKeyDto, newFile); +// +// // 验证 OSS 调用和路径更新 +// verify(aliOssUtil, times(1)).save(newFile); +// SecretKey updatedKey = new SecretKey(); +// BeanUtils.copyProperties(validSecretKeyDto, updatedKey); +// updatedKey.setFileName("new_key.pem"); +// updatedKey.setPath("https://bucket.endpoint/new_key.pem"); +// verify(secretServiceMapper, times(1)).updateById(updatedKey); +// assertTrue(result); +// } +// +// // ======================= 删除密钥测试 ======================= +// @Test +// void testDeleteSecretKey_ValidId_ShouldDeleteFileAndRecord() { +// SecretKey secretKey = new SecretKey(); +// secretKey.setId(TEST_SECRET_KEY_ID); +// secretKey.setFileName(TEST_FILE_NAME); +// when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); +// +// boolean result = secretKeyService.deleteSecretKey(TEST_SECRET_KEY_ID); +// +// // 验证 OSS 删除和 Mapper 调用 +// verify(aliOssUtil, times(1)).deleteFile(TEST_FILE_NAME); +// verify(secretServiceMapper, times(1)).deleteById(TEST_SECRET_KEY_ID); +// assertTrue(result); +// } +// +// // ======================= 列表查询测试 ======================= +// @Test +// void testListSecretKey_WithNameFilter_ShouldReturnMatchedRecords() { +// SecretKeyDto queryDto = new SecretKeyDto(); +// queryDto.setName("Test"); +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.like("name", "Test"); +// +// when(secretServiceMapper.selectPage(any(), any())).thenReturn(new Page<>()); +// +// secretKeyService.listSecretKey(queryDto); +// verify(secretServiceMapper, times(1)).selectPage(any(), wrapper); +// } +// +// // ======================= 文件下载测试 ======================= +// @Test +// void testDownloadSecretKeyFile_ValidId_ShouldReturnResponseEntity() throws IOException { +// SecretKey secretKey = new SecretKey(); +// secretKey.setFileName(TEST_FILE_NAME); +// when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); +// InputStreamResource inputStreamResource = new InputStreamResource( +// new ByteArrayInputStream("test content".getBytes()) +// ); +// when(aliOssUtil.downloadFile(TEST_FILE_NAME)).thenReturn( +// ResponseEntity.ok(inputStreamResource) +// ); +// +// ResponseEntity response = secretKeyService.downloadSecretKeyFile(TEST_SECRET_KEY_ID); +// assertNotNull(response); +// assertEquals("test content", Utils.toString(response.getBody().getInputStream())); +// } +// +// // ======================= 批量删除测试 ======================= +// @Test +// void testDeleteList_ValidIds_ShouldSubmitAsyncDelete() { +// List ids = Collections.singletonList(TEST_SECRET_KEY_ID); +// SecretKey secretKey = new SecretKey(); +// secretKey.setFileName(TEST_FILE_NAME); +// when(secretServiceMapper.selectBatchIds(ids)).thenReturn(Collections.singletonList(secretKey)); +// +// secretKeyService.deleteList(ids); +// +// // 验证异步任务提交 +// verify(secretKeyService.FILE_DELETE_EXECUTOR, times(1)).execute(any(Runnable.class)); +// verify(secretServiceMapper, times(1)).deleteBatchIds(ids); +// } +// +// // ======================= 异常处理测试 ======================= +// @Test +// void testDeleteSecretKey_FileDeleteFailed_ShouldThrowException() { +// aliOssUtil.deleteFile(TEST_FILE_NAME); +// SecretKey secretKey = new SecretKey(); +// secretKey.setId(TEST_SECRET_KEY_ID); +// secretKey.setFileName(TEST_FILE_NAME); +// when(secretServiceMapper.selectById(TEST_SECRET_KEY_ID)).thenReturn(secretKey); +// +// assertThrows(ServiceException.class, () -> { +// secretKeyService.deleteSecretKey(TEST_SECRET_KEY_ID); +// }, "删除文件失败"); +// } +//} \ No newline at end of file From b65bdd95bcc74c6670cd7b5d91f7977b526dba6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Tue, 3 Jun 2025 09:35:34 +0800 Subject: [PATCH 09/46] =?UTF-8?q?get=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/machine/service/impl/MachineEnvServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index 3a5594d7..d08fab41 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -83,8 +83,8 @@ public class MachineEnvServiceImpl extends ServiceImpl Date: Tue, 3 Jun 2025 14:03:04 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 7 --- .../controller/MachineInfoController.java | 57 +++++++++---------- .../controller/SecretKeyController.java | 26 ++++----- .../module/machine/dto/MachineInfoDto.java | 2 +- .../module/machine/entity/MachineInfo.java | 1 + .../service/impl/MachineinfoServiceImpl.java | 26 ++++++--- .../service/impl/SecretKeyServiceImpl.java | 1 + 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index 2c5ec881..64ee895a 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -28,13 +28,6 @@ 3.15.1 - - org.projectlombok - lombok - provided - - - com.jcraft diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index bbd14eca..80106d2a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -3,16 +3,19 @@ package cd.casic.module.machine.controller; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.dto.MachineInfoDto; import cd.casic.module.machine.pojo.SuccessResponseData; +import cd.casic.module.machine.utils.PageResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import static cd.casic.framework.commons.pojo.CommonResult.success; @@ -25,88 +28,82 @@ public class MachineInfoController { @PostMapping("/add") @Operation(summary = "新增机器信息") - public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { - machineInfoService.addMachineInfo(machineInfoDto); - return success(true); + public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { + return success(machineInfoService.addMachineInfo(machineInfoDto)); } @GetMapping("/list") @Operation(summary = "获取机器信息列表") - public CommonResult list(@RequestBody MachineInfoDto machineInfoDto) { + public CommonResult> list(@RequestBody MachineInfoDto machineInfoDto) { return success(machineInfoService.listMachineInfo(machineInfoDto)); } @PutMapping("/update") @Operation(summary = "编辑机器信息") - public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { - machineInfoService.updateMachineInfo(machineInfoDto); - return success(true); + public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { + return success(machineInfoService.updateMachineInfo(machineInfoDto)); } @PutMapping("/updateStatus") @Operation(summary = "机器启用/停用") - public CommonResult updateStatus(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("status") String status) { - machineInfoService.updateStatus(machineInfoId, status); - return success(true); + public CommonResult updateStatus(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("status") String status) { + return success(machineInfoService.updateStatus(machineInfoId, status)); } @PutMapping("/bindingSecretKey") @Operation(summary = "绑定密钥") - public CommonResult bindingSecretKey(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("secretKeyId") Long secretKeyId) { - machineInfoService.bindingSecretKey(machineInfoId, secretKeyId); - return success(true); + public CommonResult bindingSecretKey(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("secretKeyId") Long secretKeyId) { + return success(machineInfoService.bindingSecretKey(machineInfoId, secretKeyId)); } @DeleteMapping("/delete") @Operation(summary = "机器信息删除") - public CommonResult delete(@RequestParam("machineInfoId") Long machineInfoId) { + public CommonResult delete(@RequestParam("machineInfoId") Long machineInfoId) { machineInfoService.deleteMachineInfo(machineInfoId); return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器信息") - public CommonResult deleteList(@RequestParam("machineInfoId") List machineInfoIds) { + public CommonResult deleteList(@RequestParam("machineInfoIds") List machineInfoIds) { machineInfoService.deleteList(machineInfoIds); return success(true); } @PostMapping("/test") @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestBody MachineInfo machineInfo) { - machineInfoService.testConnection(machineInfo); - return success(true); + public CommonResult testConnection(@RequestBody MachineInfo machineInfo) { + return success(machineInfoService.testConnection(machineInfo)); } @GetMapping("/status/{machineName}") @Operation(summary = "获取机器连接状态") - public CommonResult getConnectionStatus(@PathVariable String machineName) { + public CommonResult getConnectionStatus(@PathVariable String machineName) { return success(machineInfoService.getConnectionStatus(machineName)); } @GetMapping("/status/all") @Operation(summary = "获取所有机器连接状态") - public CommonResult getAllConnectionStatus() { + public CommonResult> getAllConnectionStatus() { return success(machineInfoService.getAllConnectionStatus()); } @PostMapping("/connect") @Operation(summary = "建立机器连接") - public CommonResult connect(@RequestBody MachineInfo machineInfo) { + public CommonResult connect(@RequestBody MachineInfo machineInfo) { return success(machineInfoService.connect(machineInfo)); } @PostMapping("/disconnect/{sessionId}") @Operation(summary = "断开机器连接") - public CommonResult disconnect(@PathVariable String sessionId) { - machineInfoService.disconnect(sessionId); - return success(true); + public CommonResult disconnect(@PathVariable String sessionId) { + return success(machineInfoService.disconnect(sessionId)); } @PostMapping("/execute/{sessionId}") @Operation(summary = "执行远程命令") - public CommonResult executeCommand( + public CommonResult executeCommand( @PathVariable String sessionId, @RequestBody String command) { @@ -115,21 +112,19 @@ public class MachineInfoController { @PostMapping("/upload/{sessionId}") @Operation(summary = "上传文件到远程机器") - public CommonResult uploadFile( + public CommonResult uploadFile( @PathVariable String sessionId, @RequestParam String localFilePath, @RequestParam String remoteFilePath) { - machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath); - return success(true); + return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); } @PostMapping("/download/{sessionId}") @Operation(summary = "从远程机器下载文件") - public CommonResult downloadFile( + public CommonResult downloadFile( @PathVariable String sessionId, @RequestParam String remoteFilePath, @RequestParam String localFilePath) { - machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath); - return success(true); + return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 1c328838..cb352d41 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,7 +1,9 @@ package cd.casic.module.machine.controller; import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.module.machine.entity.SecretKey; import cd.casic.module.machine.service.SecretKeyService; import cd.casic.module.machine.dto.SecretKeyDto; +import cd.casic.module.machine.utils.PageResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -30,43 +32,39 @@ public class SecretKeyController { @PostMapping(value = "/add", consumes = "multipart/form-data") @Operation(summary ="新增密钥") - public CommonResult add(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { - secretKeyService.addSecretKey(secretKeyDto, file); - return success(true); + public CommonResult add(@RequestBody SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { + return success(secretKeyService.addSecretKey(secretKeyDto, file)); } @PutMapping("/bindingMachine") @Operation(summary ="绑定机器") - public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { + public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { secretKeyService.bindingMachine(secretKeyId, machineInfoIds); return success(true); } @PutMapping("/update") @Operation(summary ="编辑密钥信息") - public CommonResult update(@RequestPart("secretKeyDto") SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { - secretKeyService.updateSecretKey(secretKeyDto, file); - return success(true); + public CommonResult update(@RequestBody SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { + return success(secretKeyService.updateSecretKey(secretKeyDto, file)); } @DeleteMapping("/delete") @Operation(summary ="删除密钥") - public CommonResult delete(@RequestParam("secretKeyId") Long secretKeyId) { - secretKeyService.deleteSecretKey(secretKeyId); - return success(true); + public CommonResult delete(@RequestParam("secretKeyId") Long secretKeyId) { + return success(secretKeyService.deleteSecretKey(secretKeyId)); } @DeleteMapping("/deleteList") @Operation(summary ="批量删除密钥") - public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { - secretKeyService.deleteList(secretKeyIds); - return success(true); + public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { + return success(secretKeyService.deleteList(secretKeyIds)); } @GetMapping("/list") @Operation(summary ="获取密钥信息列表") - public CommonResult list(@RequestBody SecretKeyDto secretKeyDto) { + public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.listSecretKey(secretKeyDto)); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java index 0fbc2956..d39a483e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java @@ -40,5 +40,5 @@ public class MachineInfoDto extends cd.casic.module.machine.dto.PageDto { private String authenticationType; - private String machineInfoTypeCode; + private String machineInfoType; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java index 2113812f..b8c21f07 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java @@ -61,5 +61,6 @@ public class MachineInfo extends BaseEntity{ @TableField(value = "authentication_type_code") private int authenticationTypeCode; + @TableField(exist = false) private AuthenticationType authenticationType; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index b5e74c34..cb246a6b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -1,5 +1,6 @@ package cd.casic.module.machine.service.impl; +import cd.casic.module.machine.enums.MachineInfoType; import cd.casic.module.machine.handler.ConnectionSession; import cd.casic.module.machine.mapper.MachineInfoMapper; import cd.casic.module.machine.dto.MachineInfoDto; @@ -64,6 +65,11 @@ public class MachineinfoServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoId).set("status", status); + updateWrapper.eq("id", machineInfoId).set("status_code", EnumUtils.getEnumByMessage(status, MachineInfoStatus.class).getCode()); return this.update(updateWrapper); } @Override public boolean bindingSecretKey(Long machineInfoId, Long secretKeyId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoId).set("secretKeyId", secretKeyId); + updateWrapper.eq("id", machineInfoId).set("secret_key_id", secretKeyId).set("authentication_type_code",2); return this.update(updateWrapper); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 7a8253ff..2a762343 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -64,6 +64,7 @@ public class SecretKeyServiceImpl extends ServiceImpl machineInfoIds) { List machineInfos = machineInfoService.listByIds(machineInfoIds); machineInfos.forEach(machineInfo -> machineInfo.setSecretKeyId(secretKeyId)); + machineInfoService.updateBatchById(machineInfos); } @Override From a7398d265c82c50166c3fa7e2340a1c2077cb58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Tue, 3 Jun 2025 14:13:39 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 2 +- .../controller/MachineProxyController.java | 11 ++------ .../module/machine/dto/MachineEnvDTO.java | 4 +-- .../module/machine/entity/MachineEnv.java | 8 ++---- .../module/machine/entity/MachineProxy.java | 6 +---- .../machine/service/MachineProxyService.java | 6 +---- .../service/impl/MachineEnvServiceImpl.java | 4 +-- .../service/impl/MachineProxyServiceImpl.java | 26 +++---------------- 8 files changed, 15 insertions(+), 52 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index 48a1ec8e..cebe922b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -57,7 +57,7 @@ public class MachineEnvController { return success(true); } - @GetMapping("/listByMachineId") + @GetMapping("/getByMachineId") @Operation(summary = "获取机器的环境变量") public CommonResult getByMachineId( @RequestParam Long machineId) { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index fdb991fc..847dd9f3 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -34,7 +34,7 @@ public class MachineProxyController { } @GetMapping("/list") - @Operation(summary ="获取代理") + @Operation(summary ="获取代理列表") public CommonResult list(MachineProxyDTO machineProxyDTO) { return success(machineProxyService.list(machineProxyDTO)); } @@ -46,13 +46,6 @@ public class MachineProxyController { return success(true); } - @PostMapping("/receiptHeartbeat") - @Operation(summary ="接收代理心跳") - public CommonResult heartbeat(@RequestBody MachineProxyDTO machineProxyDTO) { - machineProxyService.heartbeat(machineProxyDTO); - return success(true); - } - @GetMapping("/statistics/status") @Operation(summary ="获取所有代理的状态统计") public CommonResult getStatusStatistics() { @@ -68,7 +61,7 @@ public class MachineProxyController { @DeleteMapping("/batch") @Operation(summary ="批量删除代理") - public CommonResult deleteBatch(@RequestBody List ids) { + public CommonResult deleteBatch(@RequestParam List ids) { machineProxyService.delete(ids); return success(true); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java index 212fd38a..f0da272b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java @@ -19,7 +19,7 @@ public class MachineEnvDTO extends PageDto implements Serializable { private Long id; private String envKey; private String envValue; - private Boolean sensitive; + private Integer sensitive;//(1敏感，0不敏感) private String description; private Long machineId; private Date createDate; @@ -32,7 +32,7 @@ public class MachineEnvDTO extends PageDto implements Serializable { * 获取脱敏后的环境变量值 */ public String getMaskedValue() { - if (!sensitive || envValue == null) { + if (sensitive==1 || envValue == null) { return envValue; } int length = envValue.length(); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java index e43d77c6..612dad3e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java @@ -37,7 +37,8 @@ public class MachineEnv extends BaseEntity implements Serializable { /** * 是否敏感 */ - private Boolean sensitive; + @TableField("`sensitive`") + private Integer sensitive;//(1敏感，0不敏感) /** * 描述信息 @@ -45,9 +46,4 @@ public class MachineEnv extends BaseEntity implements Serializable { private String description; - /** - * 逻辑删除标志 - */ - @TableLogic - private Boolean deleted; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java index 14f1eb7b..97585314 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java @@ -61,9 +61,5 @@ public class MachineProxy extends BaseEntity implements Serializable { private String description; - /** - * 逻辑删除标志 - */ - @TableLogic - private Boolean deleted; + } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index 63b3c5e1..532a790d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -21,10 +21,6 @@ public interface MachineProxyService extends IService { */ boolean updateStatus(MachineProxyDTO machineProxyDTO); - /** - * 接收代理心跳 - */ - boolean heartbeat(MachineProxyDTO machineProxyDTO); /** @@ -37,7 +33,7 @@ public interface MachineProxyService extends IService { /** * 更新代理配置 */ - boolean updateConfig(MachineProxyDTO machineProxyDTO); + void updateConfig(MachineProxyDTO machineProxyDTO); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index d08fab41..d2e3805c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -41,7 +41,7 @@ public class MachineEnvServiceImpl extends ServiceImpl onlineProxies = list(new LambdaQueryWrapper() .in(MachineProxy::getId, ids) - .eq(MachineProxy::getStatus, MachineProxyStatus.ONLINE.getCode())); + .eq(MachineProxy::getStatusCode, MachineProxyStatus.ONLINE.getCode())); if (!CollectionUtils.isEmpty(onlineProxies)) { List onlineIds = onlineProxies.stream() From 30c201a23075e4699cbd7f4dc925455c75df7a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Tue, 3 Jun 2025 14:22:43 +0800 Subject: [PATCH 12/46] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/sql/resource_management.sql | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/module-ci-machine/src/main/resources/sql/resource_management.sql b/modules/module-ci-machine/src/main/resources/sql/resource_management.sql index aefe0c7b..c5b8bdb3 100644 --- a/modules/module-ci-machine/src/main/resources/sql/resource_management.sql +++ b/modules/module-ci-machine/src/main/resources/sql/resource_management.sql @@ -1,8 +1,3 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; -CREATE DATABASE `resource_management` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci; - -USE `resource_management`; -- ---------------------------- -- Table structure for machine_env @@ -55,10 +50,10 @@ CREATE TABLE `machine_proxy` ( `update_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0), `host_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `ssh_port` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, - `proxy_type_code` int NULL DEFAULT NULL COMMENT '代理类型编码（关联字典表）', + `proxy_type_code` tinyint(1) NULL DEFAULT NULL COMMENT '代理类型编码（关联字典表）', `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, - `status_code` int NULL DEFAULT NULL COMMENT '状态编码（关联字典表）', -- 改为 int 类型 - `last_heart_beat_time` datetime(0) NULL DEFAULT NULL, + `status_code` tinyint(1) NULL DEFAULT NULL COMMENT '状态编码（关联字典表）', -- 改为 tinyint(1) 类型 + `last_heartbeat_time` datetime(0) NULL DEFAULT NULL, `config` json NULL, `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE From 4b8dfe978afed2ff4a3225ea5241c2348bcd26ad Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Wed, 4 Jun 2025 11:03:35 +0800 Subject: [PATCH 13/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 10 ++- .../controller/MachineInfoController.java | 15 ++-- .../controller/MachineProxyController.java | 13 ++-- .../controller/SecretKeyController.java | 12 ++-- .../module/machine/dto/MachineEnvDTO.java | 17 ----- .../module/machine/dto/MachineInfoDto.java | 4 +- .../module/machine/dto/MachineProxyDTO.java | 2 +- .../module/machine/dto/SecretKeyDto.java | 3 + .../module/machine/entity/MachineEnv.java | 5 -- .../module/machine/entity/MachineInfo.java | 3 + .../module/machine/entity/MachineProxy.java | 18 +++-- .../machine/pojo/ErrorResponseData.java | 26 ------- .../module/machine/pojo/ResponseData.java | 72 ------------------- .../machine/pojo/SuccessResponseData.java | 16 ----- .../machine/service/MachineEnvService.java | 5 +- .../machine/service/MachineInfoService.java | 6 +- .../machine/service/MachineProxyService.java | 5 +- .../machine/service/SecretKeyService.java | 4 +- .../service/impl/MachineEnvServiceImpl.java | 20 +++--- .../service/impl/MachineProxyServiceImpl.java | 57 ++++++++------- .../service/impl/MachineinfoServiceImpl.java | 24 +++++-- .../service/impl/SecretKeyServiceImpl.java | 15 ++-- 22 files changed, 123 insertions(+), 229 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index cebe922b..d068ee04 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -44,23 +44,21 @@ public class MachineEnvController { @DeleteMapping("/delete") @Operation(summary = "删除机器的环境变量") - public CommonResult deleteByMachineId( - @RequestParam Long machineId) { - machineEnvService.deleteByMachineId(machineId); + public CommonResult deleteByMachineId(@RequestParam Long machineEvnId) { + machineEnvService.deleteByMachineId(machineEvnId); return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器环境变量") - public CommonResult deleteList(@RequestParam List ids){ + public CommonResult deleteList(@RequestParam String ids){ machineEnvService.deleteList(ids); return success(true); } @GetMapping("/getByMachineId") @Operation(summary = "获取机器的环境变量") - public CommonResult getByMachineId( - @RequestParam Long machineId) { + public CommonResult getByMachineId(@RequestParam Long machineId) { return success(machineEnvService.getByMachineId(machineId)); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 80106d2a..ef4d7595 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -6,7 +6,6 @@ import cd.casic.module.machine.entity.MachineInfo; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.dto.MachineInfoDto; -import cd.casic.module.machine.pojo.SuccessResponseData; import cd.casic.module.machine.utils.PageResult; import io.swagger.v3.oas.annotations.Operation; @@ -33,7 +32,7 @@ public class MachineInfoController { } - @GetMapping("/list") + @PostMapping("/list") @Operation(summary = "获取机器信息列表") public CommonResult> list(@RequestBody MachineInfoDto machineInfoDto) { return success(machineInfoService.listMachineInfo(machineInfoDto)); @@ -47,26 +46,26 @@ public class MachineInfoController { @PutMapping("/updateStatus") @Operation(summary = "机器启用/停用") - public CommonResult updateStatus(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("status") String status) { - return success(machineInfoService.updateStatus(machineInfoId, status)); + public CommonResult updateStatus(@RequestBody MachineInfoDto machineInfoDto) { + return success(machineInfoService.updateStatus(machineInfoDto)); } @PutMapping("/bindingSecretKey") @Operation(summary = "绑定密钥") - public CommonResult bindingSecretKey(@RequestParam("machineInfoId") Long machineInfoId, @RequestParam("secretKeyId") Long secretKeyId) { - return success(machineInfoService.bindingSecretKey(machineInfoId, secretKeyId)); + public CommonResult bindingSecretKey(@RequestBody MachineInfoDto machineInfoDto) { + return success(machineInfoService.bindingSecretKey(machineInfoDto)); } @DeleteMapping("/delete") @Operation(summary = "机器信息删除") - public CommonResult delete(@RequestParam("machineInfoId") Long machineInfoId) { + public CommonResult delete(@RequestParam Long machineInfoId) { machineInfoService.deleteMachineInfo(machineInfoId); return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器信息") - public CommonResult deleteList(@RequestParam("machineInfoIds") List machineInfoIds) { + public CommonResult deleteList(@RequestParam String machineInfoIds) { machineInfoService.deleteList(machineInfoIds); return success(true); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 847dd9f3..5bf9cf08 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -33,7 +33,7 @@ public class MachineProxyController { return success(true); } - @GetMapping("/list") + @PostMapping("/list") @Operation(summary ="获取代理列表") public CommonResult list(MachineProxyDTO machineProxyDTO) { return success(machineProxyService.list(machineProxyDTO)); @@ -52,18 +52,17 @@ public class MachineProxyController { return success(machineProxyService.getStatusStatistics()); } - @PutMapping("/updateConfig") - @Operation(summary ="更新代理配置") + @PutMapping("/update") + @Operation(summary ="更新代理信息") public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { - machineProxyService.updateConfig(machineProxyDTO); + machineProxyService.update(machineProxyDTO); return success(true); } @DeleteMapping("/batch") @Operation(summary ="批量删除代理") - public CommonResult deleteBatch(@RequestParam List ids) { - machineProxyService.delete(ids); - return success(true); + public CommonResult deleteBatch(@RequestParam String ids) { + return success(machineProxyService.delete(ids)); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index cb352d41..ba8f98f4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -19,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import java.util.List; - import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @@ -38,8 +36,8 @@ public class SecretKeyController { @PutMapping("/bindingMachine") @Operation(summary ="绑定机器") - public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { - secretKeyService.bindingMachine(secretKeyId, machineInfoIds); + public CommonResult bindingMachine(@RequestBody SecretKeyDto secretKeyDto) { + secretKeyService.bindingMachine(secretKeyDto); return success(true); } @@ -52,17 +50,17 @@ public class SecretKeyController { @DeleteMapping("/delete") @Operation(summary ="删除密钥") - public CommonResult delete(@RequestParam("secretKeyId") Long secretKeyId) { + public CommonResult delete(@RequestParam Long secretKeyId) { return success(secretKeyService.deleteSecretKey(secretKeyId)); } @DeleteMapping("/deleteList") @Operation(summary ="批量删除密钥") - public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { + public CommonResult deleteList(@RequestParam String secretKeyIds) { return success(secretKeyService.deleteList(secretKeyIds)); } - @GetMapping("/list") + @PostMapping("/list") @Operation(summary ="获取密钥信息列表") public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.listSecretKey(secretKeyDto)); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java index f0da272b..bb2204a6 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java @@ -19,27 +19,10 @@ public class MachineEnvDTO extends PageDto implements Serializable { private Long id; private String envKey; private String envValue; - private Integer sensitive;//(1敏感，0不敏感) private String description; private Long machineId; private Date createDate; private Date updateDate; private String sortField; private String sortDirection; - - - /** - * 获取脱敏后的环境变量值 - */ - public String getMaskedValue() { - if (sensitive==1 || envValue == null) { - return envValue; - } - int length = envValue.length(); - if (length <= 4) { - return "****"; - } else { - return envValue.substring(0, 2) + "****" + envValue.substring(length - 2); - } - } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java index d39a483e..cd5648a1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java @@ -11,7 +11,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class MachineInfoDto extends cd.casic.module.machine.dto.PageDto { +public class MachineInfoDto extends PageDto { private Long id; private Date createDate; @@ -41,4 +41,6 @@ public class MachineInfoDto extends cd.casic.module.machine.dto.PageDto { private String authenticationType; private String machineInfoType; + + private int isProxy; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java index dcac8f76..6370edff 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java @@ -23,12 +23,12 @@ public class MachineProxyDTO extends PageDto implements Serializable { private String version; private String status; private Date lastHeartbeatTime; - private String config; private String description; private String hostIp; private String sshPort; private Date createDate; private Date updateDate; + private String password; /** * 计算代理是否在线 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java index e5aa6c4e..d7fb2beb 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @@ -33,4 +34,6 @@ public class SecretKeyDto extends PageDto { private Date createDate; private Date updateDate; + + private List machineInfoIds; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java index 612dad3e..c8c229a4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java @@ -34,11 +34,6 @@ public class MachineEnv extends BaseEntity implements Serializable { */ private String envValue; - /** - * 是否敏感 - */ - @TableField("`sensitive`") - private Integer sensitive;//(1敏感，0不敏感) /** * 描述信息 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java index b8c21f07..6843dbc4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java @@ -63,4 +63,7 @@ public class MachineInfo extends BaseEntity{ @TableField(exist = false) private AuthenticationType authenticationType; + + @TableField(value = "is_proxy") + private int isProxy; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java index 97585314..ef3f80a4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java @@ -2,6 +2,7 @@ package cd.casic.module.machine.entity; import com.baomidou.mybatisplus.annotation.*; import cd.casic.module.machine.enums.MachineInfoStatus; import cd.casic.module.machine.enums.MachineProxyType; +import jakarta.validation.Valid; import lombok.*; import java.io.Serializable; @@ -19,8 +20,10 @@ import java.util.Date; public class MachineProxy extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; + @TableField(value = "host_ip") private String hostIp; + @TableField(value = "ssh_port") private String sshPort; /** @@ -29,11 +32,13 @@ public class MachineProxy extends BaseEntity implements Serializable { @TableField(exist = false) private MachineProxyType proxyType; + @TableField(value = "proxy_type_code") private int proxyTypeCode; /** * 代理版本 */ + @TableField(value = "version") private String version; /** @@ -42,22 +47,23 @@ public class MachineProxy extends BaseEntity implements Serializable { @TableField(exist = false) private MachineInfoStatus status; - + @TableField(value = "status_code") private int statusCode; + @TableField(value = "username") + private String username; + /** * 最后心跳时间 */ private Date lastHeartbeatTime; - /** - * 代理配置 (JSON格式) - */ - private String config; - + @TableField(value = "password") + private String password; /** * 描述信息 */ + @TableField(value = "description") private String description; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java deleted file mode 100644 index c9468b20..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ErrorResponseData.java +++ /dev/null @@ -1,26 +0,0 @@ -package cd.casic.module.machine.pojo; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Data -public class ErrorResponseData extends ResponseData { - - /** - * 异常的具体类名称 - */ - private String exceptionClazz; - - public ErrorResponseData(String message) { - super(false, DEFAULT_ERROR_CODE, message, null); - } - - public ErrorResponseData(Integer code, String message) { - super(false, code, message, null); - } - - public ErrorResponseData(Integer code, String message, Object object) { - super(false, code, message, object); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java deleted file mode 100644 index ad74cb81..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/ResponseData.java +++ /dev/null @@ -1,72 +0,0 @@ -package cd.casic.module.machine.pojo; - -import lombok.Data; - -/** - * 响应结果数据 - */ -@Data -public class ResponseData { - - public static final String DEFAULT_SUCCESS_MESSAGE = "请求成功"; - - public static final String DEFAULT_ERROR_MESSAGE = "网络异常"; - - public static final Integer DEFAULT_SUCCESS_CODE = 200; - - public static final Integer DEFAULT_ERROR_CODE = 500; - - /** - * 请求是否成功 - */ - private Boolean success; - - /** - * 响应状态码 - */ - private Integer code; - - /** - * 响应信息 - */ - private String message; - - /** - * 响应对象 - */ - private Object data; - - public ResponseData() { - } - - public ResponseData(Boolean success, Integer code, String message, Object data) { - this.success = success; - this.code = code; - this.message = message; - this.data = data; - } - - public static SuccessResponseData success() { - return new SuccessResponseData(); - } - - public static SuccessResponseData success(Object object) { - return new SuccessResponseData(object); - } - - public static SuccessResponseData success(Integer code, String message, Object object) { - return new SuccessResponseData(code, message, object); - } - - public static ErrorResponseData error(String message) { - return new ErrorResponseData(message); - } - - public static ErrorResponseData error(Integer code, String message) { - return new ErrorResponseData(code, message); - } - - public static ErrorResponseData error(Integer code, String message, Object object) { - return new ErrorResponseData(code, message, object); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java deleted file mode 100644 index f2ecb844..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/pojo/SuccessResponseData.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.machine.pojo; - -public class SuccessResponseData extends ResponseData { - - public SuccessResponseData() { - super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, null); - } - - public SuccessResponseData(Object object) { - super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, object); - } - - public SuccessResponseData(Integer code, String message, Object object) { - super(true, code, message, object); - } -} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java index f27f980f..14d79992 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java @@ -18,9 +18,8 @@ public interface MachineEnvService extends IService { boolean add(MachineEnvDTO machineEnvDTO); /** * 删除机器的环境变量 - * @param machineId 机器ID */ - void deleteByMachineId(Long machineId); + void deleteByMachineId(Long machineEvnId); /** * 获取机器的环境变量 @@ -34,7 +33,7 @@ public interface MachineEnvService extends IService { */ PageResult listEnv(MachineEnvDTO machineEnvDTO); - void deleteList(List ids); + void deleteList(String ids); boolean update(MachineEnvDTO machineEnvDTO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index d4bc8a78..fa532b85 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -16,11 +16,11 @@ public interface MachineInfoService extends IService { boolean updateMachineInfo(MachineInfoDto machineInfoDto); - boolean updateStatus(Long machineInfoId, String status); + boolean updateStatus(MachineInfoDto machineInfoDto); - boolean bindingSecretKey( Long machineInfoId, Long secretKeyId); + boolean bindingSecretKey(MachineInfoDto machineInfoDto); - void deleteList(List machineInfoIds); + void deleteList(String machineInfoIds); void deleteMachineInfo(Long machineInfoId); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index 532a790d..cc1bd2e5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -33,15 +33,14 @@ public interface MachineProxyService extends IService { /** * 更新代理配置 */ - void updateConfig(MachineProxyDTO machineProxyDTO); - + void update(MachineProxyDTO machineProxyDTO); /** * 批量删除代理 * @param proxyIds 代理ID列表 */ - void delete(List proxyIds); + String delete(String proxyIds); PageResult list(MachineProxyDTO machineProxyDTO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index b0cae86a..5a6d2da3 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -13,7 +13,7 @@ import java.util.List; public interface SecretKeyService extends IService { boolean addSecretKey(SecretKeyDto secretKeyDto, MultipartFile file); - void bindingMachine(Long secretKeyId, List machineInfoIds); + void bindingMachine(SecretKeyDto secretKeyDto); boolean updateSecretKey(SecretKeyDto secretKeyDto,MultipartFile file); @@ -23,6 +23,6 @@ public interface SecretKeyService extends IService { ResponseEntity downloadSecretKeyFile(Long secretKeyId); - boolean deleteList(List secretKeyIds); + boolean deleteList(String secretKeyIds); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index d2e3805c..f5dd8f70 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -49,8 +50,8 @@ public class MachineEnvServiceImpl extends ServiceImpl ids) { - this.machineEnvMapper.deleteBatchIds(ids); + public void deleteList(String ids) { + List machineEnvIds = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); + this.machineEnvMapper.deleteBatchIds(machineEnvIds); } @Override @@ -150,7 +151,6 @@ public class MachineEnvServiceImpl extends ServiceImpl ids) { + public String delete(String ids) { + List machineProxyIds = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); // 参数校验 - if (CollectionUtils.isEmpty(ids)) { + if (CollectionUtils.isEmpty(machineProxyIds)) { throw new ServiceException(ServiceException.PARAMETER_ERROR,"参数错误"); } // 查询在线代理 List onlineProxies = list(new LambdaQueryWrapper() - .in(MachineProxy::getId, ids) + .in(MachineProxy::getId, machineProxyIds) .eq(MachineProxy::getStatusCode, MachineProxyStatus.ONLINE.getCode())); if (!CollectionUtils.isEmpty(onlineProxies)) { List onlineIds = onlineProxies.stream() - .map(MachineProxy::getId) - .collect(Collectors.toList()); - throw new IllegalArgumentException("以下代理处于在线状态，无法删除: " + String.join( ",", (CharSequence) onlineIds)); + .map(MachineProxy::getId) + .toList(); + + // 将 [10, 9] 转换为 "10, 9" + String idStr = onlineIds.toString().replaceAll("[\\[\\]]", ""); + return "以下代理处于在线状态，无法删除: " + idStr; } // 批量逻辑删除 remove(new LambdaQueryWrapper() - .in(MachineProxy::getId, ids)); + .in(MachineProxy::getId, machineProxyIds)); + return ""; } @Override @@ -132,7 +139,7 @@ public class MachineProxyServiceImpl extends ServiceImpl machineProxyDtos = page.getRecords().stream().map(machineProxy -> { MachineProxyDTO dto = new MachineProxyDTO(); BeanUtils.copyProperties(machineProxy, dto); - dto.setProxyType(EnumUtils.getEnumByCode(machineProxy.getStatusCode(), MachineProxyType.class).getMessage()); + dto.setProxyType(EnumUtils.getEnumByCode(machineProxy.getProxyTypeCode(), MachineProxyType.class).getMessage()); dto.setStatus(EnumUtils.getEnumByCode(machineProxy.getStatusCode(), MachineProxyStatus.class).getMessage()); return dto; }).toList(); @@ -148,21 +155,21 @@ public class MachineProxyServiceImpl extends ServiceImpl getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO){ QueryWrapper queryWrapper = new QueryWrapper<>(); if (machineProxyDTO.getHostIp() != null && !machineProxyDTO.getHostIp().isEmpty()) { - queryWrapper.eq("host_ip", machineProxyDTO.getHostIp()); + queryWrapper.like("host_ip", machineProxyDTO.getHostIp()); } if (machineProxyDTO.getSshPort() != null && !machineProxyDTO.getSshPort().isEmpty()) { - queryWrapper.eq("ssh_port", machineProxyDTO.getSshPort()); + queryWrapper.like("ssh_port", machineProxyDTO.getSshPort()); } if (machineProxyDTO.getUsername() != null && !machineProxyDTO.getUsername().isEmpty()) { - queryWrapper.eq("username", machineProxyDTO.getUsername()); + queryWrapper.like("username", machineProxyDTO.getUsername()); } if (machineProxyDTO.getDescription() != null && !machineProxyDTO.getDescription().isEmpty()) { - queryWrapper.eq("description", machineProxyDTO.getDescription()); + queryWrapper.like("description", machineProxyDTO.getDescription()); } if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { - queryWrapper.eq("status_code", EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(),MachineProxyStatus.class).getCode()); + queryWrapper.like("status_code", EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(),MachineProxyStatus.class).getCode()); } - return queryWrapper; + return queryWrapper.orderByDesc("create_date"); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index cb246a6b..53885c2a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -17,16 +17,21 @@ 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.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; @Slf4j @Service @@ -121,22 +126,27 @@ public class MachineinfoServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoId).set("status_code", EnumUtils.getEnumByMessage(status, MachineInfoStatus.class).getCode()); + updateWrapper.eq("id", machineInfoDto.getId()).set("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); return this.update(updateWrapper); } @Override - public boolean bindingSecretKey(Long machineInfoId, Long secretKeyId) { + public boolean bindingSecretKey(MachineInfoDto machineInfoDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoId).set("secret_key_id", secretKeyId).set("authentication_type_code",2); + updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code",2); return this.update(updateWrapper); } @Override - public void deleteList(List machineInfoIds) { - machineInfoMapper.selectBatchIds(machineInfoIds).forEach(machineInfo -> { + public void deleteList(String machineInfoIds) { + List machineInfoIdList = Arrays.stream(machineInfoIds.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .collect(Collectors.toList()); + machineInfoMapper.selectBatchIds(machineInfoIdList).forEach(machineInfo -> { if (machineInfo.getStatusCode() == 1){ this.removeById(machineInfo.getId()); } @@ -168,7 +178,7 @@ public class MachineinfoServiceImpl extends ServiceImpl machineInfoIds) { - List machineInfos = machineInfoService.listByIds(machineInfoIds); - machineInfos.forEach(machineInfo -> machineInfo.setSecretKeyId(secretKeyId)); + public void bindingMachine(SecretKeyDto secretKeyDto) { + List machineInfos = machineInfoService.listByIds(secretKeyDto.getMachineInfoIds()); + machineInfos.forEach(machineInfo -> machineInfo.setSecretKeyId(secretKeyDto.getId())); machineInfoService.updateBatchById(machineInfos); } @@ -97,6 +98,7 @@ public class SecretKeyServiceImpl extends ServiceImpl page = secretServiceMapper.selectPage(new Page<>(secretKeyDto.getPageIndex(), secretKeyDto.getPageSize()), queryWrapper); return new PageResult<>( page.getCurrent(), @@ -114,7 +116,12 @@ public class SecretKeyServiceImpl extends ServiceImpl secretKeyIds) { + public boolean deleteList(String ids) { + List secretKeyIds = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); List secretKeys = this.listByIds(secretKeyIds); // 提交异步任务到线程池 FILE_DELETE_EXECUTOR.execute(() -> { From ea35ed1f0bbde61682f6fd1aa7b39b5967a497fe Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Wed, 4 Jun 2025 14:19:29 +0800 Subject: [PATCH 14/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 5 +- .../controller/MachineInfoController.java | 16 ++--- .../controller/MachineProxyController.java | 17 ++--- .../controller/SecretKeyController.java | 17 ++--- .../module/machine/dto/MachineProxyDTO.java | 3 +- .../cd/casic/module/machine/dto/PageDto.java | 2 +- .../module/machine/entity/MachineInfo.java | 2 +- .../module/machine/entity/MachineProxy.java | 5 +- .../machine/enums/MachineProxyStatus.java | 10 +-- .../machine/enums/MachineProxyType.java | 6 +- .../machine/enums/RequestExceptionEnum.java | 4 +- .../machine/handler/ConnectionSession.java | 60 ++++++++-------- .../machine/service/MachineEnvService.java | 2 + .../machine/service/MachineInfoService.java | 19 +++-- .../machine/service/MachineProxyService.java | 5 +- .../machine/service/SecretKeyService.java | 2 +- .../service/impl/MachineEnvServiceImpl.java | 32 ++++----- .../service/impl/MachineProxyServiceImpl.java | 69 ++++++++----------- .../service/impl/MachineinfoServiceImpl.java | 27 ++++---- .../service/impl/SecretKeyServiceImpl.java | 21 +++--- .../module/machine/utils/AliOssUtil.java | 28 ++++---- 21 files changed, 177 insertions(+), 175 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index d068ee04..0a60b328 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; + import java.util.List; import static cd.casic.framework.commons.pojo.CommonResult.success; @@ -51,7 +52,7 @@ public class MachineEnvController { @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器环境变量") - public CommonResult deleteList(@RequestParam String ids){ + public CommonResult deleteList(@RequestParam String ids) { machineEnvService.deleteList(ids); return success(true); } @@ -64,7 +65,7 @@ public class MachineEnvController { @PostMapping("/list") - @Operation(summary ="获取环境变量列表") + @Operation(summary = "获取环境变量列表") public CommonResult list(@RequestBody MachineEnvDTO machineEnvDTO) { return success(machineEnvService.listEnv(machineEnvDTO)); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index ef4d7595..a77e1025 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -103,8 +103,8 @@ public class MachineInfoController { @PostMapping("/execute/{sessionId}") @Operation(summary = "执行远程命令") public CommonResult executeCommand( - @PathVariable String sessionId, - @RequestBody String command) { + @PathVariable String sessionId, + @RequestBody String command) { return success(machineInfoService.executeCommand(sessionId, command)); } @@ -112,18 +112,18 @@ public class MachineInfoController { @PostMapping("/upload/{sessionId}") @Operation(summary = "上传文件到远程机器") public CommonResult uploadFile( - @PathVariable String sessionId, - @RequestParam String localFilePath, - @RequestParam String remoteFilePath) { + @PathVariable String sessionId, + @RequestParam String localFilePath, + @RequestParam String remoteFilePath) { return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); } @PostMapping("/download/{sessionId}") @Operation(summary = "从远程机器下载文件") public CommonResult downloadFile( - @PathVariable String sessionId, - @RequestParam String remoteFilePath, - @RequestParam String localFilePath) { + @PathVariable String sessionId, + @RequestParam String remoteFilePath, + @RequestParam String localFilePath) { return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 5bf9cf08..fa573046 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -27,42 +27,43 @@ public class MachineProxyController { private MachineProxyService machineProxyService; @PostMapping("/register") - @Operation(summary ="注册新的机器代理") + @Operation(summary = "注册新的机器代理") public CommonResult register(@RequestBody MachineProxyDTO machineProxyDTO) { machineProxyService.register(machineProxyDTO); return success(true); } @PostMapping("/list") - @Operation(summary ="获取代理列表") - public CommonResult list(MachineProxyDTO machineProxyDTO) { + @Operation(summary = "获取代理列表") + public CommonResult list(@RequestBody MachineProxyDTO machineProxyDTO) { return success(machineProxyService.list(machineProxyDTO)); } @PutMapping("/updateStatus") - @Operation(summary ="更新代理状态") + @Operation(summary = "更新代理状态") public CommonResult updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { machineProxyService.updateStatus(machineProxyDTO); return success(true); } @GetMapping("/statistics/status") - @Operation(summary ="获取所有代理的状态统计") + @Operation(summary = "获取所有代理的状态统计") public CommonResult getStatusStatistics() { return success(machineProxyService.getStatusStatistics()); } @PutMapping("/update") - @Operation(summary ="更新代理信息") + @Operation(summary = "更新代理信息") public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { machineProxyService.update(machineProxyDTO); return success(true); } @DeleteMapping("/batch") - @Operation(summary ="批量删除代理") + @Operation(summary = "批量删除代理") public CommonResult deleteBatch(@RequestParam String ids) { - return success(machineProxyService.delete(ids)); + machineProxyService.delete(ids); + return success(true); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index ba8f98f4..68a2bc7d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.SecretKey; import cd.casic.module.machine.service.SecretKeyService; @@ -23,51 +24,51 @@ import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @RequestMapping("/api/secretKey") -@Tag(name = "密钥管理") +@Tag(name = "密钥管理") public class SecretKeyController { @Resource private SecretKeyService secretKeyService; @PostMapping(value = "/add", consumes = "multipart/form-data") - @Operation(summary ="新增密钥") + @Operation(summary = "新增密钥") public CommonResult add(@RequestBody SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { return success(secretKeyService.addSecretKey(secretKeyDto, file)); } @PutMapping("/bindingMachine") - @Operation(summary ="绑定机器") + @Operation(summary = "绑定机器") public CommonResult bindingMachine(@RequestBody SecretKeyDto secretKeyDto) { secretKeyService.bindingMachine(secretKeyDto); return success(true); } @PutMapping("/update") - @Operation(summary ="编辑密钥信息") + @Operation(summary = "编辑密钥信息") public CommonResult update(@RequestBody SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { return success(secretKeyService.updateSecretKey(secretKeyDto, file)); } @DeleteMapping("/delete") - @Operation(summary ="删除密钥") + @Operation(summary = "删除密钥") public CommonResult delete(@RequestParam Long secretKeyId) { return success(secretKeyService.deleteSecretKey(secretKeyId)); } @DeleteMapping("/deleteList") - @Operation(summary ="批量删除密钥") + @Operation(summary = "批量删除密钥") public CommonResult deleteList(@RequestParam String secretKeyIds) { return success(secretKeyService.deleteList(secretKeyIds)); } @PostMapping("/list") - @Operation(summary ="获取密钥信息列表") + @Operation(summary = "获取密钥信息列表") public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.listSecretKey(secretKeyDto)); } @GetMapping("/downloadSecretKeyFile") - @Operation(summary ="下载密钥文件") + @Operation(summary = "下载密钥文件") public CommonResult downloadSecretKeyFile(@RequestParam("secretKeyId") Long secretKeyId) { return success(secretKeyService.downloadSecretKeyFile(secretKeyId).getBody()); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java index 6370edff..f8d78c27 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.dto; + import cd.casic.module.machine.enums.MachineProxyStatus; import lombok.*; @@ -40,6 +41,6 @@ public class MachineProxyDTO extends PageDto implements Serializable { // 假设5分钟内有心跳为在线 long fiveMinutes = 5 * 60 * 1000; return Objects.equals(MachineProxyStatus.ONLINE.getMessage(), status) && - System.currentTimeMillis() - lastHeartbeatTime.getTime() < fiveMinutes; + System.currentTimeMillis() - lastHeartbeatTime.getTime() < fiveMinutes; } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java index 9940d98d..219fb4f8 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java @@ -3,7 +3,7 @@ package cd.casic.module.machine.dto; import lombok.Data; @Data -public class PageDto{ +public class PageDto { private int pageIndex = 1; private int pageSize = 10; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java index 6843dbc4..8aa53f56 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "machine_info") -public class MachineInfo extends BaseEntity{ +public class MachineInfo extends BaseEntity { @TableField(value = "name") private String name; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java index ef3f80a4..f17e251a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java @@ -1,4 +1,6 @@ package cd.casic.module.machine.entity; + +import cd.casic.module.machine.enums.MachineProxyStatus; import com.baomidou.mybatisplus.annotation.*; import cd.casic.module.machine.enums.MachineInfoStatus; import cd.casic.module.machine.enums.MachineProxyType; @@ -45,7 +47,7 @@ public class MachineProxy extends BaseEntity implements Serializable { * 代理状态 (online, offline, installing, updating, error) */ @TableField(exist = false) - private MachineInfoStatus status; + private MachineProxyStatus status; @TableField(value = "status_code") private int statusCode; @@ -67,5 +69,4 @@ public class MachineProxy extends BaseEntity implements Serializable { private String description; - } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java index 7478e959..dc7acd77 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java @@ -10,11 +10,11 @@ public enum MachineProxyStatus implements CodeEnum { /** * 代理状态 (online, offline, installing, updating, error) */ - ONLINE(1,"online"), - OFFLINE(2,"offline"), - INSTALLING(3,"installing"), - UPDATING(4,"updating"), - ERROR(5,"error"); + ONLINE(1, "online"), + OFFLINE(2, "offline"), + INSTALLING(3, "installing"), + UPDATING(4, "updating"), + ERROR(5, "error"); private final int code; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java index b6de6358..9cba5df2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java @@ -7,9 +7,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum MachineProxyType implements CodeEnum { - HTTP(1,"http"), - SOCKS4(2,"socks4"), - SOCKS5(3,"socks5"); + HTTP(1, "http"), + SOCKS4(2, "socks4"), + SOCKS5(3, "socks5"); private final int code; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java index 6f01b6f2..17fb4901 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java @@ -7,8 +7,8 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum RequestExceptionEnum implements CodeEnum { - REQUEST_TYPE_NOT_JSON(1,"传递参数格式错误，请使用json格式"), - REQUEST_JSON_ERROR(2,"json格式错误"), + REQUEST_TYPE_NOT_JSON(1, "传递参数格式错误，请使用json格式"), + REQUEST_JSON_ERROR(2, "json格式错误"), REQUEST_METHOD_NOT_POST(3, "不支持该请求方法，请求方法应为POST"), REQUEST_METHOD_NOT_GET(4, "不支持该请求方法，请求方法应为GET"), PARAM_ERROR(5, "参数错误"); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index ddfa59d4..0d52f459 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -62,13 +62,13 @@ public class ConnectionSession implements AutoCloseable { doConnect(); status = ConnectionStatus.CONNECTED; log.info("SSH connection established successfully to {} (attempt {}/{})", - machineInfo.getHostIp(), attempt, RETRY_COUNT); + machineInfo.getHostIp(), attempt, RETRY_COUNT); return; } catch (JSchException e) { lastException = e; status = ConnectionStatus.CONNECTION_ERROR; log.error("SSH connection attempt {}/{} failed: {}", - attempt, RETRY_COUNT, e.getMessage()); + attempt, RETRY_COUNT, e.getMessage()); // 认证失败直接退出，无需重试 if (e.getMessage().contains("Auth fail")) { @@ -105,9 +105,9 @@ public class ConnectionSession implements AutoCloseable { // 创建SSH会话 sshSession = jsch.getSession( - machineInfo.getUsername(), - machineInfo.getHostIp(), - machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 + machineInfo.getUsername(), + machineInfo.getHostIp(), + machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 ); // 配置连接参数 @@ -120,7 +120,7 @@ public class ConnectionSession implements AutoCloseable { /** * 配置认证方式（密码或密钥） */ - private void configureAuthentication(JSch jsch) throws JSchException{ + private void configureAuthentication(JSch jsch) throws JSchException { if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY) { // 密钥认证 if (machineInfo.getSecretKeyId() == null) { @@ -134,10 +134,10 @@ public class ConnectionSession implements AutoCloseable { // 加载私钥（支持密码短语，可从配置中获取） jsch.addIdentity( - machineInfo.getName(), - privateKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null // 密码短语，可为null + machineInfo.getName(), + privateKeyContent.getBytes(StandardCharsets.UTF_8), + null, + null // 密码短语，可为null ); } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD) { // 密码认证 @@ -158,7 +158,7 @@ public class ConnectionSession implements AutoCloseable { // 安全增强：默认验证主机密钥 if (isTrustedEnvironment()) { log.warn("Running in trusted environment - disabling strict host key checking for {}", - machineInfo.getHostIp()); + machineInfo.getHostIp()); config.put("StrictHostKeyChecking", "no"); } else { config.put("StrictHostKeyChecking", "yes"); @@ -261,7 +261,7 @@ public class ConnectionSession implements AutoCloseable { // 使用线程中断机制实现超时控制 Thread readerThread = new Thread(() -> { - int bytesRead ; + int bytesRead; try { while ((bytesRead = inputStream.read(buffer)) != -1) { outputStream.write(buffer, 0, bytesRead); @@ -349,10 +349,10 @@ public class ConnectionSession implements AutoCloseable { // 使用更健壮的上传方式 channel.put( - new FileInputStream(localFile), - remoteFilePath, - new ProgressMonitorAdapter(localFile.length()), - ChannelSftp.OVERWRITE + new FileInputStream(localFile), + remoteFilePath, + new ProgressMonitorAdapter(localFile.length()), + ChannelSftp.OVERWRITE ); uploadSuccess = true; @@ -361,7 +361,7 @@ public class ConnectionSession implements AutoCloseable { } catch (SftpException e) { log.error("SFTP error during file upload ({} -> {}): {}", - localFilePath, remoteFilePath, e.getMessage(), e); + localFilePath, remoteFilePath, e.getMessage(), e); throw new IOException("SFTP error: " + e.getMessage(), e); } catch (FileNotFoundException e) { log.error("Local file not found during upload: {}", localFilePath, e); @@ -418,16 +418,16 @@ public class ConnectionSession implements AutoCloseable { // 执行下载并监控进度 channel.get( - remoteFilePath, - new FileOutputStream(tempFile).toString(), - new ProgressMonitorAdapter(fileSize), - ChannelSftp.OVERWRITE + remoteFilePath, + new FileOutputStream(tempFile).toString(), + new ProgressMonitorAdapter(fileSize), + ChannelSftp.OVERWRITE ); // 验证下载完整性 if (tempFile.length() != fileSize) { throw new IOException("Download incomplete: expected " + fileSize + - " bytes, but got " + tempFile.length() + " bytes"); + " bytes, but got " + tempFile.length() + " bytes"); } // 重命名临时文件为目标文件（原子操作） @@ -441,7 +441,7 @@ public class ConnectionSession implements AutoCloseable { } catch (SftpException e) { log.error("SFTP error during file download ({} -> {}): {}", - remoteFilePath, localFilePath, e.getMessage(), e); + remoteFilePath, localFilePath, e.getMessage(), e); if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { throw new FileNotFoundException("Remote file not found: " + remoteFilePath); } @@ -482,11 +482,13 @@ public class ConnectionSession implements AutoCloseable { log.debug("Created remote directory: {}", directory); } } + // 获取路径的父目录 private String getParentDirectory(String path) { int lastSlash = path.lastIndexOf('/'); return lastSlash > 0 ? path.substring(0, lastSlash) : ""; } + // 断开SFTP通道 private void disconnectChannel(Channel channel) { if (channel != null && channel.isConnected()) { @@ -513,6 +515,7 @@ public class ConnectionSession implements AutoCloseable { disconnectChannel(channel); } } + // 增强的进度监控器 private static class ProgressMonitorAdapter implements SftpProgressMonitor { private final long totalBytes; @@ -538,7 +541,7 @@ public class ConnectionSession implements AutoCloseable { String speedStr = formatTransferSpeed(speed); log.debug("Upload progress: {}% ({}/{} bytes, {})", - progress, bytesWritten, totalBytes, speedStr); + progress, bytesWritten, totalBytes, speedStr); lastProgress = progress; } @@ -552,7 +555,7 @@ public class ConnectionSession implements AutoCloseable { String speedStr = formatTransferSpeed(speed); log.info("Upload completed: {} bytes in {} ms (avg speed: {})", - totalBytes, elapsedTime, speedStr); + totalBytes, elapsedTime, speedStr); } @Override @@ -575,13 +578,12 @@ public class ConnectionSession implements AutoCloseable { } - /** * 检查连接状态 */ public ConnectionStatus getStatus() { if (status == ConnectionStatus.CONNECTED && - (sshSession == null || !sshSession.isConnected())) { + (sshSession == null || !sshSession.isConnected())) { status = ConnectionStatus.DISCONNECTED; } return status; @@ -592,8 +594,8 @@ public class ConnectionSession implements AutoCloseable { */ public boolean isConnected() { return status == ConnectionStatus.CONNECTED && - sshSession != null && - sshSession.isConnected(); + sshSession != null && + sshSession.isConnected(); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java index 14d79992..e71ad993 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java @@ -16,6 +16,7 @@ public interface MachineEnvService extends IService { * 创建或更新机器的环境变量（一对一关系） */ boolean add(MachineEnvDTO machineEnvDTO); + /** * 删除机器的环境变量 */ @@ -23,6 +24,7 @@ public interface MachineEnvService extends IService { /** * 获取机器的环境变量 + * * @param machineId 机器ID * @return 环境变量DTO */ diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index fa532b85..6da0e94b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -25,9 +25,9 @@ public interface MachineInfoService extends IService { void deleteMachineInfo(Long machineInfoId); - /** * 测试机器连接 + * * @param machineInfo 机器信息 * @return 连接是否成功 */ @@ -35,6 +35,7 @@ public interface MachineInfoService extends IService { /** * 获取机器连接状态 + * * @param machineName 机器名称 * @return 连接状态 */ @@ -42,12 +43,14 @@ public interface MachineInfoService extends IService { /** * 获取所有连接状态 + * * @return 机器名称到连接状态的映射 */ Map getAllConnectionStatus(); /** * 建立机器连接 + * * @param machineInfo 机器信息 * @return 连接会话ID */ @@ -55,6 +58,7 @@ public interface MachineInfoService extends IService { /** * 断开机器连接 + * * @param sessionId 会话ID * @return 操作结果 */ @@ -62,16 +66,18 @@ public interface MachineInfoService extends IService { /** * 执行远程命令 + * * @param sessionId 会话ID - * @param command 命令 + * @param command 命令 * @return 命令执行结果 */ String executeCommand(String sessionId, String command); /** * 上传文件到远程机器 - * @param sessionId 会话ID - * @param localFilePath 本地文件路径 + * + * @param sessionId 会话ID + * @param localFilePath 本地文件路径 * @param remoteFilePath 远程文件路径 * @return 操作结果 */ @@ -79,9 +85,10 @@ public interface MachineInfoService extends IService { /** * 从远程机器下载文件 - * @param sessionId 会话ID + * + * @param sessionId 会话ID * @param remoteFilePath 远程文件路径 - * @param localFilePath 本地文件路径 + * @param localFilePath 本地文件路径 * @return 操作结果 */ boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index cc1bd2e5..48185546 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -1,4 +1,5 @@ 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; @@ -22,7 +23,6 @@ public interface MachineProxyService extends IService { boolean updateStatus(MachineProxyDTO machineProxyDTO); - /** * 获取所有代理的状态统计 * @@ -38,9 +38,10 @@ public interface MachineProxyService extends IService { /** * 批量删除代理 + * * @param proxyIds 代理ID列表 */ - String delete(String proxyIds); + void delete(String proxyIds); PageResult list(MachineProxyDTO machineProxyDTO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 5a6d2da3..95747cc7 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -15,7 +15,7 @@ public interface SecretKeyService extends IService { void bindingMachine(SecretKeyDto secretKeyDto); - boolean updateSecretKey(SecretKeyDto secretKeyDto,MultipartFile file); + boolean updateSecretKey(SecretKeyDto secretKeyDto, MultipartFile file); boolean deleteSecretKey(Long secretKeyId); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index f5dd8f70..fe0d14e8 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -1,4 +1,5 @@ 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; @@ -32,13 +33,13 @@ public class MachineEnvServiceImpl extends ServiceImpl() - .eq(MachineEnv::getMachineId, machineId) + new LambdaQueryWrapper() + .eq(MachineEnv::getMachineId, machineId) ); return machineEnv != null ? convertToDTO(machineEnv) : null; @@ -115,17 +115,17 @@ public class MachineEnvServiceImpl extends ServiceImpl dtoList = page.getRecords().stream() - .map(this::convertToDTO) - .collect(Collectors.toList()); + .map(this::convertToDTO) + .collect(Collectors.toList()); // 构建分页结果 return PageResult.builder() - .pageNum(page.getCurrent()) - .pageSize(page.getSize()) - .total(page.getTotal()) - .pages(page.getPages()) - .list(dtoList) - .build(); + .pageNum(page.getCurrent()) + .pageSize(page.getSize()) + .total(page.getTotal()) + .pages(page.getPages()) + .list(dtoList) + .build(); } @Override @@ -141,7 +141,7 @@ public class MachineEnvServiceImpl extends ServiceImpl getStatusStatistics() { List proxyList = list(); @@ -72,35 +73,34 @@ public class MachineProxyServiceImpl extends ServiceImpl EnumUtils.getEnumByCode(proxy.getStatusCode(), MachineProxyStatus.class).getMessage()) - .collect(Collectors.groupingBy( - Function.identity(), - Collectors.counting() // 统计每个分组的元素数量 - )); + .map(proxy -> EnumUtils.getEnumByCode(proxy.getStatusCode(), MachineProxyStatus.class).getMessage()) + .collect(Collectors.groupingBy( + Function.identity(), + Collectors.counting() // 统计每个分组的元素数量 + )); } @Override public void update(MachineProxyDTO machineProxyDTO) { // 参数校验 if (machineProxyDTO == null) { - throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL,"MachineProxyDTO对象为空"); + throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); } MachineProxy machineProxy = new MachineProxy(); BeanUtils.copyProperties(machineProxyDTO, machineProxy); - if (machineProxyDTO.getProxyType()!= null && !machineProxyDTO.getProxyType().isEmpty()){ + if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { machineProxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); } - if (machineProxyDTO.getStatus()!= null && !machineProxyDTO.getStatus().isEmpty()){ + if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { machineProxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); } this.updateById(machineProxy); } - @Override @Transactional(rollbackFor = Exception.class) - public String delete(String ids) { + public void delete(String ids) { List machineProxyIds = Arrays.stream(ids.split(",")) .map(String::trim) .filter(s -> !s.isEmpty()) @@ -108,28 +108,12 @@ public class MachineProxyServiceImpl extends ServiceImpl onlineProxies = list(new LambdaQueryWrapper() - .in(MachineProxy::getId, machineProxyIds) - .eq(MachineProxy::getStatusCode, MachineProxyStatus.ONLINE.getCode())); - - if (!CollectionUtils.isEmpty(onlineProxies)) { - List onlineIds = onlineProxies.stream() - .map(MachineProxy::getId) - .toList(); - - // 将 [10, 9] 转换为 "10, 9" - String idStr = onlineIds.toString().replaceAll("[\\[\\]]", ""); - return "以下代理处于在线状态，无法删除: " + idStr; - } - // 批量逻辑删除 remove(new LambdaQueryWrapper() - .in(MachineProxy::getId, machineProxyIds)); - return ""; + .in(MachineProxy::getId, machineProxyIds) + .ne(MachineProxy::getStatus, MachineProxyStatus.ONLINE.getCode())); } @Override @@ -144,15 +128,15 @@ public class MachineProxyServiceImpl extends ServiceImpl( - page.getCurrent(), - page.getSize(), - page.getTotal(), - page.getPages(), - machineProxyDtos + page.getCurrent(), + page.getSize(), + page.getTotal(), + page.getPages(), + machineProxyDtos ); } - private QueryWrapper getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO){ + private QueryWrapper getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (machineProxyDTO.getHostIp() != null && !machineProxyDTO.getHostIp().isEmpty()) { queryWrapper.like("host_ip", machineProxyDTO.getHostIp()); @@ -167,7 +151,10 @@ public class MachineProxyServiceImpl extends ServiceImpl implements MachineInfoService { - int ENABLE=1; - int UN_ENABLE=0; + int ENABLE = 1; + int UN_ENABLE = 0; @Resource private MachineInfoMapper machineInfoMapper; @@ -57,6 +57,7 @@ public class MachineinfoServiceImpl extends ServiceImpl 会话ID */ private final Map machineSessionMapping = new ConcurrentHashMap<>(); + @Override public boolean addMachineInfo(MachineInfoDto machineInfoDto) { if (machineInfoDto == null) { @@ -72,8 +73,8 @@ public class MachineinfoServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code",2); + updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code", 2); return this.update(updateWrapper); } @@ -147,7 +148,7 @@ public class MachineinfoServiceImpl extends ServiceImpl { - if (machineInfo.getStatusCode() == 1){ + if (machineInfo.getStatusCode() == 1) { this.removeById(machineInfo.getId()); } }); @@ -156,14 +157,14 @@ public class MachineinfoServiceImpl extends ServiceImpl getMachineInfoQueryWrapper(MachineInfoDto machineInfoDto) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (machineInfoDto.getStatus() != null && !machineInfoDto.getStatus().isEmpty()){ + if (machineInfoDto.getStatus() != null && !machineInfoDto.getStatus().isEmpty()) { queryWrapper.eq("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); } if (machineInfoDto.getName() != null && !machineInfoDto.getName().isEmpty()) { @@ -182,11 +183,9 @@ public class MachineinfoServiceImpl extends ServiceImpl listSecretKey(SecretKeyDto secretKeyDto) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (secretKeyDto.getName() != null && !secretKeyDto.getName().isEmpty()){ + if (secretKeyDto.getName() != null && !secretKeyDto.getName().isEmpty()) { queryWrapper.like("name", secretKeyDto.getName()); } - if (secretKeyDto.getDescription() != null && !secretKeyDto.getDescription().isEmpty()){ + if (secretKeyDto.getDescription() != null && !secretKeyDto.getDescription().isEmpty()) { queryWrapper.like("description", secretKeyDto.getDescription()); } queryWrapper.orderByDesc("create_date"); Page page = secretServiceMapper.selectPage(new Page<>(secretKeyDto.getPageIndex(), secretKeyDto.getPageSize()), queryWrapper); - return new PageResult<>( + return new PageResult<>( page.getCurrent(), page.getSize(), page.getTotal(), @@ -127,15 +126,15 @@ public class SecretKeyServiceImpl extends ServiceImpl { try { for (SecretKey secretKey : secretKeys) { - if (secretKey.getFileName() != null && !secretKey.getFileName().isEmpty()){ + if (secretKey.getFileName() != null && !secretKey.getFileName().isEmpty()) { aliOssUtil.deleteFile(secretKey.getFileName()); } } } catch (Exception e) { logger.error("异步删除文件失败：{}", e.getMessage()); - throw new ServiceException(ServiceException.DELETE_FILE_FAIL,"异步删除文件失败:"+e.getMessage()); + throw new ServiceException(ServiceException.DELETE_FILE_FAIL, "异步删除文件失败:" + e.getMessage()); } }); - return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0 ; + return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0; } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java index fc185e7e..4bf37ba1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java @@ -21,12 +21,12 @@ import java.nio.charset.StandardCharsets; @Component -public class AliOssUtil{ +public class AliOssUtil { -// @Autowired + // @Autowired private OSS ossClient; -// @Resource + // @Resource private AliYunConfig aliyunConfig; private static final Logger logger = LoggerFactory.getLogger(AliOssUtil.class); @@ -35,14 +35,14 @@ public class AliOssUtil{ try { String fileName = generateUniqueFileName(file.getName()); ossClient.putObject( - // 存储桶名称 - aliyunConfig.getBucketName(), - //对象键（Object Key），即文件在 OSS 中的完整路径和名称 - fileName, - //文件内容的输入流，用于读取待上传的文件数据。 - file.getInputStream(), - //文件的元数据信息，如内容类型（Content-Type）、缓存策略、文件大小等。 - null + // 存储桶名称 + aliyunConfig.getBucketName(), + //对象键（Object Key），即文件在 OSS 中的完整路径和名称 + fileName, + //文件内容的输入流，用于读取待上传的文件数据。 + file.getInputStream(), + //文件的元数据信息，如内容类型（Content-Type）、缓存策略、文件大小等。 + null ); return fileName; } catch (Exception e) { @@ -58,7 +58,7 @@ public class AliOssUtil{ // 处理文件名编码（防止中文乱码） String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8) - .replaceAll("\\+", "%20"); + .replaceAll("\\+", "%20"); // 设置响应头 HttpHeaders headers = new HttpHeaders(); @@ -67,8 +67,8 @@ public class AliOssUtil{ headers.setCacheControl("no-cache, no-store, must-revalidate"); return ResponseEntity.ok() - .headers(headers) - .body(new InputStreamResource(inputStream)); + .headers(headers) + .body(new InputStreamResource(inputStream)); } catch (Exception e) { logger.error("下载失败:{}", e.getMessage()); throw new ServiceException(ServiceException.DOWNLOAD_FILE_FAIL, "下载失败: " + e.getMessage()); From a238538106658ce758549dee9daf13cd9b879dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Wed, 4 Jun 2025 14:40:30 +0800 Subject: [PATCH 15/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 7 + .../machine/configuration/AliYunConfig.java | 39 ----- .../configuration/AliYunOssConfig.java | 33 ++++ .../controller/SecretKeyController.java | 36 ++-- .../module/machine/dto/SecretKeyDto.java | 6 +- .../module/machine/entity/SecretKey.java | 2 +- .../machine/exception/ServiceException.java | 3 + .../machine/handler/ConnectionSession.java | 15 +- .../machine/service/SecretKeyService.java | 7 +- .../service/impl/SecretKeyServiceImpl.java | 154 ++++++++++-------- .../module/machine/utils/AliOssUtil.java | 113 ------------- .../module/machine/utils/AliYunOssClient.java | 12 ++ 12 files changed, 173 insertions(+), 254 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index 64ee895a..ce137127 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -57,6 +57,13 @@ springdoc-openapi-starter-webmvc-ui 2.3.0 + + + cd.casic.boot + module-infra-biz + ${revision} + + diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java deleted file mode 100644 index 9a84250c..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.machine.configuration; - -import cd.casic.module.machine.exception.ServiceException; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; - -import lombok.Getter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -//@Configuration -@Getter -public class AliYunConfig { - private static final Logger logger = LoggerFactory.getLogger(AliYunConfig.class); - @Value("${aliyun.oss.endpoint}") - private String endpoint; - @Value("${aliyun.oss.accessKeyId}") - private String accessKeyId; - @Value("${aliyun.oss.accessKeySecret}") - private String accessKeySecret; - @Value("${aliyun.oss.bucketName}") - private String bucketName; - -// @Bean - public OSS ossClient() { - logger.info("OSS域名: {}", endpoint); - logger.info("AccessKeyId: {}", accessKeyId); - - // 添加参数校验 - if (endpoint == null || accessKeyId == null || accessKeySecret == null) { - throw new ServiceException(ServiceException.OSS_PARAM_NULL,"OSS参数为空"); - } - - return new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java new file mode 100644 index 00000000..a7ab3183 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java @@ -0,0 +1,33 @@ +package cd.casic.module.machine.configuration; + +import cd.casic.module.infra.framework.file.core.client.s3.S3FileClientConfig; +import cd.casic.module.machine.utils.AliYunOssClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration + public class AliYunOssConfig extends S3FileClientConfig{ + @Value("${aliyun.oss.endpoint}") + private String endpoint; + @Value("${aliyun.oss.accessKeyId}") + private String accessKey; + @Value("${aliyun.oss.accessKeySecret}") + private String accessSecret; + @Value("${aliyun.oss.bucketName}") + private String bucket; + // 定义 S3 客户端 Bean + @Bean + public AliYunOssClient aliYunClient() { + // 创建配置对象 + S3FileClientConfig config = new AliYunOssConfig(); + config.setEndpoint(endpoint); + config.setAccessKey(accessKey); + config.setAccessSecret(accessSecret); + config.setBucket(bucket); + AliYunOssClient aliYunOssClient = new AliYunOssClient(1L, config); + // 创建并返回客户端实例 + aliYunOssClient.init(); + return aliYunOssClient; + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index cb352d41..32f5f061 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -8,15 +8,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.core.io.InputStreamResource; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -30,31 +22,27 @@ public class SecretKeyController { @Resource private SecretKeyService secretKeyService; - @PostMapping(value = "/add", consumes = "multipart/form-data") + @PostMapping(value = "/add") @Operation(summary ="新增密钥") - public CommonResult add(@RequestBody SecretKeyDto secretKeyDto, @RequestPart("file") MultipartFile file) { - return success(secretKeyService.addSecretKey(secretKeyDto, file)); + public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { + return success(secretKeyService.addSecretKey(secretKeyDto)); } @PutMapping("/bindingMachine") @Operation(summary ="绑定机器") - public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineInfoIds") List machineInfoIds) { - secretKeyService.bindingMachine(secretKeyId, machineInfoIds); + public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { + secretKeyService.bindingMachine(secretKeyId, machineIds); return success(true); } @PutMapping("/update") @Operation(summary ="编辑密钥信息") - public CommonResult update(@RequestBody SecretKeyDto secretKeyDto, @RequestPart(value = "file", required = false) MultipartFile file) { - return success(secretKeyService.updateSecretKey(secretKeyDto, file)); + public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { + return success(secretKeyService.updateSecretKey(secretKeyDto)); } - @DeleteMapping("/delete") - @Operation(summary ="删除密钥") - public CommonResult delete(@RequestParam("secretKeyId") Long secretKeyId) { - return success(secretKeyService.deleteSecretKey(secretKeyId)); - } + @DeleteMapping("/deleteList") @Operation(summary ="批量删除密钥") @@ -68,9 +56,5 @@ public class SecretKeyController { return success(secretKeyService.listSecretKey(secretKeyDto)); } - @GetMapping("/downloadSecretKeyFile") - @Operation(summary ="下载密钥文件") - public CommonResult downloadSecretKeyFile(@RequestParam("secretKeyId") Long secretKeyId) { - return success(secretKeyService.downloadSecretKeyFile(secretKeyId).getBody()); - } + } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java index e5aa6c4e..414486ea 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @@ -19,12 +20,9 @@ public class SecretKeyDto extends PageDto { private String description; - //存储路径 + //存储路径,本地上传文件路径 private String path; - //密钥文件 - private MultipartFile file; - private String fileName; //密钥密码 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java index 18d3b3f4..f747c461 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java @@ -19,7 +19,7 @@ public class SecretKey extends BaseEntity{ @TableField(value = "description") private String description; - //存储路径 + //oss存储路径 @TableField(value = "path") private String path; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java index a4f2a62e..90f3b4d8 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java @@ -1,5 +1,6 @@ package cd.casic.module.machine.exception; +import cd.casic.module.machine.entity.SecretKey; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,6 +38,8 @@ public class ServiceException extends RuntimeException { public static final int MACHINE_ENV_KEY_ILLEGAL = 565; //oss参数无法读取 public static final int OSS_PARAM_NULL = 1001; + //密钥为空 + public static final int SECRETKEY_NULL = 1002; /** * 业务错误码 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index ddfa59d4..05a758e4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -1,8 +1,8 @@ package cd.casic.module.machine.handler; +import cd.casic.module.machine.utils.AliYunOssClient; 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; @@ -28,7 +28,7 @@ public class ConnectionSession implements AutoCloseable { SecretKeyService secretKeyService; @Resource - AliOssUtil aliOssUtil; + AliYunOssClient aliYunOssClient; private final MachineInfo machineInfo; private Session sshSession; @@ -602,7 +602,16 @@ public class ConnectionSession implements AutoCloseable { return null; } SecretKey secretKey = secretKeyService.getById(secretKeyId); - InputStream read = aliOssUtil.read(secretKey.getFileName()); + byte[] content; + try { + content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); + } catch (Exception e) { + throw new RuntimeException(e); + } + + //改为S3FileClient读取 + InputStream read = new ByteArrayInputStream(content); + try { return StreamUtils.copyToString(read, StandardCharsets.UTF_8); } catch (IOException e) { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index b0cae86a..b9647850 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -11,17 +11,16 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; public interface SecretKeyService extends IService { - boolean addSecretKey(SecretKeyDto secretKeyDto, MultipartFile file); + boolean addSecretKey(SecretKeyDto secretKeyDto) throws Exception; void bindingMachine(Long secretKeyId, List machineInfoIds); - boolean updateSecretKey(SecretKeyDto secretKeyDto,MultipartFile file); + boolean updateSecretKey(SecretKeyDto secretKeyDto); - boolean deleteSecretKey(Long secretKeyId); PageResult listSecretKey(SecretKeyDto secretKeyDto); - ResponseEntity downloadSecretKeyFile(Long secretKeyId); + boolean deleteList(List secretKeyIds); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 2a762343..2b4d6c2d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -4,90 +4,96 @@ 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.service.MachineInfoService; import cd.casic.module.machine.utils.PageResult; +import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.util.IdUtil; 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.machine.configuration.AliYunConfig; +import cd.casic.module.machine.utils.AliYunOssClient; import cd.casic.module.machine.exception.ServiceException; -import cd.casic.module.machine.service.MachineInfoService; +//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; import org.springframework.beans.BeanUtils; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; @Service public class SecretKeyServiceImpl extends ServiceImpl implements SecretKeyService { - @Resource - private AliOssUtil aliOssUtil; @Resource private MachineInfoService machineInfoService; -// @Resource - private AliYunConfig aliYunConfig; + @Resource + private AliYunOssClient aliYunOssClient; @Resource private SecretServiceMapper secretServiceMapper; - //todo public方便测试，后面改为private - public static final ExecutorService FILE_DELETE_EXECUTOR = Executors.newFixedThreadPool(10); - - Logger logger = LoggerFactory.getLogger(SecretKeyServiceImpl.class); @Override - public boolean addSecretKey(SecretKeyDto secretKeyDto, MultipartFile file) { - secretKeyDto.setFile(file); - String fileName = aliOssUtil.save(file); - String path = "https://" + aliYunConfig.getBucketName() + "." + aliYunConfig.getEndpoint() + "/" + fileName; - secretKeyDto.setPath(path); - secretKeyDto.setFileName(fileName); - SecretKey secretKey = new SecretKey(); - BeanUtils.copyProperties(secretKeyDto,secretKey); - return this.save(secretKey); - } - - @Override - public void bindingMachine(Long secretKeyId, List machineInfoIds) { - List machineInfos = machineInfoService.listByIds(machineInfoIds); - machineInfos.forEach(machineInfo -> machineInfo.setSecretKeyId(secretKeyId)); - machineInfoService.updateBatchById(machineInfos); - } - - @Override - public boolean updateSecretKey(SecretKeyDto secretKeyDto, MultipartFile file) { - if (file != null){ - secretKeyDto.setFile(file); - String fileName = aliOssUtil.save(file); - String path = "https://" + aliYunConfig.getBucketName() + "." + aliYunConfig.getEndpoint() + "/" + fileName; - secretKeyDto.setPath(path); - secretKeyDto.setFileName(fileName); + public boolean addSecretKey(SecretKeyDto secretKeyDto){ + if (secretKeyDto.getPath()==null) + { + throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不能为空"); } + + String ossPath = upLoadSecretKey(secretKeyDto.getPath()); + if (ossPath == null){ + throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥上传失败"); + } + secretKeyDto.setPath(ossPath); SecretKey secretKey = new SecretKey(); BeanUtils.copyProperties(secretKeyDto,secretKey); + //todo检查密钥合法 + return this.save(secretKey); + + + } + @Override + public boolean updateSecretKey(SecretKeyDto secretKeyDto) { + + Long id = secretKeyDto.getId(); + SecretKey secretKey = this.getById(id); + if (secretKey == null){ + throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不存在"); + } + if (!secretKey.getPath().equals(secretKeyDto.getPath())) { + //todo检查密钥合法 + String ossPath = upLoadSecretKey(secretKeyDto.getPath()); + BeanUtils.copyProperties(secretKeyDto,secretKey); + secretKey.setPath(ossPath); + } + else { + BeanUtils.copyProperties(secretKeyDto,secretKey); + } + return this.updateById(secretKey); + + } @Override - public boolean deleteSecretKey(Long secretKeyId) { - String fileName = this.getById(secretKeyId).getFileName(); - aliOssUtil.deleteFile(fileName); - return this.removeById(secretKeyId); + public void bindingMachine(Long secretKeyId, List machineIds) { + SecretKey secretKey = this.getById(secretKeyId); + if (secretKey==null){ + throw new ServiceException(ServiceException.SECRETKEY_NULL,"密钥不存在"); + } + List machineList = machineInfoService.listByIds(machineIds); + machineList.forEach(machine -> machine.setSecretKeyId(secretKeyId)); + machineInfoService.updateBatchById(machineList); } + + + + @Override public PageResult listSecretKey(SecretKeyDto secretKeyDto) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -107,28 +113,48 @@ public class SecretKeyServiceImpl extends ServiceImpl downloadSecretKeyFile(Long secretKeyId) { - String fileName = this.getById(secretKeyId).getFileName(); - return aliOssUtil.downloadFile(fileName); - } + @Override public boolean deleteList(List secretKeyIds) { List secretKeys = this.listByIds(secretKeyIds); - // 提交异步任务到线程池 - FILE_DELETE_EXECUTOR.execute(() -> { - try { - for (SecretKey secretKey : secretKeys) { - if (secretKey.getFileName() != null && !secretKey.getFileName().isEmpty()){ - aliOssUtil.deleteFile(secretKey.getFileName()); - } + + for (SecretKey secretKey : secretKeys) { + if (secretKey.getPath() != null && !secretKey.getPath().isEmpty()){ + try { + //文件名 + //删除子目录文件，需要在前面加上根目录文件路径 + String fileName = secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1); + aliYunOssClient.delete(fileName); + } catch (Exception e) { + throw new RuntimeException(e); } - } catch (Exception e) { - logger.error("异步删除文件失败：{}", e.getMessage()); - throw new ServiceException(ServiceException.DELETE_FILE_FAIL,"异步删除文件失败:"+e.getMessage()); } - }); + } + + + //todo是否删除已经绑定的机器 return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0 ; } + + + public String upLoadSecretKey(String localPath) { + + //使用S3FileClient上传文件 + aliYunOssClient.init(); + + //传输到指定文件，需要在path前面加上文件路径 + String path = IdUtil.fastSimpleUUID() + ".txt"; + + + //上传文件是从本地上传，这里传的是本地文件地址 + byte[] content = ResourceUtil.readBytes(localPath); + String ossPath; + try { + ossPath = aliYunOssClient.upload(content, path, "txt"); + }catch (Exception e) { + throw new RuntimeException(e+"上传文件失败"); + } + return ossPath; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java deleted file mode 100644 index fc185e7e..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java +++ /dev/null @@ -1,113 +0,0 @@ -package cd.casic.module.machine.utils; - -import cd.casic.module.machine.configuration.AliYunConfig; -import cd.casic.module.machine.exception.ServiceException; -import com.aliyun.oss.OSS; -import com.aliyun.oss.model.OSSObject; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import java.io.InputStream; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - - -@Component -public class AliOssUtil{ - -// @Autowired - private OSS ossClient; - -// @Resource - private AliYunConfig aliyunConfig; - - private static final Logger logger = LoggerFactory.getLogger(AliOssUtil.class); - - public String save(MultipartFile file) { - try { - String fileName = generateUniqueFileName(file.getName()); - ossClient.putObject( - // 存储桶名称 - aliyunConfig.getBucketName(), - //对象键（Object Key），即文件在 OSS 中的完整路径和名称 - fileName, - //文件内容的输入流，用于读取待上传的文件数据。 - file.getInputStream(), - //文件的元数据信息，如内容类型（Content-Type）、缓存策略、文件大小等。 - null - ); - return fileName; - } catch (Exception e) { - logger.info("文件上传失败:{}", e.getMessage()); - throw new ServiceException(ServiceException.UPLOADING_FILE_FAIL, "上传文件失败:" + e.getMessage()); - } - } - - public ResponseEntity downloadFile(String fileName) { - try { - // 读取文件流 - InputStream inputStream = read(fileName); - - // 处理文件名编码（防止中文乱码） - String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8) - .replaceAll("\\+", "%20"); - - // 设置响应头 - HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + encodedFileName); - headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); - headers.setCacheControl("no-cache, no-store, must-revalidate"); - - return ResponseEntity.ok() - .headers(headers) - .body(new InputStreamResource(inputStream)); - } catch (Exception e) { - logger.error("下载失败:{}", e.getMessage()); - throw new ServiceException(ServiceException.DOWNLOAD_FILE_FAIL, "下载失败: " + e.getMessage()); - } - } - - public void deleteFile(String fileName) { - try { - if (fileName == null || fileName.isEmpty()) { - throw new ServiceException(ServiceException.FILENAME_NULL, "文件名不能为空"); - } - - // 调用 OSS 客户端删除文件 - ossClient.deleteObject(aliyunConfig.getBucketName(), fileName); - logger.info("文件删除成功: {}", fileName); - } catch (Exception e) { - logger.error("删除文件失败: {}", e.getMessage()); - throw new ServiceException(ServiceException.DELETE_FILE_FAIL, "删除文件失败: " + e.getMessage()); - } - } - - public InputStream read(String fileName) { - try { - if (fileName == null || fileName.isEmpty()) { - throw new ServiceException(ServiceException.FILENAME_NULL, "文件名不能为空"); - } - OSSObject ossObject = ossClient.getObject(aliyunConfig.getBucketName(), fileName); - return ossObject.getObjectContent(); - } catch (Exception e) { - logger.error("读取文件失败:{}", e.getMessage()); - throw new ServiceException(ServiceException.READ_FILE_FAIL, "读取文件失败: " + e.getMessage()); - } - } - - // 生成带时间戳的唯一文件名 - private String generateUniqueFileName(String originalFileName) { - String timestamp = String.valueOf(System.currentTimeMillis()); - String ext = originalFileName.substring(originalFileName.lastIndexOf(".")); - return timestamp + ext; - } - -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java new file mode 100644 index 00000000..fff03244 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java @@ -0,0 +1,12 @@ +package cd.casic.module.machine.utils; + +import cd.casic.module.infra.framework.file.core.client.s3.S3FileClient; +import cd.casic.module.infra.framework.file.core.client.s3.S3FileClientConfig; + + +public class AliYunOssClient extends S3FileClient{ + public AliYunOssClient(Long id, S3FileClientConfig config) { + super(id, config); + } + +} From 62b0caa3daba5c61404cb338f6b874c0accd9b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Wed, 4 Jun 2025 14:50:33 +0800 Subject: [PATCH 16/46] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91oss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ops-server/src/main/resources/application-local.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ops-server/src/main/resources/application-local.yaml b/ops-server/src/main/resources/application-local.yaml index 2237153b..53dfb263 100644 --- a/ops-server/src/main/resources/application-local.yaml +++ b/ops-server/src/main/resources/application-local.yaml @@ -156,3 +156,12 @@ logging: org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # 禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 debug: false + + +#阿里云oss +aliyun: + oss: + endpoint: https://oss-cn-beijing.aliyuncs.com + accessKeyId: LTAI5tPCKES4ZxdRKybGjJf4 + accessKeySecret: mtX94qmxnWR2FDem0z38qjv0rrILSE + bucketName: kkt-web-tlias From 7cd43960018e83e2a27ae5240e14c034cbca7118 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Wed, 4 Jun 2025 17:11:00 +0800 Subject: [PATCH 17/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 3 --- .../controller/MachineInfoController.java | 3 --- .../controller/MachineProxyController.java | 2 -- .../controller/SecretKeyController.java | 18 ++++++++---------- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index 0a60b328..86e52621 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -1,6 +1,5 @@ package cd.casic.module.machine.controller; - import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.service.MachineEnvService; import cd.casic.module.machine.dto.MachineEnvDTO; @@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - import static cd.casic.framework.commons.pojo.CommonResult.success; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index a77e1025..e5bf69f5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,19 +1,16 @@ package cd.casic.module.machine.controller; - import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.MachineInfo; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.dto.MachineInfoDto; - import cd.casic.module.machine.utils.PageResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Map; import static cd.casic.framework.commons.pojo.CommonResult.success; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index fa573046..238c4bc2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -10,8 +10,6 @@ import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - import static cd.casic.framework.commons.pojo.CommonResult.success; /** diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 32f5f061..e9027d3b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.SecretKey; import cd.casic.module.machine.service.SecretKeyService; @@ -17,41 +18,38 @@ import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @RequestMapping("/api/secretKey") -@Tag(name = "密钥管理") +@Tag(name = "密钥管理") public class SecretKeyController { @Resource private SecretKeyService secretKeyService; @PostMapping(value = "/add") - @Operation(summary ="新增密钥") + @Operation(summary = "新增密钥") public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { return success(secretKeyService.addSecretKey(secretKeyDto)); } @PutMapping("/bindingMachine") - @Operation(summary ="绑定机器") + @Operation(summary = "绑定机器") public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { secretKeyService.bindingMachine(secretKeyId, machineIds); return success(true); } @PutMapping("/update") - @Operation(summary ="编辑密钥信息") + @Operation(summary = "编辑密钥信息") public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.updateSecretKey(secretKeyDto)); } - - - @DeleteMapping("/deleteList") - @Operation(summary ="批量删除密钥") + @Operation(summary = "批量删除密钥") public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { return success(secretKeyService.deleteList(secretKeyIds)); } - @GetMapping("/list") - @Operation(summary ="获取密钥信息列表") + @PostMapping("/list") + @Operation(summary = "获取密钥信息列表") public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.listSecretKey(secretKeyDto)); } From 891a332c5974bc294e899ec62551f2d8a7d66728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 5 Jun 2025 11:00:54 +0800 Subject: [PATCH 18/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineInfoController.java | 4 +- .../module/machine/dto/MachineInfoDto.java | 2 +- .../module/machine/entity/MachineInfo.java | 2 +- .../machine/handler/ConnectionSession.java | 51 ++++++++++++------- .../machine/service/MachineInfoService.java | 4 +- .../service/impl/MachineinfoServiceImpl.java | 31 +++++------ 6 files changed, 54 insertions(+), 40 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index a77e1025..453526b4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -72,8 +72,8 @@ public class MachineInfoController { @PostMapping("/test") @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestBody MachineInfo machineInfo) { - return success(machineInfoService.testConnection(machineInfo)); + public CommonResult testConnection(@RequestParam Long id) { + return success(machineInfoService.testConnection(id)); } @GetMapping("/status/{machineName}") diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java index cd5648a1..9a2e2efc 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java @@ -30,7 +30,7 @@ public class MachineInfoDto extends PageDto { private String status; - private String sshPort; + private Integer sshPort; private String password; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java index 8aa53f56..6564c264 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java @@ -46,7 +46,7 @@ public class MachineInfo extends BaseEntity { private String username; //SSH端口号 - @TableField(value = "SSH_port") + @TableField(value = "ssh_port") private Integer sshPort; @TableField(value = "password") diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index 66766890..8936ab2a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -1,18 +1,15 @@ package cd.casic.module.machine.handler; - - import cd.casic.module.machine.utils.AliYunOssClient; import cd.casic.module.machine.entity.MachineInfo; 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; +import org.springframework.stereotype.Component; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; - import java.io.*; import java.nio.charset.StandardCharsets; import java.util.Objects; @@ -23,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * 优化后的SSH连接会话类 */ @Slf4j +@Component public class ConnectionSession implements AutoCloseable { @Resource SecretKeyService secretKeyService; @@ -30,21 +28,29 @@ public class ConnectionSession implements AutoCloseable { @Resource AliYunOssClient aliYunOssClient; - private final MachineInfo machineInfo; + private MachineInfo machineInfo; private Session sshSession; private ConnectionStatus status = ConnectionStatus.DISCONNECTED; private final AtomicBoolean isExecuting = new AtomicBoolean(false); - // 连接配置常量 + // todo连接配置常量 private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) private static final int RETRY_COUNT = 3; // 重试次数 private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) - public ConnectionSession(MachineInfo machineInfo) { - this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); + public ConnectionSession() { + } + // 使用setter注入MachineInfo + public void setMachineInfo(MachineInfo machineInfo) { + this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); + log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); + } + + + /** * 建立SSH连接，支持重试机制 */ @@ -121,25 +127,32 @@ public class ConnectionSession implements AutoCloseable { * 配置认证方式（密码或密钥） */ private void configureAuthentication(JSch jsch) throws JSchException { - if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY) { + if (machineInfo.getAuthenticationTypeCode() == 2) { // 密钥认证 if (machineInfo.getSecretKeyId() == null) { throw new JSchException("Secret key ID is required for key-based authentication"); } String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); - if (StringUtils.isEmpty(privateKeyContent)) { - throw new JSchException("Private key content is empty or null for ID: " + machineInfo.getSecretKeyId()); + // 验证私钥格式 + if (!privateKeyContent.startsWith("-----BEGIN")) { + throw new JSchException("Invalid private key format. Expected OpenSSH format."); } - // 加载私钥（支持密码短语，可从配置中获取） - jsch.addIdentity( - machineInfo.getName(), - privateKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null // 密码短语，可为null - ); - } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD) { + try { + // 尝试加载私钥 + jsch.addIdentity( + machineInfo.getName(), + privateKeyContent.getBytes(StandardCharsets.UTF_8), + null, + null + ); + log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); + } catch (JSchException e) { + log.error("Failed to load private key: {}", e.getMessage()); + throw e; + } + } else if (machineInfo.getAuthenticationTypeCode() == 1) { // 密码认证 if (StringUtils.isEmpty(machineInfo.getPassword())) { throw new JSchException("Password is required for password-based authentication"); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 6da0e94b..39ee38bf 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -28,10 +28,10 @@ public interface MachineInfoService extends IService { /** * 测试机器连接 * - * @param machineInfo 机器信息 + * @param id 机器id * @return 连接是否成功 */ - boolean testConnection(MachineInfo machineInfo); + boolean testConnection(Long id); /** * 获取机器连接状态 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index 10d61f6a..26916426 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -42,7 +42,8 @@ public class MachineinfoServiceImpl extends ServiceImpl Date: Fri, 6 Jun 2025 11:35:57 +0800 Subject: [PATCH 19/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/contants/CommonConstants.java | 5 - .../contants/MachineErrorCodeConstants.java | 27 +++ .../controller/MachineEnvController.java | 58 +++--- .../machine/controller/vo/MachineEnvVO.java | 35 ++++ .../{dto => controller/vo}/PageDto.java | 2 +- .../machine/convert/MachineEnvConvert.java | 24 +++ .../dataobject/MachineEnvDO.java} | 17 +- .../machine/dal/mysql/MachineEnvMapper.java | 28 +++ .../module/machine/dto/MachineEnvDTO.java | 28 --- .../module/machine/entity/BaseEntity.java | 28 --- .../machine/exception/ServiceException.java | 55 ------ .../machine/mapper/MachineEnvMapper.java | 14 -- .../machine/service/MachineEnvService.java | 31 +-- .../service/impl/MachineEnvServiceImpl.java | 183 +++++------------- .../module/machine/utils/PageResult.java | 45 ----- 15 files changed, 234 insertions(+), 346 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{dto => controller/vo}/PageDto.java (71%) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{entity/MachineEnv.java => dal/dataobject/MachineEnvDO.java} (64%) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PageResult.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java deleted file mode 100644 index 88528544..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/CommonConstants.java +++ /dev/null @@ -1,5 +0,0 @@ -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/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java new file mode 100644 index 00000000..eba519ef --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -0,0 +1,27 @@ +package cd.casic.module.machine.contants; + +import cd.casic.framework.commons.exception.ErrorCode; + +/** + * 机器报错 + */ +public interface MachineErrorCodeConstants { + // ========== 机器模块 1-003-000-000 ========== + ErrorCode MACHINE_INFO_NULL = new ErrorCode(1_003_000_000, "机器信息为空"); + ErrorCode UPLOADING_FILE_FAIL = new ErrorCode(1_003_000_001, "上传文件失败"); + ErrorCode DOWNLOAD_FILE_FAIL = new ErrorCode(1_003_000_002, "下载失败"); + ErrorCode FILENAME_NULL = new ErrorCode(1_003_000_003, "文件名为空"); + ErrorCode READ_FILE_FAIL = new ErrorCode(1_003_000_004, "读取文件失败"); + ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_000_005, "删除文件失败"); + ErrorCode MACHINE_PROXY_DTO_NULL = new ErrorCode(1_003_000_006, "MachineProxyDTO对象为空"); + ErrorCode MACHINE_PROXY_NULL = new ErrorCode(1_003_000_007, "MachineProxy代理不存在"); + ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_000_008, "参数错误"); + ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_000_009, "机器环境变量为空"); + ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_000_009, "机器不存在"); + ErrorCode MACHINE_ENV_EXISTS = new ErrorCode(1_003_000_009, "机器已存在"); + ErrorCode MACHINE_ENV_KEY_ILLEGAL = new ErrorCode(1_003_000_010, "机器环境变量键不合法"); + ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_000_011, "oss参数无法读取"); + ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_000_012, "密钥为空"); +} + + diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index 86e52621..b61c082d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -1,69 +1,83 @@ package cd.casic.module.machine.controller; - import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import cd.casic.module.machine.service.MachineEnvService; -import cd.casic.module.machine.dto.MachineEnvDTO; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import static cd.casic.framework.commons.pojo.CommonResult.success; - /** * 环境变量控制器 */ -@RestController -@RequestMapping("/api/machineEnv") @Tag(name = "环境变量管理") -@RequiredArgsConstructor +@RestController +@RequestMapping("/ci/machineEnv") +@Validated public class MachineEnvController { @Resource private MachineEnvService machineEnvService; - @PostMapping("/add") + @PostMapping("/create") @Operation(summary = "新增环境变量") - public CommonResult add(@RequestBody MachineEnvDTO machineEnvDTO) { - machineEnvService.add(machineEnvDTO); - return success(true); + @PreAuthorize("@ss.hasPermission('ci:machineEnv:create')") + public CommonResult createEnv(@Valid @RequestBody MachineEnvVO machineEnvVO) { + Long id = machineEnvService.createEnv(machineEnvVO); + return success(id); } @PutMapping("/update") @Operation(summary = "修改环境变量") - public CommonResult update(@RequestBody MachineEnvDTO machineEnvDTO) { - machineEnvService.update(machineEnvDTO); + @PreAuthorize("@ss.hasPermission('ci:machineEnv:update')") + public CommonResult updateEnv(@Valid@RequestBody MachineEnvVO machineEnvVO) { + machineEnvService.updateEnv(machineEnvVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除机器的环境变量") - public CommonResult deleteByMachineId(@RequestParam Long machineEvnId) { - machineEnvService.deleteByMachineId(machineEvnId); + @PreAuthorize("@ss.hasPermission('ci:machineEnv:delete')") + public CommonResult deleteEnv(@RequestParam("id") Long id) { + machineEnvService.deleteEnv(id); return success(true); } @DeleteMapping("/deleteList") @Operation(summary = "批量删除机器环境变量") - public CommonResult deleteList(@RequestParam String ids) { - machineEnvService.deleteList(ids); + @PreAuthorize("@ss.hasPermission('ci:machineEnv:delete')") + public CommonResult deleteEnvList(@RequestParam("ids") String ids) { + machineEnvService.deleteEnvList(ids); return success(true); } - @GetMapping("/getByMachineId") + @GetMapping("/getEnv") @Operation(summary = "获取机器的环境变量") - public CommonResult getByMachineId(@RequestParam Long machineId) { - return success(machineEnvService.getByMachineId(machineId)); + public CommonResult getEnv(@RequestParam("id") Long id) { + MachineEnvVO machineEnvVO = machineEnvService.getEnv(id); + return success(machineEnvVO); } @PostMapping("/list") @Operation(summary = "获取环境变量列表") - public CommonResult list(@RequestBody MachineEnvDTO machineEnvDTO) { - return success(machineEnvService.listEnv(machineEnvDTO)); + public CommonResult> getEnvPage(@Valid @RequestBody MachineEnvVO machineEnvVO) { + PageResult pageResult = machineEnvService.getEnvPage(machineEnvVO); + if (CollUtil.isEmpty(pageResult.getList())) { + return success(new PageResult<>(pageResult.getTotal())); + } + return success(BeanUtils.toBean(pageResult, MachineEnvVO.class)); } } + diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java new file mode 100644 index 00000000..922daaaa --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java @@ -0,0 +1,35 @@ +package cd.casic.module.machine.controller.vo; +import cd.casic.framework.commons.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import lombok.experimental.Accessors; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 机器环境变量信息 Response VO") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) // 添加链式调用支持 +public class MachineEnvVO extends PageParam{ + + @Schema(description = "环境变量ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "环境变量键", requiredMode = Schema.RequiredMode.REQUIRED, example = "JAVA_HOME") + private String envKey; + + @Schema(description = "环境变量值", requiredMode = Schema.RequiredMode.REQUIRED, example = "/usr/java/jdk1.8.0_271") + private String envValue; + + @Schema(description = "环境变量描述", example = "Java运行环境路径") + private String description; + + @Schema(description = "关联的机器ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long machineId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-06-15T10:30:00") + private LocalDateTime createTime; + + @Schema(description = "更新时间", example = "2023-06-15T10:30:00") + private LocalDateTime updateTime; +} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java similarity index 71% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java index 219fb4f8..29202cae 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/PageDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java @@ -1,4 +1,4 @@ -package cd.casic.module.machine.dto; +package cd.casic.module.machine.controller.vo; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java new file mode 100644 index 00000000..741eb553 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java @@ -0,0 +1,24 @@ +package cd.casic.module.machine.convert; + +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +@Mapper +public interface MachineEnvConvert { + + MachineEnvConvert INSTANCE = Mappers.getMapper(MachineEnvConvert.class); + + // 转换实体为VO + default MachineEnvVO convertToVO(MachineEnvDO machineEnvDO) { + MachineEnvVO VO = new MachineEnvVO(); + VO.setId(machineEnvDO.getId()); + VO.setEnvKey(machineEnvDO.getEnvKey()); + VO.setEnvValue(machineEnvDO.getEnvValue()); + VO.setDescription(machineEnvDO.getDescription()); + VO.setCreateTime(machineEnvDO.getCreateTime()); + VO.setUpdateTime(machineEnvDO.getUpdateTime()); + return VO; + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java similarity index 64% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java index c8c229a4..4c4589a4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineEnv.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java @@ -1,8 +1,10 @@ -package cd.casic.module.machine.entity; +package cd.casic.module.machine.dal.dataobject; +import cd.casic.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.*; import lombok.*; +import lombok.experimental.Accessors; import java.io.Serializable; @@ -12,13 +14,20 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Data +@Accessors(chain = true) +@TableName("machine_env") +@Builder @NoArgsConstructor @AllArgsConstructor -@TableName("machine_env") -public class MachineEnv extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; +public class MachineEnvDO extends BaseDO { + /** + * 环境变量id + */ + @TableId + private Long id; + /** * 机器ID（唯一关联） */ diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java new file mode 100644 index 00000000..a51b31fb --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java @@ -0,0 +1,28 @@ +package cd.casic.module.machine.dal.mysql; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; +import org.apache.ibatis.annotations.Mapper; + +import java.time.LocalDateTime; + +/** + * 环境变量Mapper接口 + */ +@Mapper +public interface MachineEnvMapper extends BaseMapperX { + default PageResultselectPage(MachineEnvVO machineEnvVO){ + return selectPage(machineEnvVO,new LambdaQueryWrapperX() + .likeIfPresent(MachineEnvDO::getEnvKey, machineEnvVO.getEnvKey()) + .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription()) + .inIfPresent(MachineEnvDO::getMachineId, machineEnvVO.getMachineId()) + .orderByDesc( MachineEnvDO::getMachineId)); + } + default void deleteBatchByIds(String ids) { + this.delete(new LambdaQueryWrapperX() + .in(MachineEnvDO::getId, ids.split(",")) + ); + } +} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java deleted file mode 100644 index bb2204a6..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineEnvDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.machine.dto; - -import lombok.*; - -import java.io.Serializable; -import java.util.Date; - -/** - * 环境变量数据传输对象 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MachineEnvDTO extends PageDto implements Serializable { - private static final long serialVersionUID = 1L; - - private Long id; - private String envKey; - private String envValue; - private String description; - private Long machineId; - private Date createDate; - private Date updateDate; - private String sortField; - private String sortDirection; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java deleted file mode 100644 index 19669ab1..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/BaseEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.machine.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -@Data - -@AllArgsConstructor -@NoArgsConstructor -public class BaseEntity { - @TableId - private Long id; - - @TableField(value = "create_date") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - - @TableField(value = "update_date") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java deleted file mode 100644 index 90f3b4d8..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/exception/ServiceException.java +++ /dev/null @@ -1,55 +0,0 @@ -package cd.casic.module.machine.exception; - -import cd.casic.module.machine.entity.SecretKey; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * 业务逻辑异常 Exception - */ -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ServiceException extends RuntimeException { - //机器信息为空 - public static final int MACHINE_INFO_NULL = 555; - //上传文件失败 - public static final int UPLOADING_FILE_FAIL = 556; - //下载失败 - public static final int DOWNLOAD_FILE_FAIL = 557; - //文件名为空 - public static final int FILENAME_NULL = 558; - //读取文件失败 - public static final int READ_FILE_FAIL = 559; - //删除文件失败 - public static final int DELETE_FILE_FAIL = 560; - //MachineProxyDTO对象为空 - public static final int MACHINE_PROXY_DTO_NULL = 561; - //MachineProxy代理不存在 - public static final int MACHINE_PROXY_NULL = 562; - //参数错误 - public static final int PARAMETER_ERROR = 563; - //机器环境变量为空 - public static final int MACHINE_ENV_NULL = 564; - //机器环境变量键不合法 - public static final int MACHINE_ENV_KEY_ILLEGAL = 565; - //oss参数无法读取 - public static final int OSS_PARAM_NULL = 1001; - //密钥为空 - public static final int SECRETKEY_NULL = 1002; - - /** - * 业务错误码 - * 区间 - * machine-management-module模块(555-1000) - * common-module模块(1001-2000) - */ - private Integer code; - /** - * 错误提示 - */ - private String message; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java deleted file mode 100644 index 9e2e7558..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineEnvMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.machine.mapper; - - -import cd.casic.module.machine.entity.MachineEnv; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** - * 环境变量Mapper接口 - */ -@Mapper -public interface MachineEnvMapper extends BaseMapper { -} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java index e71ad993..04f48774 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java @@ -1,26 +1,23 @@ package cd.casic.module.machine.service; - -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; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import jakarta.validation.Valid; /** * 环境变量服务接口 */ -public interface MachineEnvService extends IService { +public interface MachineEnvService { /** * 创建或更新机器的环境变量（一对一关系） */ - boolean add(MachineEnvDTO machineEnvDTO); + Long createEnv(@Valid MachineEnvVO machineEnvVO); /** * 删除机器的环境变量 */ - void deleteByMachineId(Long machineEvnId); + void deleteEnv(Long machineEvnId); /** * 获取机器的环境变量 @@ -28,14 +25,20 @@ public interface MachineEnvService extends IService { * @param machineId 机器ID * @return 环境变量DTO */ - MachineEnvDTO getByMachineId(Long machineId); + MachineEnvVO getEnv(Long machineId); /** * @return 环境变量列表 */ - PageResult listEnv(MachineEnvDTO machineEnvDTO); + PageResult getEnvPage(@Valid MachineEnvVO machineEnvVO); - void deleteList(String ids); + /** + * 批量删除 + */ + void deleteEnvList(String ids); - boolean update(MachineEnvDTO machineEnvDTO); + /* + * 修改环境变量 + */ + void updateEnv(@Valid MachineEnvVO machineEnvVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index fe0d14e8..c17fb6b7 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -1,174 +1,97 @@ 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.convert.MachineEnvConvert; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import cd.casic.module.machine.dal.mysql.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; - +import cd.casic.framework.commons.pojo.PageResult; +import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import cd.casic.framework.commons.util.object.BeanUtils; +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; /** * 环境变量服务实现类 */ -@Service -public class MachineEnvServiceImpl extends ServiceImpl implements MachineEnvService { +@Service("machineEnvService") +public class MachineEnvServiceImpl implements MachineEnvService { @Resource private MachineEnvMapper machineEnvMapper; @Override @Transactional(rollbackFor = Exception.class) - public boolean add(MachineEnvDTO machineEnvDTO) { - // 参数校验 - if (machineEnvDTO == null) { - throw new ServiceException(ServiceException.MACHINE_ENV_NULL, "环境变量不能为空"); - } - + public Long createEnv(MachineEnvVO machineEnvVO) { + validateMachineEnvAdd(machineEnvVO); // 检查键是否合法 - if (!isValidKey(machineEnvDTO.getEnvKey())) { - throw new ServiceException(ServiceException.MACHINE_ENV_KEY_ILLEGAL, "环境变量键不合法"); - } - - // 判断是否敏感变量 - boolean isSensitive = isSensitive(machineEnvDTO.getEnvKey()); - - MachineEnv machineEnv = new MachineEnv(); - BeanUtils.copyProperties(machineEnvDTO, machineEnv); - return save(machineEnv); + validateKey(machineEnvVO.getEnvKey()); + MachineEnvDO machineEnvDO = BeanUtils.toBean(machineEnvVO, MachineEnvDO.class); + machineEnvMapper.insert(machineEnvDO); + return machineEnvDO.getId(); } @Override - public void deleteByMachineId(Long machineEvnId) { - this.removeById(machineEvnId); + public void deleteEnv(Long machineEvnId) { + machineEnvMapper.deleteById(machineEvnId); } @Override - public MachineEnvDTO getByMachineId(Long machineId) { + public MachineEnvVO getEnv(Long machineId) { if (machineId == null) { return null; } - - MachineEnv machineEnv = getOne( - new LambdaQueryWrapper() - .eq(MachineEnv::getMachineId, machineId) - ); - - return machineEnv != null ? convertToDTO(machineEnv) : null; - + MachineEnvDO machineEnvDO = machineEnvMapper.selectById(machineId); + return machineEnvDO != null ? MachineEnvConvert.INSTANCE.convertToVO(machineEnvDO) : null; } @Override - public PageResult listEnv(MachineEnvDTO machineEnvDTO) { - - // 构建查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - // 环境变量键模糊查询 - if (!StringUtils.isEmpty(machineEnvDTO.getEnvKey())) { - queryWrapper.like(MachineEnv::getEnvKey, machineEnvDTO.getEnvKey()); - } - - // 机器ID模糊查询 - if (!StringUtils.isEmpty(machineEnvDTO.getMachineId())) { - queryWrapper.like(MachineEnv::getMachineId, machineEnvDTO.getMachineId()); - } - - // 创建时间范围查询 - if (!StringUtils.isEmpty(machineEnvDTO.getCreateDate())) { - queryWrapper.ge(MachineEnv::getCreateDate, machineEnvDTO.getCreateDate()); - } - - // 排序 - if (!StringUtils.isEmpty(machineEnvDTO.getSortField())) { - boolean isAsc = "asc".equalsIgnoreCase(machineEnvDTO.getSortDirection()); - switch (machineEnvDTO.getSortField()) { - case "envKey": - queryWrapper.orderBy(true, isAsc, MachineEnv::getEnvKey); - break; - case "machineId": - queryWrapper.orderBy(true, isAsc, MachineEnv::getMachineId); - break; - case "createTime": - default: - queryWrapper.orderBy(true, isAsc, MachineEnv::getCreateDate); - break; - } - } - - // 分页查询 - Page page = machineEnvMapper.selectPage(new Page<>(machineEnvDTO.getPageIndex(), machineEnvDTO.getPageSize()), queryWrapper); - - // 转换结果 - List dtoList = page.getRecords().stream() - .map(this::convertToDTO) - .collect(Collectors.toList()); - - // 构建分页结果 - return PageResult.builder() - .pageNum(page.getCurrent()) - .pageSize(page.getSize()) - .total(page.getTotal()) - .pages(page.getPages()) - .list(dtoList) - .build(); + public PageResult getEnvPage(MachineEnvVO machineEnvVO) { + return machineEnvMapper.selectPage(machineEnvVO); } @Override - public void deleteList(String ids) { - List machineEnvIds = Arrays.stream(ids.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .map(Long::parseLong) - .toList(); - this.machineEnvMapper.deleteBatchIds(machineEnvIds); + public void deleteEnvList(String ids) { + machineEnvMapper.deleteBatchByIds(ids); } @Override - public boolean update(MachineEnvDTO machineEnvDTO) { - MachineEnv machineEnv = new MachineEnv(); - BeanUtils.copyProperties(machineEnvDTO, machineEnv); - return this.updateById(machineEnv); + public void updateEnv(MachineEnvVO machineEnvVO) { + MachineEnvDO machineEnvDO = validateMachineEnvExists(machineEnvVO.getId()); + BeanUtils.copyProperties(machineEnvVO, machineEnvDO); + machineEnvMapper.updateById(machineEnvDO); } - // 转换实体为DTO - private MachineEnvDTO convertToDTO(MachineEnv machineEnv) { - MachineEnvDTO dto = new MachineEnvDTO(); - dto.setId(machineEnv.getId()); - dto.setEnvKey(machineEnv.getEnvKey()); - dto.setEnvValue(machineEnv.getEnvValue()); - dto.setDescription(machineEnv.getDescription()); - dto.setCreateDate(machineEnv.getCreateDate()); - dto.setUpdateDate(machineEnv.getUpdateDate()); - return dto; + @VisibleForTesting + MachineEnvDO validateMachineEnvExists(Long id) { + if (id == null) { + return null; + } + MachineEnvDO machineEnvDO = machineEnvMapper.selectById(id); + if (machineEnvDO == null) { + throw exception(MACHINE_ENV_NOT_EXISTS); + } + return machineEnvDO; } + @VisibleForTesting + void validateMachineEnvAdd(MachineEnvVO machineEnvVO) { + if (machineEnvVO.getEnvKey()==null||machineEnvVO.getEnvValue()==null) { + throw exception(MACHINE_ENV_NULL); + } + } + + // 检查环境变量键是否合法 - private boolean isValidKey(String key) { - return key.matches("^[a-zA-Z_][a-zA-Z0-9_]*$"); + @VisibleForTesting + private void validateKey(String key) { + if (!key.matches("^[a-zA-Z_][a-zA-Z0-9_]*$")) { + throw exception(MACHINE_ENV_KEY_ILLEGAL); + } } - // 判断是否为敏感变量 - private boolean isSensitive(String key) { - if (key == null) { - return false; - } - String upperKey = key.toUpperCase(); - return upperKey.contains("PASSWORD") || upperKey.contains("SECRET") || - upperKey.contains("TOKEN") || upperKey.contains("KEY"); - } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PageResult.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PageResult.java deleted file mode 100644 index 3da67c88..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PageResult.java +++ /dev/null @@ -1,45 +0,0 @@ -package cd.casic.module.machine.utils; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * 分页结果通用类 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PageResult implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 当前页码 - */ - private Long pageNum; - - /** - * 每页数量 - */ - private Long pageSize; - - /** - * 总记录数 - */ - private Long total; - - /** - * 总页数 - */ - private Long pages; - - /** - * 数据列表 - */ - private List list; -} From 926c1af1e1a5cbc92f9aff8a78a409d28e4332e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Fri, 6 Jun 2025 11:37:11 +0800 Subject: [PATCH 20/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineInfoController.java | 252 ++-- .../controller/MachineProxyController.java | 134 +- .../controller/SecretKeyController.java | 114 +- .../vo}/MachineInfoDto.java | 2 +- .../vo/MachineProxyVO.java} | 4 +- .../{dto => controller/vo}/SecretKeyDto.java | 3 +- .../dataobject}/MachineInfo.java | 2 +- .../dataobject}/MachineProxy.java | 4 +- .../{entity => dal/dataobject}/SecretKey.java | 2 +- .../machine/dal/mysql/MachineInfoMapper.java | 11 + .../mysql}/MachineProxyMapper.java | 4 +- .../mysql}/SecretServiceMapper.java | 4 +- .../machine/handler/ConnectionSession.java | 1276 ++++++++--------- .../machine/mapper/MachineInfoMapper.java | 9 - .../machine/service/MachineInfoService.java | 9 +- .../machine/service/MachineProxyService.java | 15 +- .../machine/service/SecretKeyService.java | 9 +- .../service/impl/MachineProxyServiceImpl.java | 323 +++-- .../service/impl/MachineinfoServiceImpl.java | 717 +++++---- .../service/impl/SecretKeyServiceImpl.java | 317 ++-- 20 files changed, 1596 insertions(+), 1615 deletions(-) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{dto => controller/vo}/MachineInfoDto.java (94%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{dto/MachineProxyDTO.java => controller/vo/MachineProxyVO.java} (90%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{dto => controller/vo}/SecretKeyDto.java (87%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{entity => dal/dataobject}/MachineInfo.java (97%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{entity => dal/dataobject}/MachineProxy.java (91%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{entity => dal/dataobject}/SecretKey.java (93%) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{mapper => dal/mysql}/MachineProxyMapper.java (67%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/{mapper => dal/mysql}/SecretServiceMapper.java (64%) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 1d4a473a..fb38425e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,126 +1,126 @@ -package cd.casic.module.machine.controller; - -import cd.casic.framework.commons.pojo.CommonResult; -import cd.casic.module.machine.entity.MachineInfo; -import cd.casic.module.machine.enums.ConnectionStatus; -import cd.casic.module.machine.service.MachineInfoService; -import cd.casic.module.machine.dto.MachineInfoDto; -import cd.casic.module.machine.utils.PageResult; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -import static cd.casic.framework.commons.pojo.CommonResult.success; - -@RestController -@Tag(name = "机器信息管理") -@RequestMapping("/api/machineInfo") -public class MachineInfoController { - @Resource - private MachineInfoService machineInfoService; - - @PostMapping("/add") - @Operation(summary = "新增机器信息") - public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { - return success(machineInfoService.addMachineInfo(machineInfoDto)); - } - - - @PostMapping("/list") - @Operation(summary = "获取机器信息列表") - public CommonResult> list(@RequestBody MachineInfoDto machineInfoDto) { - return success(machineInfoService.listMachineInfo(machineInfoDto)); - } - - @PutMapping("/update") - @Operation(summary = "编辑机器信息") - public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { - return success(machineInfoService.updateMachineInfo(machineInfoDto)); - } - - @PutMapping("/updateStatus") - @Operation(summary = "机器启用/停用") - public CommonResult updateStatus(@RequestBody MachineInfoDto machineInfoDto) { - return success(machineInfoService.updateStatus(machineInfoDto)); - } - - @PutMapping("/bindingSecretKey") - @Operation(summary = "绑定密钥") - public CommonResult bindingSecretKey(@RequestBody MachineInfoDto machineInfoDto) { - return success(machineInfoService.bindingSecretKey(machineInfoDto)); - } - - @DeleteMapping("/delete") - @Operation(summary = "机器信息删除") - public CommonResult delete(@RequestParam Long machineInfoId) { - machineInfoService.deleteMachineInfo(machineInfoId); - return success(true); - } - - @DeleteMapping("/deleteList") - @Operation(summary = "批量删除机器信息") - public CommonResult deleteList(@RequestParam String machineInfoIds) { - machineInfoService.deleteList(machineInfoIds); - return success(true); - } - - @PostMapping("/test") - @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestParam Long id) { - return success(machineInfoService.testConnection(id)); - } - - @GetMapping("/status/{machineName}") - @Operation(summary = "获取机器连接状态") - public CommonResult getConnectionStatus(@PathVariable String machineName) { - return success(machineInfoService.getConnectionStatus(machineName)); - } - - @GetMapping("/status/all") - @Operation(summary = "获取所有机器连接状态") - public CommonResult> getAllConnectionStatus() { - return success(machineInfoService.getAllConnectionStatus()); - } - - @PostMapping("/connect") - @Operation(summary = "建立机器连接") - public CommonResult connect(@RequestBody MachineInfo machineInfo) { - return success(machineInfoService.connect(machineInfo)); - } - - @PostMapping("/disconnect/{sessionId}") - @Operation(summary = "断开机器连接") - public CommonResult disconnect(@PathVariable String sessionId) { - return success(machineInfoService.disconnect(sessionId)); - } - - @PostMapping("/execute/{sessionId}") - @Operation(summary = "执行远程命令") - public CommonResult executeCommand( - @PathVariable String sessionId, - @RequestBody String command) { - - return success(machineInfoService.executeCommand(sessionId, command)); - } - - @PostMapping("/upload/{sessionId}") - @Operation(summary = "上传文件到远程机器") - public CommonResult uploadFile( - @PathVariable String sessionId, - @RequestParam String localFilePath, - @RequestParam String remoteFilePath) { - return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); - } - - @PostMapping("/download/{sessionId}") - @Operation(summary = "从远程机器下载文件") - public CommonResult downloadFile( - @PathVariable String sessionId, - @RequestParam String remoteFilePath, - @RequestParam String localFilePath) { - return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); - } -} +//package cd.casic.module.machine.controller; +// +//import cd.casic.framework.commons.pojo.CommonResult; +//import cd.casic.framework.commons.pojo.PageResult; +//import cd.casic.module.machine.dal.dataobject.MachineInfo; +//import cd.casic.module.machine.enums.ConnectionStatus; +//import cd.casic.module.machine.service.MachineInfoService; +//import cd.casic.module.machine.controller.vo.MachineInfoDto; +//import io.swagger.v3.oas.annotations.Operation; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import jakarta.annotation.Resource; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.Map; +// +//import static cd.casic.framework.commons.pojo.CommonResult.success; +// +//@RestController +//@Tag(name = "机器信息管理") +//@RequestMapping("/api/machineInfo") +//public class MachineInfoController { +// @Resource +// private MachineInfoService machineInfoService; +// +// @PostMapping("/add") +// @Operation(summary = "新增机器信息") +// public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { +// return success(machineInfoService.addMachineInfo(machineInfoDto)); +// } +// +// +// @PostMapping("/list") +// @Operation(summary = "获取机器信息列表") +// public CommonResult> list(@RequestBody MachineInfoDto machineInfoDto) { +// return success(machineInfoService.listMachineInfo(machineInfoDto)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "编辑机器信息") +// public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { +// return success(machineInfoService.updateMachineInfo(machineInfoDto)); +// } +// +// @PutMapping("/updateStatus") +// @Operation(summary = "机器启用/停用") +// public CommonResult updateStatus(@RequestBody MachineInfoDto machineInfoDto) { +// return success(machineInfoService.updateStatus(machineInfoDto)); +// } +// +// @PutMapping("/bindingSecretKey") +// @Operation(summary = "绑定密钥") +// public CommonResult bindingSecretKey(@RequestBody MachineInfoDto machineInfoDto) { +// return success(machineInfoService.bindingSecretKey(machineInfoDto)); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "机器信息删除") +// public CommonResult delete(@RequestParam Long machineInfoId) { +// machineInfoService.deleteMachineInfo(machineInfoId); +// return success(true); +// } +// +// @DeleteMapping("/deleteList") +// @Operation(summary = "批量删除机器信息") +// public CommonResult deleteList(@RequestParam String machineInfoIds) { +// machineInfoService.deleteList(machineInfoIds); +// return success(true); +// } +// +// @PostMapping("/test") +// @Operation(summary = "测试机器连接") +// public CommonResult testConnection(@RequestParam Long id) { +// return success(machineInfoService.testConnection(id)); +// } +// +// @GetMapping("/status/{machineName}") +// @Operation(summary = "获取机器连接状态") +// public CommonResult getConnectionStatus(@PathVariable String machineName) { +// return success(machineInfoService.getConnectionStatus(machineName)); +// } +// +// @GetMapping("/status/all") +// @Operation(summary = "获取所有机器连接状态") +// public CommonResult> getAllConnectionStatus() { +// return success(machineInfoService.getAllConnectionStatus()); +// } +// +// @PostMapping("/connect") +// @Operation(summary = "建立机器连接") +// public CommonResult connect(@RequestBody MachineInfo machineInfo) { +// return success(machineInfoService.connect(machineInfo)); +// } +// +// @PostMapping("/disconnect/{sessionId}") +// @Operation(summary = "断开机器连接") +// public CommonResult disconnect(@PathVariable String sessionId) { +// return success(machineInfoService.disconnect(sessionId)); +// } +// +// @PostMapping("/execute/{sessionId}") +// @Operation(summary = "执行远程命令") +// public CommonResult executeCommand( +// @PathVariable String sessionId, +// @RequestBody String command) { +// +// return success(machineInfoService.executeCommand(sessionId, command)); +// } +// +// @PostMapping("/upload/{sessionId}") +// @Operation(summary = "上传文件到远程机器") +// public CommonResult uploadFile( +// @PathVariable String sessionId, +// @RequestParam String localFilePath, +// @RequestParam String remoteFilePath) { +// return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); +// } +// +// @PostMapping("/download/{sessionId}") +// @Operation(summary = "从远程机器下载文件") +// public CommonResult downloadFile( +// @PathVariable String sessionId, +// @RequestParam String remoteFilePath, +// @RequestParam String localFilePath) { +// return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); +// } +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 238c4bc2..16bbedb1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -1,67 +1,67 @@ -package cd.casic.module.machine.controller; - -import cd.casic.framework.commons.pojo.CommonResult; -import cd.casic.module.machine.service.MachineProxyService; -import cd.casic.module.machine.dto.MachineProxyDTO; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import static cd.casic.framework.commons.pojo.CommonResult.success; - -/** - * 机器代理控制器 - */ -@RestController -@RequestMapping("/api/machineProxy") -@Tag(name = "机器代理管理") -@RequiredArgsConstructor -public class MachineProxyController { - - @Resource - private MachineProxyService machineProxyService; - - @PostMapping("/register") - @Operation(summary = "注册新的机器代理") - public CommonResult register(@RequestBody MachineProxyDTO machineProxyDTO) { - machineProxyService.register(machineProxyDTO); - return success(true); - } - - @PostMapping("/list") - @Operation(summary = "获取代理列表") - public CommonResult list(@RequestBody MachineProxyDTO machineProxyDTO) { - return success(machineProxyService.list(machineProxyDTO)); - } - - @PutMapping("/updateStatus") - @Operation(summary = "更新代理状态") - public CommonResult updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { - machineProxyService.updateStatus(machineProxyDTO); - return success(true); - } - - @GetMapping("/statistics/status") - @Operation(summary = "获取所有代理的状态统计") - public CommonResult getStatusStatistics() { - return success(machineProxyService.getStatusStatistics()); - } - - @PutMapping("/update") - @Operation(summary = "更新代理信息") - public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { - machineProxyService.update(machineProxyDTO); - return success(true); - } - - @DeleteMapping("/batch") - @Operation(summary = "批量删除代理") - public CommonResult deleteBatch(@RequestParam String ids) { - machineProxyService.delete(ids); - return success(true); - } - -} +//package cd.casic.module.machine.controller; +// +//import cd.casic.framework.commons.pojo.CommonResult; +//import cd.casic.module.machine.service.MachineProxyService; +//import cd.casic.module.machine.controller.vo.MachineProxyDTO; +// +//import io.swagger.v3.oas.annotations.Operation; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import jakarta.annotation.Resource; +//import lombok.RequiredArgsConstructor; +//import org.springframework.web.bind.annotation.*; +// +//import static cd.casic.framework.commons.pojo.CommonResult.success; +// +///** +// * 机器代理控制器 +// */ +//@RestController +//@RequestMapping("/api/machineProxy") +//@Tag(name = "机器代理管理") +//@RequiredArgsConstructor +//public class MachineProxyController { +// +// @Resource +// private MachineProxyService machineProxyService; +// +// @PostMapping("/register") +// @Operation(summary = "注册新的机器代理") +// public CommonResult register(@RequestBody MachineProxyDTO machineProxyDTO) { +// machineProxyService.register(machineProxyDTO); +// return success(true); +// } +// +// @PostMapping("/list") +// @Operation(summary = "获取代理列表") +// public CommonResult list(@RequestBody MachineProxyDTO machineProxyDTO) { +// return success(machineProxyService.list(machineProxyDTO)); +// } +// +// @PutMapping("/updateStatus") +// @Operation(summary = "更新代理状态") +// public CommonResult updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { +// machineProxyService.updateStatus(machineProxyDTO); +// return success(true); +// } +// +// @GetMapping("/statistics/status") +// @Operation(summary = "获取所有代理的状态统计") +// public CommonResult getStatusStatistics() { +// return success(machineProxyService.getStatusStatistics()); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新代理信息") +// public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { +// machineProxyService.update(machineProxyDTO); +// return success(true); +// } +// +// @DeleteMapping("/batch") +// @Operation(summary = "批量删除代理") +// public CommonResult deleteBatch(@RequestParam String ids) { +// machineProxyService.delete(ids); +// return success(true); +// } +// +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index e9027d3b..4c204ae1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,58 +1,56 @@ -package cd.casic.module.machine.controller; - -import cd.casic.framework.commons.pojo.CommonResult; -import cd.casic.module.machine.entity.SecretKey; -import cd.casic.module.machine.service.SecretKeyService; -import cd.casic.module.machine.dto.SecretKeyDto; -import cd.casic.module.machine.utils.PageResult; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.core.io.InputStreamResource; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -import static cd.casic.framework.commons.pojo.CommonResult.success; - -@RestController -@RequestMapping("/api/secretKey") -@Tag(name = "密钥管理") -public class SecretKeyController { - @Resource - private SecretKeyService secretKeyService; - - @PostMapping(value = "/add") - @Operation(summary = "新增密钥") - public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { - return success(secretKeyService.addSecretKey(secretKeyDto)); - } - - @PutMapping("/bindingMachine") - @Operation(summary = "绑定机器") - public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { - secretKeyService.bindingMachine(secretKeyId, machineIds); - return success(true); - } - - @PutMapping("/update") - @Operation(summary = "编辑密钥信息") - public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { - return success(secretKeyService.updateSecretKey(secretKeyDto)); - } - - @DeleteMapping("/deleteList") - @Operation(summary = "批量删除密钥") - public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { - return success(secretKeyService.deleteList(secretKeyIds)); - } - - @PostMapping("/list") - @Operation(summary = "获取密钥信息列表") - public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { - return success(secretKeyService.listSecretKey(secretKeyDto)); - } - - -} +//package cd.casic.module.machine.controller; +// +//import cd.casic.framework.commons.pojo.CommonResult; +//import cd.casic.framework.commons.pojo.PageResult; +//import cd.casic.module.machine.dal.dataobject.SecretKey; +//import cd.casic.module.machine.service.SecretKeyService; +//import cd.casic.module.machine.controller.vo.SecretKeyDto; +//import io.swagger.v3.oas.annotations.Operation; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import jakarta.annotation.Resource; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.List; +// +//import static cd.casic.framework.commons.pojo.CommonResult.success; +// +//@RestController +//@RequestMapping("/api/secretKey") +//@Tag(name = "密钥管理") +//public class SecretKeyController { +// @Resource +// private SecretKeyService secretKeyService; +// +// @PostMapping(value = "/add") +// @Operation(summary = "新增密钥") +// public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { +// return success(secretKeyService.addSecretKey(secretKeyDto)); +// } +// +// @PutMapping("/bindingMachine") +// @Operation(summary = "绑定机器") +// public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { +// secretKeyService.bindingMachine(secretKeyId, machineIds); +// return success(true); +// } +// +// @PutMapping("/update") +// @Operation(summary = "编辑密钥信息") +// public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { +// return success(secretKeyService.updateSecretKey(secretKeyDto)); +// } +// +// @DeleteMapping("/deleteList") +// @Operation(summary = "批量删除密钥") +// public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { +// return success(secretKeyService.deleteList(secretKeyIds)); +// } +// +// @PostMapping("/list") +// @Operation(summary = "获取密钥信息列表") +// public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { +// return success(secretKeyService.listSecretKey(secretKeyDto)); +// } +// +// +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java similarity index 94% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java index 9a2e2efc..81371e4a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineInfoDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java @@ -1,4 +1,4 @@ -package cd.casic.module.machine.dto; +package cd.casic.module.machine.controller.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java similarity index 90% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java index f8d78c27..74e3f6cb 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/MachineProxyDTO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java @@ -1,4 +1,4 @@ -package cd.casic.module.machine.dto; +package cd.casic.module.machine.controller.vo; import cd.casic.module.machine.enums.MachineProxyStatus; import lombok.*; @@ -15,7 +15,7 @@ import java.util.Objects; @Builder @NoArgsConstructor @AllArgsConstructor -public class MachineProxyDTO extends PageDto implements Serializable { +public class MachineProxyVO extends PageDto implements Serializable { private static final long serialVersionUID = 1L; private Long id; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java similarity index 87% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java index 439a7697..c23b3836 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dto/SecretKeyDto.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java @@ -1,10 +1,9 @@ -package cd.casic.module.machine.dto; +package cd.casic.module.machine.controller.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.springframework.web.multipart.MultipartFile; import java.util.Date; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java similarity index 97% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java index 6564c264..ab3d1d50 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java @@ -1,4 +1,4 @@ -package cd.casic.module.machine.entity; +package cd.casic.module.machine.dal.dataobject; 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/machine/entity/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java similarity index 91% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java index f17e251a..be056d51 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java @@ -1,10 +1,8 @@ -package cd.casic.module.machine.entity; +package cd.casic.module.machine.dal.dataobject; import cd.casic.module.machine.enums.MachineProxyStatus; import com.baomidou.mybatisplus.annotation.*; -import cd.casic.module.machine.enums.MachineInfoStatus; import cd.casic.module.machine.enums.MachineProxyType; -import jakarta.validation.Valid; import lombok.*; import java.io.Serializable; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java similarity index 93% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java index f747c461..a1d4e820 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/entity/SecretKey.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java @@ -1,4 +1,4 @@ -package cd.casic.module.machine.entity; +package cd.casic.module.machine.dal.dataobject; 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/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java new file mode 100644 index 00000000..d8a4257b --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -0,0 +1,11 @@ +package cd.casic.module.machine.dal.mysql; + +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import cd.casic.module.machine.dal.dataobject.MachineInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MachineInfoMapper extends BaseMapperX { +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java similarity index 67% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java index f372293f..6bae3e38 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java @@ -1,5 +1,5 @@ -package cd.casic.module.machine.mapper; -import cd.casic.module.machine.entity.MachineProxy; +package cd.casic.module.machine.dal.mysql; +import cd.casic.module.machine.dal.dataobject.MachineProxy; 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/machine/mapper/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java similarity index 64% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/SecretServiceMapper.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java index 9f074063..26e92c18 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/SecretServiceMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java @@ -1,6 +1,6 @@ -package cd.casic.module.machine.mapper; +package cd.casic.module.machine.dal.mysql; -import cd.casic.module.machine.entity.SecretKey; +import cd.casic.module.machine.dal.dataobject.SecretKey; 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/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index 8936ab2a..dcbfe7e7 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -1,639 +1,639 @@ -package cd.casic.module.machine.handler; -import cd.casic.module.machine.utils.AliYunOssClient; -import cd.casic.module.machine.entity.MachineInfo; -import cd.casic.module.machine.entity.SecretKey; -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; -import org.springframework.stereotype.Component; -import org.springframework.util.StreamUtils; -import org.springframework.util.StringUtils; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.util.Objects; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * 优化后的SSH连接会话类 - */ -@Slf4j -@Component -public class ConnectionSession implements AutoCloseable { - @Resource - SecretKeyService secretKeyService; - - @Resource - AliYunOssClient aliYunOssClient; - - private MachineInfo machineInfo; - private Session sshSession; - private ConnectionStatus status = ConnectionStatus.DISCONNECTED; - private final AtomicBoolean isExecuting = new AtomicBoolean(false); - - // todo连接配置常量 - private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) - private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) - private static final int RETRY_COUNT = 3; // 重试次数 - private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) - - public ConnectionSession() { - - } - - // 使用setter注入MachineInfo - public void setMachineInfo(MachineInfo machineInfo) { - this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); - log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); - } - - - - /** - * 建立SSH连接，支持重试机制 - */ - public synchronized void connect() throws JSchException { - if (status == ConnectionStatus.CONNECTED) { - log.debug("Already connected to {}", machineInfo.getHostIp()); - return; - } - - status = ConnectionStatus.CONNECTING; - JSchException lastException = null; - - for (int attempt = 1; attempt <= RETRY_COUNT; attempt++) { - try { - doConnect(); - status = ConnectionStatus.CONNECTED; - log.info("SSH connection established successfully to {} (attempt {}/{})", - machineInfo.getHostIp(), attempt, RETRY_COUNT); - return; - } catch (JSchException e) { - lastException = e; - status = ConnectionStatus.CONNECTION_ERROR; - log.error("SSH connection attempt {}/{} failed: {}", - attempt, RETRY_COUNT, e.getMessage()); - - // 认证失败直接退出，无需重试 - if (e.getMessage().contains("Auth fail")) { - status = ConnectionStatus.AUTH_FAILED; - throw e; - } - - // 重试前等待 - if (attempt < RETRY_COUNT) { - try { - Thread.sleep(RETRY_DELAY); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - throw new JSchException("Connection attempt interrupted", ie); - } - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - // 所有重试都失败 - throw new JSchException("Failed to connect after " + RETRY_COUNT + " attempts", lastException); - } - - /** - * 实际执行连接逻辑 - */ - private void doConnect() throws JSchException, IOException { - JSch jsch = new JSch(); - - // 配置认证方式 - configureAuthentication(jsch); - - // 创建SSH会话 - sshSession = jsch.getSession( - machineInfo.getUsername(), - machineInfo.getHostIp(), - machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 - ); - - // 配置连接参数 - configureSession(sshSession); - - // 建立连接 - sshSession.connect(CONNECTION_TIMEOUT); - } - - /** - * 配置认证方式（密码或密钥） - */ - private void configureAuthentication(JSch jsch) throws JSchException { - if (machineInfo.getAuthenticationTypeCode() == 2) { - // 密钥认证 - if (machineInfo.getSecretKeyId() == null) { - throw new JSchException("Secret key ID is required for key-based authentication"); - } - - String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); - // 验证私钥格式 - if (!privateKeyContent.startsWith("-----BEGIN")) { - throw new JSchException("Invalid private key format. Expected OpenSSH format."); - } - - try { - // 尝试加载私钥 - jsch.addIdentity( - machineInfo.getName(), - privateKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null - ); - log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); - } catch (JSchException e) { - log.error("Failed to load private key: {}", e.getMessage()); - throw e; - } - } else if (machineInfo.getAuthenticationTypeCode() == 1) { - // 密码认证 - if (StringUtils.isEmpty(machineInfo.getPassword())) { - throw new JSchException("Password is required for password-based authentication"); - } - } else { - throw new JSchException("Unsupported authentication type: " + machineInfo.getAuthenticationType()); - } - } - - /** - * 配置SSH会话参数（安全增强） - */ - private void configureSession(Session session) { - Properties config = new Properties(); - - // 安全增强：默认验证主机密钥 - if (isTrustedEnvironment()) { - log.warn("Running in trusted environment - disabling strict host key checking for {}", - machineInfo.getHostIp()); - config.put("StrictHostKeyChecking", "no"); - } else { - config.put("StrictHostKeyChecking", "yes"); - // 可选：配置已知主机文件路径 - //直接配置阿里云密钥地址 - config.put("UserKnownHostsFile", secretKeyService.getById(machineInfo.getSecretKeyId()).getPath()); - } - - // 其他安全配置 - config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); - config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 - config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 - - session.setConfig(config); - } - - /** - * 判断是否为可信环境（生产环境应返回false） - */ - private boolean isTrustedEnvironment() { - // todo实际项目中应基于配置或环境变量判断 - return System.getProperty("environment", "production").equalsIgnoreCase("development"); - } - - @Override - public synchronized void close() { - disconnect(); - } - - public synchronized void disconnect() { - if (sshSession != null && sshSession.isConnected()) { - try { - sshSession.disconnect(); - log.info("SSH connection closed: {}", machineInfo.getHostIp()); - } catch (Exception e) { - log.error("Error closing SSH session: {}", e.getMessage()); - } - } - status = ConnectionStatus.DISCONNECTED; - } - - /** - * 执行远程命令，支持超时和中断处理 - */ - public String executeCommand(String command) throws JSchException, IOException { - if (!isConnected()) { - throw new IllegalStateException("Session is not connected"); - } - - if (!isExecuting.compareAndSet(false, true)) { - throw new IllegalStateException("Another command is already executing"); - } - - Channel channel = null; - InputStream inputStream = null; - ByteArrayOutputStream outputStream = null; - - try { - channel = createExecChannel(command); - inputStream = channel.getInputStream(); - outputStream = new ByteArrayOutputStream(); - - // 连接通道并设置超时 - channel.connect(COMMAND_TIMEOUT); - - // 读取命令输出 - return readCommandOutput(inputStream, outputStream, channel); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("Command execution interrupted", e); - } finally { - // 释放资源 - closeResources(channel, inputStream, outputStream); - isExecuting.set(false); - } - } - - /** - * 创建并配置命令执行通道 - */ - private Channel createExecChannel(String command) throws JSchException { - Channel channel = sshSession.openChannel("exec"); - ((ChannelExec) channel).setCommand(command); - - // 配置通道 - channel.setInputStream(null); - ((ChannelExec) channel).setErrStream(new ByteArrayOutputStream()); // 捕获错误输出 - - return channel; - } - - /** - * 读取命令输出 - */ - private String readCommandOutput(InputStream inputStream, - ByteArrayOutputStream outputStream, - Channel channel) throws IOException, InterruptedException { - byte[] buffer = new byte[1024]; - - - // 使用线程中断机制实现超时控制 - Thread readerThread = new Thread(() -> { - int bytesRead; - try { - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - } catch (IOException e) { - // 通道关闭或读取异常 - if (channel.isConnected()) { - log.warn("Error reading command output: {}", e.getMessage()); - } - } - }); - - readerThread.start(); - - // 等待命令执行完成或超时 - readerThread.join(COMMAND_TIMEOUT); - - // 如果线程仍在运行，中断并关闭通道 - if (readerThread.isAlive()) { - readerThread.interrupt(); - channel.disconnect(); - throw new IOException("Command execution timed out after " + COMMAND_TIMEOUT + "ms"); - } - - // 等待通道完全关闭 - while (channel.isConnected()) { - Thread.sleep(100); - } - - return outputStream.toString(StandardCharsets.UTF_8); - } - - /** - * 关闭资源 - */ - private void closeResources(Channel channel, InputStream inputStream, OutputStream outputStream) { - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - log.warn("Error closing output stream: {}", e.getMessage()); - } - } - - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.warn("Error closing input stream: {}", e.getMessage()); - } - } - - if (channel != null && channel.isConnected()) { - channel.disconnect(); - } - } - - /** - * 上传文件到远程服务器 - */ - public boolean uploadFile(String localFilePath, String remoteFilePath) throws IOException { - if (!isConnected()) { - throw new IllegalStateException("Cannot upload file: SSH session is not connected"); - } - - // 检查本地文件是否存在且可读 - File localFile = new File(localFilePath); - if (!localFile.exists()) { - throw new FileNotFoundException("Local file not found: " + localFilePath); - } - if (!localFile.canRead()) { - throw new IOException("Cannot read local file: " + localFilePath); - } - - ChannelSftp channel = null; - boolean uploadSuccess = false; - - try { - // 创建并连接SFTP通道，设置超时 - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - - // 确保目标目录存在 - createRemoteDirectoryIfNotExists(channel, getParentDirectory(remoteFilePath)); - - // 使用更健壮的上传方式 - channel.put( - new FileInputStream(localFile), - remoteFilePath, - new ProgressMonitorAdapter(localFile.length()), - ChannelSftp.OVERWRITE - ); - - uploadSuccess = true; - log.info("File uploaded successfully: {} -> {}", localFilePath, remoteFilePath); - return true; - - } catch (SftpException e) { - log.error("SFTP error during file upload ({} -> {}): {}", - localFilePath, remoteFilePath, e.getMessage(), e); - throw new IOException("SFTP error: " + e.getMessage(), e); - } catch (FileNotFoundException e) { - log.error("Local file not found during upload: {}", localFilePath, e); - throw e; - } catch (IOException e) { - log.error("IO error during file upload: {}", e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error("Unexpected error during file upload: {}", e.getMessage(), e); - throw new IOException("Unexpected error: " + e.getMessage(), e); - } finally { - // 确保通道始终被关闭 - disconnectChannel(channel); - -// // 如果上传失败，尝试删除不完整的文件 -// if (!uploadSuccess && remoteFilePath != null && !remoteFilePath.isEmpty()) { -// tryDeleteIncompleteFile(remoteFilePath); +//package cd.casic.module.machine.handler; +//import cd.casic.module.machine.utils.AliYunOssClient; +//import cd.casic.module.machine.dal.dataobject.MachineInfo; +//import cd.casic.module.machine.dal.dataobject.SecretKey; +//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; +//import org.springframework.stereotype.Component; +//import org.springframework.util.StreamUtils; +//import org.springframework.util.StringUtils; +//import java.io.*; +//import java.nio.charset.StandardCharsets; +//import java.util.Objects; +//import java.util.Properties; +//import java.util.concurrent.atomic.AtomicBoolean; +// +///** +// * 优化后的SSH连接会话类 +// */ +//@Slf4j +//@Component +//public class ConnectionSession implements AutoCloseable { +// @Resource +// SecretKeyService secretKeyService; +// +// @Resource +// AliYunOssClient aliYunOssClient; +// +// private MachineInfo machineInfo; +// private Session sshSession; +// private ConnectionStatus status = ConnectionStatus.DISCONNECTED; +// private final AtomicBoolean isExecuting = new AtomicBoolean(false); +// +// // todo连接配置常量 +// private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) +// private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) +// private static final int RETRY_COUNT = 3; // 重试次数 +// private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) +// +// public ConnectionSession() { +// +// } +// +// // 使用setter注入MachineInfo +// public void setMachineInfo(MachineInfo machineInfo) { +// this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); +// log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); +// } +// +// +// +// /** +// * 建立SSH连接，支持重试机制 +// */ +// public synchronized void connect() throws JSchException { +// if (status == ConnectionStatus.CONNECTED) { +// log.debug("Already connected to {}", machineInfo.getHostIp()); +// return; +// } +// +// status = ConnectionStatus.CONNECTING; +// JSchException lastException = null; +// +// for (int attempt = 1; attempt <= RETRY_COUNT; attempt++) { +// try { +// doConnect(); +// status = ConnectionStatus.CONNECTED; +// log.info("SSH connection established successfully to {} (attempt {}/{})", +// machineInfo.getHostIp(), attempt, RETRY_COUNT); +// return; +// } catch (JSchException e) { +// lastException = e; +// status = ConnectionStatus.CONNECTION_ERROR; +// log.error("SSH connection attempt {}/{} failed: {}", +// attempt, RETRY_COUNT, e.getMessage()); +// +// // 认证失败直接退出，无需重试 +// if (e.getMessage().contains("Auth fail")) { +// status = ConnectionStatus.AUTH_FAILED; +// throw e; +// } +// +// // 重试前等待 +// if (attempt < RETRY_COUNT) { +// try { +// Thread.sleep(RETRY_DELAY); +// } catch (InterruptedException ie) { +// Thread.currentThread().interrupt(); +// throw new JSchException("Connection attempt interrupted", ie); +// } +// } +// } catch (IOException e) { +// throw new RuntimeException(e); // } - } - } - - public boolean downloadFile(String remoteFilePath, String localFilePath) throws IOException { - if (!isConnected()) { - throw new IllegalStateException("Cannot download file: SSH session is not connected"); - } - - // 检查本地目录是否存在且可写 - File localFile = new File(localFilePath); - File parentDir = localFile.getParentFile(); - if (parentDir != null && !parentDir.exists()) { - if (!parentDir.mkdirs()) { - throw new IOException("Failed to create local directory: " + parentDir.getAbsolutePath()); - } - } - if (parentDir != null && !parentDir.canWrite()) { - throw new IOException("Cannot write to local directory: " + parentDir.getAbsolutePath()); - } - - ChannelSftp channel = null; - boolean downloadSuccess = false; - File tempFile = null; - - try { - // 创建并连接SFTP通道，设置超时 - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - - // 检查远程文件是否存在 - SftpATTRS attrs = channel.stat(remoteFilePath); - long fileSize = attrs.getSize(); - - // 使用临时文件避免部分下载覆盖完整文件 - tempFile = new File(localFilePath + ".part"); - - // 执行下载并监控进度 - channel.get( - remoteFilePath, - new FileOutputStream(tempFile).toString(), - new ProgressMonitorAdapter(fileSize), - ChannelSftp.OVERWRITE - ); - - // 验证下载完整性 - if (tempFile.length() != fileSize) { - throw new IOException("Download incomplete: expected " + fileSize + - " bytes, but got " + tempFile.length() + " bytes"); - } - - // 重命名临时文件为目标文件（原子操作） - if (!tempFile.renameTo(localFile)) { - throw new IOException("Failed to rename temporary file to: " + localFilePath); - } - - downloadSuccess = true; - log.info("File downloaded successfully: {} -> {}", remoteFilePath, localFilePath); - return true; - - } catch (SftpException e) { - log.error("SFTP error during file download ({} -> {}): {}", - remoteFilePath, localFilePath, e.getMessage(), e); - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - throw new FileNotFoundException("Remote file not found: " + remoteFilePath); - } - throw new IOException("SFTP error: " + e.getMessage(), e); - } catch (IOException e) { - log.error("IO error during file download: {}", e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error("Unexpected error during file download: {}", e.getMessage(), e); - throw new IOException("Unexpected error: " + e.getMessage(), e); - } finally { - // 确保通道始终被关闭 - disconnectChannel(channel); - - // 如果下载失败，清理临时文件 - if (!downloadSuccess && tempFile != null && tempFile.exists()) { - if (tempFile.delete()) { - log.debug("Deleted incomplete temporary file: {}", tempFile.getAbsolutePath()); - } else { - log.warn("Failed to delete incomplete temporary file: {}", tempFile.getAbsolutePath()); - } - } - } - } - - // 创建远程目录（如果不存在） - private void createRemoteDirectoryIfNotExists(ChannelSftp channel, String directory) throws SftpException { - if (directory == null || directory.isEmpty() || directory.equals("/")) { - return; - } - - try { - channel.stat(directory); - } catch (SftpException e) { - // 目录不存在，尝试创建 - createRemoteDirectoryIfNotExists(channel, getParentDirectory(directory)); - channel.mkdir(directory); - log.debug("Created remote directory: {}", directory); - } - } - - // 获取路径的父目录 - private String getParentDirectory(String path) { - int lastSlash = path.lastIndexOf('/'); - return lastSlash > 0 ? path.substring(0, lastSlash) : ""; - } - - // 断开SFTP通道 - private void disconnectChannel(Channel channel) { - if (channel != null && channel.isConnected()) { - try { - channel.disconnect(); - log.debug("SFTP channel disconnected"); - } catch (Exception e) { - log.warn("Error disconnecting SFTP channel: {}", e.getMessage()); - } - } - } - - // 尝试删除不完整的文件 - private void tryDeleteIncompleteFile(String remoteFilePath) { - ChannelSftp channel = null; - try { - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - channel.rm(remoteFilePath); - log.info("Deleted incomplete file: {}", remoteFilePath); - } catch (Exception e) { - log.warn("Failed to delete incomplete file {}: {}", remoteFilePath, e.getMessage()); - } finally { - disconnectChannel(channel); - } - } - - // 增强的进度监控器 - private static class ProgressMonitorAdapter implements SftpProgressMonitor { - private final long totalBytes; - private long bytesWritten = 0; - private int lastProgress = 0; - private final long startTime = System.currentTimeMillis(); - - public ProgressMonitorAdapter(long totalBytes) { - this.totalBytes = totalBytes; - } - - @Override - public boolean count(long count) { - bytesWritten += count; - - // 计算进度百分比 - int progress = (int) ((bytesWritten * 100) / totalBytes); - - // 每10%或每秒更新一次日志 - long elapsedTime = System.currentTimeMillis() - startTime; - if (progress - lastProgress >= 10 || elapsedTime >= 1000) { - double speed = bytesWritten / (elapsedTime / 1000.0); - String speedStr = formatTransferSpeed(speed); - - log.debug("Upload progress: {}% ({}/{} bytes, {})", - progress, bytesWritten, totalBytes, speedStr); - lastProgress = progress; - } - - return true; // 返回true继续传输，返回false中断传输 - } - - @Override - public void end() { - long elapsedTime = System.currentTimeMillis() - startTime; - double speed = totalBytes / (elapsedTime / 1000.0); - String speedStr = formatTransferSpeed(speed); - - log.info("Upload completed: {} bytes in {} ms (avg speed: {})", - totalBytes, elapsedTime, speedStr); - } - - @Override - public void init(int op, String src, String dest, long max) { - log.info("Starting upload: {} -> {} ({} bytes)", src, dest, max); - } - - // 格式化传输速度 - private String formatTransferSpeed(double bytesPerSecond) { - String[] units = {"B/s", "KB/s", "MB/s", "GB/s"}; - int unitIndex = 0; - - while (bytesPerSecond >= 1024 && unitIndex < units.length - 1) { - bytesPerSecond /= 1024; - unitIndex++; - } - - return String.format("%.2f %s", bytesPerSecond, units[unitIndex]); - } - } - - - /** - * 检查连接状态 - */ - public ConnectionStatus getStatus() { - if (status == ConnectionStatus.CONNECTED && - (sshSession == null || !sshSession.isConnected())) { - status = ConnectionStatus.DISCONNECTED; - } - return status; - } - - /** - * 检查是否已连接 - */ - public boolean isConnected() { - return status == ConnectionStatus.CONNECTED && - sshSession != null && - sshSession.isConnected(); - } - - - private String getPrivateKeyContent(Long secretKeyId) { - if (secretKeyId == null) { - return null; - } - SecretKey secretKey = secretKeyService.getById(secretKeyId); - byte[] content; - try { - content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); - } catch (Exception e) { - throw new RuntimeException(e); - } - - //改为S3FileClient读取 - InputStream read = new ByteArrayInputStream(content); - - try { - return StreamUtils.copyToString(read, StandardCharsets.UTF_8); - } catch (IOException e) { - log.error("读取私钥文件失败", e); - throw new RuntimeException(e); - } - - - } -} +// } +// +// // 所有重试都失败 +// throw new JSchException("Failed to connect after " + RETRY_COUNT + " attempts", lastException); +// } +// +// /** +// * 实际执行连接逻辑 +// */ +// private void doConnect() throws JSchException, IOException { +// JSch jsch = new JSch(); +// +// // 配置认证方式 +// configureAuthentication(jsch); +// +// // 创建SSH会话 +// sshSession = jsch.getSession( +// machineInfo.getUsername(), +// machineInfo.getHostIp(), +// machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 +// ); +// +// // 配置连接参数 +// configureSession(sshSession); +// +// // 建立连接 +// sshSession.connect(CONNECTION_TIMEOUT); +// } +// +// /** +// * 配置认证方式（密码或密钥） +// */ +// private void configureAuthentication(JSch jsch) throws JSchException { +// if (machineInfo.getAuthenticationTypeCode() == 2) { +// // 密钥认证 +// if (machineInfo.getSecretKeyId() == null) { +// throw new JSchException("Secret key ID is required for key-based authentication"); +// } +// +// String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); +// // 验证私钥格式 +// if (!privateKeyContent.startsWith("-----BEGIN")) { +// throw new JSchException("Invalid private key format. Expected OpenSSH format."); +// } +// +// try { +// // 尝试加载私钥 +// jsch.addIdentity( +// machineInfo.getName(), +// privateKeyContent.getBytes(StandardCharsets.UTF_8), +// null, +// null +// ); +// log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); +// } catch (JSchException e) { +// log.error("Failed to load private key: {}", e.getMessage()); +// throw e; +// } +// } else if (machineInfo.getAuthenticationTypeCode() == 1) { +// // 密码认证 +// if (StringUtils.isEmpty(machineInfo.getPassword())) { +// throw new JSchException("Password is required for password-based authentication"); +// } +// } else { +// throw new JSchException("Unsupported authentication type: " + machineInfo.getAuthenticationType()); +// } +// } +// +// /** +// * 配置SSH会话参数（安全增强） +// */ +// private void configureSession(Session session) { +// Properties config = new Properties(); +// +// // 安全增强：默认验证主机密钥 +// if (isTrustedEnvironment()) { +// log.warn("Running in trusted environment - disabling strict host key checking for {}", +// machineInfo.getHostIp()); +// config.put("StrictHostKeyChecking", "no"); +// } else { +// config.put("StrictHostKeyChecking", "yes"); +// // 可选：配置已知主机文件路径 +// //直接配置阿里云密钥地址 +// config.put("UserKnownHostsFile", secretKeyService.getById(machineInfo.getSecretKeyId()).getPath()); +// } +// +// // 其他安全配置 +// config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); +// config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 +// config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 +// +// session.setConfig(config); +// } +// +// /** +// * 判断是否为可信环境（生产环境应返回false） +// */ +// private boolean isTrustedEnvironment() { +// // todo实际项目中应基于配置或环境变量判断 +// return System.getProperty("environment", "production").equalsIgnoreCase("development"); +// } +// +// @Override +// public synchronized void close() { +// disconnect(); +// } +// +// public synchronized void disconnect() { +// if (sshSession != null && sshSession.isConnected()) { +// try { +// sshSession.disconnect(); +// log.info("SSH connection closed: {}", machineInfo.getHostIp()); +// } catch (Exception e) { +// log.error("Error closing SSH session: {}", e.getMessage()); +// } +// } +// status = ConnectionStatus.DISCONNECTED; +// } +// +// /** +// * 执行远程命令，支持超时和中断处理 +// */ +// public String executeCommand(String command) throws JSchException, IOException { +// if (!isConnected()) { +// throw new IllegalStateException("Session is not connected"); +// } +// +// if (!isExecuting.compareAndSet(false, true)) { +// throw new IllegalStateException("Another command is already executing"); +// } +// +// Channel channel = null; +// InputStream inputStream = null; +// ByteArrayOutputStream outputStream = null; +// +// try { +// channel = createExecChannel(command); +// inputStream = channel.getInputStream(); +// outputStream = new ByteArrayOutputStream(); +// +// // 连接通道并设置超时 +// channel.connect(COMMAND_TIMEOUT); +// +// // 读取命令输出 +// return readCommandOutput(inputStream, outputStream, channel); +// } catch (InterruptedException e) { +// Thread.currentThread().interrupt(); +// throw new IOException("Command execution interrupted", e); +// } finally { +// // 释放资源 +// closeResources(channel, inputStream, outputStream); +// isExecuting.set(false); +// } +// } +// +// /** +// * 创建并配置命令执行通道 +// */ +// private Channel createExecChannel(String command) throws JSchException { +// Channel channel = sshSession.openChannel("exec"); +// ((ChannelExec) channel).setCommand(command); +// +// // 配置通道 +// channel.setInputStream(null); +// ((ChannelExec) channel).setErrStream(new ByteArrayOutputStream()); // 捕获错误输出 +// +// return channel; +// } +// +// /** +// * 读取命令输出 +// */ +// private String readCommandOutput(InputStream inputStream, +// ByteArrayOutputStream outputStream, +// Channel channel) throws IOException, InterruptedException { +// byte[] buffer = new byte[1024]; +// +// +// // 使用线程中断机制实现超时控制 +// Thread readerThread = new Thread(() -> { +// int bytesRead; +// try { +// while ((bytesRead = inputStream.read(buffer)) != -1) { +// outputStream.write(buffer, 0, bytesRead); +// } +// } catch (IOException e) { +// // 通道关闭或读取异常 +// if (channel.isConnected()) { +// log.warn("Error reading command output: {}", e.getMessage()); +// } +// } +// }); +// +// readerThread.start(); +// +// // 等待命令执行完成或超时 +// readerThread.join(COMMAND_TIMEOUT); +// +// // 如果线程仍在运行，中断并关闭通道 +// if (readerThread.isAlive()) { +// readerThread.interrupt(); +// channel.disconnect(); +// throw new IOException("Command execution timed out after " + COMMAND_TIMEOUT + "ms"); +// } +// +// // 等待通道完全关闭 +// while (channel.isConnected()) { +// Thread.sleep(100); +// } +// +// return outputStream.toString(StandardCharsets.UTF_8); +// } +// +// /** +// * 关闭资源 +// */ +// private void closeResources(Channel channel, InputStream inputStream, OutputStream outputStream) { +// if (outputStream != null) { +// try { +// outputStream.close(); +// } catch (IOException e) { +// log.warn("Error closing output stream: {}", e.getMessage()); +// } +// } +// +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// log.warn("Error closing input stream: {}", e.getMessage()); +// } +// } +// +// if (channel != null && channel.isConnected()) { +// channel.disconnect(); +// } +// } +// +// /** +// * 上传文件到远程服务器 +// */ +// public boolean uploadFile(String localFilePath, String remoteFilePath) throws IOException { +// if (!isConnected()) { +// throw new IllegalStateException("Cannot upload file: SSH session is not connected"); +// } +// +// // 检查本地文件是否存在且可读 +// File localFile = new File(localFilePath); +// if (!localFile.exists()) { +// throw new FileNotFoundException("Local file not found: " + localFilePath); +// } +// if (!localFile.canRead()) { +// throw new IOException("Cannot read local file: " + localFilePath); +// } +// +// ChannelSftp channel = null; +// boolean uploadSuccess = false; +// +// try { +// // 创建并连接SFTP通道，设置超时 +// channel = (ChannelSftp) sshSession.openChannel("sftp"); +// channel.connect(CONNECTION_TIMEOUT); +// +// // 确保目标目录存在 +// createRemoteDirectoryIfNotExists(channel, getParentDirectory(remoteFilePath)); +// +// // 使用更健壮的上传方式 +// channel.put( +// new FileInputStream(localFile), +// remoteFilePath, +// new ProgressMonitorAdapter(localFile.length()), +// ChannelSftp.OVERWRITE +// ); +// +// uploadSuccess = true; +// log.info("File uploaded successfully: {} -> {}", localFilePath, remoteFilePath); +// return true; +// +// } catch (SftpException e) { +// log.error("SFTP error during file upload ({} -> {}): {}", +// localFilePath, remoteFilePath, e.getMessage(), e); +// throw new IOException("SFTP error: " + e.getMessage(), e); +// } catch (FileNotFoundException e) { +// log.error("Local file not found during upload: {}", localFilePath, e); +// throw e; +// } catch (IOException e) { +// log.error("IO error during file upload: {}", e.getMessage(), e); +// throw e; +// } catch (Exception e) { +// log.error("Unexpected error during file upload: {}", e.getMessage(), e); +// throw new IOException("Unexpected error: " + e.getMessage(), e); +// } finally { +// // 确保通道始终被关闭 +// disconnectChannel(channel); +// +//// // 如果上传失败，尝试删除不完整的文件 +//// if (!uploadSuccess && remoteFilePath != null && !remoteFilePath.isEmpty()) { +//// tryDeleteIncompleteFile(remoteFilePath); +//// } +// } +// } +// +// public boolean downloadFile(String remoteFilePath, String localFilePath) throws IOException { +// if (!isConnected()) { +// throw new IllegalStateException("Cannot download file: SSH session is not connected"); +// } +// +// // 检查本地目录是否存在且可写 +// File localFile = new File(localFilePath); +// File parentDir = localFile.getParentFile(); +// if (parentDir != null && !parentDir.exists()) { +// if (!parentDir.mkdirs()) { +// throw new IOException("Failed to create local directory: " + parentDir.getAbsolutePath()); +// } +// } +// if (parentDir != null && !parentDir.canWrite()) { +// throw new IOException("Cannot write to local directory: " + parentDir.getAbsolutePath()); +// } +// +// ChannelSftp channel = null; +// boolean downloadSuccess = false; +// File tempFile = null; +// +// try { +// // 创建并连接SFTP通道，设置超时 +// channel = (ChannelSftp) sshSession.openChannel("sftp"); +// channel.connect(CONNECTION_TIMEOUT); +// +// // 检查远程文件是否存在 +// SftpATTRS attrs = channel.stat(remoteFilePath); +// long fileSize = attrs.getSize(); +// +// // 使用临时文件避免部分下载覆盖完整文件 +// tempFile = new File(localFilePath + ".part"); +// +// // 执行下载并监控进度 +// channel.get( +// remoteFilePath, +// new FileOutputStream(tempFile).toString(), +// new ProgressMonitorAdapter(fileSize), +// ChannelSftp.OVERWRITE +// ); +// +// // 验证下载完整性 +// if (tempFile.length() != fileSize) { +// throw new IOException("Download incomplete: expected " + fileSize + +// " bytes, but got " + tempFile.length() + " bytes"); +// } +// +// // 重命名临时文件为目标文件（原子操作） +// if (!tempFile.renameTo(localFile)) { +// throw new IOException("Failed to rename temporary file to: " + localFilePath); +// } +// +// downloadSuccess = true; +// log.info("File downloaded successfully: {} -> {}", remoteFilePath, localFilePath); +// return true; +// +// } catch (SftpException e) { +// log.error("SFTP error during file download ({} -> {}): {}", +// remoteFilePath, localFilePath, e.getMessage(), e); +// if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { +// throw new FileNotFoundException("Remote file not found: " + remoteFilePath); +// } +// throw new IOException("SFTP error: " + e.getMessage(), e); +// } catch (IOException e) { +// log.error("IO error during file download: {}", e.getMessage(), e); +// throw e; +// } catch (Exception e) { +// log.error("Unexpected error during file download: {}", e.getMessage(), e); +// throw new IOException("Unexpected error: " + e.getMessage(), e); +// } finally { +// // 确保通道始终被关闭 +// disconnectChannel(channel); +// +// // 如果下载失败，清理临时文件 +// if (!downloadSuccess && tempFile != null && tempFile.exists()) { +// if (tempFile.delete()) { +// log.debug("Deleted incomplete temporary file: {}", tempFile.getAbsolutePath()); +// } else { +// log.warn("Failed to delete incomplete temporary file: {}", tempFile.getAbsolutePath()); +// } +// } +// } +// } +// +// // 创建远程目录（如果不存在） +// private void createRemoteDirectoryIfNotExists(ChannelSftp channel, String directory) throws SftpException { +// if (directory == null || directory.isEmpty() || directory.equals("/")) { +// return; +// } +// +// try { +// channel.stat(directory); +// } catch (SftpException e) { +// // 目录不存在，尝试创建 +// createRemoteDirectoryIfNotExists(channel, getParentDirectory(directory)); +// channel.mkdir(directory); +// log.debug("Created remote directory: {}", directory); +// } +// } +// +// // 获取路径的父目录 +// private String getParentDirectory(String path) { +// int lastSlash = path.lastIndexOf('/'); +// return lastSlash > 0 ? path.substring(0, lastSlash) : ""; +// } +// +// // 断开SFTP通道 +// private void disconnectChannel(Channel channel) { +// if (channel != null && channel.isConnected()) { +// try { +// channel.disconnect(); +// log.debug("SFTP channel disconnected"); +// } catch (Exception e) { +// log.warn("Error disconnecting SFTP channel: {}", e.getMessage()); +// } +// } +// } +// +// // 尝试删除不完整的文件 +// private void tryDeleteIncompleteFile(String remoteFilePath) { +// ChannelSftp channel = null; +// try { +// channel = (ChannelSftp) sshSession.openChannel("sftp"); +// channel.connect(CONNECTION_TIMEOUT); +// channel.rm(remoteFilePath); +// log.info("Deleted incomplete file: {}", remoteFilePath); +// } catch (Exception e) { +// log.warn("Failed to delete incomplete file {}: {}", remoteFilePath, e.getMessage()); +// } finally { +// disconnectChannel(channel); +// } +// } +// +// // 增强的进度监控器 +// private static class ProgressMonitorAdapter implements SftpProgressMonitor { +// private final long totalBytes; +// private long bytesWritten = 0; +// private int lastProgress = 0; +// private final long startTime = System.currentTimeMillis(); +// +// public ProgressMonitorAdapter(long totalBytes) { +// this.totalBytes = totalBytes; +// } +// +// @Override +// public boolean count(long count) { +// bytesWritten += count; +// +// // 计算进度百分比 +// int progress = (int) ((bytesWritten * 100) / totalBytes); +// +// // 每10%或每秒更新一次日志 +// long elapsedTime = System.currentTimeMillis() - startTime; +// if (progress - lastProgress >= 10 || elapsedTime >= 1000) { +// double speed = bytesWritten / (elapsedTime / 1000.0); +// String speedStr = formatTransferSpeed(speed); +// +// log.debug("Upload progress: {}% ({}/{} bytes, {})", +// progress, bytesWritten, totalBytes, speedStr); +// lastProgress = progress; +// } +// +// return true; // 返回true继续传输，返回false中断传输 +// } +// +// @Override +// public void end() { +// long elapsedTime = System.currentTimeMillis() - startTime; +// double speed = totalBytes / (elapsedTime / 1000.0); +// String speedStr = formatTransferSpeed(speed); +// +// log.info("Upload completed: {} bytes in {} ms (avg speed: {})", +// totalBytes, elapsedTime, speedStr); +// } +// +// @Override +// public void init(int op, String src, String dest, long max) { +// log.info("Starting upload: {} -> {} ({} bytes)", src, dest, max); +// } +// +// // 格式化传输速度 +// private String formatTransferSpeed(double bytesPerSecond) { +// String[] units = {"B/s", "KB/s", "MB/s", "GB/s"}; +// int unitIndex = 0; +// +// while (bytesPerSecond >= 1024 && unitIndex < units.length - 1) { +// bytesPerSecond /= 1024; +// unitIndex++; +// } +// +// return String.format("%.2f %s", bytesPerSecond, units[unitIndex]); +// } +// } +// +// +// /** +// * 检查连接状态 +// */ +// public ConnectionStatus getStatus() { +// if (status == ConnectionStatus.CONNECTED && +// (sshSession == null || !sshSession.isConnected())) { +// status = ConnectionStatus.DISCONNECTED; +// } +// return status; +// } +// +// /** +// * 检查是否已连接 +// */ +// public boolean isConnected() { +// return status == ConnectionStatus.CONNECTED && +// sshSession != null && +// sshSession.isConnected(); +// } +// +// +// private String getPrivateKeyContent(Long secretKeyId) { +// if (secretKeyId == null) { +// return null; +// } +// SecretKey secretKey = secretKeyService.getById(secretKeyId); +// byte[] content; +// try { +// content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// +// //改为S3FileClient读取 +// InputStream read = new ByteArrayInputStream(content); +// +// try { +// return StreamUtils.copyToString(read, StandardCharsets.UTF_8); +// } catch (IOException e) { +// log.error("读取私钥文件失败", e); +// throw new RuntimeException(e); +// } +// +// +// } +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java deleted file mode 100644 index 088d2760..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/mapper/MachineInfoMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package cd.casic.module.machine.mapper; - -import cd.casic.module.machine.entity.MachineInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MachineInfoMapper extends BaseMapper { -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 39ee38bf..23591523 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -1,15 +1,14 @@ package cd.casic.module.machine.service; -import cd.casic.module.machine.dto.MachineInfoDto; -import cd.casic.module.machine.entity.MachineInfo; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.controller.vo.MachineInfoDto; +import cd.casic.module.machine.dal.dataobject.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; import java.util.Map; -public interface MachineInfoService extends IService { +public interface MachineInfoService { boolean addMachineInfo(MachineInfoDto MachineInfoDto); PageResult listMachineInfo(MachineInfoDto MachineInfoDto); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index 48185546..df305c5a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -1,11 +1,10 @@ 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 cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.controller.vo.MachineProxyVO; +import cd.casic.module.machine.dal.dataobject.MachineProxy; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; import java.util.Map; /** @@ -15,12 +14,12 @@ public interface MachineProxyService extends IService { /** * 注册新的机器代理 */ - boolean register(MachineProxyDTO machineProxyDTO); + boolean register(MachineProxyVO machineProxyVO); /** * 更新代理状态 */ - boolean updateStatus(MachineProxyDTO machineProxyDTO); + boolean updateStatus(MachineProxyVO machineProxyVO); /** @@ -33,7 +32,7 @@ public interface MachineProxyService extends IService { /** * 更新代理配置 */ - void update(MachineProxyDTO machineProxyDTO); + void update(MachineProxyVO machineProxyVO); /** @@ -43,5 +42,5 @@ public interface MachineProxyService extends IService { */ void delete(String proxyIds); - PageResult list(MachineProxyDTO machineProxyDTO); + PageResult list(MachineProxyVO machineProxyVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index b9647850..f9887229 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -1,12 +1,9 @@ package cd.casic.module.machine.service; -import cd.casic.module.machine.entity.SecretKey; -import cd.casic.module.machine.dto.SecretKeyDto; -import cd.casic.module.machine.utils.PageResult; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.dal.dataobject.SecretKey; +import cd.casic.module.machine.controller.vo.SecretKeyDto; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index 6a62fa71..1eca5b9a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -1,162 +1,161 @@ -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; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -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 java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 机器代理服务实现类 - */ -@Service -public class MachineProxyServiceImpl extends ServiceImpl implements MachineProxyService { - @Resource - private MachineProxyMapper machineProxyMapper; - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean register(MachineProxyDTO machineProxyDTO) { - // 创建代理记录 - MachineProxy proxy = new MachineProxy(); - BeanUtils.copyProperties(machineProxyDTO, proxy); - proxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); - proxy.setVersion("1.0.0"); - proxy.setStatusCode(MachineProxyStatus.ONLINE.getCode()); - return save(proxy); - } - - @Override - public boolean updateStatus(MachineProxyDTO machineProxyDTO) { - // 参数校验 - if (machineProxyDTO == null) { - throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); - } - - // 查询代理 - MachineProxy proxy = this.getById(machineProxyDTO.getId()); - - if (proxy == null) { - throw new ServiceException(ServiceException.MACHINE_PROXY_NULL, "代理不存在"); - } - - // 更新状态 - proxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); - proxy.setUpdateDate(new Date()); - return updateById(proxy); - } - - - @Override - public Map getStatusStatistics() { - List proxyList = list(); - - if (CollectionUtils.isEmpty(proxyList)) { - return Collections.emptyMap(); - } - return proxyList.stream() - .map(proxy -> EnumUtils.getEnumByCode(proxy.getStatusCode(), MachineProxyStatus.class).getMessage()) - .collect(Collectors.groupingBy( - Function.identity(), - Collectors.counting() // 统计每个分组的元素数量 - )); - } - - @Override - public void update(MachineProxyDTO machineProxyDTO) { - // 参数校验 - if (machineProxyDTO == null) { - throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); - } - MachineProxy machineProxy = new MachineProxy(); - BeanUtils.copyProperties(machineProxyDTO, machineProxy); - if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { - machineProxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); - } - if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { - machineProxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); - } - this.updateById(machineProxy); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String ids) { - List machineProxyIds = Arrays.stream(ids.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .map(Long::parseLong) - .toList(); - // 参数校验 - if (CollectionUtils.isEmpty(machineProxyIds)) { - throw new ServiceException(ServiceException.PARAMETER_ERROR, "参数错误"); - } - // 批量逻辑删除 - remove(new LambdaQueryWrapper() - .in(MachineProxy::getId, machineProxyIds) - .ne(MachineProxy::getStatus, MachineProxyStatus.ONLINE.getCode())); - } - - @Override - public PageResult list(MachineProxyDTO machineProxyDTO) { - QueryWrapper queryWrapper = getMachineProxyQueryWrapper(machineProxyDTO); - Page page = machineProxyMapper.selectPage(new Page<>(machineProxyDTO.getPageIndex(), machineProxyDTO.getPageSize()), queryWrapper); - List machineProxyDtos = page.getRecords().stream().map(machineProxy -> { - MachineProxyDTO dto = new MachineProxyDTO(); - BeanUtils.copyProperties(machineProxy, dto); - dto.setProxyType(EnumUtils.getEnumByCode(machineProxy.getProxyTypeCode(), MachineProxyType.class).getMessage()); - dto.setStatus(EnumUtils.getEnumByCode(machineProxy.getStatusCode(), MachineProxyStatus.class).getMessage()); - return dto; - }).toList(); - return new PageResult<>( - page.getCurrent(), - page.getSize(), - page.getTotal(), - page.getPages(), - machineProxyDtos - ); - } - - private QueryWrapper getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (machineProxyDTO.getHostIp() != null && !machineProxyDTO.getHostIp().isEmpty()) { - queryWrapper.like("host_ip", machineProxyDTO.getHostIp()); - } - if (machineProxyDTO.getSshPort() != null && !machineProxyDTO.getSshPort().isEmpty()) { - queryWrapper.like("ssh_port", machineProxyDTO.getSshPort()); - } - if (machineProxyDTO.getUsername() != null && !machineProxyDTO.getUsername().isEmpty()) { - queryWrapper.like("username", machineProxyDTO.getUsername()); - } - if (machineProxyDTO.getDescription() != null && !machineProxyDTO.getDescription().isEmpty()) { - queryWrapper.like("description", machineProxyDTO.getDescription()); - } - if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { - queryWrapper.like("status_code", EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); - } - if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { - queryWrapper.like("proxy_type_code", EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); - } - return queryWrapper.orderByDesc("create_date"); - } - -} +//package cd.casic.module.machine.service.impl; +// +//import cd.casic.module.machine.controller.vo.MachineProxyDTO; +//import cd.casic.module.machine.dal.dataobject.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.dal.mysql.MachineProxyMapper; +//import cd.casic.module.machine.service.MachineProxyService; +//import cd.casic.module.machine.utils.EnumUtils; +//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 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 java.util.*; +//import java.util.function.Function; +//import java.util.stream.Collectors; +// +///** +// * 机器代理服务实现类 +// */ +//@Service +//public class MachineProxyServiceImpl extends ServiceImpl implements MachineProxyService { +// @Resource +// private MachineProxyMapper machineProxyMapper; +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public boolean register(MachineProxyDTO machineProxyDTO) { +// // 创建代理记录 +// MachineProxy proxy = new MachineProxy(); +// BeanUtils.copyProperties(machineProxyDTO, proxy); +// proxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); +// proxy.setVersion("1.0.0"); +// proxy.setStatusCode(MachineProxyStatus.ONLINE.getCode()); +// return save(proxy); +// } +// +// @Override +// public boolean updateStatus(MachineProxyDTO machineProxyDTO) { +// // 参数校验 +// if (machineProxyDTO == null) { +// throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); +// } +// +// // 查询代理 +// MachineProxy proxy = this.getById(machineProxyDTO.getId()); +// +// if (proxy == null) { +// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL, "代理不存在"); +// } +// +// // 更新状态 +// proxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); +// proxy.setUpdateTime(new Date()); +// return updateById(proxy); +// } +// +// +// @Override +// public Map getStatusStatistics() { +// List proxyList = list(); +// +// if (CollectionUtils.isEmpty(proxyList)) { +// return Collections.emptyMap(); +// } +// return proxyList.stream() +// .map(proxy -> EnumUtils.getEnumByCode(proxy.getStatusCode(), MachineProxyStatus.class).getMessage()) +// .collect(Collectors.groupingBy( +// Function.identity(), +// Collectors.counting() // 统计每个分组的元素数量 +// )); +// } +// +// @Override +// public void update(MachineProxyDTO machineProxyDTO) { +// // 参数校验 +// if (machineProxyDTO == null) { +// throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); +// } +// MachineProxy machineProxy = new MachineProxy(); +// BeanUtils.copyProperties(machineProxyDTO, machineProxy); +// if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { +// machineProxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); +// } +// if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { +// machineProxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); +// } +// this.updateById(machineProxy); +// } +// +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void delete(String ids) { +// List machineProxyIds = Arrays.stream(ids.split(",")) +// .map(String::trim) +// .filter(s -> !s.isEmpty()) +// .map(Long::parseLong) +// .toList(); +// // 参数校验 +// if (CollectionUtils.isEmpty(machineProxyIds)) { +// throw new ServiceException(ServiceException.PARAMETER_ERROR, "参数错误"); +// } +// // 批量逻辑删除 +// remove(new LambdaQueryWrapper() +// .in(MachineProxy::getId, machineProxyIds) +// .ne(MachineProxy::getStatus, MachineProxyStatus.ONLINE.getCode())); +// } +// +// @Override +// public PageResult list(MachineProxyDTO machineProxyDTO) { +// QueryWrapper queryWrapper = getMachineProxyQueryWrapper(machineProxyDTO); +// Page page = machineProxyMapper.selectPage(new Page<>(machineProxyDTO.getPageIndex(), machineProxyDTO.getPageSize()), queryWrapper); +// List machineProxyDtos = page.getRecords().stream().map(machineProxy -> { +// MachineProxyDTO dto = new MachineProxyDTO(); +// BeanUtils.copyProperties(machineProxy, dto); +// dto.setProxyType(EnumUtils.getEnumByCode(machineProxy.getProxyTypeCode(), MachineProxyType.class).getMessage()); +// dto.setStatus(EnumUtils.getEnumByCode(machineProxy.getStatusCode(), MachineProxyStatus.class).getMessage()); +// return dto; +// }).toList(); +// return new PageResult<>( +// page.getCurrent(), +// page.getSize(), +// page.getTotal(), +// page.getPages(), +// machineProxyDtos +// ); +// } +// +// private QueryWrapper getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// if (machineProxyDTO.getHostIp() != null && !machineProxyDTO.getHostIp().isEmpty()) { +// queryWrapper.like("host_ip", machineProxyDTO.getHostIp()); +// } +// if (machineProxyDTO.getSshPort() != null && !machineProxyDTO.getSshPort().isEmpty()) { +// queryWrapper.like("ssh_port", machineProxyDTO.getSshPort()); +// } +// if (machineProxyDTO.getUsername() != null && !machineProxyDTO.getUsername().isEmpty()) { +// queryWrapper.like("username", machineProxyDTO.getUsername()); +// } +// if (machineProxyDTO.getDescription() != null && !machineProxyDTO.getDescription().isEmpty()) { +// queryWrapper.like("description", machineProxyDTO.getDescription()); +// } +// if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { +// queryWrapper.like("status_code", EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); +// } +// if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { +// queryWrapper.like("proxy_type_code", EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); +// } +// return queryWrapper.orderByDesc("create_date"); +// } +// +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index 26916426..4dfa1245 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -1,363 +1,354 @@ -package cd.casic.module.machine.service.impl; - -import cd.casic.module.machine.enums.MachineInfoType; -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; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class MachineinfoServiceImpl extends ServiceImpl implements MachineInfoService { - - int ENABLE = 1; - int UN_ENABLE = 0; - - @Resource - private MachineInfoMapper machineInfoMapper; - @Resource - private ConnectionSession connectionSession; - /** - * 会话ID生成器 - */ - private final AtomicInteger sessionIdGenerator = new AtomicInteger(1000); - - /** - * 会话管理：会话ID -> 连接会话 - */ - private final Map sessions = new ConcurrentHashMap<>(); - - /** - * 机器名称 -> 会话ID - */ - private final Map machineSessionMapping = new ConcurrentHashMap<>(); - - @Override - public boolean addMachineInfo(MachineInfoDto machineInfoDto) { - if (machineInfoDto == null) { - throw new ServiceException(ServiceException.MACHINE_INFO_NULL, "机器信息为空"); - } - MachineInfo machineInfo = new MachineInfo(); - BeanUtils.copyProperties(machineInfoDto, machineInfo); - machineInfo.setStatusCode(1); - machineInfo.setAuthenticationTypeCode( - "密码认证".equals(machineInfoDto.getAuthenticationType()) - ? AuthenticationType.PASSWORD.getCode() - : AuthenticationType.SECRET_KEY.getCode() - ); - machineInfo.setMachineInfoTypeCode( - "Windows".equals(machineInfoDto.getMachineInfoType()) - ? MachineInfoType.WINDOWS.getCode() - : MachineInfoType.Linux.getCode() - ); - - return this.save(machineInfo); - } - - @Override - public PageResult listMachineInfo(MachineInfoDto machineInfoDto) { - QueryWrapper queryWrapper = getMachineInfoQueryWrapper(machineInfoDto); - Page page = machineInfoMapper.selectPage( - new Page<>(machineInfoDto.getPageIndex(), machineInfoDto.getPageSize()), - queryWrapper - ); - - List machineInfoDtos = page.getRecords().stream() - .map(machineInfo -> { - MachineInfoDto dto = new MachineInfoDto(); - BeanUtils.copyProperties(machineInfo, dto); - // 直接调用原有枚举转换方法 - dto.setMachineInfoType(EnumUtils.getEnumByCode(machineInfo.getMachineInfoTypeCode(), MachineInfoType.class).getMessage()); - dto.setStatus(EnumUtils.getEnumByCode(machineInfo.getStatusCode(), MachineInfoStatus.class).getMessage()); - dto.setAuthenticationType(EnumUtils.getEnumByCode(machineInfo.getAuthenticationTypeCode(), AuthenticationType.class).getMessage()); - return dto; - }) - .toList(); - - return new PageResult<>( - page.getCurrent(), - page.getSize(), - page.getTotal(), - page.getPages(), - machineInfoDtos - ); - } - - @Override - public boolean updateMachineInfo(MachineInfoDto machineInfoDto) { - MachineInfo machineInfo = new MachineInfo(); - BeanUtils.copyProperties(machineInfoDto, machineInfo); - machineInfo.setAuthenticationTypeCode( - "密码认证".equals(machineInfoDto.getAuthenticationType()) - ? AuthenticationType.PASSWORD.getCode() - : AuthenticationType.SECRET_KEY.getCode() - ); - machineInfo.setMachineInfoTypeCode( - "Windows".equals(machineInfoDto.getMachineInfoType()) - ? MachineInfoType.WINDOWS.getCode() - : MachineInfoType.Linux.getCode() - ); - return this.updateById(machineInfo); - } - - @Override - public boolean updateStatus(MachineInfoDto machineInfoDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoDto.getId()).set("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); - return this.update(updateWrapper); - } - - @Override - public boolean bindingSecretKey(MachineInfoDto machineInfoDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code", 2); - return this.update(updateWrapper); - } - - @Override - public void deleteList(String machineInfoIds) { - List machineInfoIdList = Arrays.stream(machineInfoIds.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .map(Long::parseLong) - .collect(Collectors.toList()); - machineInfoMapper.selectBatchIds(machineInfoIdList).forEach(machineInfo -> { - if (machineInfo.getStatusCode() == 1) { - this.removeById(machineInfo.getId()); - } - }); - } - - @Override - public void deleteMachineInfo(Long machineInfoId) { - MachineInfo machineInfo = this.getById(machineInfoId); - if (machineInfo.getStatusCode() == 1) { - this.removeById(machineInfoId); - } - } - - private QueryWrapper getMachineInfoQueryWrapper(MachineInfoDto machineInfoDto) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (machineInfoDto.getStatus() != null && !machineInfoDto.getStatus().isEmpty()) { - queryWrapper.eq("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); - } - if (machineInfoDto.getName() != null && !machineInfoDto.getName().isEmpty()) { - queryWrapper.like("name", machineInfoDto.getName()); - } - if (machineInfoDto.getTag() != null && !machineInfoDto.getTag().isEmpty()) { - queryWrapper.like("tag", machineInfoDto.getTag()); - } - if (machineInfoDto.getHostIp() != null && !machineInfoDto.getHostIp().isEmpty()) { - queryWrapper.like("host_ip", machineInfoDto.getHostIp()); - } - if (machineInfoDto.getDescription() != null && !machineInfoDto.getDescription().isEmpty()) { - queryWrapper.like("description", machineInfoDto.getDescription()); - } - return queryWrapper.orderByDesc("create_date"); - } - - - @Override - public boolean testConnection(Long id) { - //先查询机器是否存在，在判断机器可用性 - MachineInfo machineInfo = this.getById(id); - if (machineInfo==null){ - throw new RuntimeException("机器不存在"); - } - if (machineInfo.getStatusCode() == 0) { - throw new RuntimeException("机器不可用"); - } - log.info("测试机器连接: {}", machineInfo.getHostIp()); - connectionSession.setMachineInfo(machineInfo); - try{ - connectionSession.connect(); - return true; - } catch (Exception e) { - log.error("机器连接测试失败: {}", e.getMessage(), e); - return false; - } - } - - @Override - public ConnectionStatus getConnectionStatus(String machineName) { - String sessionId = machineSessionMapping.get(machineName); - if (sessionId == null) { - return ConnectionStatus.DISCONNECTED; - } - - ConnectionSession session = sessions.get(sessionId); - return session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED; - } - - @Override - public Map getAllConnectionStatus() { - Map result = new HashMap<>(); - - machineSessionMapping.forEach((machineName, sessionId) -> { - ConnectionSession session = sessions.get(sessionId); - result.put(machineName, session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED); - }); - - return result; - } - - @Override - public String connect(MachineInfo machineInfo) { - if (machineInfo.getStatus().getCode() == UN_ENABLE) { - throw new RuntimeException("机器不可用"); - } - log.info("建立机器连接: {}", machineInfo.getHostIp()); - - // 检查是否已连接 - String existingSessionId = machineSessionMapping.get(machineInfo.getName()); - if (existingSessionId != null) { - ConnectionSession existingSession = sessions.get(existingSessionId); - if (existingSession != null && existingSession.getStatus() == ConnectionStatus.CONNECTED) { - log.info("机器已连接，返回现有会话: {}", machineInfo.getHostIp()); - return existingSessionId; - } - } - - try { - connectionSession.setMachineInfo(machineInfo); - - connectionSession.connect(); - - // 生成会话ID - String sessionId = generateSessionId(); - - // 保存会话 - sessions.put(sessionId, connectionSession); - machineSessionMapping.put(machineInfo.getName(), sessionId); - - log.info("机器连接成功: {}, 会话ID: {}", machineInfo.getHostIp(), sessionId); - return sessionId; - } catch (Exception e) { - log.error("机器连接失败: {}", e.getMessage(), e); - throw new RuntimeException("机器连接失败: " + e.getMessage(), e); - } - } - - @Override - public boolean disconnect(String sessionId) { - log.info("断开机器连接: {}", sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - log.warn("会话不存在: {}", sessionId); - return false; - } - - try { - session.disconnect(); - - // 清理会话 - sessions.remove(sessionId); - machineSessionMapping.entrySet().removeIf(entry -> entry.getValue().equals(sessionId)); - - log.info("机器连接已断开: {}", sessionId); - return true; - } catch (Exception e) { - log.error("断开连接失败: {}", e.getMessage(), e); - return false; - } - } - - @Override - public String executeCommand(String sessionId, String command) { - log.info("执行命令: {}, 会话ID: {}", command, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.executeCommand(command); - } catch (Exception e) { - log.error("命令执行失败: {}", e.getMessage(), e); - throw new RuntimeException("命令执行失败: " + e.getMessage(), e); - } - } - - @Override - public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { - log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.uploadFile(localFilePath, remoteFilePath); - } catch (Exception e) { - log.error("文件上传失败: {}", e.getMessage(), e); - throw new RuntimeException("文件上传失败: " + e.getMessage(), e); - } - } - - @Override - public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { - log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.downloadFile(remoteFilePath, localFilePath); - } catch (Exception e) { - log.error("文件下载失败: {}", e.getMessage(), e); - throw new RuntimeException("文件下载失败: " + e.getMessage(), e); - } - } - - - /** - * 生成会话ID - */ - private String generateSessionId() { - return "session-" + sessionIdGenerator.incrementAndGet(); - } -} +//package cd.casic.module.machine.service.impl; +//import cd.casic.module.machine.enums.MachineInfoType; +//import cd.casic.module.machine.handler.ConnectionSession; +//import cd.casic.module.machine.dal.mysql.MachineInfoMapper; +//import cd.casic.module.machine.controller.vo.MachineInfoDto; +//import cd.casic.module.machine.dal.dataobject.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.service.MachineInfoService; +//import cd.casic.module.machine.utils.EnumUtils; +//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 jakarta.annotation.Resource; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.BeanUtils; +//import org.springframework.stereotype.Service; +//import java.util.Arrays; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +//import java.util.concurrent.ConcurrentHashMap; +//import java.util.concurrent.atomic.AtomicInteger; +//import java.util.stream.Collectors; +// +//@Slf4j +//@Service("machineInfoService") +//public class MachineinfoServiceImpl implements MachineInfoService { +// +// int ENABLE = 1; +// int UN_ENABLE = 0; +// +// @Resource +// private MachineInfoMapper machineInfoMapper; +// @Resource +// private ConnectionSession connectionSession; +// /** +// * 会话ID生成器 +// */ +// private final AtomicInteger sessionIdGenerator = new AtomicInteger(1000); +// +// /** +// * 会话管理：会话ID -> 连接会话 +// */ +// private final Map sessions = new ConcurrentHashMap<>(); +// +// /** +// * 机器名称 -> 会话ID +// */ +// private final Map machineSessionMapping = new ConcurrentHashMap<>(); +// +// @Override +// public boolean addMachineInfo(MachineInfoDto machineInfoDto) { +// if (machineInfoDto == null) { +// throw new ServiceException(ServiceException.MACHINE_INFO_NULL, "机器信息为空"); +// } +// MachineInfo machineInfo = new MachineInfo(); +// BeanUtils.copyProperties(machineInfoDto, machineInfo); +// machineInfo.setStatusCode(1); +// machineInfo.setAuthenticationTypeCode( +// "密码认证".equals(machineInfoDto.getAuthenticationType()) +// ? AuthenticationType.PASSWORD.getCode() +// : AuthenticationType.SECRET_KEY.getCode() +// ); +// machineInfo.setMachineInfoTypeCode( +// "Windows".equals(machineInfoDto.getMachineInfoType()) +// ? MachineInfoType.WINDOWS.getCode() +// : MachineInfoType.Linux.getCode() +// ); +// +// return this.save(machineInfo); +// } +// +// @Override +// public PageResult listMachineInfo(MachineInfoDto machineInfoDto) { +// QueryWrapper queryWrapper = getMachineInfoQueryWrapper(machineInfoDto); +// Page page = machineInfoMapper.selectPage( +// new Page<>(machineInfoDto.getPageIndex(), machineInfoDto.getPageSize()), +// queryWrapper +// ); +// +// List machineInfoDtos = page.getRecords().stream() +// .map(machineInfo -> { +// MachineInfoDto dto = new MachineInfoDto(); +// BeanUtils.copyProperties(machineInfo, dto); +// // 直接调用原有枚举转换方法 +// dto.setMachineInfoType(EnumUtils.getEnumByCode(machineInfo.getMachineInfoTypeCode(), MachineInfoType.class).getMessage()); +// dto.setStatus(EnumUtils.getEnumByCode(machineInfo.getStatusCode(), MachineInfoStatus.class).getMessage()); +// dto.setAuthenticationType(EnumUtils.getEnumByCode(machineInfo.getAuthenticationTypeCode(), AuthenticationType.class).getMessage()); +// return dto; +// }) +// .toList(); +// +// return new PageResult<>( +// page.getCurrent(), +// page.getSize(), +// page.getTotal(), +// page.getPages(), +// machineInfoDtos +// ); +// } +// +// @Override +// public boolean updateMachineInfo(MachineInfoDto machineInfoDto) { +// MachineInfo machineInfo = new MachineInfo(); +// BeanUtils.copyProperties(machineInfoDto, machineInfo); +// machineInfo.setAuthenticationTypeCode( +// "密码认证".equals(machineInfoDto.getAuthenticationType()) +// ? AuthenticationType.PASSWORD.getCode() +// : AuthenticationType.SECRET_KEY.getCode() +// ); +// machineInfo.setMachineInfoTypeCode( +// "Windows".equals(machineInfoDto.getMachineInfoType()) +// ? MachineInfoType.WINDOWS.getCode() +// : MachineInfoType.Linux.getCode() +// ); +// return this.updateById(machineInfo); +// } +// +// @Override +// public boolean updateStatus(MachineInfoDto machineInfoDto) { +// UpdateWrapper updateWrapper = new UpdateWrapper<>(); +// updateWrapper.eq("id", machineInfoDto.getId()).set("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); +// return this.update(updateWrapper); +// } +// +// @Override +// public boolean bindingSecretKey(MachineInfoDto machineInfoDto) { +// UpdateWrapper updateWrapper = new UpdateWrapper<>(); +// updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code", 2); +// return this.update(updateWrapper); +// } +// +// @Override +// public void deleteList(String machineInfoIds) { +// List machineInfoIdList = Arrays.stream(machineInfoIds.split(",")) +// .map(String::trim) +// .filter(s -> !s.isEmpty()) +// .map(Long::parseLong) +// .collect(Collectors.toList()); +// machineInfoMapper.selectBatchIds(machineInfoIdList).forEach(machineInfo -> { +// if (machineInfo.getStatusCode() == 1) { +// this.removeById(machineInfo.getId()); +// } +// }); +// } +// +// @Override +// public void deleteMachineInfo(Long machineInfoId) { +// MachineInfo machineInfo = this.getById(machineInfoId); +// if (machineInfo.getStatusCode() == 1) { +// this.removeById(machineInfoId); +// } +// } +// +// private QueryWrapper getMachineInfoQueryWrapper(MachineInfoDto machineInfoDto) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// if (machineInfoDto.getStatus() != null && !machineInfoDto.getStatus().isEmpty()) { +// queryWrapper.eq("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); +// } +// if (machineInfoDto.getName() != null && !machineInfoDto.getName().isEmpty()) { +// queryWrapper.like("name", machineInfoDto.getName()); +// } +// if (machineInfoDto.getTag() != null && !machineInfoDto.getTag().isEmpty()) { +// queryWrapper.like("tag", machineInfoDto.getTag()); +// } +// if (machineInfoDto.getHostIp() != null && !machineInfoDto.getHostIp().isEmpty()) { +// queryWrapper.like("host_ip", machineInfoDto.getHostIp()); +// } +// if (machineInfoDto.getDescription() != null && !machineInfoDto.getDescription().isEmpty()) { +// queryWrapper.like("description", machineInfoDto.getDescription()); +// } +// return queryWrapper.orderByDesc("create_date"); +// } +// +// +// @Override +// public boolean testConnection(Long id) { +// //先查询机器是否存在，在判断机器可用性 +// MachineInfo machineInfo = machineInfoMapper.getById(id); +// if (machineInfo==null){ +// throw new RuntimeException("机器不存在"); +// } +// if (machineInfo.getStatusCode() == 0) { +// throw new RuntimeException("机器不可用"); +// } +// log.info("测试机器连接: {}", machineInfo.getHostIp()); +// connectionSession.setMachineInfo(machineInfo); +// try{ +// connectionSession.connect(); +// return true; +// } catch (Exception e) { +// log.error("机器连接测试失败: {}", e.getMessage(), e); +// return false; +// } +// } +// +// @Override +// public ConnectionStatus getConnectionStatus(String machineName) { +// String sessionId = machineSessionMapping.get(machineName); +// if (sessionId == null) { +// return ConnectionStatus.DISCONNECTED; +// } +// +// ConnectionSession session = sessions.get(sessionId); +// return session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED; +// } +// +// @Override +// public Map getAllConnectionStatus() { +// Map result = new HashMap<>(); +// +// machineSessionMapping.forEach((machineName, sessionId) -> { +// ConnectionSession session = sessions.get(sessionId); +// result.put(machineName, session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED); +// }); +// +// return result; +// } +// +// @Override +// public String connect(MachineInfo machineInfo) { +// if (machineInfo.getStatus().getCode() == UN_ENABLE) { +// throw new RuntimeException("机器不可用"); +// } +// log.info("建立机器连接: {}", machineInfo.getHostIp()); +// +// // 检查是否已连接 +// String existingSessionId = machineSessionMapping.get(machineInfo.getName()); +// if (existingSessionId != null) { +// ConnectionSession existingSession = sessions.get(existingSessionId); +// if (existingSession != null && existingSession.getStatus() == ConnectionStatus.CONNECTED) { +// log.info("机器已连接，返回现有会话: {}", machineInfo.getHostIp()); +// return existingSessionId; +// } +// } +// +// try { +// connectionSession.setMachineInfo(machineInfo); +// +// connectionSession.connect(); +// +// // 生成会话ID +// String sessionId = generateSessionId(); +// +// // 保存会话 +// sessions.put(sessionId, connectionSession); +// machineSessionMapping.put(machineInfo.getName(), sessionId); +// +// log.info("机器连接成功: {}, 会话ID: {}", machineInfo.getHostIp(), sessionId); +// return sessionId; +// } catch (Exception e) { +// log.error("机器连接失败: {}", e.getMessage(), e); +// throw new RuntimeException("机器连接失败: " + e.getMessage(), e); +// } +// } +// +// @Override +// public boolean disconnect(String sessionId) { +// log.info("断开机器连接: {}", sessionId); +// +// ConnectionSession session = sessions.get(sessionId); +// if (session == null) { +// log.warn("会话不存在: {}", sessionId); +// return false; +// } +// +// try { +// session.disconnect(); +// +// // 清理会话 +// sessions.remove(sessionId); +// machineSessionMapping.entrySet().removeIf(entry -> entry.getValue().equals(sessionId)); +// +// log.info("机器连接已断开: {}", sessionId); +// return true; +// } catch (Exception e) { +// log.error("断开连接失败: {}", e.getMessage(), e); +// return false; +// } +// } +// +// @Override +// public String executeCommand(String sessionId, String command) { +// log.info("执行命令: {}, 会话ID: {}", command, sessionId); +// +// ConnectionSession session = sessions.get(sessionId); +// if (session == null) { +// throw new RuntimeException("会话不存在: " + sessionId); +// } +// +// if (session.getStatus() != ConnectionStatus.CONNECTED) { +// throw new RuntimeException("会话未连接: " + sessionId); +// } +// +// try { +// return session.executeCommand(command); +// } catch (Exception e) { +// log.error("命令执行失败: {}", e.getMessage(), e); +// throw new RuntimeException("命令执行失败: " + e.getMessage(), e); +// } +// } +// +// @Override +// public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { +// log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); +// +// ConnectionSession session = sessions.get(sessionId); +// if (session == null) { +// throw new RuntimeException("会话不存在: " + sessionId); +// } +// +// if (session.getStatus() != ConnectionStatus.CONNECTED) { +// throw new RuntimeException("会话未连接: " + sessionId); +// } +// +// try { +// return session.uploadFile(localFilePath, remoteFilePath); +// } catch (Exception e) { +// log.error("文件上传失败: {}", e.getMessage(), e); +// throw new RuntimeException("文件上传失败: " + e.getMessage(), e); +// } +// } +// +// @Override +// public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { +// log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); +// +// ConnectionSession session = sessions.get(sessionId); +// if (session == null) { +// throw new RuntimeException("会话不存在: " + sessionId); +// } +// +// if (session.getStatus() != ConnectionStatus.CONNECTED) { +// throw new RuntimeException("会话未连接: " + sessionId); +// } +// +// try { +// return session.downloadFile(remoteFilePath, localFilePath); +// } catch (Exception e) { +// log.error("文件下载失败: {}", e.getMessage(), e); +// throw new RuntimeException("文件下载失败: " + e.getMessage(), e); +// } +// } +// +// +// /** +// * 生成会话ID +// */ +// private String generateSessionId() { +// return "session-" + sessionIdGenerator.incrementAndGet(); +// } +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 2b4d6c2d..99d263b1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -1,160 +1,159 @@ -package cd.casic.module.machine.service.impl; - -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.service.MachineInfoService; -import cd.casic.module.machine.utils.PageResult; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -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.machine.utils.AliYunOssClient; -import cd.casic.module.machine.exception.ServiceException; +//package cd.casic.module.machine.service.impl; +// +//import cd.casic.module.machine.controller.vo.SecretKeyDto; +//import cd.casic.module.machine.dal.dataobject.MachineInfo; +//import cd.casic.module.machine.dal.dataobject.SecretKey; +//import cd.casic.module.machine.dal.mysql.SecretServiceMapper; //import cd.casic.module.machine.service.MachineInfoService; -import cd.casic.module.machine.service.SecretKeyService; -import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class SecretKeyServiceImpl extends ServiceImpl implements SecretKeyService { - - @Resource - private MachineInfoService machineInfoService; - - @Resource - private AliYunOssClient aliYunOssClient; - - @Resource - private SecretServiceMapper secretServiceMapper; - - - - - @Override - public boolean addSecretKey(SecretKeyDto secretKeyDto){ - if (secretKeyDto.getPath()==null) - { - throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不能为空"); - } - - String ossPath = upLoadSecretKey(secretKeyDto.getPath()); - if (ossPath == null){ - throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥上传失败"); - } - secretKeyDto.setPath(ossPath); - SecretKey secretKey = new SecretKey(); - BeanUtils.copyProperties(secretKeyDto,secretKey); - //todo检查密钥合法 - return this.save(secretKey); - - - } - @Override - public boolean updateSecretKey(SecretKeyDto secretKeyDto) { - - Long id = secretKeyDto.getId(); - SecretKey secretKey = this.getById(id); - if (secretKey == null){ - throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不存在"); - } - if (!secretKey.getPath().equals(secretKeyDto.getPath())) { - //todo检查密钥合法 - String ossPath = upLoadSecretKey(secretKeyDto.getPath()); - BeanUtils.copyProperties(secretKeyDto,secretKey); - secretKey.setPath(ossPath); - } - else { - BeanUtils.copyProperties(secretKeyDto,secretKey); - } - - return this.updateById(secretKey); - - - } - - @Override - public void bindingMachine(Long secretKeyId, List machineIds) { - SecretKey secretKey = this.getById(secretKeyId); - if (secretKey==null){ - throw new ServiceException(ServiceException.SECRETKEY_NULL,"密钥不存在"); - } - List machineList = machineInfoService.listByIds(machineIds); - machineList.forEach(machine -> machine.setSecretKeyId(secretKeyId)); - machineInfoService.updateBatchById(machineList); - } - - - - - - @Override - public PageResult listSecretKey(SecretKeyDto secretKeyDto) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (secretKeyDto.getName() != null && !secretKeyDto.getName().isEmpty()){ - queryWrapper.like("name", secretKeyDto.getName()); - } - if (secretKeyDto.getDescription() != null && !secretKeyDto.getDescription().isEmpty()){ - queryWrapper.like("description", secretKeyDto.getDescription()); - } - Page page = secretServiceMapper.selectPage(new Page<>(secretKeyDto.getPageIndex(), secretKeyDto.getPageSize()), queryWrapper); - return new PageResult<>( - page.getCurrent(), - page.getSize(), - page.getTotal(), - page.getPages(), - page.getRecords() - ); - } - - - - @Override - public boolean deleteList(List secretKeyIds) { - List secretKeys = this.listByIds(secretKeyIds); - - for (SecretKey secretKey : secretKeys) { - if (secretKey.getPath() != null && !secretKey.getPath().isEmpty()){ - try { - //文件名 - //删除子目录文件，需要在前面加上根目录文件路径 - String fileName = secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1); - aliYunOssClient.delete(fileName); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - - - //todo是否删除已经绑定的机器 - return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0 ; - } - - - public String upLoadSecretKey(String localPath) { - - //使用S3FileClient上传文件 - aliYunOssClient.init(); - - //传输到指定文件，需要在path前面加上文件路径 - String path = IdUtil.fastSimpleUUID() + ".txt"; - - - //上传文件是从本地上传，这里传的是本地文件地址 - byte[] content = ResourceUtil.readBytes(localPath); - String ossPath; - try { - ossPath = aliYunOssClient.upload(content, path, "txt"); - }catch (Exception e) { - throw new RuntimeException(e+"上传文件失败"); - } - return ossPath; - } -} +//import cn.hutool.core.io.resource.ResourceUtil; +//import cn.hutool.core.util.IdUtil; +//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.machine.utils.AliYunOssClient; +//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.springframework.beans.BeanUtils; +//import org.springframework.stereotype.Service; +// +//import java.util.List; +// +//@Service +//public class SecretKeyServiceImpl extends ServiceImpl implements SecretKeyService { +// +// @Resource +// private MachineInfoService machineInfoService; +// +// @Resource +// private AliYunOssClient aliYunOssClient; +// +// @Resource +// private SecretServiceMapper secretServiceMapper; +// +// +// +// +// @Override +// public boolean addSecretKey(SecretKeyDto secretKeyDto){ +// if (secretKeyDto.getPath()==null) +// { +// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不能为空"); +// } +// +// String ossPath = upLoadSecretKey(secretKeyDto.getPath()); +// if (ossPath == null){ +// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥上传失败"); +// } +// secretKeyDto.setPath(ossPath); +// SecretKey secretKey = new SecretKey(); +// BeanUtils.copyProperties(secretKeyDto,secretKey); +// //todo检查密钥合法 +// return this.save(secretKey); +// +// +// } +// @Override +// public boolean updateSecretKey(SecretKeyDto secretKeyDto) { +// +// Long id = secretKeyDto.getId(); +// SecretKey secretKey = this.getById(id); +// if (secretKey == null){ +// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不存在"); +// } +// if (!secretKey.getPath().equals(secretKeyDto.getPath())) { +// //todo检查密钥合法 +// String ossPath = upLoadSecretKey(secretKeyDto.getPath()); +// BeanUtils.copyProperties(secretKeyDto,secretKey); +// secretKey.setPath(ossPath); +// } +// else { +// BeanUtils.copyProperties(secretKeyDto,secretKey); +// } +// +// return this.updateById(secretKey); +// +// +// } +// +// @Override +// public void bindingMachine(Long secretKeyId, List machineIds) { +// SecretKey secretKey = this.getById(secretKeyId); +// if (secretKey==null){ +// throw new ServiceException(ServiceException.SECRETKEY_NULL,"密钥不存在"); +// } +// List machineList = machineInfoService.listByIds(machineIds); +// machineList.forEach(machine -> machine.setSecretKeyId(secretKeyId)); +// machineInfoService.updateBatchById(machineList); +// } +// +// +// +// +// +// @Override +// public PageResult listSecretKey(SecretKeyDto secretKeyDto) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// if (secretKeyDto.getName() != null && !secretKeyDto.getName().isEmpty()){ +// queryWrapper.like("name", secretKeyDto.getName()); +// } +// if (secretKeyDto.getDescription() != null && !secretKeyDto.getDescription().isEmpty()){ +// queryWrapper.like("description", secretKeyDto.getDescription()); +// } +// Page page = secretServiceMapper.selectPage(new Page<>(secretKeyDto.getPageIndex(), secretKeyDto.getPageSize()), queryWrapper); +// return new PageResult<>( +// page.getCurrent(), +// page.getSize(), +// page.getTotal(), +// page.getPages(), +// page.getRecords() +// ); +// } +// +// +// +// @Override +// public boolean deleteList(List secretKeyIds) { +// List secretKeys = this.listByIds(secretKeyIds); +// +// for (SecretKey secretKey : secretKeys) { +// if (secretKey.getPath() != null && !secretKey.getPath().isEmpty()){ +// try { +// //文件名 +// //删除子目录文件，需要在前面加上根目录文件路径 +// String fileName = secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1); +// aliYunOssClient.delete(fileName); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// +// +// //todo是否删除已经绑定的机器 +// return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0 ; +// } +// +// +// public String upLoadSecretKey(String localPath) { +// +// //使用S3FileClient上传文件 +// aliYunOssClient.init(); +// +// //传输到指定文件，需要在path前面加上文件路径 +// String path = IdUtil.fastSimpleUUID() + ".txt"; +// +// +// //上传文件是从本地上传，这里传的是本地文件地址 +// byte[] content = ResourceUtil.readBytes(localPath); +// String ossPath; +// try { +// ossPath = aliYunOssClient.upload(content, path, "txt"); +// }catch (Exception e) { +// throw new RuntimeException(e+"上传文件失败"); +// } +// return ossPath; +// } +//} From 66bc6a1250dc0269848db879d55c08174c5ad078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Fri, 6 Jun 2025 16:05:05 +0800 Subject: [PATCH 21/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contants/MachineErrorCodeConstants.java | 12 +- .../controller/MachineProxyController.java | 139 +++++---- .../machine/controller/vo/MachineProxyVO.java | 60 ++-- .../module/machine/controller/vo/PageDto.java | 10 - ...{MachineProxy.java => MachineProxyDO.java} | 46 +-- .../machine/dal/mysql/MachineProxyMapper.java | 39 ++- .../machine/enums/MachineProxyType.java | 23 +- .../machine/enums/RequestExceptionEnum.java | 19 -- .../machine/service/MachineProxyService.java | 19 +- .../service/impl/MachineProxyServiceImpl.java | 293 ++++++++---------- 10 files changed, 323 insertions(+), 337 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/{MachineProxy.java => MachineProxyDO.java} (56%) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index eba519ef..a69ebcbc 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -13,13 +13,19 @@ public interface MachineErrorCodeConstants { ErrorCode FILENAME_NULL = new ErrorCode(1_003_000_003, "文件名为空"); ErrorCode READ_FILE_FAIL = new ErrorCode(1_003_000_004, "读取文件失败"); ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_000_005, "删除文件失败"); - ErrorCode MACHINE_PROXY_DTO_NULL = new ErrorCode(1_003_000_006, "MachineProxyDTO对象为空"); - ErrorCode MACHINE_PROXY_NULL = new ErrorCode(1_003_000_007, "MachineProxy代理不存在"); + ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_000_008, "参数错误"); + // ========== 机器环境变量模块 1-003-000-009 ========== ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_000_009, "机器环境变量为空"); ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_000_009, "机器不存在"); - ErrorCode MACHINE_ENV_EXISTS = new ErrorCode(1_003_000_009, "机器已存在"); ErrorCode MACHINE_ENV_KEY_ILLEGAL = new ErrorCode(1_003_000_010, "机器环境变量键不合法"); + // ========== 机器代理模块 1-003-000-006 ========== + ErrorCode MACHINE_PROXY_HOST_IP_NULL = new ErrorCode(1_003_000_006, "机器代理主机地址为空"); + ErrorCode MACHINE_PROXY_USER_NAME_NULL = new ErrorCode(1_003_000_006, "机器代理用户名为空"); + ErrorCode MACHINE_PROXY_NOT_EXISTS = new ErrorCode(1_003_000_007, "机器代理不存在"); + ErrorCode MACHINE_PROXY_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_007, "机器代理类型不存在"); + ErrorCode MACHINE_PROXY_IS_ONLINE = new ErrorCode(1_003_000_007, "机器代理在线，不能删除"); + ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_000_011, "oss参数无法读取"); ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_000_012, "密钥为空"); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 16bbedb1..18f8c827 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -1,67 +1,72 @@ -//package cd.casic.module.machine.controller; -// -//import cd.casic.framework.commons.pojo.CommonResult; -//import cd.casic.module.machine.service.MachineProxyService; -//import cd.casic.module.machine.controller.vo.MachineProxyDTO; -// -//import io.swagger.v3.oas.annotations.Operation; -//import io.swagger.v3.oas.annotations.tags.Tag; -//import jakarta.annotation.Resource; -//import lombok.RequiredArgsConstructor; -//import org.springframework.web.bind.annotation.*; -// -//import static cd.casic.framework.commons.pojo.CommonResult.success; -// -///** -// * 机器代理控制器 -// */ -//@RestController -//@RequestMapping("/api/machineProxy") -//@Tag(name = "机器代理管理") -//@RequiredArgsConstructor -//public class MachineProxyController { -// -// @Resource -// private MachineProxyService machineProxyService; -// -// @PostMapping("/register") -// @Operation(summary = "注册新的机器代理") -// public CommonResult register(@RequestBody MachineProxyDTO machineProxyDTO) { -// machineProxyService.register(machineProxyDTO); -// return success(true); -// } -// -// @PostMapping("/list") -// @Operation(summary = "获取代理列表") -// public CommonResult list(@RequestBody MachineProxyDTO machineProxyDTO) { -// return success(machineProxyService.list(machineProxyDTO)); -// } -// -// @PutMapping("/updateStatus") -// @Operation(summary = "更新代理状态") -// public CommonResult updateStatus(@RequestBody MachineProxyDTO machineProxyDTO) { -// machineProxyService.updateStatus(machineProxyDTO); -// return success(true); -// } -// -// @GetMapping("/statistics/status") -// @Operation(summary = "获取所有代理的状态统计") -// public CommonResult getStatusStatistics() { -// return success(machineProxyService.getStatusStatistics()); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新代理信息") -// public CommonResult updateConfig(@RequestBody MachineProxyDTO machineProxyDTO) { -// machineProxyService.update(machineProxyDTO); -// return success(true); -// } -// -// @DeleteMapping("/batch") -// @Operation(summary = "批量删除代理") -// public CommonResult deleteBatch(@RequestParam String ids) { -// machineProxyService.delete(ids); -// return success(true); -// } -// -//} +package cd.casic.module.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.controller.vo.MachineProxyVO; +import cd.casic.module.machine.dal.dataobject.MachineProxyDO; +import cd.casic.module.machine.service.MachineProxyService; +import cn.hutool.core.collection.CollUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import java.util.Map; +import static cd.casic.framework.commons.pojo.CommonResult.success; + +/** + * 机器代理控制器 + */ +@RestController +@RequestMapping("/ci/machineProxy") +@Tag(name = "机器代理管理") +@Validated +public class MachineProxyController { + + @Resource + private MachineProxyService machineProxyService; + + @PostMapping("/create") + @Operation(summary = "注册新的机器代理") + @PreAuthorize("@ss.hasPermission('ci:machineProxy:create')") + public CommonResult createProxy(@Valid @RequestBody MachineProxyVO machineProxyVO) { + Long id = machineProxyService.createProxy(machineProxyVO); + return success(id); + } + + @PutMapping("/update") + @Operation(summary = "修改代理") + @PreAuthorize("@ss.hasPermission('ci:machineProxy:update')") + public CommonResult updateProxy(@Valid @RequestBody MachineProxyVO machineProxyVO) { + machineProxyService.updateProxy(machineProxyVO); + return success(true); + } + + @PostMapping("/list") + @Operation(summary = "获取代理列表") + public CommonResult> getProxyPage(@Valid @RequestBody MachineProxyVO machineProxyVO) { + PageResult pageResult = machineProxyService.getProxyPage(machineProxyVO); + if (CollUtil.isEmpty(pageResult.getList())) { + return success(new PageResult<>(pageResult.getTotal())); + } + return success(BeanUtils.toBean(pageResult, MachineProxyVO.class)); + } + + @GetMapping("/allStatus") + @Operation(summary = "获取所有代理的状态统计") + public CommonResult> getStatusStatistics() { + return success(machineProxyService.getAllProxyStatus()); + } + + + @DeleteMapping("/deleteList") + @Operation(summary = "批量删除代理") + @PreAuthorize("@ss.hasPermission('ci:machineProxy:delete')") + public CommonResult deleteProxyList(@RequestParam String ids) { + machineProxyService.deleteProxyList(ids); + return success(true); + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java index 74e3f6cb..5072f2be 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java @@ -1,46 +1,50 @@ package cd.casic.module.machine.controller.vo; - -import cd.casic.module.machine.enums.MachineProxyStatus; +import cd.casic.framework.commons.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import lombok.experimental.Accessors; +import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; -import java.util.Objects; - -/** - * 机器代理数据传输对象 - */ +@Schema(description = "管理后台 - 机器代理信息 Response VO") @EqualsAndHashCode(callSuper = true) @Data @Builder @NoArgsConstructor @AllArgsConstructor -public class MachineProxyVO extends PageDto implements Serializable { - private static final long serialVersionUID = 1L; +@Accessors(chain = true) +public class MachineProxyVO extends PageParam { + @Schema(description = "代理ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; + + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin") private String username; - private String proxyType; + + @Schema(description = "代理类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "HTTP") + private Integer proxyType; + + @Schema(description = "版本号", example = "1.0.0") private String version; + + @Schema(description = "状态（ONLINE:在线，OFFLINE:离线）", requiredMode = Schema.RequiredMode.REQUIRED, example = "ONLINE") private String status; - private Date lastHeartbeatTime; + + @Schema(description = "描述信息", example = "用于生产环境的代理服务器") private String description; + + @Schema(description = "主机IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.100") private String hostIp; + + @Schema(description = "SSH端口", requiredMode = Schema.RequiredMode.REQUIRED, example = "22") private String sshPort; - private Date createDate; - private Date updateDate; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-06-15T10:30:00") + private LocalDateTime createTime; + + @Schema(description = "更新时间", example = "2023-06-15T10:30:00") + private LocalDateTime updateTime; + + @Schema(description = "密码", example = "******") private String password; - /** - * 计算代理是否在线 - */ - public boolean isOnline() { - if (status == null || lastHeartbeatTime == null) { - return false; - } - // 假设5分钟内有心跳为在线 - long fiveMinutes = 5 * 60 * 1000; - return Objects.equals(MachineProxyStatus.ONLINE.getMessage(), status) && - System.currentTimeMillis() - lastHeartbeatTime.getTime() < fiveMinutes; - } -} +} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java deleted file mode 100644 index 29202cae..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/PageDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package cd.casic.module.machine.controller.vo; - -import lombok.Data; - -@Data -public class PageDto { - private int pageIndex = 1; - - private int pageSize = 10; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java similarity index 56% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java index be056d51..349fe8ca 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxy.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java @@ -1,9 +1,11 @@ package cd.casic.module.machine.dal.dataobject; +import cd.casic.framework.mybatis.core.dataobject.BaseDO; import cd.casic.module.machine.enums.MachineProxyStatus; import com.baomidou.mybatisplus.annotation.*; import cd.casic.module.machine.enums.MachineProxyType; import lombok.*; +import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; @@ -13,12 +15,18 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data +@Accessors(chain = true) @Builder @NoArgsConstructor @AllArgsConstructor @TableName("machine_proxy") -public class MachineProxy extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; +public class MachineProxyDO extends BaseDO { + + /** + * 代理id + */ + @TableId + private Long id; @TableField(value = "host_ip") private String hostIp; @@ -26,43 +34,23 @@ public class MachineProxy extends BaseEntity implements Serializable { @TableField(value = "ssh_port") private String sshPort; - /** - * 代理类型 - */ - @TableField(exist = false) - private MachineProxyType proxyType; + //todo 字典？？ + @TableField(value = "proxy_type") + private int proxyType; - @TableField(value = "proxy_type_code") - private int proxyTypeCode; - - /** - * 代理版本 - */ @TableField(value = "version") private String version; - /** - * 代理状态 (online, offline, installing, updating, error) - */ - @TableField(exist = false) - private MachineProxyStatus status; - - @TableField(value = "status_code") - private int statusCode; + //todo 字典？？ + @TableField(value = "status") + private int status; @TableField(value = "username") private String username; - /** - * 最后心跳时间 - */ - private Date lastHeartbeatTime; - @TableField(value = "password") private String password; - /** - * 描述信息 - */ + @TableField(value = "description") private String description; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java index 6bae3e38..93ef9f5b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java @@ -1,11 +1,44 @@ package cd.casic.module.machine.dal.mysql; -import cd.casic.module.machine.dal.dataobject.MachineProxy; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.controller.vo.MachineProxyVO; +import cd.casic.module.machine.dal.dataobject.MachineEnvDO; +import cd.casic.module.machine.dal.dataobject.MachineProxyDO; +import cd.casic.module.machine.enums.MachineProxyStatus; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + +import static com.baomidou.mybatisplus.extension.toolkit.Db.listObjs; + /** * 机器代理Mapper接口 */ @Mapper -public interface MachineProxyMapper extends BaseMapper { +public interface MachineProxyMapper extends BaseMapperX { + + + + default PageResult selectPage(MachineProxyVO machineProxyVO) { + return selectPage(machineProxyVO, new LambdaQueryWrapperX() + .eqIfPresent(MachineProxyDO::getHostIp, machineProxyVO.getHostIp()) + .eqIfPresent(MachineProxyDO::getProxyType, machineProxyVO.getProxyType()) + .eqIfPresent(MachineProxyDO::getStatus, machineProxyVO.getStatus()) + .likeIfPresent(MachineProxyDO::getDescription, machineProxyVO.getDescription()) + ); + } + default List getOnlineProxyListInIds(List ids) { + LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX<>(); + + // 1. 状态为在线（eqIfPresent 确保状态非空时拼接条件） + queryWrapper.eqIfPresent(MachineProxyDO::getStatus, MachineProxyStatus.ONLINE.getCode()); + + // 2. 传入的 ID 列表非空时，添加 IN 条件（使用 inIfPresent 自动过滤空值） + queryWrapper.inIfPresent(MachineProxyDO::getId, ids); + + // 4. 仅查询 ID 字段，提升性能 + return listObjs(queryWrapper.select(MachineProxyDO::getId)); + } } \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java index 9cba5df2..affcbd7b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java @@ -1,17 +1,30 @@ package cd.casic.module.machine.enums; - - +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + @Getter @AllArgsConstructor -public enum MachineProxyType implements CodeEnum { +public enum MachineProxyType implements IntArrayValuable { HTTP(1, "http"), SOCKS4(2, "socks4"), SOCKS5(3, "socks5"); + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MachineProxyType::getCode).toArray(); - private final int code; - + /** + * 状态值 + */ + private final Integer code; + /** + * 状态名 + */ private final String message; + + + @Override + public int[] array() { + return ARRAYS; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java deleted file mode 100644 index 17fb4901..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/RequestExceptionEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.machine.enums; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum RequestExceptionEnum implements CodeEnum { - REQUEST_TYPE_NOT_JSON(1, "传递参数格式错误，请使用json格式"), - REQUEST_JSON_ERROR(2, "json格式错误"), - REQUEST_METHOD_NOT_POST(3, "不支持该请求方法，请求方法应为POST"), - REQUEST_METHOD_NOT_GET(4, "不支持该请求方法，请求方法应为GET"), - PARAM_ERROR(5, "参数错误"); - - private final int code; - - private final String message; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index df305c5a..e996fa09 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -2,24 +2,23 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineProxyVO; -import cd.casic.module.machine.dal.dataobject.MachineProxy; -import com.baomidou.mybatisplus.extension.service.IService; +import cd.casic.module.machine.dal.dataobject.MachineProxyDO; import java.util.Map; /** * 机器代理服务接口 */ -public interface MachineProxyService extends IService { +public interface MachineProxyService { /** * 注册新的机器代理 */ - boolean register(MachineProxyVO machineProxyVO); + Long createProxy(MachineProxyVO machineProxyVO); /** * 更新代理状态 */ - boolean updateStatus(MachineProxyVO machineProxyVO); + void updateProxy(MachineProxyVO machineProxyVO); /** @@ -27,12 +26,8 @@ public interface MachineProxyService extends IService { * * @return 状态统计Map */ - Map getStatusStatistics(); + Map getAllProxyStatus(); - /** - * 更新代理配置 - */ - void update(MachineProxyVO machineProxyVO); /** @@ -40,7 +35,7 @@ public interface MachineProxyService extends IService { * * @param proxyIds 代理ID列表 */ - void delete(String proxyIds); + void deleteProxyList(String proxyIds); - PageResult list(MachineProxyVO machineProxyVO); + PageResult getProxyPage(MachineProxyVO machineProxyVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index 1eca5b9a..9a946b5d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -1,161 +1,132 @@ -//package cd.casic.module.machine.service.impl; -// -//import cd.casic.module.machine.controller.vo.MachineProxyDTO; -//import cd.casic.module.machine.dal.dataobject.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.dal.mysql.MachineProxyMapper; -//import cd.casic.module.machine.service.MachineProxyService; -//import cd.casic.module.machine.utils.EnumUtils; -//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 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 java.util.*; -//import java.util.function.Function; -//import java.util.stream.Collectors; -// -///** -// * 机器代理服务实现类 -// */ -//@Service -//public class MachineProxyServiceImpl extends ServiceImpl implements MachineProxyService { -// @Resource -// private MachineProxyMapper machineProxyMapper; -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public boolean register(MachineProxyDTO machineProxyDTO) { -// // 创建代理记录 -// MachineProxy proxy = new MachineProxy(); -// BeanUtils.copyProperties(machineProxyDTO, proxy); -// proxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); -// proxy.setVersion("1.0.0"); -// proxy.setStatusCode(MachineProxyStatus.ONLINE.getCode()); -// return save(proxy); -// } -// -// @Override -// public boolean updateStatus(MachineProxyDTO machineProxyDTO) { -// // 参数校验 -// if (machineProxyDTO == null) { -// throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); -// } -// -// // 查询代理 -// MachineProxy proxy = this.getById(machineProxyDTO.getId()); -// -// if (proxy == null) { -// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL, "代理不存在"); -// } -// -// // 更新状态 -// proxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); -// proxy.setUpdateTime(new Date()); -// return updateById(proxy); -// } -// -// -// @Override -// public Map getStatusStatistics() { -// List proxyList = list(); -// -// if (CollectionUtils.isEmpty(proxyList)) { -// return Collections.emptyMap(); -// } -// return proxyList.stream() -// .map(proxy -> EnumUtils.getEnumByCode(proxy.getStatusCode(), MachineProxyStatus.class).getMessage()) -// .collect(Collectors.groupingBy( -// Function.identity(), -// Collectors.counting() // 统计每个分组的元素数量 -// )); -// } -// -// @Override -// public void update(MachineProxyDTO machineProxyDTO) { -// // 参数校验 -// if (machineProxyDTO == null) { -// throw new ServiceException(ServiceException.MACHINE_PROXY_DTO_NULL, "MachineProxyDTO对象为空"); -// } -// MachineProxy machineProxy = new MachineProxy(); -// BeanUtils.copyProperties(machineProxyDTO, machineProxy); -// if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { -// machineProxy.setProxyTypeCode(EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); -// } -// if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { -// machineProxy.setStatusCode(EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); -// } -// this.updateById(machineProxy); -// } -// -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void delete(String ids) { -// List machineProxyIds = Arrays.stream(ids.split(",")) -// .map(String::trim) -// .filter(s -> !s.isEmpty()) -// .map(Long::parseLong) -// .toList(); -// // 参数校验 -// if (CollectionUtils.isEmpty(machineProxyIds)) { -// throw new ServiceException(ServiceException.PARAMETER_ERROR, "参数错误"); -// } -// // 批量逻辑删除 -// remove(new LambdaQueryWrapper() -// .in(MachineProxy::getId, machineProxyIds) -// .ne(MachineProxy::getStatus, MachineProxyStatus.ONLINE.getCode())); -// } -// -// @Override -// public PageResult list(MachineProxyDTO machineProxyDTO) { -// QueryWrapper queryWrapper = getMachineProxyQueryWrapper(machineProxyDTO); -// Page page = machineProxyMapper.selectPage(new Page<>(machineProxyDTO.getPageIndex(), machineProxyDTO.getPageSize()), queryWrapper); -// List machineProxyDtos = page.getRecords().stream().map(machineProxy -> { -// MachineProxyDTO dto = new MachineProxyDTO(); -// BeanUtils.copyProperties(machineProxy, dto); -// dto.setProxyType(EnumUtils.getEnumByCode(machineProxy.getProxyTypeCode(), MachineProxyType.class).getMessage()); -// dto.setStatus(EnumUtils.getEnumByCode(machineProxy.getStatusCode(), MachineProxyStatus.class).getMessage()); -// return dto; -// }).toList(); -// return new PageResult<>( -// page.getCurrent(), -// page.getSize(), -// page.getTotal(), -// page.getPages(), -// machineProxyDtos -// ); -// } -// -// private QueryWrapper getMachineProxyQueryWrapper(MachineProxyDTO machineProxyDTO) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (machineProxyDTO.getHostIp() != null && !machineProxyDTO.getHostIp().isEmpty()) { -// queryWrapper.like("host_ip", machineProxyDTO.getHostIp()); -// } -// if (machineProxyDTO.getSshPort() != null && !machineProxyDTO.getSshPort().isEmpty()) { -// queryWrapper.like("ssh_port", machineProxyDTO.getSshPort()); -// } -// if (machineProxyDTO.getUsername() != null && !machineProxyDTO.getUsername().isEmpty()) { -// queryWrapper.like("username", machineProxyDTO.getUsername()); -// } -// if (machineProxyDTO.getDescription() != null && !machineProxyDTO.getDescription().isEmpty()) { -// queryWrapper.like("description", machineProxyDTO.getDescription()); -// } -// if (machineProxyDTO.getStatus() != null && !machineProxyDTO.getStatus().isEmpty()) { -// queryWrapper.like("status_code", EnumUtils.getEnumByMessage(machineProxyDTO.getStatus(), MachineProxyStatus.class).getCode()); -// } -// if (machineProxyDTO.getProxyType() != null && !machineProxyDTO.getProxyType().isEmpty()) { -// queryWrapper.like("proxy_type_code", EnumUtils.getEnumByMessage(machineProxyDTO.getProxyType(), MachineProxyType.class).getCode()); -// } -// return queryWrapper.orderByDesc("create_date"); -// } -// -//} +package cd.casic.module.machine.service.impl; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.controller.vo.MachineProxyVO; +import cd.casic.module.machine.dal.dataobject.MachineProxyDO; +import cd.casic.module.machine.enums.MachineProxyStatus; +import cd.casic.module.machine.enums.MachineProxyType; +import cd.casic.module.machine.dal.mysql.MachineProxyMapper; +import cd.casic.module.machine.service.MachineProxyService; +import cd.casic.module.machine.utils.EnumUtils; +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.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Resource; +import cd.casic.framework.commons.util.object.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; +import static com.baomidou.mybatisplus.extension.toolkit.Db.save; +import static org.apache.catalina.security.SecurityUtil.remove; + +/** + * 机器代理服务实现类 + */ +@Service +public class MachineProxyServiceImpl implements MachineProxyService { + @Resource + private MachineProxyMapper machineProxyMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createProxy(MachineProxyVO machineProxyVO) { + validateMachineProxyAdd(machineProxyVO); + // 创建代理记录 + MachineProxyDO machineProxyDO = BeanUtils.toBean(machineProxyVO, MachineProxyDO.class);; + save(machineProxyDO); + return machineProxyDO.getId(); + } + + @Override + public void updateProxy(MachineProxyVO machineProxyVO) { + // 参数校验 + MachineProxyDO machineProxyDO = validateMachineProxyExists(machineProxyVO.getId()); + // 更新状态 + BeanUtils.copyProperties(machineProxyVO, machineProxyDO); + machineProxyMapper.updateById(machineProxyDO); + } + + + @Override + public Map getAllProxyStatus() { + List proxyList = machineProxyMapper.selectList(new QueryWrapper<>()); + if (CollectionUtils.isEmpty(proxyList)) { + return Collections.emptyMap(); + } + return proxyList.stream() + .map(MachineProxyDO::getStatus) + .collect(Collectors.groupingBy( + Function.identity(), + // 统计每个分组的元素数量 + Collectors.counting() + )); + } + + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteProxyList(String ids) { + if (ids == null) { + return; + } + List machineProxyIds = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); + //检查是否存在在线的代理 + validateMachineProxyOnline(machineProxyIds); + // 批量逻辑删除 + machineProxyMapper.deleteBatchIds(machineProxyIds); + } + + @Override + public PageResult getProxyPage(MachineProxyVO machineProxyVO) { + return machineProxyMapper.selectPage(machineProxyVO); + } + + + + @VisibleForTesting + MachineProxyDO validateMachineProxyExists(Long id) { + if (id == null) { + return null; + } + MachineProxyDO machineProxyDO = machineProxyMapper.selectById(id); + if (machineProxyDO == null) { + throw exception(MACHINE_PROXY_NOT_EXISTS); + } + return machineProxyDO; + } + + @VisibleForTesting + void validateMachineProxyOnline(List ids) { + List idList = machineProxyMapper.getOnlineProxyListInIds(ids); + if(!idList.isEmpty()){ + throw exception(MACHINE_PROXY_IS_ONLINE,idList); + } + } + + @VisibleForTesting + void validateMachineProxyAdd(MachineProxyVO machineProxyVO) { + if (machineProxyVO.getHostIp()==null) { + throw exception(MACHINE_PROXY_HOST_IP_NULL); + } + if (machineProxyVO.getUsername()==null) { + throw exception(MACHINE_PROXY_USER_NAME_NULL); + } + + // 校验代理类型 + int[] arrays = MachineProxyType.ARRAYS; + if (Arrays.stream(arrays).filter(i -> i == machineProxyVO.getProxyType()).findAny().isEmpty()) { + throw exception(MACHINE_PROXY_TYPE_NOT_EXISTS); + } + } + +} From 2d4653b29a231719cfabdddbee7757d378b0a689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Fri, 6 Jun 2025 16:05:29 +0800 Subject: [PATCH 22/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/machine/controller/vo/MachineEnvVO.java | 1 + .../module/machine/dal/dataobject/MachineEnvDO.java | 6 +++++- .../module/machine/dal/mysql/MachineEnvMapper.java | 10 ++-------- .../machine/service/impl/MachineEnvServiceImpl.java | 13 ++++++++++++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java index 922daaaa..8d5a5545 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java @@ -5,6 +5,7 @@ import lombok.*; import lombok.experimental.Accessors; import java.time.LocalDateTime; +@EqualsAndHashCode(callSuper = true) @Schema(description = "管理后台 - 机器环境变量信息 Response VO") @Data @NoArgsConstructor diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java index 4c4589a4..61a6e25b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java @@ -15,10 +15,10 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) -@TableName("machine_env") @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("machine_env") public class MachineEnvDO extends BaseDO { @@ -51,3 +51,7 @@ public class MachineEnvDO extends BaseDO { } + + + + diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java index a51b31fb..f2cf426e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java @@ -16,13 +16,7 @@ public interface MachineEnvMapper extends BaseMapperX { default PageResultselectPage(MachineEnvVO machineEnvVO){ return selectPage(machineEnvVO,new LambdaQueryWrapperX() .likeIfPresent(MachineEnvDO::getEnvKey, machineEnvVO.getEnvKey()) - .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription()) - .inIfPresent(MachineEnvDO::getMachineId, machineEnvVO.getMachineId()) - .orderByDesc( MachineEnvDO::getMachineId)); - } - default void deleteBatchByIds(String ids) { - this.delete(new LambdaQueryWrapperX() - .in(MachineEnvDO::getId, ids.split(",")) - ); + .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription())); } + } \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index c17fb6b7..a4b4efe5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -10,6 +10,10 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import cd.casic.framework.commons.util.object.BeanUtils; + +import java.util.Arrays; +import java.util.List; + import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; @@ -56,7 +60,14 @@ public class MachineEnvServiceImpl implements MachineEnvService { @Override public void deleteEnvList(String ids) { - machineEnvMapper.deleteBatchByIds(ids); + //ids转换为List,使用流 + List machineEnvIds = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); + + machineEnvMapper.deleteBatchIds(machineEnvIds); } @Override From 97ffb19c039f60e1c371304025683d7b069a14c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Fri, 6 Jun 2025 16:41:13 +0800 Subject: [PATCH 23/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/dal/mysql/MachineProxyMapper.java | 18 ------------------ .../machine/enums/MachineProxyStatus.java | 12 +++++++++++- .../service/impl/MachineProxyServiceImpl.java | 12 +++++++++--- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java index 93ef9f5b..5cc87bfd 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java @@ -2,17 +2,10 @@ package cd.casic.module.machine.dal.mysql; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; -import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.controller.vo.MachineProxyVO; -import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import cd.casic.module.machine.dal.dataobject.MachineProxyDO; -import cd.casic.module.machine.enums.MachineProxyStatus; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - -import static com.baomidou.mybatisplus.extension.toolkit.Db.listObjs; - /** * 机器代理Mapper接口 */ @@ -29,16 +22,5 @@ public interface MachineProxyMapper extends BaseMapperX { .likeIfPresent(MachineProxyDO::getDescription, machineProxyVO.getDescription()) ); } - default List getOnlineProxyListInIds(List ids) { - LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX<>(); - // 1. 状态为在线（eqIfPresent 确保状态非空时拼接条件） - queryWrapper.eqIfPresent(MachineProxyDO::getStatus, MachineProxyStatus.ONLINE.getCode()); - - // 2. 传入的 ID 列表非空时，添加 IN 条件（使用 inIfPresent 自动过滤空值） - queryWrapper.inIfPresent(MachineProxyDO::getId, ids); - - // 4. 仅查询 ID 字段，提升性能 - return listObjs(queryWrapper.select(MachineProxyDO::getId)); - } } \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java index dc7acd77..12864b47 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java @@ -1,12 +1,15 @@ package cd.casic.module.machine.enums; +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + @Getter @AllArgsConstructor -public enum MachineProxyStatus implements CodeEnum { +public enum MachineProxyStatus implements IntArrayValuable { /** * 代理状态 (online, offline, installing, updating, error) */ @@ -16,7 +19,14 @@ public enum MachineProxyStatus implements CodeEnum { UPDATING(4, "updating"), ERROR(5, "error"); + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MachineProxyStatus::getCode).toArray(); + private final int code; private final String message; + + @Override + public int[] array() { + return ARRAYS; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index 9a946b5d..e4c5d0be 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -107,9 +107,15 @@ public class MachineProxyServiceImpl implements MachineProxyService { @VisibleForTesting void validateMachineProxyOnline(List ids) { - List idList = machineProxyMapper.getOnlineProxyListInIds(ids); - if(!idList.isEmpty()){ - throw exception(MACHINE_PROXY_IS_ONLINE,idList); + List machineProxyDOS = machineProxyMapper.selectBatchIds(ids); + ListonlineId=new ArrayList<>(); + machineProxyDOS.forEach(machineProxyDO->{ + if (machineProxyDO.getStatus() == MachineProxyStatus.ONLINE.getCode()) { + onlineId.add(machineProxyDO.getId()); + } + }); + if(!onlineId.isEmpty()){ + throw exception(MACHINE_PROXY_IS_ONLINE,onlineId); } } From be07dc0e0a2f1a8b796356db4d960fadff0b3928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Mon, 9 Jun 2025 18:05:30 +0800 Subject: [PATCH 24/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contants/MachineErrorCodeConstants.java | 21 + .../controller/MachineInfoController.java | 269 ++-- .../controller/SecretKeyController.java | 134 +- .../machine/controller/vo/MachineInfoDto.java | 46 - .../machine/controller/vo/MachineInfoVO.java | 64 + .../machine/controller/vo/SecretKeyDto.java | 35 - .../machine/controller/vo/SecretKeyVO.java | 43 + .../{MachineInfo.java => MachineInfoDO.java} | 43 +- .../{SecretKey.java => SecretKeyDO.java} | 11 +- .../machine/dal/mysql/MachineInfoMapper.java | 45 +- .../machine/dal/mysql/SecretKeyMapper.java | 29 + .../dal/mysql/SecretServiceMapper.java | 9 - .../machine/enums/AuthenticationType.java | 11 +- .../machine/enums/MachineInfoStatus.java | 8 +- .../module/machine/enums/MachineInfoType.java | 12 +- .../machine/enums/MachineProxyStatus.java | 1 + .../enums/PermissionExceptionEnum.java | 19 - .../machine/handler/ConnectionSession.java | 1277 +++++++++-------- .../machine/service/MachineInfoService.java | 25 +- .../machine/service/SecretKeyService.java | 21 +- .../service/impl/MachineEnvServiceImpl.java | 8 +- .../service/impl/MachineProxyServiceImpl.java | 7 +- .../service/impl/MachineinfoServiceImpl.java | 724 +++++----- .../service/impl/SecretKeyServiceImpl.java | 316 ++-- 24 files changed, 1673 insertions(+), 1505 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/{MachineInfo.java => MachineInfoDO.java} (58%) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/{SecretKey.java => SecretKeyDO.java} (77%) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index a69ebcbc..e42240bd 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -8,6 +8,16 @@ import cd.casic.framework.commons.exception.ErrorCode; public interface MachineErrorCodeConstants { // ========== 机器模块 1-003-000-000 ========== ErrorCode MACHINE_INFO_NULL = new ErrorCode(1_003_000_000, "机器信息为空"); + ErrorCode MACHINE_INFO_HOST_IP_NULL = new ErrorCode(1_003_000_000, "机器主机IP为空"); + ErrorCode MACHINE_INFO_USER_NAME_NULL = new ErrorCode(1_003_000_000, "机器用户名为空"); + ErrorCode MACHINE_INFO_TYPE_NULL = new ErrorCode(1_003_000_022, "机器类型为空"); + ErrorCode MACHINE_INFO_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_011, "机器类型不存在"); + ErrorCode MACHINE_INFO_TAG_NULL = new ErrorCode(1_003_000_044, "机器唯一标识为空"); + ErrorCode MACHINE_INFO_TAG_EXISTS = new ErrorCode(1_003_000_044, "机器唯一标识已存在"); + ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NULL = new ErrorCode(1_003_000_044, "机器认证类型为空"); + ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_044, "机器认证类型不存在"); + ErrorCode MACHINE_ENABLE = new ErrorCode(1_003_000_044, "机器启用中"); + ErrorCode MACHINE_UN_ENABLE = new ErrorCode(1_003_000_044, "机器不可用"); ErrorCode UPLOADING_FILE_FAIL = new ErrorCode(1_003_000_001, "上传文件失败"); ErrorCode DOWNLOAD_FILE_FAIL = new ErrorCode(1_003_000_002, "下载失败"); ErrorCode FILENAME_NULL = new ErrorCode(1_003_000_003, "文件名为空"); @@ -15,6 +25,8 @@ public interface MachineErrorCodeConstants { ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_000_005, "删除文件失败"); ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_000_008, "参数错误"); + + // ========== 机器环境变量模块 1-003-000-009 ========== ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_000_009, "机器环境变量为空"); ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_000_009, "机器不存在"); @@ -26,6 +38,15 @@ public interface MachineErrorCodeConstants { ErrorCode MACHINE_PROXY_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_007, "机器代理类型不存在"); ErrorCode MACHINE_PROXY_IS_ONLINE = new ErrorCode(1_003_000_007, "机器代理在线，不能删除"); + // ========== 密钥模块 1-003-000-010 ========== + ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_000_010, "密钥为空"); + ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_000_010, "密钥不存在"); + ErrorCode SECRET_KEY_NAME_ILLEGAL = new ErrorCode(1_003_000_010, "密钥名称不合法"); + ErrorCode SECRET_KEY_PATH_ILLEGAL = new ErrorCode(1_003_000_010, "密钥路径不合法"); + ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_000_010, "密钥路径为空"); + ErrorCode SECRET_KEY_UPLOAD_FAIL = new ErrorCode(1_003_000_010, "密钥上传失败"); + + ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_000_011, "oss参数无法读取"); ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_000_012, "密钥为空"); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index fb38425e..34c94923 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,126 +1,143 @@ -//package cd.casic.module.machine.controller; -// -//import cd.casic.framework.commons.pojo.CommonResult; -//import cd.casic.framework.commons.pojo.PageResult; -//import cd.casic.module.machine.dal.dataobject.MachineInfo; -//import cd.casic.module.machine.enums.ConnectionStatus; -//import cd.casic.module.machine.service.MachineInfoService; -//import cd.casic.module.machine.controller.vo.MachineInfoDto; -//import io.swagger.v3.oas.annotations.Operation; -//import io.swagger.v3.oas.annotations.tags.Tag; -//import jakarta.annotation.Resource; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Map; -// -//import static cd.casic.framework.commons.pojo.CommonResult.success; -// -//@RestController -//@Tag(name = "机器信息管理") -//@RequestMapping("/api/machineInfo") -//public class MachineInfoController { -// @Resource -// private MachineInfoService machineInfoService; -// -// @PostMapping("/add") -// @Operation(summary = "新增机器信息") -// public CommonResult add(@RequestBody MachineInfoDto machineInfoDto) { -// return success(machineInfoService.addMachineInfo(machineInfoDto)); -// } -// -// -// @PostMapping("/list") -// @Operation(summary = "获取机器信息列表") -// public CommonResult> list(@RequestBody MachineInfoDto machineInfoDto) { -// return success(machineInfoService.listMachineInfo(machineInfoDto)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "编辑机器信息") -// public CommonResult update(@RequestBody MachineInfoDto machineInfoDto) { -// return success(machineInfoService.updateMachineInfo(machineInfoDto)); -// } -// -// @PutMapping("/updateStatus") -// @Operation(summary = "机器启用/停用") -// public CommonResult updateStatus(@RequestBody MachineInfoDto machineInfoDto) { -// return success(machineInfoService.updateStatus(machineInfoDto)); -// } -// -// @PutMapping("/bindingSecretKey") -// @Operation(summary = "绑定密钥") -// public CommonResult bindingSecretKey(@RequestBody MachineInfoDto machineInfoDto) { -// return success(machineInfoService.bindingSecretKey(machineInfoDto)); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "机器信息删除") -// public CommonResult delete(@RequestParam Long machineInfoId) { -// machineInfoService.deleteMachineInfo(machineInfoId); -// return success(true); -// } -// -// @DeleteMapping("/deleteList") -// @Operation(summary = "批量删除机器信息") -// public CommonResult deleteList(@RequestParam String machineInfoIds) { -// machineInfoService.deleteList(machineInfoIds); -// return success(true); -// } -// -// @PostMapping("/test") -// @Operation(summary = "测试机器连接") -// public CommonResult testConnection(@RequestParam Long id) { -// return success(machineInfoService.testConnection(id)); -// } -// -// @GetMapping("/status/{machineName}") -// @Operation(summary = "获取机器连接状态") -// public CommonResult getConnectionStatus(@PathVariable String machineName) { -// return success(machineInfoService.getConnectionStatus(machineName)); -// } -// -// @GetMapping("/status/all") -// @Operation(summary = "获取所有机器连接状态") -// public CommonResult> getAllConnectionStatus() { -// return success(machineInfoService.getAllConnectionStatus()); -// } -// -// @PostMapping("/connect") -// @Operation(summary = "建立机器连接") -// public CommonResult connect(@RequestBody MachineInfo machineInfo) { -// return success(machineInfoService.connect(machineInfo)); -// } -// -// @PostMapping("/disconnect/{sessionId}") -// @Operation(summary = "断开机器连接") -// public CommonResult disconnect(@PathVariable String sessionId) { -// return success(machineInfoService.disconnect(sessionId)); -// } -// -// @PostMapping("/execute/{sessionId}") -// @Operation(summary = "执行远程命令") -// public CommonResult executeCommand( -// @PathVariable String sessionId, -// @RequestBody String command) { -// -// return success(machineInfoService.executeCommand(sessionId, command)); -// } -// -// @PostMapping("/upload/{sessionId}") -// @Operation(summary = "上传文件到远程机器") -// public CommonResult uploadFile( -// @PathVariable String sessionId, -// @RequestParam String localFilePath, -// @RequestParam String remoteFilePath) { -// return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); -// } -// -// @PostMapping("/download/{sessionId}") -// @Operation(summary = "从远程机器下载文件") -// public CommonResult downloadFile( -// @PathVariable String sessionId, -// @RequestParam String remoteFilePath, -// @RequestParam String localFilePath) { -// return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); -// } -//} +package cd.casic.module.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.service.MachineInfoService; +import cd.casic.module.machine.controller.vo.MachineInfoVO; +import cn.hutool.core.collection.CollUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; +import static cd.casic.framework.commons.pojo.CommonResult.success; + +@RestController +@Tag(name = "机器信息管理") +@RequestMapping("/ci/machineInfo") +@Validated +public class MachineInfoController { + @Resource + private MachineInfoService machineInfoService; + + @PostMapping("/create") + @Operation(summary = "新增机器信息") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:create')") + public CommonResult createMachine(@Valid @RequestBody MachineInfoVO machineInfoVO) { + Long id = machineInfoService.createMachine(machineInfoVO); + return success(id); + } + + + @PutMapping("/update") + @Operation(summary = "编辑机器信息") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:update')") + public CommonResult updateMachineInfo(@Valid @RequestBody MachineInfoVO machineInfoVO) { + machineInfoService.updateMachineInfo(machineInfoVO); + return success(true); + } + + @PutMapping("/updateStatus") + @Operation(summary = "机器启用/停用") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:status')") + public CommonResult updateStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { + Integer newStatus = machineInfoService.updateStatus(id, status); + return success(newStatus); + } + + @PostMapping("/list") + @Operation(summary = "获取机器信息列表") + public CommonResult> list(@Valid @RequestBody MachineInfoVO machineInfoVO) { + PageResult pageResult = machineInfoService.listMachineInfo(machineInfoVO); + if (CollUtil.isEmpty(pageResult.getList())) { + return success(new PageResult<>(pageResult.getTotal())); + } + return success(BeanUtils.toBean(pageResult, MachineInfoVO.class)); + } + + @PutMapping("/bindingSecretKey") + @Operation(summary = "绑定密钥") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:binding')") + public CommonResult bindingSecretKey(@RequestParam("ids") List ids, @RequestParam("secretKeyId") Long secretKeyId) { + machineInfoService.bindingSecretKey(ids,secretKeyId); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "机器信息删除") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:delete')") + public CommonResult deleteMachineInfo(@RequestParam("id") Long id) { + machineInfoService.deleteMachineInfo(id); + return success(true); + } + + @DeleteMapping("/deleteList") + @Operation(summary = "批量删除机器信息") +// @PreAuthorize("@ss.hasPermission('ci:machineInfo:delete')") + public CommonResult deleteMachineInfoList(@RequestParam("machineInfoIds") String ids) { + machineInfoService.deleteMachineInfoList(ids); + return success(true); + } + + @PostMapping("/test") + @Operation(summary = "测试机器连接") + public CommonResult testConnection(@RequestParam Long id) { + return success(machineInfoService.testConnection(id)); + } + + @GetMapping("/status/{machineName}") + @Operation(summary = "获取机器连接状态") + public CommonResult getConnectionStatus(@PathVariable String machineName) { + return success(machineInfoService.getConnectionStatus(machineName)); + } + + @GetMapping("/status/all") + @Operation(summary = "获取所有机器连接状态") + public CommonResult> getAllConnectionStatus() { + return success(machineInfoService.getAllConnectionStatus()); + } + + @PostMapping("/connect") + @Operation(summary = "建立机器连接") + public CommonResult connect(@Valid @RequestBody MachineInfoDO machineInfoDO) { + return success(machineInfoService.connect(machineInfoDO)); + } + + @PostMapping("/disconnect/{sessionId}") + @Operation(summary = "断开机器连接") + public CommonResult disconnect(@PathVariable String sessionId) { + return success(machineInfoService.disconnect(sessionId)); + } + + @PostMapping("/execute/{sessionId}") + @Operation(summary = "执行远程命令") + public CommonResult executeCommand( + @PathVariable String sessionId, + @RequestBody String command) { + + return success(machineInfoService.executeCommand(sessionId, command)); + } + + @PostMapping("/upload/{sessionId}") + @Operation(summary = "上传文件到远程机器") + public CommonResult uploadFile( + @PathVariable String sessionId, + @RequestParam String localFilePath, + @RequestParam String remoteFilePath) { + return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); + } + + @PostMapping("/download/{sessionId}") + @Operation(summary = "从远程机器下载文件") + public CommonResult downloadFile( + @PathVariable String sessionId, + @RequestParam String remoteFilePath, + @RequestParam String localFilePath) { + return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 4c204ae1..f75f3168 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,56 +1,78 @@ -//package cd.casic.module.machine.controller; -// -//import cd.casic.framework.commons.pojo.CommonResult; -//import cd.casic.framework.commons.pojo.PageResult; -//import cd.casic.module.machine.dal.dataobject.SecretKey; -//import cd.casic.module.machine.service.SecretKeyService; -//import cd.casic.module.machine.controller.vo.SecretKeyDto; -//import io.swagger.v3.oas.annotations.Operation; -//import io.swagger.v3.oas.annotations.tags.Tag; -//import jakarta.annotation.Resource; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.List; -// -//import static cd.casic.framework.commons.pojo.CommonResult.success; -// -//@RestController -//@RequestMapping("/api/secretKey") -//@Tag(name = "密钥管理") -//public class SecretKeyController { -// @Resource -// private SecretKeyService secretKeyService; -// -// @PostMapping(value = "/add") -// @Operation(summary = "新增密钥") -// public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { -// return success(secretKeyService.addSecretKey(secretKeyDto)); -// } -// -// @PutMapping("/bindingMachine") -// @Operation(summary = "绑定机器") -// public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { -// secretKeyService.bindingMachine(secretKeyId, machineIds); -// return success(true); -// } -// -// @PutMapping("/update") -// @Operation(summary = "编辑密钥信息") -// public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { -// return success(secretKeyService.updateSecretKey(secretKeyDto)); -// } -// -// @DeleteMapping("/deleteList") -// @Operation(summary = "批量删除密钥") -// public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { -// return success(secretKeyService.deleteList(secretKeyIds)); -// } -// -// @PostMapping("/list") -// @Operation(summary = "获取密钥信息列表") -// public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { -// return success(secretKeyService.listSecretKey(secretKeyDto)); -// } -// -// -//} +package cd.casic.module.machine.controller; +import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.dal.dataobject.SecretKeyDO; +import cd.casic.module.machine.service.SecretKeyService; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cn.hutool.core.collection.CollUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import static cd.casic.framework.commons.pojo.CommonResult.success; + +@RestController +@RequestMapping("/ci/secretKey") +@Tag(name = "密钥管理") +@Validated +public class SecretKeyController { + @Resource + private SecretKeyService secretKeyService; + + @PostMapping(value = "/create") + @Operation(summary = "新增密钥") +// @PreAuthorize("@ss.hasPermission('ci:secretKey:create')") + public CommonResult createSecretKey(@Valid @RequestBody SecretKeyVO secretKeyVO) throws Exception { + Long secretKeyId = secretKeyService.createSecretKey(secretKeyVO); + return success(secretKeyId); + } + + @PutMapping("/update") + @Operation(summary = "编辑密钥信息") +// @PreAuthorize("@ss.hasPermission('ci:secretKey:update')") + public CommonResult updateSecretKey(@Valid @RequestBody SecretKeyVO secretKeyVO) { + secretKeyService.updateSecretKey(secretKeyVO); + return success(true); + } + + @PutMapping("/bindingMachine") + @Operation(summary = "绑定机器") //todo解绑机器 +// @PreAuthorize("@ss.hasPermission('ci:secretKey:binding')") + public CommonResult bindingMachine(@RequestParam("id") Long id, @RequestParam("machineInfoIds") List machineInfoId) { + secretKeyService.bindingMachine(id, machineInfoId); + return success(true); + } + + @GetMapping("/getSecretKey") + @Operation(summary = "获取机器的环境变量") + public CommonResult getSecretKey(@RequestParam("id") Long id) { + SecretKeyVO secretKeyVO = secretKeyService.getSecretKey(id); + return success(secretKeyVO); + } + + + @DeleteMapping("/deleteList") + @Operation(summary = "批量删除密钥") +// @PreAuthorize("@ss.hasPermission('ci:secretKey:delete')") + public CommonResult deleteSecretKeyList(@RequestParam("ids") List ids) { + secretKeyService.deleteSecretKeyList(ids); + return success(true); + } + + @PostMapping("/list") + @Operation(summary = "获取密钥信息列表") + public CommonResult> getSecretKeypage(@Valid @RequestBody SecretKeyVO secretKeyVO) { + PageResult pageResult = secretKeyService.getSecretKeypage(secretKeyVO); + if (CollUtil.isEmpty(pageResult.getList())) { + return success(new PageResult<>(pageResult.getTotal())); + } + return success(BeanUtils.toBean(pageResult,SecretKeyVO.class)); + } + + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java deleted file mode 100644 index 81371e4a..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoDto.java +++ /dev/null @@ -1,46 +0,0 @@ -package cd.casic.module.machine.controller.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.util.Date; - -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -public class MachineInfoDto extends PageDto { - private Long id; - - private Date createDate; - - private Date updateDate; - - private String name; - - private String tag; - - private String hostIp; - - private String description; - - private String username; - - private String status; - - private Integer sshPort; - - private String password; - - private Long secretKeyId; - - private Long machineProxyId; - - private String authenticationType; - - private String machineInfoType; - - private int isProxy; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java new file mode 100644 index 00000000..be6964bc --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java @@ -0,0 +1,64 @@ +package cd.casic.module.machine.controller.vo; + +import cd.casic.framework.commons.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import lombok.experimental.Accessors; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Schema(description = "管理后台 - 机器信息 Response VO") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class MachineInfoVO extends PageParam { + + @Schema(description = "机器ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-06-15T10:30:00") + private Date createTime; + + @Schema(description = "更新时间", example = "2023-06-15T10:30:00") + private Date updateTime; + + @Schema(description = "机器名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "server-01") + private String name; + + @Schema(description = "机器标签,唯一标识", example = "production,web-server") + private String tag; + + @Schema(description = "主机IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.100") + private String hostIp; + + @Schema(description = "机器描述", example = "生产环境Web服务器") + private String description; + + @Schema(description = "登录用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin") + private String username; + + @Schema(description = "机器状态", example = "online,offline,maintenance") + private Integer status; + + @Schema(description = "SSH端口", example = "22") + private Integer sshPort; + + @Schema(description = "登录密码", example = "******") + private String password; + + @Schema(description = "密钥ID", example = "5") + private Long secretKeyId; + + @Schema(description = "代理ID", example = "101") + private Long machineProxyId; + + @Schema(description = "认证类型", example = "password,key") + private Integer authenticationType; + + @Schema(description = "机器信息类型", example = "Linux,Windows") + private Integer machineInfoType; + + +} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java deleted file mode 100644 index c23b3836..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.machine.controller.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.util.Date; -import java.util.List; - -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -public class SecretKeyDto extends PageDto { - private Long id; - - private String name; - - private String description; - - //存储路径,本地上传文件路径 - private String path; - - private String fileName; - - //密钥密码 - private String password; - - private Date createDate; - - private Date updateDate; - - private List machineInfoIds; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java new file mode 100644 index 00000000..9245edea --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -0,0 +1,43 @@ +package cd.casic.module.machine.controller.vo; +import cd.casic.framework.commons.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import lombok.experimental.Accessors; +import java.time.LocalDateTime; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Schema(description = "管理后台 - 密钥信息 Response VO") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) // 添加链式调用支持 +public class SecretKeyVO extends PageParam { + + @Schema(description = "密钥ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "密钥名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产环境密钥") + private String name; + + @Schema(description = "密钥描述", example = "用于加密敏感数据的密钥") + private String description; + + @Schema(description = "存储路径（本地上传文件路径）", example = "/data/secret_keys/") + private String path; + + @Schema(description = "文件名", example = "key.pem") + private String fileName; + + @Schema(description = "密钥密码", example = "******") + private String password; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-06-15T10:30:00") + private LocalDateTime createTime; + + @Schema(description = "更新时间", example = "2023-06-15T10:30:00") + private LocalDateTime updateTime; + + @Schema(description = "关联的机器ID列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1024, 2048]") + private List machineInfoIds; +} \ No newline at end of file diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java similarity index 58% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java index ab3d1d50..0b25a446 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfo.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java @@ -1,24 +1,35 @@ package cd.casic.module.machine.dal.dataobject; +import cd.casic.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -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; import lombok.NoArgsConstructor; + @EqualsAndHashCode(callSuper = true) @Data @AllArgsConstructor @NoArgsConstructor @TableName(value = "machine_info") -public class MachineInfo extends BaseEntity { +public class MachineInfoDO extends BaseDO { + + /** + * 机器id + */ + @TableId + private Long id; + + @TableField(value = "name") private String name; + /** + * 机器唯一标识 + */ @TableField(value = "tag") private String tag; @@ -28,18 +39,11 @@ public class MachineInfo extends BaseEntity { @TableField(value = "description") private String description; - @TableField(exist = false) - private MachineInfoType machineInfoType; + @TableField(value = "machine_info_type") + private Integer machineInfoType; - @TableField(value = "machine_info_type_code") - private int machineInfoTypeCode; - - - @TableField(exist = false) - private MachineInfoStatus status; - - @TableField(value = "status_code") - private int statusCode; + @TableField(value = "status") + private Integer status; //用户名 @TableField(value = "username") @@ -58,12 +62,7 @@ public class MachineInfo extends BaseEntity { @TableField(value = "machine_proxy_id") private Long machineProxyId; - @TableField(value = "authentication_type_code") - private int authenticationTypeCode; + @TableField(value = "authentication_type") + private Integer authenticationType; - @TableField(exist = false) - private AuthenticationType authenticationType; - - @TableField(value = "is_proxy") - private int isProxy; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java similarity index 77% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java index a1d4e820..cab9d3b4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKey.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java @@ -1,6 +1,8 @@ package cd.casic.module.machine.dal.dataobject; +import cd.casic.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; @@ -12,7 +14,14 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "machine_secret_key") -public class SecretKey extends BaseEntity{ +public class SecretKeyDO extends BaseDO { + + /** + * 密钥id + */ + @TableId + private Long id; + @TableField(value = "name") private String name; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index d8a4257b..d0a967fa 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -1,11 +1,50 @@ package cd.casic.module.machine.dal.mysql; +import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; +import cd.casic.module.machine.controller.vo.MachineEnvVO; +import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; -import cd.casic.module.machine.dal.dataobject.MachineInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper -public interface MachineInfoMapper extends BaseMapperX { +public interface MachineInfoMapper extends BaseMapperX { + default Boolean existsByTag(String tag){ + return selectOne(new QueryWrapper().eq("tag", tag))!=null; + } + default void updateStatus(Long machineInfoId, Integer status){ + UpdateWrapper set = new UpdateWrapper<>(); + set.eq("id", machineInfoId).set("status", status); + this.update(null,set); + } + default void bindingSecretKey(List machineInfoIds, Long secretKeyId){ + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() + .set(MachineInfoDO::getSecretKeyId, secretKeyId) + .in(MachineInfoDO::getId, machineInfoIds); + this.update(null, wrapper); + } + default void unBindingSecretKey(List secretKeyId){ + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() + .set(MachineInfoDO::getSecretKeyId, null) + .in(MachineInfoDO::getSecretKeyId, secretKeyId); + this.update(null, wrapper); + } + default PageResult selectPage(MachineInfoVO machineInfoVO){ + return selectPage(machineInfoVO,new LambdaQueryWrapperX() + .likeIfPresent(MachineInfoDO::getName, machineInfoVO.getName()) + .likeIfPresent(MachineInfoDO::getTag, machineInfoVO.getTag()) + .likeIfPresent(MachineInfoDO::getDescription, machineInfoVO.getDescription()) + .likeIfPresent(MachineInfoDO::getUsername, machineInfoVO.getUsername()) + .eqIfPresent(MachineInfoDO::getHostIp, machineInfoVO.getHostIp())); + } + + } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java new file mode 100644 index 00000000..05166abe --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java @@ -0,0 +1,29 @@ +package cd.casic.module.machine.dal.mysql; + +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.dal.dataobject.SecretKeyDO; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SecretKeyMapper extends BaseMapperX { + //查询列表 + default PageResult selectPage(SecretKeyVO secretKeyVO){ + return selectPage(secretKeyVO,new LambdaQueryWrapperX() + .likeIfPresent(SecretKeyDO::getName,secretKeyVO.getName()) + .likeIfPresent(SecretKeyDO::getDescription,secretKeyVO.getDescription())); + + } + + default void bindingMachine(Long machineInfoId, List secretKeyId){ + UpdateWrapper set = new UpdateWrapper<>(); + set.eq("id", secretKeyId).set("machineInfoId", machineInfoId); + this.update(null,set); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java deleted file mode 100644 index 26e92c18..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretServiceMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package cd.casic.module.machine.dal.mysql; - -import cd.casic.module.machine.dal.dataobject.SecretKey; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface SecretServiceMapper extends BaseMapper { -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java index 80eb092a..71f8314c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/AuthenticationType.java @@ -1,16 +1,25 @@ package cd.casic.module.machine.enums; +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + @Getter @AllArgsConstructor -public enum AuthenticationType implements CodeEnum { +public enum AuthenticationType implements IntArrayValuable { PASSWORD(1,"密码认证"), SECRET_KEY(2,"密钥认证"); + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(AuthenticationType::getCode).toArray(); private final int code; private final String message; + + @Override + public int[] array() { + return ARRAYS; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java index df37b1dd..74f3d869 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java @@ -1,16 +1,22 @@ package cd.casic.module.machine.enums; +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public enum MachineInfoStatus implements CodeEnum { +public enum MachineInfoStatus implements IntArrayValuable { ENABLE(1,"启用"), UN_ENABLE(0,"停用"); private final int code; private final String message; + + @Override + public int[] array() { + return new int[0]; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java index 20084334..2a168b31 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoType.java @@ -1,16 +1,24 @@ package cd.casic.module.machine.enums; +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + @Getter @AllArgsConstructor -public enum MachineInfoType implements CodeEnum { +public enum MachineInfoType implements IntArrayValuable { Linux(1,"Linux"), WINDOWS(2,"Windows"); - + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MachineInfoType::getCode).toArray(); private final int code; private final String message; + + @Override + public int[] array() { + return ARRAYS; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java index 12864b47..e162c82a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyStatus.java @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Arrays; +import java.util.List; @Getter @AllArgsConstructor diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java deleted file mode 100644 index c98b9332..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/PermissionExceptionEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.machine.enums; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum PermissionExceptionEnum implements CodeEnum { - URL_NOT_EXIST(1, "资源路径不存在，请检查请求地址"), - - NO_PERMISSION(2, "没有权限访问资源，请联系管理员"), - - NO_PERMISSION_OPERATE(3, "没有权限操作该数据，请联系管理员"); - - private final int code; - - private final String message; -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index dcbfe7e7..88949967 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -1,639 +1,640 @@ -//package cd.casic.module.machine.handler; -//import cd.casic.module.machine.utils.AliYunOssClient; -//import cd.casic.module.machine.dal.dataobject.MachineInfo; -//import cd.casic.module.machine.dal.dataobject.SecretKey; -//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; -//import org.springframework.stereotype.Component; -//import org.springframework.util.StreamUtils; -//import org.springframework.util.StringUtils; -//import java.io.*; -//import java.nio.charset.StandardCharsets; -//import java.util.Objects; -//import java.util.Properties; -//import java.util.concurrent.atomic.AtomicBoolean; -// -///** -// * 优化后的SSH连接会话类 -// */ -//@Slf4j -//@Component -//public class ConnectionSession implements AutoCloseable { -// @Resource -// SecretKeyService secretKeyService; -// -// @Resource -// AliYunOssClient aliYunOssClient; -// -// private MachineInfo machineInfo; -// private Session sshSession; -// private ConnectionStatus status = ConnectionStatus.DISCONNECTED; -// private final AtomicBoolean isExecuting = new AtomicBoolean(false); -// -// // todo连接配置常量 -// private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) -// private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) -// private static final int RETRY_COUNT = 3; // 重试次数 -// private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) -// -// public ConnectionSession() { -// -// } -// -// // 使用setter注入MachineInfo -// public void setMachineInfo(MachineInfo machineInfo) { -// this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); -// log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); -// } -// -// -// -// /** -// * 建立SSH连接，支持重试机制 -// */ -// public synchronized void connect() throws JSchException { -// if (status == ConnectionStatus.CONNECTED) { -// log.debug("Already connected to {}", machineInfo.getHostIp()); -// return; -// } -// -// status = ConnectionStatus.CONNECTING; -// JSchException lastException = null; -// -// for (int attempt = 1; attempt <= RETRY_COUNT; attempt++) { -// try { -// doConnect(); -// status = ConnectionStatus.CONNECTED; -// log.info("SSH connection established successfully to {} (attempt {}/{})", -// machineInfo.getHostIp(), attempt, RETRY_COUNT); -// return; -// } catch (JSchException e) { -// lastException = e; -// status = ConnectionStatus.CONNECTION_ERROR; -// log.error("SSH connection attempt {}/{} failed: {}", -// attempt, RETRY_COUNT, e.getMessage()); -// -// // 认证失败直接退出，无需重试 -// if (e.getMessage().contains("Auth fail")) { -// status = ConnectionStatus.AUTH_FAILED; -// throw e; -// } -// -// // 重试前等待 -// if (attempt < RETRY_COUNT) { -// try { -// Thread.sleep(RETRY_DELAY); -// } catch (InterruptedException ie) { -// Thread.currentThread().interrupt(); -// throw new JSchException("Connection attempt interrupted", ie); -// } -// } -// } catch (IOException e) { -// throw new RuntimeException(e); +package cd.casic.module.machine.handler; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.utils.AliYunOssClient; +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; +import org.springframework.stereotype.Component; +import org.springframework.util.StreamUtils; +import org.springframework.util.StringUtils; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * 优化后的SSH连接会话类 + */ +@Slf4j +@Component +public class ConnectionSession implements AutoCloseable { + @Resource + SecretKeyService secretKeyService; + + @Resource + AliYunOssClient aliYunOssClient; + + private MachineInfoDO machineInfo; + private Session sshSession; + private ConnectionStatus status = ConnectionStatus.DISCONNECTED; + private final AtomicBoolean isExecuting = new AtomicBoolean(false); + + // todo连接配置常量 + private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) + private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) + private static final int RETRY_COUNT = 3; // 重试次数 + private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) + + public ConnectionSession() { + + } + + // 使用setter注入MachineInfo + public void setMachineInfo(MachineInfoDO machineInfo) { + this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); + log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); + } + + + + /** + * 建立SSH连接，支持重试机制 + */ + public synchronized void connect() throws JSchException { + if (status == ConnectionStatus.CONNECTED) { + log.debug("Already connected to {}", machineInfo.getHostIp()); + return; + } + + status = ConnectionStatus.CONNECTING; + JSchException lastException = null; + + for (int attempt = 1; attempt <= RETRY_COUNT; attempt++) { + try { + doConnect(); + status = ConnectionStatus.CONNECTED; + log.info("SSH connection established successfully to {} (attempt {}/{})", + machineInfo.getHostIp(), attempt, RETRY_COUNT); + return; + } catch (JSchException e) { + lastException = e; + status = ConnectionStatus.CONNECTION_ERROR; + log.error("SSH connection attempt {}/{} failed: {}", + attempt, RETRY_COUNT, e.getMessage()); + + // 认证失败直接退出，无需重试 + if (e.getMessage().contains("Auth fail")) { + status = ConnectionStatus.AUTH_FAILED; + throw e; + } + + // 重试前等待 + if (attempt < RETRY_COUNT) { + try { + Thread.sleep(RETRY_DELAY); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + throw new JSchException("Connection attempt interrupted", ie); + } + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + // 所有重试都失败 + throw new JSchException("Failed to connect after " + RETRY_COUNT + " attempts", lastException); + } + + /** + * 实际执行连接逻辑 + */ + private void doConnect() throws JSchException, IOException { + JSch jsch = new JSch(); + + // 配置认证方式 + configureAuthentication(jsch); + + // 创建SSH会话 + sshSession = jsch.getSession( + machineInfo.getUsername(), + machineInfo.getHostIp(), + machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 + ); + + // 配置连接参数 + configureSession(sshSession); + + // 建立连接 + sshSession.connect(CONNECTION_TIMEOUT); + } + + /** + * 配置认证方式（密码或密钥） + */ + private void configureAuthentication(JSch jsch) throws JSchException { + if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { + // 密钥认证 + if (machineInfo.getSecretKeyId() == null) { + throw new JSchException("Secret key ID is required for key-based authentication"); + } + + String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); + // 验证私钥格式 + if (!privateKeyContent.startsWith("-----BEGIN")) { + throw new JSchException("Invalid private key format. Expected OpenSSH format."); + } + + try { + // 尝试加载私钥 + jsch.addIdentity( + machineInfo.getName(), + privateKeyContent.getBytes(StandardCharsets.UTF_8), + null, + null + ); + log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); + } catch (JSchException e) { + log.error("Failed to load private key: {}", e.getMessage()); + throw e; + } + } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { + // 密码认证 + if (StringUtils.isEmpty(machineInfo.getPassword())) { + throw new JSchException("Password is required for password-based authentication"); + } + } else { + throw new JSchException("Unsupported authentication type: " + machineInfo.getAuthenticationType()); + } + } + + /** + * 配置SSH会话参数（安全增强） + */ + private void configureSession(Session session) { + Properties config = new Properties(); + + // 安全增强：默认验证主机密钥 + if (isTrustedEnvironment()) { + log.warn("Running in trusted environment - disabling strict host key checking for {}", + machineInfo.getHostIp()); + config.put("StrictHostKeyChecking", "no"); + } else { + config.put("StrictHostKeyChecking", "yes"); + // 可选：配置已知主机文件路径 + //直接配置阿里云密钥地址 + config.put("UserKnownHostsFile", secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath()); + } + + // 其他安全配置 + config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); + config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 + config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 + + session.setConfig(config); + } + + /** + * 判断是否为可信环境（生产环境应返回false） + */ + private boolean isTrustedEnvironment() { + // todo实际项目中应基于配置或环境变量判断 + return System.getProperty("environment", "production").equalsIgnoreCase("development"); + } + + @Override + public synchronized void close() { + disconnect(); + } + + public synchronized void disconnect() { + if (sshSession != null && sshSession.isConnected()) { + try { + sshSession.disconnect(); + log.info("SSH connection closed: {}", machineInfo.getHostIp()); + } catch (Exception e) { + log.error("Error closing SSH session: {}", e.getMessage()); + } + } + status = ConnectionStatus.DISCONNECTED; + } + + /** + * 执行远程命令，支持超时和中断处理 + */ + public String executeCommand(String command) throws JSchException, IOException { + if (!isConnected()) { + throw new IllegalStateException("Session is not connected"); + } + + if (!isExecuting.compareAndSet(false, true)) { + throw new IllegalStateException("Another command is already executing"); + } + + Channel channel = null; + InputStream inputStream = null; + ByteArrayOutputStream outputStream = null; + + try { + channel = createExecChannel(command); + inputStream = channel.getInputStream(); + outputStream = new ByteArrayOutputStream(); + + // 连接通道并设置超时 + channel.connect(COMMAND_TIMEOUT); + + // 读取命令输出 + return readCommandOutput(inputStream, outputStream, channel); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("Command execution interrupted", e); + } finally { + // 释放资源 + closeResources(channel, inputStream, outputStream); + isExecuting.set(false); + } + } + + /** + * 创建并配置命令执行通道 + */ + private Channel createExecChannel(String command) throws JSchException { + Channel channel = sshSession.openChannel("exec"); + ((ChannelExec) channel).setCommand(command); + + // 配置通道 + channel.setInputStream(null); + ((ChannelExec) channel).setErrStream(new ByteArrayOutputStream()); // 捕获错误输出 + + return channel; + } + + /** + * 读取命令输出 + */ + private String readCommandOutput(InputStream inputStream, + ByteArrayOutputStream outputStream, + Channel channel) throws IOException, InterruptedException { + byte[] buffer = new byte[1024]; + + + // 使用线程中断机制实现超时控制 + Thread readerThread = new Thread(() -> { + int bytesRead; + try { + while ((bytesRead = inputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + } catch (IOException e) { + // 通道关闭或读取异常 + if (channel.isConnected()) { + log.warn("Error reading command output: {}", e.getMessage()); + } + } + }); + + readerThread.start(); + + // 等待命令执行完成或超时 + readerThread.join(COMMAND_TIMEOUT); + + // 如果线程仍在运行，中断并关闭通道 + if (readerThread.isAlive()) { + readerThread.interrupt(); + channel.disconnect(); + throw new IOException("Command execution timed out after " + COMMAND_TIMEOUT + "ms"); + } + + // 等待通道完全关闭 + while (channel.isConnected()) { + Thread.sleep(100); + } + + return outputStream.toString(StandardCharsets.UTF_8); + } + + /** + * 关闭资源 + */ + private void closeResources(Channel channel, InputStream inputStream, OutputStream outputStream) { + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + log.warn("Error closing output stream: {}", e.getMessage()); + } + } + + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn("Error closing input stream: {}", e.getMessage()); + } + } + + if (channel != null && channel.isConnected()) { + channel.disconnect(); + } + } + + /** + * 上传文件到远程服务器 + */ + public boolean uploadFile(String localFilePath, String remoteFilePath) throws IOException { + if (!isConnected()) { + throw new IllegalStateException("Cannot upload file: SSH session is not connected"); + } + + // 检查本地文件是否存在且可读 + File localFile = new File(localFilePath); + if (!localFile.exists()) { + throw new FileNotFoundException("Local file not found: " + localFilePath); + } + if (!localFile.canRead()) { + throw new IOException("Cannot read local file: " + localFilePath); + } + + ChannelSftp channel = null; + boolean uploadSuccess = false; + + try { + // 创建并连接SFTP通道，设置超时 + channel = (ChannelSftp) sshSession.openChannel("sftp"); + channel.connect(CONNECTION_TIMEOUT); + + // 确保目标目录存在 + createRemoteDirectoryIfNotExists(channel, getParentDirectory(remoteFilePath)); + + // 使用更健壮的上传方式 + channel.put( + new FileInputStream(localFile), + remoteFilePath, + new ProgressMonitorAdapter(localFile.length()), + ChannelSftp.OVERWRITE + ); + + uploadSuccess = true; + log.info("File uploaded successfully: {} -> {}", localFilePath, remoteFilePath); + return true; + + } catch (SftpException e) { + log.error("SFTP error during file upload ({} -> {}): {}", + localFilePath, remoteFilePath, e.getMessage(), e); + throw new IOException("SFTP error: " + e.getMessage(), e); + } catch (FileNotFoundException e) { + log.error("Local file not found during upload: {}", localFilePath, e); + throw e; + } catch (IOException e) { + log.error("IO error during file upload: {}", e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error("Unexpected error during file upload: {}", e.getMessage(), e); + throw new IOException("Unexpected error: " + e.getMessage(), e); + } finally { + // 确保通道始终被关闭 + disconnectChannel(channel); + +// // 如果上传失败，尝试删除不完整的文件 +// if (!uploadSuccess && remoteFilePath != null && !remoteFilePath.isEmpty()) { +// tryDeleteIncompleteFile(remoteFilePath); // } -// } -// -// // 所有重试都失败 -// throw new JSchException("Failed to connect after " + RETRY_COUNT + " attempts", lastException); -// } -// -// /** -// * 实际执行连接逻辑 -// */ -// private void doConnect() throws JSchException, IOException { -// JSch jsch = new JSch(); -// -// // 配置认证方式 -// configureAuthentication(jsch); -// -// // 创建SSH会话 -// sshSession = jsch.getSession( -// machineInfo.getUsername(), -// machineInfo.getHostIp(), -// machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 -// ); -// -// // 配置连接参数 -// configureSession(sshSession); -// -// // 建立连接 -// sshSession.connect(CONNECTION_TIMEOUT); -// } -// -// /** -// * 配置认证方式（密码或密钥） -// */ -// private void configureAuthentication(JSch jsch) throws JSchException { -// if (machineInfo.getAuthenticationTypeCode() == 2) { -// // 密钥认证 -// if (machineInfo.getSecretKeyId() == null) { -// throw new JSchException("Secret key ID is required for key-based authentication"); -// } -// -// String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); -// // 验证私钥格式 -// if (!privateKeyContent.startsWith("-----BEGIN")) { -// throw new JSchException("Invalid private key format. Expected OpenSSH format."); -// } -// -// try { -// // 尝试加载私钥 -// jsch.addIdentity( -// machineInfo.getName(), -// privateKeyContent.getBytes(StandardCharsets.UTF_8), -// null, -// null -// ); -// log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); -// } catch (JSchException e) { -// log.error("Failed to load private key: {}", e.getMessage()); -// throw e; -// } -// } else if (machineInfo.getAuthenticationTypeCode() == 1) { -// // 密码认证 -// if (StringUtils.isEmpty(machineInfo.getPassword())) { -// throw new JSchException("Password is required for password-based authentication"); -// } -// } else { -// throw new JSchException("Unsupported authentication type: " + machineInfo.getAuthenticationType()); -// } -// } -// -// /** -// * 配置SSH会话参数（安全增强） -// */ -// private void configureSession(Session session) { -// Properties config = new Properties(); -// -// // 安全增强：默认验证主机密钥 -// if (isTrustedEnvironment()) { -// log.warn("Running in trusted environment - disabling strict host key checking for {}", -// machineInfo.getHostIp()); -// config.put("StrictHostKeyChecking", "no"); -// } else { -// config.put("StrictHostKeyChecking", "yes"); -// // 可选：配置已知主机文件路径 -// //直接配置阿里云密钥地址 -// config.put("UserKnownHostsFile", secretKeyService.getById(machineInfo.getSecretKeyId()).getPath()); -// } -// -// // 其他安全配置 -// config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); -// config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 -// config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 -// -// session.setConfig(config); -// } -// -// /** -// * 判断是否为可信环境（生产环境应返回false） -// */ -// private boolean isTrustedEnvironment() { -// // todo实际项目中应基于配置或环境变量判断 -// return System.getProperty("environment", "production").equalsIgnoreCase("development"); -// } -// -// @Override -// public synchronized void close() { -// disconnect(); -// } -// -// public synchronized void disconnect() { -// if (sshSession != null && sshSession.isConnected()) { -// try { -// sshSession.disconnect(); -// log.info("SSH connection closed: {}", machineInfo.getHostIp()); -// } catch (Exception e) { -// log.error("Error closing SSH session: {}", e.getMessage()); -// } -// } -// status = ConnectionStatus.DISCONNECTED; -// } -// -// /** -// * 执行远程命令，支持超时和中断处理 -// */ -// public String executeCommand(String command) throws JSchException, IOException { -// if (!isConnected()) { -// throw new IllegalStateException("Session is not connected"); -// } -// -// if (!isExecuting.compareAndSet(false, true)) { -// throw new IllegalStateException("Another command is already executing"); -// } -// -// Channel channel = null; -// InputStream inputStream = null; -// ByteArrayOutputStream outputStream = null; -// -// try { -// channel = createExecChannel(command); -// inputStream = channel.getInputStream(); -// outputStream = new ByteArrayOutputStream(); -// -// // 连接通道并设置超时 -// channel.connect(COMMAND_TIMEOUT); -// -// // 读取命令输出 -// return readCommandOutput(inputStream, outputStream, channel); -// } catch (InterruptedException e) { -// Thread.currentThread().interrupt(); -// throw new IOException("Command execution interrupted", e); -// } finally { -// // 释放资源 -// closeResources(channel, inputStream, outputStream); -// isExecuting.set(false); -// } -// } -// -// /** -// * 创建并配置命令执行通道 -// */ -// private Channel createExecChannel(String command) throws JSchException { -// Channel channel = sshSession.openChannel("exec"); -// ((ChannelExec) channel).setCommand(command); -// -// // 配置通道 -// channel.setInputStream(null); -// ((ChannelExec) channel).setErrStream(new ByteArrayOutputStream()); // 捕获错误输出 -// -// return channel; -// } -// -// /** -// * 读取命令输出 -// */ -// private String readCommandOutput(InputStream inputStream, -// ByteArrayOutputStream outputStream, -// Channel channel) throws IOException, InterruptedException { -// byte[] buffer = new byte[1024]; -// -// -// // 使用线程中断机制实现超时控制 -// Thread readerThread = new Thread(() -> { -// int bytesRead; -// try { -// while ((bytesRead = inputStream.read(buffer)) != -1) { -// outputStream.write(buffer, 0, bytesRead); -// } -// } catch (IOException e) { -// // 通道关闭或读取异常 -// if (channel.isConnected()) { -// log.warn("Error reading command output: {}", e.getMessage()); -// } -// } -// }); -// -// readerThread.start(); -// -// // 等待命令执行完成或超时 -// readerThread.join(COMMAND_TIMEOUT); -// -// // 如果线程仍在运行，中断并关闭通道 -// if (readerThread.isAlive()) { -// readerThread.interrupt(); -// channel.disconnect(); -// throw new IOException("Command execution timed out after " + COMMAND_TIMEOUT + "ms"); -// } -// -// // 等待通道完全关闭 -// while (channel.isConnected()) { -// Thread.sleep(100); -// } -// -// return outputStream.toString(StandardCharsets.UTF_8); -// } -// -// /** -// * 关闭资源 -// */ -// private void closeResources(Channel channel, InputStream inputStream, OutputStream outputStream) { -// if (outputStream != null) { -// try { -// outputStream.close(); -// } catch (IOException e) { -// log.warn("Error closing output stream: {}", e.getMessage()); -// } -// } -// -// if (inputStream != null) { -// try { -// inputStream.close(); -// } catch (IOException e) { -// log.warn("Error closing input stream: {}", e.getMessage()); -// } -// } -// -// if (channel != null && channel.isConnected()) { -// channel.disconnect(); -// } -// } -// -// /** -// * 上传文件到远程服务器 -// */ -// public boolean uploadFile(String localFilePath, String remoteFilePath) throws IOException { -// if (!isConnected()) { -// throw new IllegalStateException("Cannot upload file: SSH session is not connected"); -// } -// -// // 检查本地文件是否存在且可读 -// File localFile = new File(localFilePath); -// if (!localFile.exists()) { -// throw new FileNotFoundException("Local file not found: " + localFilePath); -// } -// if (!localFile.canRead()) { -// throw new IOException("Cannot read local file: " + localFilePath); -// } -// -// ChannelSftp channel = null; -// boolean uploadSuccess = false; -// -// try { -// // 创建并连接SFTP通道，设置超时 -// channel = (ChannelSftp) sshSession.openChannel("sftp"); -// channel.connect(CONNECTION_TIMEOUT); -// -// // 确保目标目录存在 -// createRemoteDirectoryIfNotExists(channel, getParentDirectory(remoteFilePath)); -// -// // 使用更健壮的上传方式 -// channel.put( -// new FileInputStream(localFile), -// remoteFilePath, -// new ProgressMonitorAdapter(localFile.length()), -// ChannelSftp.OVERWRITE -// ); -// -// uploadSuccess = true; -// log.info("File uploaded successfully: {} -> {}", localFilePath, remoteFilePath); -// return true; -// -// } catch (SftpException e) { -// log.error("SFTP error during file upload ({} -> {}): {}", -// localFilePath, remoteFilePath, e.getMessage(), e); -// throw new IOException("SFTP error: " + e.getMessage(), e); -// } catch (FileNotFoundException e) { -// log.error("Local file not found during upload: {}", localFilePath, e); -// throw e; -// } catch (IOException e) { -// log.error("IO error during file upload: {}", e.getMessage(), e); -// throw e; -// } catch (Exception e) { -// log.error("Unexpected error during file upload: {}", e.getMessage(), e); -// throw new IOException("Unexpected error: " + e.getMessage(), e); -// } finally { -// // 确保通道始终被关闭 -// disconnectChannel(channel); -// -//// // 如果上传失败，尝试删除不完整的文件 -//// if (!uploadSuccess && remoteFilePath != null && !remoteFilePath.isEmpty()) { -//// tryDeleteIncompleteFile(remoteFilePath); -//// } -// } -// } -// -// public boolean downloadFile(String remoteFilePath, String localFilePath) throws IOException { -// if (!isConnected()) { -// throw new IllegalStateException("Cannot download file: SSH session is not connected"); -// } -// -// // 检查本地目录是否存在且可写 -// File localFile = new File(localFilePath); -// File parentDir = localFile.getParentFile(); -// if (parentDir != null && !parentDir.exists()) { -// if (!parentDir.mkdirs()) { -// throw new IOException("Failed to create local directory: " + parentDir.getAbsolutePath()); -// } -// } -// if (parentDir != null && !parentDir.canWrite()) { -// throw new IOException("Cannot write to local directory: " + parentDir.getAbsolutePath()); -// } -// -// ChannelSftp channel = null; -// boolean downloadSuccess = false; -// File tempFile = null; -// -// try { -// // 创建并连接SFTP通道，设置超时 -// channel = (ChannelSftp) sshSession.openChannel("sftp"); -// channel.connect(CONNECTION_TIMEOUT); -// -// // 检查远程文件是否存在 -// SftpATTRS attrs = channel.stat(remoteFilePath); -// long fileSize = attrs.getSize(); -// -// // 使用临时文件避免部分下载覆盖完整文件 -// tempFile = new File(localFilePath + ".part"); -// -// // 执行下载并监控进度 -// channel.get( -// remoteFilePath, -// new FileOutputStream(tempFile).toString(), -// new ProgressMonitorAdapter(fileSize), -// ChannelSftp.OVERWRITE -// ); -// -// // 验证下载完整性 -// if (tempFile.length() != fileSize) { -// throw new IOException("Download incomplete: expected " + fileSize + -// " bytes, but got " + tempFile.length() + " bytes"); -// } -// -// // 重命名临时文件为目标文件（原子操作） -// if (!tempFile.renameTo(localFile)) { -// throw new IOException("Failed to rename temporary file to: " + localFilePath); -// } -// -// downloadSuccess = true; -// log.info("File downloaded successfully: {} -> {}", remoteFilePath, localFilePath); -// return true; -// -// } catch (SftpException e) { -// log.error("SFTP error during file download ({} -> {}): {}", -// remoteFilePath, localFilePath, e.getMessage(), e); -// if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { -// throw new FileNotFoundException("Remote file not found: " + remoteFilePath); -// } -// throw new IOException("SFTP error: " + e.getMessage(), e); -// } catch (IOException e) { -// log.error("IO error during file download: {}", e.getMessage(), e); -// throw e; -// } catch (Exception e) { -// log.error("Unexpected error during file download: {}", e.getMessage(), e); -// throw new IOException("Unexpected error: " + e.getMessage(), e); -// } finally { -// // 确保通道始终被关闭 -// disconnectChannel(channel); -// -// // 如果下载失败，清理临时文件 -// if (!downloadSuccess && tempFile != null && tempFile.exists()) { -// if (tempFile.delete()) { -// log.debug("Deleted incomplete temporary file: {}", tempFile.getAbsolutePath()); -// } else { -// log.warn("Failed to delete incomplete temporary file: {}", tempFile.getAbsolutePath()); -// } -// } -// } -// } -// -// // 创建远程目录（如果不存在） -// private void createRemoteDirectoryIfNotExists(ChannelSftp channel, String directory) throws SftpException { -// if (directory == null || directory.isEmpty() || directory.equals("/")) { -// return; -// } -// -// try { -// channel.stat(directory); -// } catch (SftpException e) { -// // 目录不存在，尝试创建 -// createRemoteDirectoryIfNotExists(channel, getParentDirectory(directory)); -// channel.mkdir(directory); -// log.debug("Created remote directory: {}", directory); -// } -// } -// -// // 获取路径的父目录 -// private String getParentDirectory(String path) { -// int lastSlash = path.lastIndexOf('/'); -// return lastSlash > 0 ? path.substring(0, lastSlash) : ""; -// } -// -// // 断开SFTP通道 -// private void disconnectChannel(Channel channel) { -// if (channel != null && channel.isConnected()) { -// try { -// channel.disconnect(); -// log.debug("SFTP channel disconnected"); -// } catch (Exception e) { -// log.warn("Error disconnecting SFTP channel: {}", e.getMessage()); -// } -// } -// } -// -// // 尝试删除不完整的文件 -// private void tryDeleteIncompleteFile(String remoteFilePath) { -// ChannelSftp channel = null; -// try { -// channel = (ChannelSftp) sshSession.openChannel("sftp"); -// channel.connect(CONNECTION_TIMEOUT); -// channel.rm(remoteFilePath); -// log.info("Deleted incomplete file: {}", remoteFilePath); -// } catch (Exception e) { -// log.warn("Failed to delete incomplete file {}: {}", remoteFilePath, e.getMessage()); -// } finally { -// disconnectChannel(channel); -// } -// } -// -// // 增强的进度监控器 -// private static class ProgressMonitorAdapter implements SftpProgressMonitor { -// private final long totalBytes; -// private long bytesWritten = 0; -// private int lastProgress = 0; -// private final long startTime = System.currentTimeMillis(); -// -// public ProgressMonitorAdapter(long totalBytes) { -// this.totalBytes = totalBytes; -// } -// -// @Override -// public boolean count(long count) { -// bytesWritten += count; -// -// // 计算进度百分比 -// int progress = (int) ((bytesWritten * 100) / totalBytes); -// -// // 每10%或每秒更新一次日志 -// long elapsedTime = System.currentTimeMillis() - startTime; -// if (progress - lastProgress >= 10 || elapsedTime >= 1000) { -// double speed = bytesWritten / (elapsedTime / 1000.0); -// String speedStr = formatTransferSpeed(speed); -// -// log.debug("Upload progress: {}% ({}/{} bytes, {})", -// progress, bytesWritten, totalBytes, speedStr); -// lastProgress = progress; -// } -// -// return true; // 返回true继续传输，返回false中断传输 -// } -// -// @Override -// public void end() { -// long elapsedTime = System.currentTimeMillis() - startTime; -// double speed = totalBytes / (elapsedTime / 1000.0); -// String speedStr = formatTransferSpeed(speed); -// -// log.info("Upload completed: {} bytes in {} ms (avg speed: {})", -// totalBytes, elapsedTime, speedStr); -// } -// -// @Override -// public void init(int op, String src, String dest, long max) { -// log.info("Starting upload: {} -> {} ({} bytes)", src, dest, max); -// } -// -// // 格式化传输速度 -// private String formatTransferSpeed(double bytesPerSecond) { -// String[] units = {"B/s", "KB/s", "MB/s", "GB/s"}; -// int unitIndex = 0; -// -// while (bytesPerSecond >= 1024 && unitIndex < units.length - 1) { -// bytesPerSecond /= 1024; -// unitIndex++; -// } -// -// return String.format("%.2f %s", bytesPerSecond, units[unitIndex]); -// } -// } -// -// -// /** -// * 检查连接状态 -// */ -// public ConnectionStatus getStatus() { -// if (status == ConnectionStatus.CONNECTED && -// (sshSession == null || !sshSession.isConnected())) { -// status = ConnectionStatus.DISCONNECTED; -// } -// return status; -// } -// -// /** -// * 检查是否已连接 -// */ -// public boolean isConnected() { -// return status == ConnectionStatus.CONNECTED && -// sshSession != null && -// sshSession.isConnected(); -// } -// -// -// private String getPrivateKeyContent(Long secretKeyId) { -// if (secretKeyId == null) { -// return null; -// } -// SecretKey secretKey = secretKeyService.getById(secretKeyId); -// byte[] content; -// try { -// content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); -// } catch (Exception e) { -// throw new RuntimeException(e); -// } -// -// //改为S3FileClient读取 -// InputStream read = new ByteArrayInputStream(content); -// -// try { -// return StreamUtils.copyToString(read, StandardCharsets.UTF_8); -// } catch (IOException e) { -// log.error("读取私钥文件失败", e); -// throw new RuntimeException(e); -// } -// -// -// } -//} + } + } + + public boolean downloadFile(String remoteFilePath, String localFilePath) throws IOException { + if (!isConnected()) { + throw new IllegalStateException("Cannot download file: SSH session is not connected"); + } + + // 检查本地目录是否存在且可写 + File localFile = new File(localFilePath); + File parentDir = localFile.getParentFile(); + if (parentDir != null && !parentDir.exists()) { + if (!parentDir.mkdirs()) { + throw new IOException("Failed to create local directory: " + parentDir.getAbsolutePath()); + } + } + if (parentDir != null && !parentDir.canWrite()) { + throw new IOException("Cannot write to local directory: " + parentDir.getAbsolutePath()); + } + + ChannelSftp channel = null; + boolean downloadSuccess = false; + File tempFile = null; + + try { + // 创建并连接SFTP通道，设置超时 + channel = (ChannelSftp) sshSession.openChannel("sftp"); + channel.connect(CONNECTION_TIMEOUT); + + // 检查远程文件是否存在 + SftpATTRS attrs = channel.stat(remoteFilePath); + long fileSize = attrs.getSize(); + + // 使用临时文件避免部分下载覆盖完整文件 + tempFile = new File(localFilePath + ".part"); + + // 执行下载并监控进度 + channel.get( + remoteFilePath, + new FileOutputStream(tempFile).toString(), + new ProgressMonitorAdapter(fileSize), + ChannelSftp.OVERWRITE + ); + + // 验证下载完整性 + if (tempFile.length() != fileSize) { + throw new IOException("Download incomplete: expected " + fileSize + + " bytes, but got " + tempFile.length() + " bytes"); + } + + // 重命名临时文件为目标文件（原子操作） + if (!tempFile.renameTo(localFile)) { + throw new IOException("Failed to rename temporary file to: " + localFilePath); + } + + downloadSuccess = true; + log.info("File downloaded successfully: {} -> {}", remoteFilePath, localFilePath); + return true; + + } catch (SftpException e) { + log.error("SFTP error during file download ({} -> {}): {}", + remoteFilePath, localFilePath, e.getMessage(), e); + if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { + throw new FileNotFoundException("Remote file not found: " + remoteFilePath); + } + throw new IOException("SFTP error: " + e.getMessage(), e); + } catch (IOException e) { + log.error("IO error during file download: {}", e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error("Unexpected error during file download: {}", e.getMessage(), e); + throw new IOException("Unexpected error: " + e.getMessage(), e); + } finally { + // 确保通道始终被关闭 + disconnectChannel(channel); + + // 如果下载失败，清理临时文件 + if (!downloadSuccess && tempFile != null && tempFile.exists()) { + if (tempFile.delete()) { + log.debug("Deleted incomplete temporary file: {}", tempFile.getAbsolutePath()); + } else { + log.warn("Failed to delete incomplete temporary file: {}", tempFile.getAbsolutePath()); + } + } + } + } + + // 创建远程目录（如果不存在） + private void createRemoteDirectoryIfNotExists(ChannelSftp channel, String directory) throws SftpException { + if (directory == null || directory.isEmpty() || directory.equals("/")) { + return; + } + + try { + channel.stat(directory); + } catch (SftpException e) { + // 目录不存在，尝试创建 + createRemoteDirectoryIfNotExists(channel, getParentDirectory(directory)); + channel.mkdir(directory); + log.debug("Created remote directory: {}", directory); + } + } + + // 获取路径的父目录 + private String getParentDirectory(String path) { + int lastSlash = path.lastIndexOf('/'); + return lastSlash > 0 ? path.substring(0, lastSlash) : ""; + } + + // 断开SFTP通道 + private void disconnectChannel(Channel channel) { + if (channel != null && channel.isConnected()) { + try { + channel.disconnect(); + log.debug("SFTP channel disconnected"); + } catch (Exception e) { + log.warn("Error disconnecting SFTP channel: {}", e.getMessage()); + } + } + } + + // 尝试删除不完整的文件 + private void tryDeleteIncompleteFile(String remoteFilePath) { + ChannelSftp channel = null; + try { + channel = (ChannelSftp) sshSession.openChannel("sftp"); + channel.connect(CONNECTION_TIMEOUT); + channel.rm(remoteFilePath); + log.info("Deleted incomplete file: {}", remoteFilePath); + } catch (Exception e) { + log.warn("Failed to delete incomplete file {}: {}", remoteFilePath, e.getMessage()); + } finally { + disconnectChannel(channel); + } + } + + // 增强的进度监控器 + private static class ProgressMonitorAdapter implements SftpProgressMonitor { + private final long totalBytes; + private long bytesWritten = 0; + private int lastProgress = 0; + private final long startTime = System.currentTimeMillis(); + + public ProgressMonitorAdapter(long totalBytes) { + this.totalBytes = totalBytes; + } + + @Override + public boolean count(long count) { + bytesWritten += count; + + // 计算进度百分比 + int progress = (int) ((bytesWritten * 100) / totalBytes); + + // 每10%或每秒更新一次日志 + long elapsedTime = System.currentTimeMillis() - startTime; + if (progress - lastProgress >= 10 || elapsedTime >= 1000) { + double speed = bytesWritten / (elapsedTime / 1000.0); + String speedStr = formatTransferSpeed(speed); + + log.debug("Upload progress: {}% ({}/{} bytes, {})", + progress, bytesWritten, totalBytes, speedStr); + lastProgress = progress; + } + + return true; // 返回true继续传输，返回false中断传输 + } + + @Override + public void end() { + long elapsedTime = System.currentTimeMillis() - startTime; + double speed = totalBytes / (elapsedTime / 1000.0); + String speedStr = formatTransferSpeed(speed); + + log.info("Upload completed: {} bytes in {} ms (avg speed: {})", + totalBytes, elapsedTime, speedStr); + } + + @Override + public void init(int op, String src, String dest, long max) { + log.info("Starting upload: {} -> {} ({} bytes)", src, dest, max); + } + + // 格式化传输速度 + private String formatTransferSpeed(double bytesPerSecond) { + String[] units = {"B/s", "KB/s", "MB/s", "GB/s"}; + int unitIndex = 0; + + while (bytesPerSecond >= 1024 && unitIndex < units.length - 1) { + bytesPerSecond /= 1024; + unitIndex++; + } + + return String.format("%.2f %s", bytesPerSecond, units[unitIndex]); + } + } + + + /** + * 检查连接状态 + */ + public ConnectionStatus getStatus() { + if (status == ConnectionStatus.CONNECTED && + (sshSession == null || !sshSession.isConnected())) { + status = ConnectionStatus.DISCONNECTED; + } + return status; + } + + /** + * 检查是否已连接 + */ + public boolean isConnected() { + return status == ConnectionStatus.CONNECTED && + sshSession != null && + sshSession.isConnected(); + } + + + private String getPrivateKeyContent(Long secretKeyId) { + if (secretKeyId == null) { + return null; + } + SecretKeyVO secretKey = secretKeyService.getSecretKey(secretKeyId); + byte[] content; + try { + content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); + } catch (Exception e) { + throw new RuntimeException(e); + } + + //改为S3FileClient读取 + InputStream read = new ByteArrayInputStream(content); + + try { + return StreamUtils.copyToString(read, StandardCharsets.UTF_8); + } catch (IOException e) { + log.error("读取私钥文件失败", e); + throw new RuntimeException(e); + } + + + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 23591523..1831eb68 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -1,25 +1,26 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.machine.controller.vo.MachineInfoDto; -import cd.casic.module.machine.dal.dataobject.MachineInfo; +import cd.casic.module.machine.controller.vo.MachineInfoVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; -import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; import java.util.Map; public interface MachineInfoService { - boolean addMachineInfo(MachineInfoDto MachineInfoDto); + Long createMachine(MachineInfoVO MachineInfoVO); - PageResult listMachineInfo(MachineInfoDto MachineInfoDto); + PageResult listMachineInfo(MachineInfoVO MachineInfoVO); - boolean updateMachineInfo(MachineInfoDto machineInfoDto); + void updateMachineInfo(MachineInfoVO machineInfoVO); - boolean updateStatus(MachineInfoDto machineInfoDto); + Integer updateStatus(Long machineInfoId, Integer status); - boolean bindingSecretKey(MachineInfoDto machineInfoDto); + void bindingSecretKey(List machineInfoIds, Long secretKeyId); - void deleteList(String machineInfoIds); + void deleteMachineInfoList(String machineInfoIds); void deleteMachineInfo(Long machineInfoId); @@ -50,10 +51,10 @@ public interface MachineInfoService { /** * 建立机器连接 * - * @param machineInfo 机器信息 + * @param machineInfoDO 机器信息 * @return 连接会话ID */ - String connect(MachineInfo machineInfo); + String connect(MachineInfoDO machineInfoDO); /** * 断开机器连接 @@ -91,4 +92,6 @@ public interface MachineInfoService { * @return 操作结果 */ boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); + + void unBindingSecretKey(List SecretKeyIds); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index f9887229..66397635 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -1,24 +1,25 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.machine.dal.dataobject.SecretKey; -import cd.casic.module.machine.controller.vo.SecretKeyDto; -import com.baomidou.mybatisplus.extension.service.IService; - +import cd.casic.module.machine.dal.dataobject.SecretKeyDO; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import jakarta.validation.Valid; import java.util.List; -public interface SecretKeyService extends IService { - boolean addSecretKey(SecretKeyDto secretKeyDto) throws Exception; +public interface SecretKeyService{ + Long createSecretKey(@Valid SecretKeyVO secretKeyVO) throws Exception; - void bindingMachine(Long secretKeyId, List machineInfoIds); + void bindingMachine(Long id, List machineInfoId); - boolean updateSecretKey(SecretKeyDto secretKeyDto); + void updateSecretKey(@Valid SecretKeyVO secretKeyVO); - PageResult listSecretKey(SecretKeyDto secretKeyDto); + PageResult getSecretKeypage(@Valid SecretKeyVO secretKeyVO); - boolean deleteList(List secretKeyIds); + void deleteSecretKeyList(List ids); + + SecretKeyVO getSecretKey(Long id); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index a4b4efe5..d9908cd8 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -1,5 +1,4 @@ package cd.casic.module.machine.service.impl; -import cd.casic.module.machine.convert.MachineEnvConvert; import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import cd.casic.module.machine.dal.mysql.MachineEnvMapper; @@ -45,11 +44,8 @@ public class MachineEnvServiceImpl implements MachineEnvService { @Override public MachineEnvVO getEnv(Long machineId) { - if (machineId == null) { - return null; - } - MachineEnvDO machineEnvDO = machineEnvMapper.selectById(machineId); - return machineEnvDO != null ? MachineEnvConvert.INSTANCE.convertToVO(machineEnvDO) : null; + MachineEnvDO machineEnvDO = validateMachineEnvExists(machineId); + return BeanUtils.toBean(machineEnvDO, MachineEnvVO.class); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index e4c5d0be..d4523f9c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -6,10 +6,7 @@ import cd.casic.module.machine.enums.MachineProxyStatus; import cd.casic.module.machine.enums.MachineProxyType; import cd.casic.module.machine.dal.mysql.MachineProxyMapper; import cd.casic.module.machine.service.MachineProxyService; -import cd.casic.module.machine.utils.EnumUtils; -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.google.common.annotations.VisibleForTesting; import jakarta.annotation.Resource; import cd.casic.framework.commons.util.object.BeanUtils; @@ -19,16 +16,14 @@ import org.springframework.util.CollectionUtils; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; - import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; import static com.baomidou.mybatisplus.extension.toolkit.Db.save; -import static org.apache.catalina.security.SecurityUtil.remove; /** * 机器代理服务实现类 */ -@Service +@Service("machineProxyService") public class MachineProxyServiceImpl implements MachineProxyService { @Resource private MachineProxyMapper machineProxyMapper; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index 4dfa1245..87685435 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -1,354 +1,370 @@ -//package cd.casic.module.machine.service.impl; -//import cd.casic.module.machine.enums.MachineInfoType; -//import cd.casic.module.machine.handler.ConnectionSession; -//import cd.casic.module.machine.dal.mysql.MachineInfoMapper; -//import cd.casic.module.machine.controller.vo.MachineInfoDto; -//import cd.casic.module.machine.dal.dataobject.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.service.MachineInfoService; -//import cd.casic.module.machine.utils.EnumUtils; -//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 jakarta.annotation.Resource; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.beans.BeanUtils; -//import org.springframework.stereotype.Service; -//import java.util.Arrays; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -//import java.util.concurrent.ConcurrentHashMap; -//import java.util.concurrent.atomic.AtomicInteger; -//import java.util.stream.Collectors; -// -//@Slf4j -//@Service("machineInfoService") -//public class MachineinfoServiceImpl implements MachineInfoService { -// -// int ENABLE = 1; -// int UN_ENABLE = 0; -// -// @Resource -// private MachineInfoMapper machineInfoMapper; -// @Resource -// private ConnectionSession connectionSession; -// /** -// * 会话ID生成器 -// */ -// private final AtomicInteger sessionIdGenerator = new AtomicInteger(1000); -// -// /** -// * 会话管理：会话ID -> 连接会话 -// */ -// private final Map sessions = new ConcurrentHashMap<>(); -// -// /** -// * 机器名称 -> 会话ID -// */ -// private final Map machineSessionMapping = new ConcurrentHashMap<>(); -// -// @Override -// public boolean addMachineInfo(MachineInfoDto machineInfoDto) { -// if (machineInfoDto == null) { -// throw new ServiceException(ServiceException.MACHINE_INFO_NULL, "机器信息为空"); -// } -// MachineInfo machineInfo = new MachineInfo(); -// BeanUtils.copyProperties(machineInfoDto, machineInfo); -// machineInfo.setStatusCode(1); -// machineInfo.setAuthenticationTypeCode( -// "密码认证".equals(machineInfoDto.getAuthenticationType()) -// ? AuthenticationType.PASSWORD.getCode() -// : AuthenticationType.SECRET_KEY.getCode() -// ); -// machineInfo.setMachineInfoTypeCode( -// "Windows".equals(machineInfoDto.getMachineInfoType()) -// ? MachineInfoType.WINDOWS.getCode() -// : MachineInfoType.Linux.getCode() -// ); -// -// return this.save(machineInfo); -// } -// -// @Override -// public PageResult listMachineInfo(MachineInfoDto machineInfoDto) { -// QueryWrapper queryWrapper = getMachineInfoQueryWrapper(machineInfoDto); -// Page page = machineInfoMapper.selectPage( -// new Page<>(machineInfoDto.getPageIndex(), machineInfoDto.getPageSize()), -// queryWrapper -// ); -// -// List machineInfoDtos = page.getRecords().stream() -// .map(machineInfo -> { -// MachineInfoDto dto = new MachineInfoDto(); -// BeanUtils.copyProperties(machineInfo, dto); -// // 直接调用原有枚举转换方法 -// dto.setMachineInfoType(EnumUtils.getEnumByCode(machineInfo.getMachineInfoTypeCode(), MachineInfoType.class).getMessage()); -// dto.setStatus(EnumUtils.getEnumByCode(machineInfo.getStatusCode(), MachineInfoStatus.class).getMessage()); -// dto.setAuthenticationType(EnumUtils.getEnumByCode(machineInfo.getAuthenticationTypeCode(), AuthenticationType.class).getMessage()); -// return dto; -// }) -// .toList(); -// -// return new PageResult<>( -// page.getCurrent(), -// page.getSize(), -// page.getTotal(), -// page.getPages(), -// machineInfoDtos -// ); -// } -// -// @Override -// public boolean updateMachineInfo(MachineInfoDto machineInfoDto) { -// MachineInfo machineInfo = new MachineInfo(); -// BeanUtils.copyProperties(machineInfoDto, machineInfo); -// machineInfo.setAuthenticationTypeCode( -// "密码认证".equals(machineInfoDto.getAuthenticationType()) -// ? AuthenticationType.PASSWORD.getCode() -// : AuthenticationType.SECRET_KEY.getCode() -// ); -// machineInfo.setMachineInfoTypeCode( -// "Windows".equals(machineInfoDto.getMachineInfoType()) -// ? MachineInfoType.WINDOWS.getCode() -// : MachineInfoType.Linux.getCode() -// ); -// return this.updateById(machineInfo); -// } -// -// @Override -// public boolean updateStatus(MachineInfoDto machineInfoDto) { -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.eq("id", machineInfoDto.getId()).set("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); -// return this.update(updateWrapper); -// } -// -// @Override -// public boolean bindingSecretKey(MachineInfoDto machineInfoDto) { -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.eq("id", machineInfoDto.getId()).set("secret_key_id", machineInfoDto.getSecretKeyId()).set("authentication_type_code", 2); -// return this.update(updateWrapper); -// } -// -// @Override -// public void deleteList(String machineInfoIds) { -// List machineInfoIdList = Arrays.stream(machineInfoIds.split(",")) -// .map(String::trim) -// .filter(s -> !s.isEmpty()) -// .map(Long::parseLong) -// .collect(Collectors.toList()); -// machineInfoMapper.selectBatchIds(machineInfoIdList).forEach(machineInfo -> { -// if (machineInfo.getStatusCode() == 1) { -// this.removeById(machineInfo.getId()); -// } -// }); -// } -// -// @Override -// public void deleteMachineInfo(Long machineInfoId) { -// MachineInfo machineInfo = this.getById(machineInfoId); -// if (machineInfo.getStatusCode() == 1) { -// this.removeById(machineInfoId); -// } -// } -// -// private QueryWrapper getMachineInfoQueryWrapper(MachineInfoDto machineInfoDto) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (machineInfoDto.getStatus() != null && !machineInfoDto.getStatus().isEmpty()) { -// queryWrapper.eq("status_code", EnumUtils.getEnumByMessage(machineInfoDto.getStatus(), MachineInfoStatus.class).getCode()); -// } -// if (machineInfoDto.getName() != null && !machineInfoDto.getName().isEmpty()) { -// queryWrapper.like("name", machineInfoDto.getName()); -// } -// if (machineInfoDto.getTag() != null && !machineInfoDto.getTag().isEmpty()) { -// queryWrapper.like("tag", machineInfoDto.getTag()); -// } -// if (machineInfoDto.getHostIp() != null && !machineInfoDto.getHostIp().isEmpty()) { -// queryWrapper.like("host_ip", machineInfoDto.getHostIp()); -// } -// if (machineInfoDto.getDescription() != null && !machineInfoDto.getDescription().isEmpty()) { -// queryWrapper.like("description", machineInfoDto.getDescription()); -// } -// return queryWrapper.orderByDesc("create_date"); -// } -// -// -// @Override -// public boolean testConnection(Long id) { -// //先查询机器是否存在，在判断机器可用性 -// MachineInfo machineInfo = machineInfoMapper.getById(id); -// if (machineInfo==null){ -// throw new RuntimeException("机器不存在"); -// } -// if (machineInfo.getStatusCode() == 0) { -// throw new RuntimeException("机器不可用"); -// } -// log.info("测试机器连接: {}", machineInfo.getHostIp()); -// connectionSession.setMachineInfo(machineInfo); -// try{ -// connectionSession.connect(); -// return true; -// } catch (Exception e) { -// log.error("机器连接测试失败: {}", e.getMessage(), e); -// return false; -// } -// } -// -// @Override -// public ConnectionStatus getConnectionStatus(String machineName) { -// String sessionId = machineSessionMapping.get(machineName); -// if (sessionId == null) { -// return ConnectionStatus.DISCONNECTED; -// } -// -// ConnectionSession session = sessions.get(sessionId); -// return session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED; -// } -// -// @Override -// public Map getAllConnectionStatus() { -// Map result = new HashMap<>(); -// -// machineSessionMapping.forEach((machineName, sessionId) -> { -// ConnectionSession session = sessions.get(sessionId); -// result.put(machineName, session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED); -// }); -// -// return result; -// } -// -// @Override -// public String connect(MachineInfo machineInfo) { -// if (machineInfo.getStatus().getCode() == UN_ENABLE) { -// throw new RuntimeException("机器不可用"); -// } -// log.info("建立机器连接: {}", machineInfo.getHostIp()); -// -// // 检查是否已连接 -// String existingSessionId = machineSessionMapping.get(machineInfo.getName()); -// if (existingSessionId != null) { -// ConnectionSession existingSession = sessions.get(existingSessionId); -// if (existingSession != null && existingSession.getStatus() == ConnectionStatus.CONNECTED) { -// log.info("机器已连接，返回现有会话: {}", machineInfo.getHostIp()); -// return existingSessionId; -// } -// } -// -// try { -// connectionSession.setMachineInfo(machineInfo); -// -// connectionSession.connect(); -// -// // 生成会话ID -// String sessionId = generateSessionId(); -// -// // 保存会话 -// sessions.put(sessionId, connectionSession); -// machineSessionMapping.put(machineInfo.getName(), sessionId); -// -// log.info("机器连接成功: {}, 会话ID: {}", machineInfo.getHostIp(), sessionId); -// return sessionId; -// } catch (Exception e) { -// log.error("机器连接失败: {}", e.getMessage(), e); -// throw new RuntimeException("机器连接失败: " + e.getMessage(), e); -// } -// } -// -// @Override -// public boolean disconnect(String sessionId) { -// log.info("断开机器连接: {}", sessionId); -// -// ConnectionSession session = sessions.get(sessionId); -// if (session == null) { -// log.warn("会话不存在: {}", sessionId); -// return false; -// } -// -// try { -// session.disconnect(); -// -// // 清理会话 -// sessions.remove(sessionId); -// machineSessionMapping.entrySet().removeIf(entry -> entry.getValue().equals(sessionId)); -// -// log.info("机器连接已断开: {}", sessionId); -// return true; -// } catch (Exception e) { -// log.error("断开连接失败: {}", e.getMessage(), e); -// return false; -// } -// } -// -// @Override -// public String executeCommand(String sessionId, String command) { -// log.info("执行命令: {}, 会话ID: {}", command, sessionId); -// -// ConnectionSession session = sessions.get(sessionId); -// if (session == null) { -// throw new RuntimeException("会话不存在: " + sessionId); -// } -// -// if (session.getStatus() != ConnectionStatus.CONNECTED) { -// throw new RuntimeException("会话未连接: " + sessionId); -// } -// -// try { -// return session.executeCommand(command); -// } catch (Exception e) { -// log.error("命令执行失败: {}", e.getMessage(), e); -// throw new RuntimeException("命令执行失败: " + e.getMessage(), e); -// } -// } -// -// @Override -// public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { -// log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); -// -// ConnectionSession session = sessions.get(sessionId); -// if (session == null) { -// throw new RuntimeException("会话不存在: " + sessionId); -// } -// -// if (session.getStatus() != ConnectionStatus.CONNECTED) { -// throw new RuntimeException("会话未连接: " + sessionId); -// } -// -// try { -// return session.uploadFile(localFilePath, remoteFilePath); -// } catch (Exception e) { -// log.error("文件上传失败: {}", e.getMessage(), e); -// throw new RuntimeException("文件上传失败: " + e.getMessage(), e); -// } -// } -// -// @Override -// public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { -// log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); -// -// ConnectionSession session = sessions.get(sessionId); -// if (session == null) { -// throw new RuntimeException("会话不存在: " + sessionId); -// } -// -// if (session.getStatus() != ConnectionStatus.CONNECTED) { -// throw new RuntimeException("会话未连接: " + sessionId); -// } -// -// try { -// return session.downloadFile(remoteFilePath, localFilePath); -// } catch (Exception e) { -// log.error("文件下载失败: {}", e.getMessage(), e); -// throw new RuntimeException("文件下载失败: " + e.getMessage(), e); -// } -// } -// -// -// /** -// * 生成会话ID -// */ -// private String generateSessionId() { -// return "session-" + sessionIdGenerator.incrementAndGet(); -// } -//} +package cd.casic.module.machine.service.impl; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.MachineInfoType; +import cd.casic.module.machine.handler.ConnectionSession; +import cd.casic.module.machine.dal.mysql.MachineInfoMapper; +import cd.casic.module.machine.controller.vo.MachineInfoVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.enums.MachineInfoStatus; +import cd.casic.module.machine.service.MachineInfoService; +import cd.casic.module.machine.service.SecretKeyService; +import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import cd.casic.framework.commons.util.object.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +/** + * 机器信息服务实现类 + */ +@Slf4j +@Service("machineInfoService") +public class MachineinfoServiceImpl implements MachineInfoService { + + @Resource + private SecretKeyService secretKeyService; + @Resource + private MachineInfoMapper machineInfoMapper; + @Resource + private ConnectionSession connectionSession; + /** + * 会话ID生成器 + */ + private final AtomicInteger sessionIdGenerator = new AtomicInteger(1000); + + /** + * 会话管理：会话ID -> 连接会话 + */ + private final Map sessions = new ConcurrentHashMap<>(); + + /** + * 机器名称 -> 会话ID + */ + private final Map machineSessionMapping = new ConcurrentHashMap<>(); + + @Override + public Long createMachine(MachineInfoVO machineInfoVO) { + validateMachineEnvAdd(machineInfoVO); + validateMachineTagUnique(machineInfoVO.getTag()); + MachineInfoDO machineInfoDO = BeanUtils.toBean(machineInfoVO, MachineInfoDO.class); + Long secretKeyId = machineInfoDO.getSecretKeyId(); + SecretKeyVO secretKey = secretKeyService.getSecretKey(secretKeyId); + if (secretKey==null){ + throw exception(SECRET_KEY_NOT_EXISTS); + } + machineInfoMapper.insert(machineInfoDO); + Long id = machineInfoDO.getId(); + return id; + } + + @Override + public void updateMachineInfo(MachineInfoVO machineInfoVO) { + validateMachineEnvAdd(machineInfoVO); + String newTag = machineInfoVO.getTag(); + MachineInfoDO machineInfoDO = validateMachineInfoExists(machineInfoVO.getId()); + String oldTag = machineInfoDO.getTag(); + if (!newTag.equals(oldTag)){ + validateMachineTagUnique(newTag); + } + BeanUtils.copyProperties(machineInfoVO, machineInfoDO); + machineInfoMapper.updateById(machineInfoDO); + } + + @Override + public Integer updateStatus(Long machineInfoId, Integer status) { + machineInfoMapper.updateStatus(machineInfoId, status); + return machineInfoMapper.selectById(machineInfoId).getStatus(); + } + + @Override + public PageResult listMachineInfo(MachineInfoVO machineInfoVO) { + return machineInfoMapper.selectPage(machineInfoVO); + } + + @Override + public void bindingSecretKey(List machineInfoId,Long secretKeyId) { + machineInfoMapper.bindingSecretKey(machineInfoId,secretKeyId); + } + + @Override + @Transactional//其中一个在线，那么就回滚 + public void deleteMachineInfoList(String machineInfoIds) { + List machineInfoIdList = Arrays.stream(machineInfoIds.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); + machineInfoIdList.forEach(this::deleteMachineInfo); + } + + @Override + public void deleteMachineInfo(Long machineInfoId) { + MachineInfoDO machineInfoDO = validateMachineInfoExists(machineInfoId); + validateMachineEnable(machineInfoDO); + machineInfoMapper.deleteById(machineInfoId); + } + + + @Override + public boolean testConnection(Long id) { + //先查询机器是否存在，在判断机器可用性 + MachineInfoDO machineInfoDO = validateMachineInfoExists(id); + validateMachineUnEnable(machineInfoDO); + log.info("测试机器连接: {}", machineInfoDO.getHostIp()); + connectionSession.setMachineInfo(machineInfoDO); + try{ + connectionSession.connect(); + return true; + } catch (Exception e) { + log.error("机器连接测试失败: {}", e.getMessage(), e); + return false; + } + } + + @Override + public ConnectionStatus getConnectionStatus(String machineName) { + String sessionId = machineSessionMapping.get(machineName); + if (sessionId == null) { + return ConnectionStatus.DISCONNECTED; + } + + ConnectionSession session = sessions.get(sessionId); + return session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED; + } + + @Override + public Map getAllConnectionStatus() { + Map result = new HashMap<>(); + + machineSessionMapping.forEach((machineName, sessionId) -> { + ConnectionSession session = sessions.get(sessionId); + result.put(machineName, session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED); + }); + + return result; + } + + @Override + public String connect(MachineInfoDO machineInfoDO) { + //先查询机器是否存在，在判断机器可用性 + validateMachineUnEnable(machineInfoDO); + log.info("建立机器连接: {}", machineInfoDO.getHostIp()); + + // 检查是否已连接 + String existingSessionId = machineSessionMapping.get(machineInfoDO.getName()); + if (existingSessionId != null) { + ConnectionSession existingSession = sessions.get(existingSessionId); + if (existingSession != null && existingSession.getStatus() == ConnectionStatus.CONNECTED) { + log.info("机器已连接，返回现有会话: {}", machineInfoDO.getHostIp()); + return existingSessionId; + } + } + + try { + connectionSession.setMachineInfo(machineInfoDO); + + connectionSession.connect(); + + // 生成会话ID + String sessionId = generateSessionId(); + + // 保存会话 + sessions.put(sessionId, connectionSession); + machineSessionMapping.put(machineInfoDO.getName(), sessionId); + + log.info("机器连接成功: {}, 会话ID: {}", machineInfoDO.getHostIp(), sessionId); + return sessionId; + } catch (Exception e) { + log.error("机器连接失败: {}", e.getMessage(), e); + throw new RuntimeException("机器连接失败: " + e.getMessage(), e); + } + } + + @Override + public boolean disconnect(String sessionId) { + log.info("断开机器连接: {}", sessionId); + + ConnectionSession session = sessions.get(sessionId); + if (session == null) { + log.warn("会话不存在: {}", sessionId); + return false; + } + + try { + session.disconnect(); + + // 清理会话 + sessions.remove(sessionId); + machineSessionMapping.entrySet().removeIf(entry -> entry.getValue().equals(sessionId)); + + log.info("机器连接已断开: {}", sessionId); + return true; + } catch (Exception e) { + log.error("断开连接失败: {}", e.getMessage(), e); + return false; + } + } + + @Override + public String executeCommand(String sessionId, String command) { + log.info("执行命令: {}, 会话ID: {}", command, sessionId); + + ConnectionSession session = sessions.get(sessionId); + if (session == null) { + throw new RuntimeException("会话不存在: " + sessionId); + } + + if (session.getStatus() != ConnectionStatus.CONNECTED) { + throw new RuntimeException("会话未连接: " + sessionId); + } + + try { + return session.executeCommand(command); + } catch (Exception e) { + log.error("命令执行失败: {}", e.getMessage(), e); + throw new RuntimeException("命令执行失败: " + e.getMessage(), e); + } + } + + @Override + public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { + log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); + + ConnectionSession session = sessions.get(sessionId); + if (session == null) { + throw new RuntimeException("会话不存在: " + sessionId); + } + + if (session.getStatus() != ConnectionStatus.CONNECTED) { + throw new RuntimeException("会话未连接: " + sessionId); + } + + try { + return session.uploadFile(localFilePath, remoteFilePath); + } catch (Exception e) { + log.error("文件上传失败: {}", e.getMessage(), e); + throw new RuntimeException("文件上传失败: " + e.getMessage(), e); + } + } + + @Override + public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { + log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); + + ConnectionSession session = sessions.get(sessionId); + if (session == null) { + throw new RuntimeException("会话不存在: " + sessionId); + } + + if (session.getStatus() != ConnectionStatus.CONNECTED) { + throw new RuntimeException("会话未连接: " + sessionId); + } + + try { + return session.downloadFile(remoteFilePath, localFilePath); + } catch (Exception e) { + log.error("文件下载失败: {}", e.getMessage(), e); + throw new RuntimeException("文件下载失败: " + e.getMessage(), e); + } + } + + @Override + public void unBindingSecretKey(List SecretKeyIds) { + machineInfoMapper.unBindingSecretKey(SecretKeyIds); + } + + @VisibleForTesting + void validateMachineEnvAdd(MachineInfoVO machineInfoVO) { + if (machineInfoVO.getHostIp().isEmpty()) { + throw exception(MACHINE_INFO_HOST_IP_NULL); + } + if (machineInfoVO.getUsername().isEmpty()){ + throw exception(MACHINE_INFO_USER_NAME_NULL); + } + if(machineInfoVO.getTag().isEmpty()){ + throw exception(MACHINE_INFO_TAG_NULL); + } + + if (machineInfoVO.getAuthenticationType()!=null){ + boolean flag=true; + for (int type : AuthenticationType.ARRAYS) { + if (type == machineInfoVO.getAuthenticationType()) { + flag=false; + break; + } + if (flag){ + throw exception(MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS); + } + } + }else { + throw exception(MACHINE_INFO_AUTHENTICATION_TYPE_NULL); + } + + + if (machineInfoVO.getMachineInfoType()!= null){ + boolean flag = true; + for (int type : MachineInfoType.ARRAYS) { + if (type == machineInfoVO.getMachineInfoType()) { + flag=false; + break; + } + } + if (flag) { + throw exception(MACHINE_INFO_TYPE_NOT_EXISTS); + } + }else { + throw exception(MACHINE_INFO_TYPE_NULL); + } + + } + + @VisibleForTesting + void validateMachineTagUnique(String tag){ + if (machineInfoMapper.existsByTag(tag)) { + throw exception(MACHINE_INFO_TAG_EXISTS); + } + } + @VisibleForTesting + MachineInfoDO validateMachineInfoExists(Long id) { + if (id == null) { + return null; + } + MachineInfoDO machineInfoDO = machineInfoMapper.selectById(id); + if (machineInfoDO == null) { + throw exception(MACHINE_INFO_NULL); + } + return machineInfoDO; + } + @VisibleForTesting + void validateMachineEnable(MachineInfoDO machineInfoDO) { + + if (machineInfoDO.getStatus()==MachineInfoStatus.ENABLE.getCode()){ + throw exception(MACHINE_ENABLE); + } + } + @VisibleForTesting + void validateMachineUnEnable(MachineInfoDO machineInfoDO) { + + if (machineInfoDO.getStatus()==MachineInfoStatus.UN_ENABLE.getCode()){ + throw exception(MACHINE_UN_ENABLE); + } + } + + /** + * 生成会话ID + */ + private String generateSessionId() { + return "session-" + sessionIdGenerator.incrementAndGet(); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 99d263b1..d0d9426f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -1,159 +1,157 @@ -//package cd.casic.module.machine.service.impl; -// -//import cd.casic.module.machine.controller.vo.SecretKeyDto; -//import cd.casic.module.machine.dal.dataobject.MachineInfo; -//import cd.casic.module.machine.dal.dataobject.SecretKey; -//import cd.casic.module.machine.dal.mysql.SecretServiceMapper; -//import cd.casic.module.machine.service.MachineInfoService; -//import cn.hutool.core.io.resource.ResourceUtil; -//import cn.hutool.core.util.IdUtil; -//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.machine.utils.AliYunOssClient; -//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.springframework.beans.BeanUtils; -//import org.springframework.stereotype.Service; -// -//import java.util.List; -// -//@Service -//public class SecretKeyServiceImpl extends ServiceImpl implements SecretKeyService { -// -// @Resource -// private MachineInfoService machineInfoService; -// -// @Resource -// private AliYunOssClient aliYunOssClient; -// -// @Resource -// private SecretServiceMapper secretServiceMapper; -// -// -// -// -// @Override -// public boolean addSecretKey(SecretKeyDto secretKeyDto){ -// if (secretKeyDto.getPath()==null) -// { -// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不能为空"); -// } -// -// String ossPath = upLoadSecretKey(secretKeyDto.getPath()); -// if (ossPath == null){ -// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥上传失败"); -// } -// secretKeyDto.setPath(ossPath); -// SecretKey secretKey = new SecretKey(); -// BeanUtils.copyProperties(secretKeyDto,secretKey); -// //todo检查密钥合法 -// return this.save(secretKey); -// -// -// } -// @Override -// public boolean updateSecretKey(SecretKeyDto secretKeyDto) { -// -// Long id = secretKeyDto.getId(); -// SecretKey secretKey = this.getById(id); -// if (secretKey == null){ -// throw new ServiceException(ServiceException.MACHINE_PROXY_NULL,"密钥不存在"); -// } -// if (!secretKey.getPath().equals(secretKeyDto.getPath())) { -// //todo检查密钥合法 -// String ossPath = upLoadSecretKey(secretKeyDto.getPath()); -// BeanUtils.copyProperties(secretKeyDto,secretKey); -// secretKey.setPath(ossPath); -// } -// else { -// BeanUtils.copyProperties(secretKeyDto,secretKey); -// } -// -// return this.updateById(secretKey); -// -// -// } -// -// @Override -// public void bindingMachine(Long secretKeyId, List machineIds) { -// SecretKey secretKey = this.getById(secretKeyId); -// if (secretKey==null){ -// throw new ServiceException(ServiceException.SECRETKEY_NULL,"密钥不存在"); -// } -// List machineList = machineInfoService.listByIds(machineIds); -// machineList.forEach(machine -> machine.setSecretKeyId(secretKeyId)); -// machineInfoService.updateBatchById(machineList); -// } -// -// -// -// -// -// @Override -// public PageResult listSecretKey(SecretKeyDto secretKeyDto) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (secretKeyDto.getName() != null && !secretKeyDto.getName().isEmpty()){ -// queryWrapper.like("name", secretKeyDto.getName()); -// } -// if (secretKeyDto.getDescription() != null && !secretKeyDto.getDescription().isEmpty()){ -// queryWrapper.like("description", secretKeyDto.getDescription()); -// } -// Page page = secretServiceMapper.selectPage(new Page<>(secretKeyDto.getPageIndex(), secretKeyDto.getPageSize()), queryWrapper); -// return new PageResult<>( -// page.getCurrent(), -// page.getSize(), -// page.getTotal(), -// page.getPages(), -// page.getRecords() -// ); -// } -// -// -// -// @Override -// public boolean deleteList(List secretKeyIds) { -// List secretKeys = this.listByIds(secretKeyIds); -// -// for (SecretKey secretKey : secretKeys) { -// if (secretKey.getPath() != null && !secretKey.getPath().isEmpty()){ -// try { -// //文件名 -// //删除子目录文件，需要在前面加上根目录文件路径 -// String fileName = secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1); -// aliYunOssClient.delete(fileName); -// } catch (Exception e) { -// throw new RuntimeException(e); -// } -// } -// } -// -// -// //todo是否删除已经绑定的机器 -// return secretServiceMapper.deleteBatchIds(secretKeyIds) > 0 ; -// } -// -// -// public String upLoadSecretKey(String localPath) { -// -// //使用S3FileClient上传文件 -// aliYunOssClient.init(); -// -// //传输到指定文件，需要在path前面加上文件路径 -// String path = IdUtil.fastSimpleUUID() + ".txt"; -// -// -// //上传文件是从本地上传，这里传的是本地文件地址 -// byte[] content = ResourceUtil.readBytes(localPath); -// String ossPath; -// try { -// ossPath = aliYunOssClient.upload(content, path, "txt"); -// }catch (Exception e) { -// throw new RuntimeException(e+"上传文件失败"); -// } -// return ossPath; -// } -//} +package cd.casic.module.machine.service.impl; +import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.dal.dataobject.SecretKeyDO; +import cd.casic.module.machine.dal.mysql.SecretKeyMapper; +import cd.casic.module.machine.service.MachineInfoService; +import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.util.IdUtil; +import cd.casic.module.machine.utils.AliYunOssClient; +import cd.casic.module.machine.service.SecretKeyService; +import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +/** + * 密钥服务实现类 + */ +@Service("secretKeyService") +public class SecretKeyServiceImpl implements SecretKeyService { + + @Resource + private MachineInfoService machineInfoService; + + @Resource + private AliYunOssClient aliYunOssClient; + + @Resource + private SecretKeyMapper secretKeyMapper; + + + + @Override + public SecretKeyVO getSecretKey(Long id){ + SecretKeyDO secretKeyDO = validateSecretKeyExists(id); + return BeanUtils.toBean(secretKeyDO, SecretKeyVO.class); + } + + @Override + public Long createSecretKey(SecretKeyVO secretKeyVO){ + validateSecretKeyAdd(secretKeyVO); + String ossPath = upLoadSecretKey(secretKeyVO.getPath()); + //检查得到的oss路径是否为空 + validateSecretKeyPath(ossPath); + secretKeyVO.setPath(ossPath); + SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); + //todo检查密钥合法 + + secretKeyMapper.insert(secretKeyDO); + return secretKeyDO.getId(); + + + } + @Override + public void updateSecretKey(SecretKeyVO secretKeyVO) { + SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyVO.getId()); + //如果路径改变==改变密钥 + if (!secretKeyDO.getPath().equals(secretKeyVO.getPath())) { + //todo检查密钥合法 + String ossPath = upLoadSecretKey(secretKeyVO.getPath()); + BeanUtils.copyProperties(secretKeyVO, secretKeyDO); + secretKeyDO.setPath(ossPath); + } + else { + BeanUtils.copyProperties(secretKeyVO,secretKeyDO); + } + secretKeyMapper.updateById(secretKeyDO); + } + + @Override + public void bindingMachine(Long id,List machineInfoIds) { + validateSecretKeyExists(id); + machineInfoService.bindingSecretKey(machineInfoIds, id); + } + + @Override + @Transactional + public void deleteSecretKeyList(List ids) { + ids.forEach( + secretKeyId -> { + SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyId); + if (secretKeyDO.getPath() != null && !secretKeyDO.getPath().isEmpty()){ + try { + //文件名 + //删除子目录文件，需要在前面加上根目录文件路径 + String fileName = secretKeyDO.getPath().substring(secretKeyDO.getPath().lastIndexOf("/") + 1); + aliYunOssClient.delete(fileName); + } catch (Exception e) { + throw exception(DELETE_FILE_FAIL); + } + } + } + ); + + //绑定的机器全部设置为空 + machineInfoService.unBindingSecretKey(ids); + + secretKeyMapper.deleteBatchIds(ids); + } + + @Override + public PageResult getSecretKeypage(SecretKeyVO secretKeyVO) { + return secretKeyMapper.selectPage(secretKeyVO); + } + + public String upLoadSecretKey(String localPath) { + //使用S3FileClient上传文件 + aliYunOssClient.init(); + //传输到指定文件，需要在path前面加上文件路径 + String path = IdUtil.fastSimpleUUID() + ".txt"; + //上传文件是从本地上传，这里传的是本地文件地址 + byte[] content = ResourceUtil.readBytes(localPath); + String ossPath; + try { + ossPath = aliYunOssClient.upload(content, path, "txt"); + }catch (Exception e) { + throw exception(UPLOADING_FILE_FAIL); + } + return ossPath; + } + + @VisibleForTesting + void validateSecretKeyAdd(SecretKeyVO secretKeyVO) { + if (secretKeyVO==null) { + throw exception(SECRET_KEY_NULL); + } + if (secretKeyVO.getPath().isEmpty()) { + throw exception(SECRET_KEY_PATH_NULL); + } + } + + @VisibleForTesting + void validateSecretKeyPath(String path) { + if (path.isEmpty()) { + throw exception(SECRET_KEY_PATH_NULL); + } + } + + + @VisibleForTesting + SecretKeyDO validateSecretKeyExists(Long id) { + if (id == null) { + return null; + } + SecretKeyDO secretKeyDO = secretKeyMapper.selectById(id); + if (secretKeyDO == null) { + throw exception(SECRET_KEY_NOT_EXISTS); + } + return secretKeyDO; + } + +} From da63f376253c53ceb0dd7a4aac78f13665f38b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 12 Jun 2025 09:54:53 +0800 Subject: [PATCH 25/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contants/MachineErrorCodeConstants.java | 77 +++++++++---------- .../casic/module/machine/enums/CodeEnum.java | 7 -- .../casic/module/machine/utils/EnumUtils.java | 50 ------------ 3 files changed, 38 insertions(+), 96 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/EnumUtils.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index e42240bd..dc6ad9eb 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -6,49 +6,48 @@ import cd.casic.framework.commons.exception.ErrorCode; * 机器报错 */ public interface MachineErrorCodeConstants { - // ========== 机器模块 1-003-000-000 ========== + // ========== 机器基础信息模块 1-003-000-000 ========== ErrorCode MACHINE_INFO_NULL = new ErrorCode(1_003_000_000, "机器信息为空"); - ErrorCode MACHINE_INFO_HOST_IP_NULL = new ErrorCode(1_003_000_000, "机器主机IP为空"); - ErrorCode MACHINE_INFO_USER_NAME_NULL = new ErrorCode(1_003_000_000, "机器用户名为空"); - ErrorCode MACHINE_INFO_TYPE_NULL = new ErrorCode(1_003_000_022, "机器类型为空"); - ErrorCode MACHINE_INFO_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_011, "机器类型不存在"); - ErrorCode MACHINE_INFO_TAG_NULL = new ErrorCode(1_003_000_044, "机器唯一标识为空"); - ErrorCode MACHINE_INFO_TAG_EXISTS = new ErrorCode(1_003_000_044, "机器唯一标识已存在"); - ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NULL = new ErrorCode(1_003_000_044, "机器认证类型为空"); - ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_044, "机器认证类型不存在"); - ErrorCode MACHINE_ENABLE = new ErrorCode(1_003_000_044, "机器启用中"); - ErrorCode MACHINE_UN_ENABLE = new ErrorCode(1_003_000_044, "机器不可用"); - ErrorCode UPLOADING_FILE_FAIL = new ErrorCode(1_003_000_001, "上传文件失败"); - ErrorCode DOWNLOAD_FILE_FAIL = new ErrorCode(1_003_000_002, "下载失败"); - ErrorCode FILENAME_NULL = new ErrorCode(1_003_000_003, "文件名为空"); - ErrorCode READ_FILE_FAIL = new ErrorCode(1_003_000_004, "读取文件失败"); - ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_000_005, "删除文件失败"); + ErrorCode MACHINE_INFO_HOST_IP_NULL = new ErrorCode(1_003_000_001, "机器主机IP为空"); + ErrorCode MACHINE_INFO_USER_NAME_NULL = new ErrorCode(1_003_000_002, "机器用户名为空"); + ErrorCode MACHINE_INFO_TYPE_NULL = new ErrorCode(1_003_000_003, "机器类型为空"); + ErrorCode MACHINE_INFO_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_004, "机器类型不存在"); + ErrorCode MACHINE_INFO_TAG_NULL = new ErrorCode(1_003_000_005, "机器唯一标识为空"); + ErrorCode MACHINE_INFO_TAG_EXISTS = new ErrorCode(1_003_000_006, "机器唯一标识已存在"); + ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NULL = new ErrorCode(1_003_000_007, "机器认证类型为空"); + ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_008, "机器认证类型不存在"); + ErrorCode MACHINE_ENABLE = new ErrorCode(1_003_000_009, "机器启用中"); + ErrorCode MACHINE_UN_ENABLE = new ErrorCode(1_003_000_010, "机器不可用"); - ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_000_008, "参数错误"); + // ========== 文件操作模块 1-003-001-000 ========== + ErrorCode UPLOADING_FILE_FAIL = new ErrorCode(1_003_001_000, "上传文件失败"); + ErrorCode DOWNLOAD_FILE_FAIL = new ErrorCode(1_003_001_001, "下载失败"); + ErrorCode FILENAME_NULL = new ErrorCode(1_003_001_002, "文件名为空"); + ErrorCode READ_FILE_FAIL = new ErrorCode(1_003_001_003, "读取文件失败"); + ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_001_004, "删除文件失败"); + // ========== 机器环境变量模块 1-003-002-000 ========== + ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_002_000, "机器环境变量为空"); + ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_002_001, "机器不存在"); + ErrorCode MACHINE_ENV_KEY_ILLEGAL = new ErrorCode(1_003_002_002, "机器环境变量键不合法"); - // ========== 机器环境变量模块 1-003-000-009 ========== - ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_000_009, "机器环境变量为空"); - ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_000_009, "机器不存在"); - ErrorCode MACHINE_ENV_KEY_ILLEGAL = new ErrorCode(1_003_000_010, "机器环境变量键不合法"); - // ========== 机器代理模块 1-003-000-006 ========== - ErrorCode MACHINE_PROXY_HOST_IP_NULL = new ErrorCode(1_003_000_006, "机器代理主机地址为空"); - ErrorCode MACHINE_PROXY_USER_NAME_NULL = new ErrorCode(1_003_000_006, "机器代理用户名为空"); - ErrorCode MACHINE_PROXY_NOT_EXISTS = new ErrorCode(1_003_000_007, "机器代理不存在"); - ErrorCode MACHINE_PROXY_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_007, "机器代理类型不存在"); - ErrorCode MACHINE_PROXY_IS_ONLINE = new ErrorCode(1_003_000_007, "机器代理在线，不能删除"); + // ========== 机器代理模块 1-003-003-000 ========== + ErrorCode MACHINE_PROXY_HOST_IP_NULL = new ErrorCode(1_003_003_000, "机器代理主机地址为空"); + ErrorCode MACHINE_PROXY_USER_NAME_NULL = new ErrorCode(1_003_003_001, "机器代理用户名为空"); + ErrorCode MACHINE_PROXY_NOT_EXISTS = new ErrorCode(1_003_003_002, "机器代理不存在"); + ErrorCode MACHINE_PROXY_TYPE_NOT_EXISTS = new ErrorCode(1_003_003_003, "机器代理类型不存在"); + ErrorCode MACHINE_PROXY_IS_ONLINE = new ErrorCode(1_003_003_004, "机器代理在线，不能删除"); - // ========== 密钥模块 1-003-000-010 ========== - ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_000_010, "密钥为空"); - ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_000_010, "密钥不存在"); - ErrorCode SECRET_KEY_NAME_ILLEGAL = new ErrorCode(1_003_000_010, "密钥名称不合法"); - ErrorCode SECRET_KEY_PATH_ILLEGAL = new ErrorCode(1_003_000_010, "密钥路径不合法"); - ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_000_010, "密钥路径为空"); - ErrorCode SECRET_KEY_UPLOAD_FAIL = new ErrorCode(1_003_000_010, "密钥上传失败"); + // ========== 密钥模块 1-003-004-000 ========== + ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_004_000, "密钥为空"); + ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_004_001, "密钥不存在"); + ErrorCode SECRET_KEY_NAME_ILLEGAL = new ErrorCode(1_003_004_002, "密钥名称不合法"); + ErrorCode SECRET_KEY_PATH_ILLEGAL = new ErrorCode(1_003_004_003, "密钥路径不合法"); + ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_004_004, "密钥路径为空"); + ErrorCode SECRET_KEY_UPLOAD_FAIL = new ErrorCode(1_003_004_005, "密钥上传失败"); - - ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_000_011, "oss参数无法读取"); - ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_000_012, "密钥为空"); + // ========== 其他模块 1-003-005-000 ========== + ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_005_000, "oss参数无法读取"); + ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_005_001, "密钥为空"); + ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_005_002, "参数错误"); } - - diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java deleted file mode 100644 index a6a4c1b4..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/CodeEnum.java +++ /dev/null @@ -1,7 +0,0 @@ -package cd.casic.module.machine.enums; - -public interface CodeEnum { - int getCode(); - - String getMessage(); -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/EnumUtils.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/EnumUtils.java deleted file mode 100644 index 55cbbb20..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/EnumUtils.java +++ /dev/null @@ -1,50 +0,0 @@ -package cd.casic.module.machine.utils; - - -import cd.casic.module.machine.enums.CodeEnum; - -public class EnumUtils { - /** - * 根据code和枚举类型获取对应的枚举值 - * - * @param code 枚举的code值 - * @param enumClass 实现了CodeEnum接口的枚举类 - * @param 枚举类型 - * @return 对应的枚举值，若未找到则返回null - */ - public static T getEnumByCode(Object code, Class enumClass) { - if (code == null || enumClass == null) { - return null; - } - - // 遍历枚举值查找匹配的code - for (T enumConstant : enumClass.getEnumConstants()) { - if (code.equals(enumConstant.getCode())) { - return enumConstant; - } - } - return null; - } - - /** - * 根据message和枚举类型获取对应的枚举值 - * - * @param message 枚举的message值 - * @param enumClass 实现了CodeEnum接口的枚举类 - * @param 枚举类型 - * @return 对应的枚举值，若未找到则返回null - */ - public static T getEnumByMessage(String message, Class enumClass) { - if (message == null || enumClass == null) { - return null; - } - - // 遍历枚举值查找匹配的message - for (T enumConstant : enumClass.getEnumConstants()) { - if (message.equals(enumConstant.getMessage())) { - return enumConstant; - } - } - return null; - } -} From 8189a825d394d784572238868fefa9209e597071 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Thu, 12 Jun 2025 17:19:29 +0800 Subject: [PATCH 26/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 3 +- .../controller/MachineInfoController.java | 18 ++--- .../controller/MachineProxyController.java | 15 +++- .../controller/SecretKeyController.java | 9 ++- .../machine/controller/vo/MachineEnvVO.java | 6 +- .../machine/controller/vo/MachineInfoVO.java | 6 +- .../machine/controller/vo/MachineProxyVO.java | 8 ++- .../machine/controller/vo/SecretKeyVO.java | 4 +- .../machine/convert/MachineEnvConvert.java | 1 + .../machine/dal/dataobject/MachineEnvDO.java | 2 +- .../machine/dal/mysql/MachineEnvMapper.java | 15 ++-- .../machine/dal/mysql/MachineInfoMapper.java | 45 +++++++----- .../machine/dal/mysql/MachineProxyMapper.java | 21 +++--- .../machine/dal/mysql/SecretKeyMapper.java | 12 ++-- .../machine/enums/MachineInfoStatus.java | 10 +-- .../machine/enums/MachineProxyType.java | 1 + .../machine/service/MachineEnvService.java | 3 +- .../machine/service/MachineInfoService.java | 10 +-- .../machine/service/MachineProxyService.java | 16 +++-- .../machine/service/SecretKeyService.java | 8 +-- .../service/impl/MachineEnvServiceImpl.java | 17 ++--- .../service/impl/MachineProxyServiceImpl.java | 50 ++++++------- .../service/impl/MachineinfoServiceImpl.java | 70 ++++++++++--------- .../service/impl/SecretKeyServiceImpl.java | 47 +++++++------ 24 files changed, 223 insertions(+), 174 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index b61c082d..d7ca1c20 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; @@ -41,7 +42,7 @@ public class MachineEnvController { @PutMapping("/update") @Operation(summary = "修改环境变量") @PreAuthorize("@ss.hasPermission('ci:machineEnv:update')") - public CommonResult updateEnv(@Valid@RequestBody MachineEnvVO machineEnvVO) { + public CommonResult updateEnv(@Valid @RequestBody MachineEnvVO machineEnvVO) { machineEnvService.updateEnv(machineEnvVO); return success(true); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 34c94923..6922f05f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; @@ -13,8 +14,9 @@ import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; + import java.util.Map; + import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @@ -28,7 +30,7 @@ public class MachineInfoController { @PostMapping("/create") @Operation(summary = "新增机器信息") // @PreAuthorize("@ss.hasPermission('ci:machineInfo:create')") - public CommonResult createMachine(@Valid @RequestBody MachineInfoVO machineInfoVO) { + public CommonResult createMachine(@Valid @RequestBody MachineInfoVO machineInfoVO) { Long id = machineInfoService.createMachine(machineInfoVO); return success(id); } @@ -45,8 +47,8 @@ public class MachineInfoController { @PutMapping("/updateStatus") @Operation(summary = "机器启用/停用") // @PreAuthorize("@ss.hasPermission('ci:machineInfo:status')") - public CommonResult updateStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { - Integer newStatus = machineInfoService.updateStatus(id, status); + public CommonResult updateStatus(@Valid @RequestBody MachineInfoVO machineInfoVO) { + Integer newStatus = machineInfoService.updateStatus(machineInfoVO); return success(newStatus); } @@ -60,14 +62,6 @@ public class MachineInfoController { return success(BeanUtils.toBean(pageResult, MachineInfoVO.class)); } - @PutMapping("/bindingSecretKey") - @Operation(summary = "绑定密钥") -// @PreAuthorize("@ss.hasPermission('ci:machineInfo:binding')") - public CommonResult bindingSecretKey(@RequestParam("ids") List ids, @RequestParam("secretKeyId") Long secretKeyId) { - machineInfoService.bindingSecretKey(ids,secretKeyId); - return success(true); - } - @DeleteMapping("/delete") @Operation(summary = "机器信息删除") // @PreAuthorize("@ss.hasPermission('ci:machineInfo:delete')") diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index 18f8c827..83082ee5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; @@ -13,7 +14,9 @@ import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import java.util.Map; + import static cd.casic.framework.commons.pojo.CommonResult.success; /** @@ -30,7 +33,7 @@ public class MachineProxyController { @PostMapping("/create") @Operation(summary = "注册新的机器代理") - @PreAuthorize("@ss.hasPermission('ci:machineProxy:create')") +// @PreAuthorize("@ss.hasPermission('ci:machineProxy:create')") public CommonResult createProxy(@Valid @RequestBody MachineProxyVO machineProxyVO) { Long id = machineProxyService.createProxy(machineProxyVO); return success(id); @@ -38,7 +41,7 @@ public class MachineProxyController { @PutMapping("/update") @Operation(summary = "修改代理") - @PreAuthorize("@ss.hasPermission('ci:machineProxy:update')") +// @PreAuthorize("@ss.hasPermission('ci:machineProxy:update')") public CommonResult updateProxy(@Valid @RequestBody MachineProxyVO machineProxyVO) { machineProxyService.updateProxy(machineProxyVO); return success(true); @@ -60,10 +63,16 @@ public class MachineProxyController { return success(machineProxyService.getAllProxyStatus()); } + @DeleteMapping("delete") + @Operation(summary = "删除代理") + public CommonResult delete(@RequestParam("id") Long id) { + machineProxyService.delete(id); + return success(true); + } @DeleteMapping("/deleteList") @Operation(summary = "批量删除代理") - @PreAuthorize("@ss.hasPermission('ci:machineProxy:delete')") +// @PreAuthorize("@ss.hasPermission('ci:machineProxy:delete')") public CommonResult deleteProxyList(@RequestParam String ids) { machineProxyService.deleteProxyList(ids); return success(true); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index f75f3168..626a1d32 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; @@ -13,7 +14,9 @@ import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import java.util.List; + import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @@ -43,8 +46,8 @@ public class SecretKeyController { @PutMapping("/bindingMachine") @Operation(summary = "绑定机器") //todo解绑机器 // @PreAuthorize("@ss.hasPermission('ci:secretKey:binding')") - public CommonResult bindingMachine(@RequestParam("id") Long id, @RequestParam("machineInfoIds") List machineInfoId) { - secretKeyService.bindingMachine(id, machineInfoId); + public CommonResult bindingMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { + secretKeyService.bindingMachine(secretKeyVO); return success(true); } @@ -71,7 +74,7 @@ public class SecretKeyController { if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); } - return success(BeanUtils.toBean(pageResult,SecretKeyVO.class)); + return success(BeanUtils.toBean(pageResult, SecretKeyVO.class)); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java index 8d5a5545..16ae6eef 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java @@ -1,8 +1,10 @@ package cd.casic.module.machine.controller.vo; + import cd.casic.framework.commons.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; + import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @@ -11,7 +13,7 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) // 添加链式调用支持 -public class MachineEnvVO extends PageParam{ +public class MachineEnvVO extends PageParam { @Schema(description = "环境变量ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; @@ -33,4 +35,4 @@ public class MachineEnvVO extends PageParam{ @Schema(description = "更新时间", example = "2023-06-15T10:30:00") private LocalDateTime updateTime; -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java index be6964bc..beb64176 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineInfoVO.java @@ -40,7 +40,7 @@ public class MachineInfoVO extends PageParam { private String username; @Schema(description = "机器状态", example = "online,offline,maintenance") - private Integer status; + private Integer status = -1; @Schema(description = "SSH端口", example = "22") private Integer sshPort; @@ -55,10 +55,10 @@ public class MachineInfoVO extends PageParam { private Long machineProxyId; @Schema(description = "认证类型", example = "password,key") - private Integer authenticationType; + private Integer authenticationType ; @Schema(description = "机器信息类型", example = "Linux,Windows") private Integer machineInfoType; -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java index 5072f2be..f8f75259 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineProxyVO.java @@ -1,8 +1,10 @@ package cd.casic.module.machine.controller.vo; + import cd.casic.framework.commons.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; + import java.time.LocalDateTime; @Schema(description = "管理后台 - 机器代理信息 Response VO") @@ -21,13 +23,13 @@ public class MachineProxyVO extends PageParam { private String username; @Schema(description = "代理类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "HTTP") - private Integer proxyType; + private Integer proxyType = -1; @Schema(description = "版本号", example = "1.0.0") private String version; @Schema(description = "状态（ONLINE:在线，OFFLINE:离线）", requiredMode = Schema.RequiredMode.REQUIRED, example = "ONLINE") - private String status; + private int status = -1; @Schema(description = "描述信息", example = "用于生产环境的代理服务器") private String description; @@ -47,4 +49,4 @@ public class MachineProxyVO extends PageParam { @Schema(description = "密码", example = "******") private String password; -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java index 9245edea..b2f8145f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -1,8 +1,10 @@ package cd.casic.module.machine.controller.vo; + import cd.casic.framework.commons.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; + import java.time.LocalDateTime; import java.util.List; @@ -40,4 +42,4 @@ public class SecretKeyVO extends PageParam { @Schema(description = "关联的机器ID列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1024, 2048]") private List machineInfoIds; -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java index 741eb553..92a947b4 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java @@ -4,6 +4,7 @@ import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; + @Mapper public interface MachineEnvConvert { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java index 61a6e25b..12fc0981 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java @@ -19,7 +19,7 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @TableName("machine_env") -public class MachineEnvDO extends BaseDO { +public class MachineEnvDO extends BaseDO { /** diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java index f2cf426e..b5060c25 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.dal.mysql; + import cd.casic.framework.mybatis.core.mapper.BaseMapperX; import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; @@ -13,10 +14,14 @@ import java.time.LocalDateTime; */ @Mapper public interface MachineEnvMapper extends BaseMapperX { - default PageResultselectPage(MachineEnvVO machineEnvVO){ - return selectPage(machineEnvVO,new LambdaQueryWrapperX() - .likeIfPresent(MachineEnvDO::getEnvKey, machineEnvVO.getEnvKey()) - .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription())); + default PageResult selectPage(MachineEnvVO machineEnvVO) { + LambdaQueryWrapperX machineEnvDOLambdaQueryWrapperX = new LambdaQueryWrapperX() + .likeIfPresent(MachineEnvDO::getEnvKey, machineEnvVO.getEnvKey()) + .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription()); + if (machineEnvVO.getMachineId() != null && machineEnvVO.getMachineId() > 0) { + machineEnvDOLambdaQueryWrapperX.eqIfPresent(MachineEnvDO::getMachineId, machineEnvVO.getMachineId()); + } + return selectPage(machineEnvVO, machineEnvDOLambdaQueryWrapperX); } -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index d0a967fa..407c4ebb 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -11,39 +11,48 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import jakarta.annotation.Resource; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper public interface MachineInfoMapper extends BaseMapperX { - default Boolean existsByTag(String tag){ - return selectOne(new QueryWrapper().eq("tag", tag))!=null; + default Boolean existsByTag(String tag) { + return selectOne(new QueryWrapper().eq("tag", tag)) != null; } - default void updateStatus(Long machineInfoId, Integer status){ + + default void updateStatus(Long machineInfoId, Integer status) { UpdateWrapper set = new UpdateWrapper<>(); set.eq("id", machineInfoId).set("status", status); - this.update(null,set); + this.update(null, set); } - default void bindingSecretKey(List machineInfoIds, Long secretKeyId){ - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() - .set(MachineInfoDO::getSecretKeyId, secretKeyId) - .in(MachineInfoDO::getId, machineInfoIds); + + default void bindingSecretKey(List machineInfoIds, Long secretKeyId) { + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.in("id", machineInfoIds) // 匹配 ID 集合 + .set("secret_key_id", secretKeyId); // 设置新的 status 值 this.update(null, wrapper); } - default void unBindingSecretKey(List secretKeyId){ + + default void unBindingSecretKey(List secretKeyId) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() - .set(MachineInfoDO::getSecretKeyId, null) - .in(MachineInfoDO::getSecretKeyId, secretKeyId); + .set(MachineInfoDO::getSecretKeyId, null) + .in(MachineInfoDO::getSecretKeyId, secretKeyId); this.update(null, wrapper); } - default PageResult selectPage(MachineInfoVO machineInfoVO){ - return selectPage(machineInfoVO,new LambdaQueryWrapperX() - .likeIfPresent(MachineInfoDO::getName, machineInfoVO.getName()) - .likeIfPresent(MachineInfoDO::getTag, machineInfoVO.getTag()) - .likeIfPresent(MachineInfoDO::getDescription, machineInfoVO.getDescription()) - .likeIfPresent(MachineInfoDO::getUsername, machineInfoVO.getUsername()) - .eqIfPresent(MachineInfoDO::getHostIp, machineInfoVO.getHostIp())); + + default PageResult selectPage(MachineInfoVO machineInfoVO) { + LambdaQueryWrapperX machineInfoDOLambdaQueryWrapperX = new LambdaQueryWrapperX() + .likeIfPresent(MachineInfoDO::getName, machineInfoVO.getName()) + .likeIfPresent(MachineInfoDO::getTag, machineInfoVO.getTag()) + .likeIfPresent(MachineInfoDO::getDescription, machineInfoVO.getDescription()) + .likeIfPresent(MachineInfoDO::getUsername, machineInfoVO.getUsername()) + .likeIfPresent(MachineInfoDO::getHostIp, machineInfoVO.getHostIp()); + if (machineInfoVO.getStatus() != -1) { + machineInfoDOLambdaQueryWrapperX.eqIfPresent(MachineInfoDO::getStatus, machineInfoVO.getStatus()); + } + return selectPage(machineInfoVO, machineInfoDOLambdaQueryWrapperX); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java index 5cc87bfd..05e4df4a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineProxyMapper.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.dal.mysql; + import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -12,15 +13,17 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MachineProxyMapper extends BaseMapperX { - - default PageResult selectPage(MachineProxyVO machineProxyVO) { - return selectPage(machineProxyVO, new LambdaQueryWrapperX() - .eqIfPresent(MachineProxyDO::getHostIp, machineProxyVO.getHostIp()) - .eqIfPresent(MachineProxyDO::getProxyType, machineProxyVO.getProxyType()) - .eqIfPresent(MachineProxyDO::getStatus, machineProxyVO.getStatus()) - .likeIfPresent(MachineProxyDO::getDescription, machineProxyVO.getDescription()) - ); + LambdaQueryWrapperX machineProxyDOLambdaQueryWrapperX = new LambdaQueryWrapperX() + .eqIfPresent(MachineProxyDO::getHostIp, machineProxyVO.getHostIp()) + .likeIfPresent(MachineProxyDO::getDescription, machineProxyVO.getDescription()); + if (machineProxyVO.getStatus() != -1) { + machineProxyDOLambdaQueryWrapperX.eqIfPresent(MachineProxyDO::getStatus, machineProxyVO.getStatus()); + } + if (machineProxyVO.getProxyType() != -1) { + machineProxyDOLambdaQueryWrapperX.eqIfPresent(MachineProxyDO::getProxyType, machineProxyVO.getProxyType()); + } + return selectPage(machineProxyVO, machineProxyDOLambdaQueryWrapperX); } -} \ No newline at end of file +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java index 05166abe..a5907cdd 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java @@ -14,16 +14,16 @@ import java.util.List; @Mapper public interface SecretKeyMapper extends BaseMapperX { //查询列表 - default PageResult selectPage(SecretKeyVO secretKeyVO){ - return selectPage(secretKeyVO,new LambdaQueryWrapperX() - .likeIfPresent(SecretKeyDO::getName,secretKeyVO.getName()) - .likeIfPresent(SecretKeyDO::getDescription,secretKeyVO.getDescription())); + default PageResult selectPage(SecretKeyVO secretKeyVO) { + return selectPage(secretKeyVO, new LambdaQueryWrapperX() + .likeIfPresent(SecretKeyDO::getName, secretKeyVO.getName()) + .likeIfPresent(SecretKeyDO::getDescription, secretKeyVO.getDescription())); } - default void bindingMachine(Long machineInfoId, List secretKeyId){ + default void bindingMachine(Long machineInfoId, List secretKeyId) { UpdateWrapper set = new UpdateWrapper<>(); set.eq("id", secretKeyId).set("machineInfoId", machineInfoId); - this.update(null,set); + this.update(null, set); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java index 74f3d869..d0ddd5b1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineInfoStatus.java @@ -5,18 +5,20 @@ import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + @Getter @AllArgsConstructor public enum MachineInfoStatus implements IntArrayValuable { - ENABLE(1,"启用"), - UN_ENABLE(0,"停用"); - + ENABLE(1, "启用"), + UN_ENABLE(0, "停用"); + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MachineInfoStatus::getCode).toArray(); private final int code; private final String message; @Override public int[] array() { - return new int[0]; + return ARRAYS; } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java index affcbd7b..88171c5f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/MachineProxyType.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.enums; + import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java index 04f48774..1222ff42 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineEnvService.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.service; + import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; @@ -38,7 +39,7 @@ public interface MachineEnvService { void deleteEnvList(String ids); /* - * 修改环境变量 + * 修改环境变量 */ void updateEnv(@Valid MachineEnvVO machineEnvVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 1831eb68..a7ea9c56 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -4,19 +4,21 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; +import jakarta.validation.Valid; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; -public interface MachineInfoService { +public interface MachineInfoService { Long createMachine(MachineInfoVO MachineInfoVO); - PageResult listMachineInfo(MachineInfoVO MachineInfoVO); + PageResult listMachineInfo(@Valid MachineInfoVO MachineInfoVO); - void updateMachineInfo(MachineInfoVO machineInfoVO); + void updateMachineInfo(@Valid MachineInfoVO machineInfoVO); - Integer updateStatus(Long machineInfoId, Integer status); + Integer updateStatus(@Valid MachineInfoVO machineInfoVO); void bindingSecretKey(List machineInfoIds, Long secretKeyId); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index e996fa09..0c699356 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -3,6 +3,9 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineProxyVO; import cd.casic.module.machine.dal.dataobject.MachineProxyDO; +import jakarta.validation.Valid; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.Map; @@ -13,13 +16,19 @@ public interface MachineProxyService { /** * 注册新的机器代理 */ - Long createProxy(MachineProxyVO machineProxyVO); + Long createProxy(@Valid MachineProxyVO machineProxyVO); /** * 更新代理状态 */ - void updateProxy(MachineProxyVO machineProxyVO); + void updateProxy(@Valid MachineProxyVO machineProxyVO); + /** + * 删除代理 + * + * @param + */ + void delete(Long id); /** * 获取所有代理的状态统计 @@ -29,7 +38,6 @@ public interface MachineProxyService { Map getAllProxyStatus(); - /** * 批量删除代理 * @@ -37,5 +45,5 @@ public interface MachineProxyService { */ void deleteProxyList(String proxyIds); - PageResult getProxyPage(MachineProxyVO machineProxyVO); + PageResult getProxyPage(@Valid MachineProxyVO machineProxyVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 66397635..178c421b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -4,20 +4,18 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.controller.vo.SecretKeyVO; import jakarta.validation.Valid; + import java.util.List; -public interface SecretKeyService{ +public interface SecretKeyService { Long createSecretKey(@Valid SecretKeyVO secretKeyVO) throws Exception; - void bindingMachine(Long id, List machineInfoId); + void bindingMachine(@Valid SecretKeyVO secretKeyVO); void updateSecretKey(@Valid SecretKeyVO secretKeyVO); - PageResult getSecretKeypage(@Valid SecretKeyVO secretKeyVO); - - void deleteSecretKeyList(List ids); SecretKeyVO getSecretKey(Long id); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java index d9908cd8..3363307e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.service.impl; + import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import cd.casic.module.machine.dal.mysql.MachineEnvMapper; @@ -20,7 +21,7 @@ import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; * 环境变量服务实现类 */ @Service("machineEnvService") -public class MachineEnvServiceImpl implements MachineEnvService { +public class MachineEnvServiceImpl implements MachineEnvService { @Resource private MachineEnvMapper machineEnvMapper; @@ -58,10 +59,10 @@ public class MachineEnvServiceImpl implements MachineEnvService { public void deleteEnvList(String ids) { //ids转换为List,使用流 List machineEnvIds = Arrays.stream(ids.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .map(Long::parseLong) - .toList(); + .map(String::trim) + .filter(s -> !s.isEmpty()) + .map(Long::parseLong) + .toList(); machineEnvMapper.deleteBatchIds(machineEnvIds); } @@ -84,20 +85,20 @@ public class MachineEnvServiceImpl implements MachineEnvService { } return machineEnvDO; } + @VisibleForTesting void validateMachineEnvAdd(MachineEnvVO machineEnvVO) { - if (machineEnvVO.getEnvKey()==null||machineEnvVO.getEnvValue()==null) { + if (machineEnvVO.getEnvKey() == null || machineEnvVO.getEnvValue() == null) { throw exception(MACHINE_ENV_NULL); } } - // 检查环境变量键是否合法 @VisibleForTesting private void validateKey(String key) { if (!key.matches("^[a-zA-Z_][a-zA-Z0-9_]*$")) { - throw exception(MACHINE_ENV_KEY_ILLEGAL); + throw exception(MACHINE_ENV_KEY_ILLEGAL); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index d4523f9c..3f3fc764 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.service.impl; + import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineProxyVO; import cd.casic.module.machine.dal.dataobject.MachineProxyDO; @@ -13,9 +14,12 @@ import cd.casic.framework.commons.util.object.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestParam; + import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; + import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; import static com.baomidou.mybatisplus.extension.toolkit.Db.save; @@ -33,7 +37,8 @@ public class MachineProxyServiceImpl implements MachineProxyService { public Long createProxy(MachineProxyVO machineProxyVO) { validateMachineProxyAdd(machineProxyVO); // 创建代理记录 - MachineProxyDO machineProxyDO = BeanUtils.toBean(machineProxyVO, MachineProxyDO.class);; + MachineProxyDO machineProxyDO = BeanUtils.toBean(machineProxyVO, MachineProxyDO.class); + ; save(machineProxyDO); return machineProxyDO.getId(); } @@ -47,6 +52,19 @@ public class MachineProxyServiceImpl implements MachineProxyService { machineProxyMapper.updateById(machineProxyDO); } + @Override + public void delete(Long id) { + MachineProxyDO machineProxyDO = validateMachineProxyExists(id); + validateMachineProxyOnline(machineProxyDO); + machineProxyMapper.deleteById(id); + } + + @VisibleForTesting + void validateMachineProxyOnline(MachineProxyDO machineProxyDO) { + if (machineProxyDO.getStatus() == MachineProxyStatus.ONLINE.getCode()) { + throw exception(MACHINE_PROXY_IS_ONLINE); + } + } @Override public Map getAllProxyStatus() { @@ -58,7 +76,7 @@ public class MachineProxyServiceImpl implements MachineProxyService { .map(MachineProxyDO::getStatus) .collect(Collectors.groupingBy( Function.identity(), - // 统计每个分组的元素数量 + // 统计每个分组的元素数量 Collectors.counting() )); } @@ -75,23 +93,19 @@ public class MachineProxyServiceImpl implements MachineProxyService { .filter(s -> !s.isEmpty()) .map(Long::parseLong) .toList(); - //检查是否存在在线的代理 - validateMachineProxyOnline(machineProxyIds); // 批量逻辑删除 - machineProxyMapper.deleteBatchIds(machineProxyIds); + machineProxyIds.forEach(this::delete); } @Override public PageResult getProxyPage(MachineProxyVO machineProxyVO) { - return machineProxyMapper.selectPage(machineProxyVO); + return machineProxyMapper.selectPage(machineProxyVO); } - - @VisibleForTesting MachineProxyDO validateMachineProxyExists(Long id) { if (id == null) { - return null; + throw exception(MACHINE_PROXY_NOT_EXISTS); } MachineProxyDO machineProxyDO = machineProxyMapper.selectById(id); if (machineProxyDO == null) { @@ -100,26 +114,12 @@ public class MachineProxyServiceImpl implements MachineProxyService { return machineProxyDO; } - @VisibleForTesting - void validateMachineProxyOnline(List ids) { - List machineProxyDOS = machineProxyMapper.selectBatchIds(ids); - ListonlineId=new ArrayList<>(); - machineProxyDOS.forEach(machineProxyDO->{ - if (machineProxyDO.getStatus() == MachineProxyStatus.ONLINE.getCode()) { - onlineId.add(machineProxyDO.getId()); - } - }); - if(!onlineId.isEmpty()){ - throw exception(MACHINE_PROXY_IS_ONLINE,onlineId); - } - } - @VisibleForTesting void validateMachineProxyAdd(MachineProxyVO machineProxyVO) { - if (machineProxyVO.getHostIp()==null) { + if (machineProxyVO.getHostIp() == null) { throw exception(MACHINE_PROXY_HOST_IP_NULL); } - if (machineProxyVO.getUsername()==null) { + if (machineProxyVO.getUsername() == null) { throw exception(MACHINE_PROXY_USER_NAME_NULL); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java index 87685435..8c271e48 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.service.impl; + import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.enums.AuthenticationType; @@ -30,7 +31,7 @@ import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; */ @Slf4j @Service("machineInfoService") -public class MachineinfoServiceImpl implements MachineInfoService { +public class MachineinfoServiceImpl implements MachineInfoService { @Resource private SecretKeyService secretKeyService; @@ -58,14 +59,15 @@ public class MachineinfoServiceImpl implements MachineInfoService { validateMachineEnvAdd(machineInfoVO); validateMachineTagUnique(machineInfoVO.getTag()); MachineInfoDO machineInfoDO = BeanUtils.toBean(machineInfoVO, MachineInfoDO.class); - Long secretKeyId = machineInfoDO.getSecretKeyId(); - SecretKeyVO secretKey = secretKeyService.getSecretKey(secretKeyId); - if (secretKey==null){ - throw exception(SECRET_KEY_NOT_EXISTS); + if (machineInfoVO.getAuthenticationType() == 2) { + Long secretKeyId = machineInfoDO.getSecretKeyId(); + SecretKeyVO secretKey = secretKeyService.getSecretKey(secretKeyId); + if (secretKey == null) { + throw exception(SECRET_KEY_NOT_EXISTS); + } } machineInfoMapper.insert(machineInfoDO); - Long id = machineInfoDO.getId(); - return id; + return machineInfoDO.getId(); } @Override @@ -74,7 +76,7 @@ public class MachineinfoServiceImpl implements MachineInfoService { String newTag = machineInfoVO.getTag(); MachineInfoDO machineInfoDO = validateMachineInfoExists(machineInfoVO.getId()); String oldTag = machineInfoDO.getTag(); - if (!newTag.equals(oldTag)){ + if (!newTag.equals(oldTag)) { validateMachineTagUnique(newTag); } BeanUtils.copyProperties(machineInfoVO, machineInfoDO); @@ -82,19 +84,19 @@ public class MachineinfoServiceImpl implements MachineInfoService { } @Override - public Integer updateStatus(Long machineInfoId, Integer status) { - machineInfoMapper.updateStatus(machineInfoId, status); - return machineInfoMapper.selectById(machineInfoId).getStatus(); + public Integer updateStatus(MachineInfoVO machineInfoVO) { + machineInfoMapper.updateStatus(machineInfoVO.getId(), machineInfoVO.getStatus()); + return machineInfoVO.getStatus(); } @Override public PageResult listMachineInfo(MachineInfoVO machineInfoVO) { - return machineInfoMapper.selectPage(machineInfoVO); + return machineInfoMapper.selectPage(machineInfoVO); } @Override - public void bindingSecretKey(List machineInfoId,Long secretKeyId) { - machineInfoMapper.bindingSecretKey(machineInfoId,secretKeyId); + public void bindingSecretKey(List machineInfoIds, Long secretKeyId) { + machineInfoMapper.bindingSecretKey(machineInfoIds, secretKeyId); } @Override @@ -123,7 +125,7 @@ public class MachineinfoServiceImpl implements MachineInfoService { validateMachineUnEnable(machineInfoDO); log.info("测试机器连接: {}", machineInfoDO.getHostIp()); connectionSession.setMachineInfo(machineInfoDO); - try{ + try { connectionSession.connect(); return true; } catch (Exception e) { @@ -289,56 +291,57 @@ public class MachineinfoServiceImpl implements MachineInfoService { if (machineInfoVO.getHostIp().isEmpty()) { throw exception(MACHINE_INFO_HOST_IP_NULL); } - if (machineInfoVO.getUsername().isEmpty()){ + if (machineInfoVO.getUsername().isEmpty()) { throw exception(MACHINE_INFO_USER_NAME_NULL); } - if(machineInfoVO.getTag().isEmpty()){ + if (machineInfoVO.getTag().isEmpty()) { throw exception(MACHINE_INFO_TAG_NULL); } - if (machineInfoVO.getAuthenticationType()!=null){ - boolean flag=true; + if (machineInfoVO.getAuthenticationType() != null) { + boolean flag = true; for (int type : AuthenticationType.ARRAYS) { if (type == machineInfoVO.getAuthenticationType()) { - flag=false; + flag = false; break; } - if (flag){ - throw exception(MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS); - } } - }else { + if (flag) { + throw exception(MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS); + } + } else { throw exception(MACHINE_INFO_AUTHENTICATION_TYPE_NULL); } - if (machineInfoVO.getMachineInfoType()!= null){ + if (machineInfoVO.getMachineInfoType() != null) { boolean flag = true; for (int type : MachineInfoType.ARRAYS) { - if (type == machineInfoVO.getMachineInfoType()) { - flag=false; + if (type == machineInfoVO.getMachineInfoType()) { + flag = false; break; } } if (flag) { throw exception(MACHINE_INFO_TYPE_NOT_EXISTS); } - }else { + } else { throw exception(MACHINE_INFO_TYPE_NULL); } } @VisibleForTesting - void validateMachineTagUnique(String tag){ + void validateMachineTagUnique(String tag) { if (machineInfoMapper.existsByTag(tag)) { throw exception(MACHINE_INFO_TAG_EXISTS); } } + @VisibleForTesting MachineInfoDO validateMachineInfoExists(Long id) { if (id == null) { - return null; + throw exception(MACHINE_INFO_NULL); } MachineInfoDO machineInfoDO = machineInfoMapper.selectById(id); if (machineInfoDO == null) { @@ -346,17 +349,18 @@ public class MachineinfoServiceImpl implements MachineInfoService { } return machineInfoDO; } + @VisibleForTesting void validateMachineEnable(MachineInfoDO machineInfoDO) { - - if (machineInfoDO.getStatus()==MachineInfoStatus.ENABLE.getCode()){ + if (machineInfoDO.getStatus() == MachineInfoStatus.ENABLE.getCode()) { throw exception(MACHINE_ENABLE); } } + @VisibleForTesting void validateMachineUnEnable(MachineInfoDO machineInfoDO) { - if (machineInfoDO.getStatus()==MachineInfoStatus.UN_ENABLE.getCode()){ + if (machineInfoDO.getStatus() == MachineInfoStatus.UN_ENABLE.getCode()) { throw exception(MACHINE_UN_ENABLE); } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index d0d9426f..0aa028a1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.service.impl; + import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.module.machine.controller.vo.SecretKeyVO; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; + import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; @@ -34,15 +36,14 @@ public class SecretKeyServiceImpl implements SecretKeyService { private SecretKeyMapper secretKeyMapper; - @Override - public SecretKeyVO getSecretKey(Long id){ + public SecretKeyVO getSecretKey(Long id) { SecretKeyDO secretKeyDO = validateSecretKeyExists(id); return BeanUtils.toBean(secretKeyDO, SecretKeyVO.class); } @Override - public Long createSecretKey(SecretKeyVO secretKeyVO){ + public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); String ossPath = upLoadSecretKey(secretKeyVO.getPath()); //检查得到的oss路径是否为空 @@ -56,6 +57,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { } + @Override public void updateSecretKey(SecretKeyVO secretKeyVO) { SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyVO.getId()); @@ -65,36 +67,35 @@ public class SecretKeyServiceImpl implements SecretKeyService { String ossPath = upLoadSecretKey(secretKeyVO.getPath()); BeanUtils.copyProperties(secretKeyVO, secretKeyDO); secretKeyDO.setPath(ossPath); - } - else { - BeanUtils.copyProperties(secretKeyVO,secretKeyDO); + } else { + BeanUtils.copyProperties(secretKeyVO, secretKeyDO); } secretKeyMapper.updateById(secretKeyDO); } @Override - public void bindingMachine(Long id,List machineInfoIds) { - validateSecretKeyExists(id); - machineInfoService.bindingSecretKey(machineInfoIds, id); + public void bindingMachine(SecretKeyVO secretKeyVO) { + validateSecretKeyExists(secretKeyVO.getId()); + machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(), secretKeyVO.getId()); } @Override @Transactional public void deleteSecretKeyList(List ids) { ids.forEach( - secretKeyId -> { - SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyId); - if (secretKeyDO.getPath() != null && !secretKeyDO.getPath().isEmpty()){ - try { - //文件名 - //删除子目录文件，需要在前面加上根目录文件路径 - String fileName = secretKeyDO.getPath().substring(secretKeyDO.getPath().lastIndexOf("/") + 1); - aliYunOssClient.delete(fileName); - } catch (Exception e) { - throw exception(DELETE_FILE_FAIL); - } + secretKeyId -> { + SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyId); + if (secretKeyDO.getPath() != null && !secretKeyDO.getPath().isEmpty()) { + try { + //文件名 + //删除子目录文件，需要在前面加上根目录文件路径 + String fileName = secretKeyDO.getPath().substring(secretKeyDO.getPath().lastIndexOf("/") + 1); + aliYunOssClient.delete(fileName); + } catch (Exception e) { + throw exception(DELETE_FILE_FAIL); } } + } ); //绑定的机器全部设置为空 @@ -118,7 +119,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { String ossPath; try { ossPath = aliYunOssClient.upload(content, path, "txt"); - }catch (Exception e) { + } catch (Exception e) { throw exception(UPLOADING_FILE_FAIL); } return ossPath; @@ -126,7 +127,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { @VisibleForTesting void validateSecretKeyAdd(SecretKeyVO secretKeyVO) { - if (secretKeyVO==null) { + if (secretKeyVO == null) { throw exception(SECRET_KEY_NULL); } if (secretKeyVO.getPath().isEmpty()) { @@ -145,7 +146,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { @VisibleForTesting SecretKeyDO validateSecretKeyExists(Long id) { if (id == null) { - return null; + throw exception(SECRET_KEY_NOT_EXISTS); } SecretKeyDO secretKeyDO = secretKeyMapper.selectById(id); if (secretKeyDO == null) { From 6b8165028e7b7d09437fed6e6098ebedb9974366 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Mon, 16 Jun 2025 09:08:12 +0800 Subject: [PATCH 27/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E8=A7=A3=E7=BB=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/controller/SecretKeyController.java | 11 ++++++++--- .../module/machine/dal/mysql/MachineInfoMapper.java | 7 ------- .../module/machine/handler/ConnectionSession.java | 6 ++++-- .../module/machine/service/MachineInfoService.java | 2 -- .../module/machine/service/SecretKeyService.java | 2 ++ ...foServiceImpl.java => MachineInfoServiceImpl.java} | 7 +------ .../machine/service/impl/SecretKeyServiceImpl.java | 7 ++++++- 7 files changed, 21 insertions(+), 21 deletions(-) rename modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/{MachineinfoServiceImpl.java => MachineInfoServiceImpl.java} (98%) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 626a1d32..668e05ed 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -44,13 +44,20 @@ public class SecretKeyController { } @PutMapping("/bindingMachine") - @Operation(summary = "绑定机器") //todo解绑机器 + @Operation(summary = "绑定机器") // @PreAuthorize("@ss.hasPermission('ci:secretKey:binding')") public CommonResult bindingMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { secretKeyService.bindingMachine(secretKeyVO); return success(true); } + @PutMapping("unbindMachine") + @Operation(summary = "解绑机器") + public CommonResult unbindMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { + secretKeyService.unbindMachine(secretKeyVO); + return success(true); + } + @GetMapping("/getSecretKey") @Operation(summary = "获取机器的环境变量") public CommonResult getSecretKey(@RequestParam("id") Long id) { @@ -76,6 +83,4 @@ public class SecretKeyController { } return success(BeanUtils.toBean(pageResult, SecretKeyVO.class)); } - - } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index 407c4ebb..5b23cbe8 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -35,13 +35,6 @@ public interface MachineInfoMapper extends BaseMapperX { this.update(null, wrapper); } - default void unBindingSecretKey(List secretKeyId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() - .set(MachineInfoDO::getSecretKeyId, null) - .in(MachineInfoDO::getSecretKeyId, secretKeyId); - this.update(null, wrapper); - } - default PageResult selectPage(MachineInfoVO machineInfoVO) { LambdaQueryWrapperX machineInfoDOLambdaQueryWrapperX = new LambdaQueryWrapperX() .likeIfPresent(MachineInfoDO::getName, machineInfoVO.getName()) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java index 88949967..4c5e87e6 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; /** * 优化后的SSH连接会话类 */ @@ -57,7 +59,7 @@ public class ConnectionSession implements AutoCloseable { */ public synchronized void connect() throws JSchException { if (status == ConnectionStatus.CONNECTED) { - log.debug("Already connected to {}", machineInfo.getHostIp()); + log.debug("已经连接到 {}", machineInfo.getHostIp()); return; } @@ -131,7 +133,7 @@ public class ConnectionSession implements AutoCloseable { if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { // 密钥认证 if (machineInfo.getSecretKeyId() == null) { - throw new JSchException("Secret key ID is required for key-based authentication"); + throw exception(SECRET_KEY_NULL); } String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index a7ea9c56..b86538e0 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -94,6 +94,4 @@ public interface MachineInfoService { * @return 操作结果 */ boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); - - void unBindingSecretKey(List SecretKeyIds); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 178c421b..0307cb28 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -19,5 +19,7 @@ public interface SecretKeyService { void deleteSecretKeyList(List ids); SecretKeyVO getSecretKey(Long id); + + void unbindMachine(@Valid SecretKeyVO secretKeyVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java similarity index 98% rename from modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java rename to modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index 8c271e48..69b397be 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineinfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -31,7 +31,7 @@ import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; */ @Slf4j @Service("machineInfoService") -public class MachineinfoServiceImpl implements MachineInfoService { +public class MachineInfoServiceImpl implements MachineInfoService { @Resource private SecretKeyService secretKeyService; @@ -281,11 +281,6 @@ public class MachineinfoServiceImpl implements MachineInfoService { } } - @Override - public void unBindingSecretKey(List SecretKeyIds) { - machineInfoMapper.unBindingSecretKey(SecretKeyIds); - } - @VisibleForTesting void validateMachineEnvAdd(MachineInfoVO machineInfoVO) { if (machineInfoVO.getHostIp().isEmpty()) { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 0aa028a1..1e37d57e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -42,6 +42,11 @@ public class SecretKeyServiceImpl implements SecretKeyService { return BeanUtils.toBean(secretKeyDO, SecretKeyVO.class); } + @Override + public void unbindMachine(SecretKeyVO secretKeyVO) { + machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(),null); + } + @Override public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); @@ -99,7 +104,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { ); //绑定的机器全部设置为空 - machineInfoService.unBindingSecretKey(ids); + machineInfoService.bindingSecretKey(ids,null); secretKeyMapper.deleteBatchIds(ids); } From 38ba61ed3a72f55b985369d49ebdbe693972544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Mon, 16 Jun 2025 14:44:34 +0800 Subject: [PATCH 28/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/controller/MachineInfoController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 6922f05f..95d9cb18 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -80,7 +80,7 @@ public class MachineInfoController { @PostMapping("/test") @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestParam Long id) { + public CommonResult testConnection(@RequestParam("id") Long id) { return success(machineInfoService.testConnection(id)); } @@ -102,13 +102,13 @@ public class MachineInfoController { return success(machineInfoService.connect(machineInfoDO)); } - @PostMapping("/disconnect/{sessionId}") + @GetMapping("/disconnect/{sessionId}") @Operation(summary = "断开机器连接") public CommonResult disconnect(@PathVariable String sessionId) { return success(machineInfoService.disconnect(sessionId)); } - @PostMapping("/execute/{sessionId}") + @GetMapping("/execute/{sessionId}") @Operation(summary = "执行远程命令") public CommonResult executeCommand( @PathVariable String sessionId, @@ -117,7 +117,7 @@ public class MachineInfoController { return success(machineInfoService.executeCommand(sessionId, command)); } - @PostMapping("/upload/{sessionId}") + @GetMapping("/upload/{sessionId}") @Operation(summary = "上传文件到远程机器") public CommonResult uploadFile( @PathVariable String sessionId, @@ -126,7 +126,7 @@ public class MachineInfoController { return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); } - @PostMapping("/download/{sessionId}") + @GetMapping("/download/{sessionId}") @Operation(summary = "从远程机器下载文件") public CommonResult downloadFile( @PathVariable String sessionId, From 2f3a2ae28fd2fe42998c3bbccfc77e3b019afda3 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Tue, 24 Jun 2025 16:20:09 +0800 Subject: [PATCH 29/46] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E7=94=A8websocket(=E8=81=94=E8=B0=83=E4=BB=BB?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98)=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BF=9C=E7=A8=8B=E6=9C=BA=E5=99=A8=E5=AF=B9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=A0=91=E7=9A=84=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=B7=A5=E6=95=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 17 +- .../WebSocketHandshakeInterceptor.java | 85 +++ .../machine/component/FileTreeComponent.java | 214 ++++++ .../component/WebSocketConnection.java | 230 +++++++ .../component/WebSocketSessionManager.java | 114 ++++ .../configuration/AliYunOssConfig.java | 2 +- .../configuration/WebSocketConfig.java | 40 ++ .../contants/MachineErrorCodeConstants.java | 32 +- .../controller/MachineInfoController.java | 78 +-- .../controller/SecretKeyController.java | 27 +- .../machine/controller/vo/SecretKeyVO.java | 2 + .../machine/convert/MachineEnvConvert.java | 25 - .../module/machine/dal/model/FileNode.java | 56 ++ .../machine/dal/mysql/MachineInfoMapper.java | 5 + .../machine/dal/mysql/SecretKeyMapper.java | 1 - .../machine/enums/ConnectionStatus.java | 29 +- .../module/machine/enums/SSHChanelType.java | 35 + .../machine/handler/ConnectionSession.java | 642 ------------------ .../handler/MachineWebSocketHandler.java | 67 ++ .../machine/service/MachineInfoService.java | 88 +-- .../machine/service/SecretKeyService.java | 11 + .../service/impl/MachineInfoServiceImpl.java | 243 ++----- .../service/impl/MachineProxyServiceImpl.java | 2 - .../service/impl/SecretKeyServiceImpl.java | 83 ++- .../module/machine/utils/AliYunOssClient.java | 3 +- .../module/machine/utils/PropertyUtils.java | 35 - 26 files changed, 1175 insertions(+), 991 deletions(-) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PropertyUtils.java diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index ce137127..6f221741 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -28,6 +28,12 @@ 3.15.1 + + + org.springframework.boot + spring-boot-starter-websocket + + com.jcraft @@ -63,7 +69,14 @@ module-infra-biz ${revision} - - + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java new file mode 100644 index 00000000..a0a6f890 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java @@ -0,0 +1,85 @@ +package cd.casic.module.machine.Interceptor; + +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.server.HandshakeInterceptor; + +import java.net.URI; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +@Component +@Slf4j +public class WebSocketHandshakeInterceptor implements HandshakeInterceptor { + @Override + public boolean beforeHandshake( + @NotNull ServerHttpRequest request, + @NotNull ServerHttpResponse response, + @NotNull WebSocketHandler wsHandler, + @NotNull Map attributes + ) { + log.info("WebSocket握手请求: {}", request.getURI()); + + // 从URL参数中获取id + String id = extractIdFromUrl(request.getURI()); + + System.out.println("-----------------------------------------"); + if (id != null) { + attributes.put("machineId", id); // 将id存入attributes + log.info("握手验证成功 - ID: {}", id); + return true; + } else { + response.setStatusCode(HttpStatus.BAD_REQUEST); + log.warn("握手验证失败 - 缺少 id URL 参数"); + return false; + } + } + + @Override + public void afterHandshake( + @NotNull ServerHttpRequest request, + @NotNull ServerHttpResponse response, + @NotNull WebSocketHandler wsHandler, + Exception exception + ) { + if (exception == null) { + log.info("WebSocket握手完成 - URI: {}", + request.getURI()); + } else { + log.error("WebSocket握手异常 - URI: {}, 异常信息: {}", + request.getURI(), + exception.getMessage(), + exception); + } + } + + // 从URI中提取id参数的辅助方法 + private String extractIdFromUrl(URI uri) { + try { + String query = uri.getQuery(); + if (query != null) { + String[] params = query.split("&"); + for (String param : params) { + String[] keyValue = param.split("="); + if (keyValue.length == 2 && "id".equalsIgnoreCase(keyValue[0])) { // 修改为匹配id + return URLDecoder.decode(keyValue[1], StandardCharsets.UTF_8); + } + } + } + } catch (Exception e) { + log.error("解析URL参数失败", e); + throw exception(FAILED_TO_PARSE_URL_PARAMETERS); + } + return null; + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java new file mode 100644 index 00000000..d42fa416 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java @@ -0,0 +1,214 @@ +package cd.casic.module.machine.component; + +import cd.casic.module.machine.dal.model.FileNode; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import com.jcraft.jsch.SftpATTRS; +import com.jcraft.jsch.SftpException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +@Slf4j +@Component +public class FileTreeComponent { + + private ChannelSftp sftp; + //todo缓存过期还未设置 + private final Map directoryCache = new ConcurrentHashMap<>(); + private static final long CACHE_EXPIRE_TIME = 60 * 1000; // 缓存过期时间：1分钟 + private final Map cacheTimeStamp = new ConcurrentHashMap<>(); + + // 将文件树转换为JSON友好的Map结构（仅一级目录） + public static Map convertToMap(FileNode node) { + Map map = new HashMap<>(); + map.put("name", node.getName()); + map.put("isDirectory", node.isDirectory()); + map.put("size", node.getSize()); + map.put("permissions", node.getPermissions()); + map.put("modifiedTime", node.getModifiedTime()); + // 仅添加直接子项，不递归 + if (node.isDirectory() && !node.getChildren().isEmpty()) { + List> children = node.getChildren().stream() + .map(FileTreeComponent::convertToMap) + .collect(Collectors.toList()); + map.put("children", children); + } + return map; + } + + // 获取指定路径的直接子项（不递归） + public List listDirectChildren(String path) { + if (sftp == null || !isSftpConnected()) { + log.error("SFTP连接无效，无法列出文件"); + throw exception(CONNECTION_LOST); + } + + List entries = Collections.synchronizedList(new ArrayList<>()); + //定义ChannelSftp下LsEntrySelector接口中select方法 + ChannelSftp.LsEntrySelector selector = entry -> { + entries.add(entry); + return ChannelSftp.LsEntrySelector.CONTINUE; + }; + + try { + sftp.ls(path, selector); + } catch (SftpException e) { + log.error("读取远程文件目录结构失败 [错误码: {}, 信息: {}]", + e.id, e.getMessage(), e); + throw exception(READ_REMOTE_DIRECTORY_FAIL); + } + return new ArrayList<>(entries); + } + + // 创建文件节点（支持使用完整路径或文件名） + private static FileNode createFileNode(String name, SftpATTRS attrs, boolean useFullPath) { + String displayName = useFullPath ? name : name.substring(name.lastIndexOf('/') + 1); + return new FileNode( + displayName, + attrs.isDir(), + attrs.getSize(), + attrs.getPermissionsString(), + attrs.getMTime() * 1000L // 转换为毫秒 + ); + } + + // 获取远程文件树的方法（仅展示下一级） + public Map getRemoteFileTree(Session session, String path) { + path = normalizePath(path); + Channel channel = null; + try { + // 缓存有效性检查 + String cacheKey = "ls:" + path; + long currentTime = System.currentTimeMillis(); + + // 检查缓存是否存在且未过期 + if (directoryCache.containsKey(cacheKey) && + currentTime - cacheTimeStamp.getOrDefault(cacheKey, 0L) < CACHE_EXPIRE_TIME) { + log.debug("从缓存获取目录内容: {}", path); + // 构建缓存中的根节点 + FileNode root = directoryCache.get(cacheKey); + return sortFileInfo(convertToMap(root)); + } + + // 打开SFTP通道 + channel = session.openChannel("sftp"); + channel.connect(); + sftp = (ChannelSftp) channel; + + // 先通过stat获取当前路径信息 + SftpATTRS rootAttrs = sftp.stat(path); + FileNode root = createFileNode(path, rootAttrs, true); + + // 仅获取直接子项，不递归 + List entries = listDirectChildren(path); + //循环添加子节点 + for (ChannelSftp.LsEntry entry : entries) { + String fileName = entry.getFilename(); + if (fileName.equals(".") || fileName.equals("..")) continue; + SftpATTRS attrs = entry.getAttrs(); + FileNode childNode = createFileNode(fileName, attrs, false); + root.addChild(childNode); + } + // 更新缓 + directoryCache.put(cacheKey, root); + cacheTimeStamp.put(cacheKey, currentTime); + return sortFileInfo(convertToMap(root)); + } catch (JSchException e) { + log.error("SFTP通道创建或连接失败: {}", e.getMessage(), e); + if (e.getMessage().contains("open")) { + throw exception(CREATE_CHANEL_ERROR); + } else { + throw exception(CHANEL_CONNECT_FAIL); + } + } catch (SftpException e) { + if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { + // 仅捕获路径不存在的错误 + log.error("路径不存在: {}", path); + throw exception(PATH_NOT_EXISTS); // 自定义异常 + } else if (e.id == ChannelSftp.SSH_FX_PERMISSION_DENIED) { + // 处理权限问题（非路径不存在） + log.error("无路径访问权限: {}", path); + throw exception(NO_PATH_PERMISSION); + } else { + log.error("获取目录内容失败: {}", e.getMessage(), e); + throw exception(READ_REMOTE_DIRECTORY_FAIL); + } + } finally { + // 确保资源释放 + if (sftp != null) { + try { + sftp.disconnect(); + } catch (Exception ex) { + log.warn("关闭SFTP连接失败", ex); + } + } + if (channel != null && channel.isConnected()) { + channel.disconnect(); + } + } + } + + // 检查SFTP连接状态 + private boolean isSftpConnected() { + if (sftp == null) return false; + try { + sftp.pwd(); + return true; + } catch (Exception e) { + log.warn("SFTP连接状态检查失败", e); + return false; + } + } + + // 规范化路径：确保末尾有斜杠（根路径除外） + private String normalizePath(String path) { + // 移除多余的斜杠（多个连续的斜杠会被替换为一个） + path = path.replaceAll("/+", "/"); + + // 如果路径不为根路径且末尾没有斜杠，则添加斜杠 + if (!"/".equals(path) && !path.endsWith("/")) { + path += "/"; + } + + return path; + } + + /** + * 对文件和目录信息进行排序（仅处理直接子级） + * + * @param fileInfoMap 文件/目录信息映射 + * @return 排序后的映射 + */ + public Map sortFileInfo(Map fileInfoMap) { + // 检查是否包含子节点 + if (fileInfoMap.containsKey("children")) { + List> children = (List>) fileInfoMap.get("children"); + // 对子节点列表进行排序 + if (children != null && !children.isEmpty()) { + children.sort((a, b) -> { + // 获取isDirectory属性并比较 + boolean isADirectory = (boolean) a.get("isDirectory"); + boolean isBDirectory = (boolean) b.get("isDirectory"); + // 目录排在文件前面 + return Boolean.compare(isBDirectory, isADirectory); + }); + // 更新排序后的子节点列表 + fileInfoMap.put("children", children); + } + } + return fileInfoMap; + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java new file mode 100644 index 00000000..1674e8f7 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java @@ -0,0 +1,230 @@ +package cd.casic.module.machine.component; + +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.enums.SSHChanelType; +import cd.casic.module.machine.service.SecretKeyService; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Properties; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.SECRET_KEY_NULL; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +@Slf4j +@Data +@Component +public class WebSocketConnection { + private SecretKeyService secretKeyService; + + private MachineInfoDO machineInfo; + private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; + private Session sshSession; + + public WebSocketConnection(SecretKeyService secretKeyService) { + this.secretKeyService = secretKeyService; + } + + private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) + + public void initConnection(MachineInfoDO machineInfo) { + try { + this.machineInfo = machineInfo; + this.sshSession = doConnect(machineInfo); + log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); + this.connectionStatus = ConnectionStatus.CONNECTING; + } catch (ServiceException e) { + log.warn("SSH 连接失败: {}", e.getMessage()); + throw e; + } + } + + public void disconnect() { + if (sshSession != null && sshSession.isConnected()) { + try { + sshSession.disconnect(); + log.info("SSH连接关闭: {}", machineInfo.getHostIp()); + } catch (Exception e) { + log.error("关闭SSH连接失败: {}", e.getMessage()); + throw exception(CLOSE_CLOSE_SESSION_ERROR); + } + } + connectionStatus = ConnectionStatus.DISCONNECTED; + } + + /** + * 执行远程命令，支持超时和中断处理 + */ + public void executeCommand(WebSocketSession webSocketSession, String command) { + // 1. 检查连接状态 + if (sshSession == null || !sshSession.isConnected()) { + sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); + return; + } + try { + // 2. 创建SSH命令执行通道 + Channel channel; + try { + channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); + } catch (JSchException e) { + throw exception(CREATE_CHANEL_ERROR); + } + ((ChannelExec) channel).setCommand(command); + // 3. 设置输入/输出流 + channel.setInputStream(null); + ((ChannelExec) channel).setErrStream(System.err); + // 4. 获取命令输出流 + InputStream inputStream = channel.getInputStream(); + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); + BufferedReader reader = new BufferedReader(inputStreamReader); + // 5. 连接并执行命令 + channel.connect(); + // 6. 读取命令输出并实时发送给客户端 + String line; + while ((line = reader.readLine()) != null) { + // 实时发送输出到客户端 + webSocketSession.sendMessage(new TextMessage(line)); + } + // 7. 等待命令执行完成 + int exitStatus = channel.getExitStatus(); + // 8. 发送命令执行完毕的消息 + webSocketSession.sendMessage(new TextMessage( + "[系统] 命令执行完毕，退出状态: " + exitStatus + )); + // 9. 关闭通道 + channel.disconnect(); + } catch (JSchException | IOException e) { + throw exception(EXECUTE_COMMAND_FAIL); + } + } + + // 发送错误消息的辅助方法 + public void sendErrorMessage(WebSocketSession webSocketSession, String message) { + try { + if (webSocketSession.isOpen()) { + webSocketSession.sendMessage(new TextMessage("[错误] " + message)); + } + } catch (IOException e) { + log.error("发送错误消息失败", e); + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + /** + * 实际执行连接逻辑 + */ + private Session doConnect(MachineInfoDO machineInfo) { + JSch jsch = new JSch(); + // 配置认证方式 + configureAuthentication(jsch, machineInfo); + Session session; + // 创建SSH会话 + try { + session = jsch.getSession( + machineInfo.getUsername(), + machineInfo.getHostIp(), + machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 + ); + } catch (JSchException e) { + throw exception(CREATE_SESSION_ERROR); + } + // 配置连接参数 + configureSession(session, machineInfo); + // 建立连接 + try { + session.connect(CONNECTION_TIMEOUT); + } catch (JSchException e) { + throw exception(SESSION_CONNECT_ERROR); + } + return session; + } + + /** + * 配置认证方式（密码或密钥） + */ + private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { + if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { + // 密钥认证 + if (machineInfo.getSecretKeyId() == null) { + throw exception(SECRET_KEY_NULL); + } + String pubKeyContent = secretKeyService.getKeyContent(machineInfo.getSecretKeyId()); + // 验证秘钥格式 + if (!pubKeyContent.startsWith("-----BEGIN")) { + log.error("无效的密钥格式{}", pubKeyContent); + throw exception(INVALID_kEY_FORMAT); + } + try { + // 尝试加载秘钥私钥 + jsch.addIdentity( + machineInfo.getName(), + pubKeyContent.getBytes(StandardCharsets.UTF_8), + null, + null + ); + log.info("密钥加载成功 {}", machineInfo.getHostIp()); + } catch (JSchException e) { + log.error("密钥加载失败: {}", e.getMessage()); + throw exception(READ_SECRET_CONTENT_ERROR); + } + } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { + // 密码认证 + if (!StringUtils.hasText(machineInfo.getPassword())) { + throw exception(PASSWORD_NOT_EXISTS); + } + } else { + log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); + throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); + } + } + + /** + * 配置SSH会话参数（安全增强） + */ + private void configureSession(Session session, MachineInfoDO machineInfo) { + Properties config = new Properties(); + // 根据认证类型配置不同的认证策略 + if (machineInfo.getAuthenticationType() == 1) { // 密码认证 + // 设置密码 + session.setPassword(machineInfo.getPassword()); + config.put("StrictHostKeyChecking", "no"); + // 仅使用密码认证（禁用其他认证方式） + config.put("PreferredAuthentications", "password"); + // 禁用公钥相关配置（避免干扰） + config.put("PubkeyAuthentication", "no"); + } else { // 密钥认证 + try { + String preKeyPath = secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath(); + JSch jsch = new JSch(); + jsch.addIdentity(preKeyPath); // 添加私钥 + // 保持默认认证顺序（公钥优先） + config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); + } catch (JSchException e) { + log.error("SSH密钥配置失败", e); + throw exception(SSH_KEY_CONFIGURATION_FAIL); + } + } + config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 + config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 + session.setConfig(config); + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java new file mode 100644 index 00000000..e07eab42 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java @@ -0,0 +1,114 @@ +package cd.casic.module.machine.component; + +import org.springframework.stereotype.Component; +import org.springframework.web.socket.WebSocketSession; + +import java.util.Collection; +import java.util.concurrent.ConcurrentHashMap; + +@Component("machineWebSocketSessionManger") +//管理webSocketSession +public class WebSocketSessionManager { + + //webSocketSessionId - WebSocketSession 保存 WebSocketSession 对象与会话 ID 的映射 + private static final ConcurrentHashMap WebSocketSessionMap = new ConcurrentHashMap<>(); + + //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 + private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); + + //机器id - WebSocketConnection + private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); + + public static void addWebSocketSession(String sessionId, WebSocketSession session) { + WebSocketSessionMap.put(sessionId, session); + } + + /** + * 获取 WebSocketSession + */ + public static WebSocketSession getWebSocketSession(String sessionId) { + return WebSocketSessionMap.get(sessionId); + } + + /** + * 移除 WebSocketSession + */ + public static void removeWebSocketSession(String sessionId) { + WebSocketSessionMap.remove(sessionId); + } + + /** + * 检查 sessionId 是否存在 + */ + public static boolean containsWebSocketSession(String sessionId) { + return WebSocketSessionMap.containsKey(sessionId); + } + + /** + * 获取所有 WebSocketSession + */ + public static Collection getAllWebSocketSessions() { + return WebSocketSessionMap.values(); + } + + public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { + sessionConnectionMap.put(sessionId, connection); + } + + /** + * 获取 WebSocketConnection + */ + public static WebSocketConnection getWebSocketConnection(String sessionId) { + return sessionConnectionMap.get(sessionId); + } + + /** + * 移除 WebSocketConnection + */ + public static void removeWebSocketConnection(String sessionId) { + sessionConnectionMap.remove(sessionId); + } + + /** + * 检查 sessionId 是否存在 + */ + public static boolean containsWebSocketConnection(String sessionId) { + return sessionConnectionMap.containsKey(sessionId); + } + + /** + * 获取所有 WebSocketConnection + */ + public static ConcurrentHashMap getAllWebSocketConnections() { + return webSocketSessionConnectionMap; + } + + /** + * 添加 WebSocketConnection + */ + public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { + webSocketSessionConnectionMap.put(machineId, connection); + } + + /** + * 获取 WebSocketConnection + */ + public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { + return webSocketSessionConnectionMap.get(machineId); + } + + /** + * 移除 WebSocketConnection + */ + public static void removeWebSocketConnectionByMachineId(Long machineId) { + webSocketSessionConnectionMap.remove(machineId); + } + + /** + * 检查 machineId 是否存在 + */ + public static boolean containsMachineId(Long machineId) { + return webSocketSessionConnectionMap.containsKey(machineId); + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java index a7ab3183..fc66eda6 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration - public class AliYunOssConfig extends S3FileClientConfig{ +public class AliYunOssConfig extends S3FileClientConfig{ @Value("${aliyun.oss.endpoint}") private String endpoint; @Value("${aliyun.oss.accessKeyId}") diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java new file mode 100644 index 00000000..c44d5d9e --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java @@ -0,0 +1,40 @@ +package cd.casic.module.machine.configuration; + +import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; +import cd.casic.module.machine.handler.MachineWebSocketHandler; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; +import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; + +@Configuration +@EnableWebSocket +//WebSocket端点配置 +public class WebSocketConfig implements WebSocketConfigurer { + @Resource + private MachineWebSocketHandler machineWebSocketHandler; + + @Resource + private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(machineWebSocketHandler, "/ssh/terminal") + .addInterceptors(webSocketHandshakeInterceptor) + .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） + } + + @Bean + public ServletServerContainerFactoryBean createWebSocketContainer() { + return new ServletServerContainerFactoryBean(); + } + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index dc6ad9eb..2d14d8e1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -41,13 +41,33 @@ public interface MachineErrorCodeConstants { // ========== 密钥模块 1-003-004-000 ========== ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_004_000, "密钥为空"); ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_004_001, "密钥不存在"); - ErrorCode SECRET_KEY_NAME_ILLEGAL = new ErrorCode(1_003_004_002, "密钥名称不合法"); - ErrorCode SECRET_KEY_PATH_ILLEGAL = new ErrorCode(1_003_004_003, "密钥路径不合法"); - ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_004_004, "密钥路径为空"); - ErrorCode SECRET_KEY_UPLOAD_FAIL = new ErrorCode(1_003_004_005, "密钥上传失败"); + ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_004_002, "密钥路径为空"); + ErrorCode INVALID_kEY_FORMAT = new ErrorCode(1_003_004_003, "无效的密钥格式"); + ErrorCode READ_SECRET_CONTENT_ERROR = new ErrorCode(1_003_004_004, "读取密钥加载失败"); // ========== 其他模块 1-003-005-000 ========== ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_005_000, "oss参数无法读取"); - ErrorCode SECRETKEY_NULL = new ErrorCode(1_003_005_001, "密钥为空"); - ErrorCode PARAMETER_ERROR = new ErrorCode(1_003_005_002, "参数错误"); + ErrorCode FILE_UPLOAD_ERROR = new ErrorCode(1_003_005_001, "文件上传失败"); + ErrorCode FILE_DOWNLOAD_ERROR = new ErrorCode(1_003_005_002, "文件下载失败"); + + //========== 会话连接模块 1-003-006-000 ========== + ErrorCode SESSION_CONNECT_ERROR = new ErrorCode(1_003_006_001, "会话连接失败"); + ErrorCode CLOSE_CLOSE_SESSION_ERROR = new ErrorCode(1_003_006_002, "关闭连接失败"); + ErrorCode SESSION_NOT_CONNECT = new ErrorCode(1_003_006_003, "会话未连接"); + ErrorCode EXECUTE_COMMAND_FAIL = new ErrorCode(1_003_006_004, "命令执行失败"); + ErrorCode PASSWORD_NOT_EXISTS = new ErrorCode(1_003_006_005, "密码不存在"); + ErrorCode SSH_KEY_CONFIGURATION_FAIL = new ErrorCode(1_003_006_006, "SSH密钥配置失败"); + ErrorCode NOT_SUPPORT_AUTHENTICATION_TYPE = new ErrorCode(1_003_006_007, "认证类型不支持"); + ErrorCode CREATE_SESSION_ERROR = new ErrorCode(1_003_006_008, "创建会话失败"); + ErrorCode WEBSOCKET_SEND_MESSAGE_ERROR = new ErrorCode(1_003_006_009, "websocket发送消息失败"); + ErrorCode CREATE_CHANEL_ERROR = new ErrorCode(1_003_006_010, "执行通道创建失败"); + ErrorCode CHANEL_CONNECT_FAIL = new ErrorCode(1_003_006_011, "通道连接失败"); + ErrorCode FAILED_TO_PARSE_URL_PARAMETERS = new ErrorCode(1_003_006_012, "解析URL参数失败"); + + //========== 远程文件树模块 1-003-007-000 ========== + ErrorCode NOT_DIRECTORY_NODE = new ErrorCode(1_003_007_001, "非目录节点不能添加子节点"); + ErrorCode READ_REMOTE_DIRECTORY_FAIL = new ErrorCode(1_003_007_002, "读取远程文件目录结构失败"); + ErrorCode CONNECTION_LOST = new ErrorCode(1_003_007_003, "SFTP连接无效，无法列出文件"); + ErrorCode PATH_NOT_EXISTS = new ErrorCode(1_003_007_004, "路径不存在"); + ErrorCode NO_PATH_PERMISSION = new ErrorCode(1_003_007_005, "无路径访问权限"); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 95d9cb18..8e4fbe4f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -65,8 +65,8 @@ public class MachineInfoController { @DeleteMapping("/delete") @Operation(summary = "机器信息删除") // @PreAuthorize("@ss.hasPermission('ci:machineInfo:delete')") - public CommonResult deleteMachineInfo(@RequestParam("id") Long id) { - machineInfoService.deleteMachineInfo(id); + public CommonResult deleteMachineInfo(@RequestParam("machineInfoId") Long machineInfoId) { + machineInfoService.deleteMachineInfo(machineInfoId); return success(true); } @@ -78,60 +78,54 @@ public class MachineInfoController { return success(true); } - @PostMapping("/test") + @GetMapping("/test") @Operation(summary = "测试机器连接") public CommonResult testConnection(@RequestParam("id") Long id) { return success(machineInfoService.testConnection(id)); } - @GetMapping("/status/{machineName}") + @GetMapping("/status") @Operation(summary = "获取机器连接状态") - public CommonResult getConnectionStatus(@PathVariable String machineName) { - return success(machineInfoService.getConnectionStatus(machineName)); + public CommonResult getConnectionStatus(@RequestParam Long id) { + return success(machineInfoService.getConnectionStatus(id)); } @GetMapping("/status/all") @Operation(summary = "获取所有机器连接状态") - public CommonResult> getAllConnectionStatus() { + public CommonResult> getAllConnectionStatus() { return success(machineInfoService.getAllConnectionStatus()); } - @PostMapping("/connect") - @Operation(summary = "建立机器连接") - public CommonResult connect(@Valid @RequestBody MachineInfoDO machineInfoDO) { - return success(machineInfoService.connect(machineInfoDO)); + @GetMapping("/connect") + @Operation(summary = "建立连接") + public CommonResult> connect(@RequestParam Long id) { + return success(machineInfoService.connect(id)); } - @GetMapping("/disconnect/{sessionId}") - @Operation(summary = "断开机器连接") - public CommonResult disconnect(@PathVariable String sessionId) { - return success(machineInfoService.disconnect(sessionId)); - } - - @GetMapping("/execute/{sessionId}") - @Operation(summary = "执行远程命令") - public CommonResult executeCommand( - @PathVariable String sessionId, - @RequestBody String command) { - - return success(machineInfoService.executeCommand(sessionId, command)); - } - - @GetMapping("/upload/{sessionId}") - @Operation(summary = "上传文件到远程机器") - public CommonResult uploadFile( - @PathVariable String sessionId, - @RequestParam String localFilePath, - @RequestParam String remoteFilePath) { - return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); - } - - @GetMapping("/download/{sessionId}") - @Operation(summary = "从远程机器下载文件") - public CommonResult downloadFile( - @PathVariable String sessionId, - @RequestParam String remoteFilePath, - @RequestParam String localFilePath) { - return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); + @GetMapping("/fileTreeNode") + @Operation(summary = "获得文件树") + public CommonResult> fileTreeNode( + @RequestParam Long machineId, + @RequestParam(required = false, defaultValue = "/") String path + ) { + return CommonResult.success(machineInfoService.fileTreeNode(machineId, path)); } +// @GetMapping("/upload") +// @Operation(summary = "上传文件到远程机器") +// public CommonResult uploadFile( +// @RequestParam String sessionId, +// @RequestParam String localFilePath, +// @RequestParam String remoteFilePath +// ) { +// return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); +// } +// +// @GetMapping("/download") +// @Operation(summary = "从远程机器下载文件") +// public CommonResult downloadFile( +// @RequestParam String sessionId, +// @RequestParam String remoteFilePath, +// @RequestParam String localFilePath) { +// return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); +// } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 668e05ed..00ae348e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -3,6 +3,7 @@ package cd.casic.module.machine.controller; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.service.SecretKeyService; import cd.casic.module.machine.controller.vo.SecretKeyVO; @@ -11,6 +12,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -51,20 +54,32 @@ public class SecretKeyController { return success(true); } - @PutMapping("unbindMachine") + @PutMapping("/unbindMachine") @Operation(summary = "解绑机器") public CommonResult unbindMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { secretKeyService.unbindMachine(secretKeyVO); return success(true); } + @GetMapping("/getBindMachine") + @Operation(summary = "获取密钥绑定的机器列表") + public CommonResult> getBindMachine(@RequestParam Long secretKeyId) { + return success(secretKeyService.getBindMachine(secretKeyId)); + } + @GetMapping("/getSecretKey") - @Operation(summary = "获取机器的环境变量") + @Operation(summary = "获取机器的密钥") public CommonResult getSecretKey(@RequestParam("id") Long id) { SecretKeyVO secretKeyVO = secretKeyService.getSecretKey(id); return success(secretKeyVO); } + @DeleteMapping("/delete") + @Operation(summary = "密钥信息删除") + public CommonResult delete(@RequestParam("id") Long id) { + secretKeyService.deleteSecretKey(id); + return success(true); + } @DeleteMapping("/deleteList") @Operation(summary = "批量删除密钥") @@ -76,11 +91,17 @@ public class SecretKeyController { @PostMapping("/list") @Operation(summary = "获取密钥信息列表") - public CommonResult> getSecretKeypage(@Valid @RequestBody SecretKeyVO secretKeyVO) { + public CommonResult> getSecretKeyPage(@Valid @RequestBody SecretKeyVO secretKeyVO) { PageResult pageResult = secretKeyService.getSecretKeypage(secretKeyVO); if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); } return success(BeanUtils.toBean(pageResult, SecretKeyVO.class)); } + + @GetMapping("/download") + @Operation(summary = "下载密钥文件") + public ResponseEntity downloadSecretFile(@RequestParam("id") Long id) { + return secretKeyService.downloadSecretFile(id); + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java index b2f8145f..f3716509 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -4,7 +4,9 @@ import cd.casic.framework.commons.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.time.LocalDateTime; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java deleted file mode 100644 index 92a947b4..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/convert/MachineEnvConvert.java +++ /dev/null @@ -1,25 +0,0 @@ -package cd.casic.module.machine.convert; - -import cd.casic.module.machine.controller.vo.MachineEnvVO; -import cd.casic.module.machine.dal.dataobject.MachineEnvDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface MachineEnvConvert { - - MachineEnvConvert INSTANCE = Mappers.getMapper(MachineEnvConvert.class); - - // 转换实体为VO - default MachineEnvVO convertToVO(MachineEnvDO machineEnvDO) { - MachineEnvVO VO = new MachineEnvVO(); - VO.setId(machineEnvDO.getId()); - VO.setEnvKey(machineEnvDO.getEnvKey()); - VO.setEnvValue(machineEnvDO.getEnvValue()); - VO.setDescription(machineEnvDO.getDescription()); - VO.setCreateTime(machineEnvDO.getCreateTime()); - VO.setUpdateTime(machineEnvDO.getUpdateTime()); - return VO; - } - -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java new file mode 100644 index 00000000..9741fa0d --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java @@ -0,0 +1,56 @@ +package cd.casic.module.machine.dal.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +import java.util.ArrayList; +import java.util.List; + +//文件节点类 +@Data +/* + * 远程文件系统的节点信息，用于构建文件树结构 + */ +@Schema(description = "远程文件系统节点") +public class FileNode { + @Schema(description = "文件名或目录名") + private String name; + + @Schema(description = "是否为目录") + private boolean isDirectory; + + @Schema(description = "文件大小（字节）") + private long size; + + @Schema(description = "文件权限字符串（如 rwxr-xr-x）") + private String permissions; + + @Schema(description = "最后修改时间（时间戳，毫秒）") + private long modifiedTime; + + @Schema(description = "子节点列表（仅目录有此属性）") + private List children; + + public FileNode(String name, boolean isDirectory, long size, String permissions, long modifiedTime) { + this.name = name; + this.isDirectory = isDirectory; + this.size = size; + this.permissions = permissions; + this.modifiedTime = modifiedTime; + + if (isDirectory) { + this.children = new ArrayList<>(); + } + + } + + public void addChild(FileNode child) { + if (this.children == null) { + throw exception(NOT_DIRECTORY_NODE); + } + this.children.add(child); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index 5b23cbe8..985a5a81 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -48,5 +48,10 @@ public interface MachineInfoMapper extends BaseMapperX { return selectPage(machineInfoVO, machineInfoDOLambdaQueryWrapperX); } + default List selectBindMachineBySecretKey(Long secretKeyId) { + LambdaQueryWrapperX lambdaQueryWrapperX = new LambdaQueryWrapperX() + .eq(MachineInfoDO::getSecretKeyId, secretKeyId); + return selectList(lambdaQueryWrapperX); + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java index a5907cdd..f159c478 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java @@ -18,7 +18,6 @@ public interface SecretKeyMapper extends BaseMapperX { return selectPage(secretKeyVO, new LambdaQueryWrapperX() .likeIfPresent(SecretKeyDO::getName, secretKeyVO.getName()) .likeIfPresent(SecretKeyDO::getDescription, secretKeyVO.getDescription())); - } default void bindingMachine(Long machineInfoId, List secretKeyId) { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java index 5e3101fd..a4c81e5f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java @@ -1,22 +1,33 @@ package cd.casic.module.machine.enums; +import cd.casic.framework.commons.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; + /** * 连接状态枚举 */ @Getter @AllArgsConstructor -public enum ConnectionStatus { - DISCONNECTED("断开连接"), - CONNECTING("正在连接"), - CONNECTED("已连接"), - AUTH_FAILED("认证失败"), - CONNECTION_TIMEOUT("连接超时"), - CONNECTION_ERROR("连接错误"), - CLOSED("已关闭"); +public enum ConnectionStatus implements IntArrayValuable { + DISCONNECTED(1, "断开连接"), + CONNECTING(2, "正在连接"), + CONNECTED(3, "已连接"), + AUTH_FAILED(4, "认证失败"), + CONNECTION_TIMEOUT(5, "连接超时"), + CONNECTION_ERROR(6, "连接错误"), + CLOSED(7, "已关闭"); - private final String description; + private final int code; + private final String message; + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ConnectionStatus::getCode).toArray(); + + @Override + public int[] array() { + return ARRAYS; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java new file mode 100644 index 00000000..c915797e --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java @@ -0,0 +1,35 @@ +package cd.casic.module.machine.enums; + +import cd.casic.framework.commons.core.IntArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +@Getter +@AllArgsConstructor +//ssh远程连接管道类型 +public enum SSHChanelType implements IntArrayValuable { + EXEC(1, "单条命令返回结果"), + SHELL(2, "多行命令持续交互"), + SUBSYSTEM(3, "文件传输或其它特点服务"), + DIRECT_TCP_IP(4, "TCP 端口转发"), + X11(5, "X Window 系统转发"); + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SSHChanelType::getCode).toArray(); + + /** + * 状态值 + */ + private final Integer code; + + /** + * 状态名 + */ + private final String message; + + @Override + public int[] array() { + return ARRAYS; + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java deleted file mode 100644 index 4c5e87e6..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/ConnectionSession.java +++ /dev/null @@ -1,642 +0,0 @@ -package cd.casic.module.machine.handler; -import cd.casic.module.machine.controller.vo.SecretKeyVO; -import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.AuthenticationType; -import cd.casic.module.machine.utils.AliYunOssClient; -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; -import org.springframework.stereotype.Component; -import org.springframework.util.StreamUtils; -import org.springframework.util.StringUtils; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.util.Objects; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; -/** - * 优化后的SSH连接会话类 - */ -@Slf4j -@Component -public class ConnectionSession implements AutoCloseable { - @Resource - SecretKeyService secretKeyService; - - @Resource - AliYunOssClient aliYunOssClient; - - private MachineInfoDO machineInfo; - private Session sshSession; - private ConnectionStatus status = ConnectionStatus.DISCONNECTED; - private final AtomicBoolean isExecuting = new AtomicBoolean(false); - - // todo连接配置常量 - private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) - private static final int COMMAND_TIMEOUT = 30000; // 命令执行超时时间(毫秒) - private static final int RETRY_COUNT = 3; // 重试次数 - private static final int RETRY_DELAY = 1000; // 重试间隔(毫秒) - - public ConnectionSession() { - - } - - // 使用setter注入MachineInfo - public void setMachineInfo(MachineInfoDO machineInfo) { - this.machineInfo = Objects.requireNonNull(machineInfo, "MachineInfo cannot be null"); - log.debug("MachineInfo 已注入: {}", machineInfo.getHostIp()); - } - - - - /** - * 建立SSH连接，支持重试机制 - */ - public synchronized void connect() throws JSchException { - if (status == ConnectionStatus.CONNECTED) { - log.debug("已经连接到 {}", machineInfo.getHostIp()); - return; - } - - status = ConnectionStatus.CONNECTING; - JSchException lastException = null; - - for (int attempt = 1; attempt <= RETRY_COUNT; attempt++) { - try { - doConnect(); - status = ConnectionStatus.CONNECTED; - log.info("SSH connection established successfully to {} (attempt {}/{})", - machineInfo.getHostIp(), attempt, RETRY_COUNT); - return; - } catch (JSchException e) { - lastException = e; - status = ConnectionStatus.CONNECTION_ERROR; - log.error("SSH connection attempt {}/{} failed: {}", - attempt, RETRY_COUNT, e.getMessage()); - - // 认证失败直接退出，无需重试 - if (e.getMessage().contains("Auth fail")) { - status = ConnectionStatus.AUTH_FAILED; - throw e; - } - - // 重试前等待 - if (attempt < RETRY_COUNT) { - try { - Thread.sleep(RETRY_DELAY); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - throw new JSchException("Connection attempt interrupted", ie); - } - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - // 所有重试都失败 - throw new JSchException("Failed to connect after " + RETRY_COUNT + " attempts", lastException); - } - - /** - * 实际执行连接逻辑 - */ - private void doConnect() throws JSchException, IOException { - JSch jsch = new JSch(); - - // 配置认证方式 - configureAuthentication(jsch); - - // 创建SSH会话 - sshSession = jsch.getSession( - machineInfo.getUsername(), - machineInfo.getHostIp(), - machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 - ); - - // 配置连接参数 - configureSession(sshSession); - - // 建立连接 - sshSession.connect(CONNECTION_TIMEOUT); - } - - /** - * 配置认证方式（密码或密钥） - */ - private void configureAuthentication(JSch jsch) throws JSchException { - if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { - // 密钥认证 - if (machineInfo.getSecretKeyId() == null) { - throw exception(SECRET_KEY_NULL); - } - - String privateKeyContent = getPrivateKeyContent(machineInfo.getSecretKeyId()); - // 验证私钥格式 - if (!privateKeyContent.startsWith("-----BEGIN")) { - throw new JSchException("Invalid private key format. Expected OpenSSH format."); - } - - try { - // 尝试加载私钥 - jsch.addIdentity( - machineInfo.getName(), - privateKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null - ); - log.info("Private key loaded successfully for {}", machineInfo.getHostIp()); - } catch (JSchException e) { - log.error("Failed to load private key: {}", e.getMessage()); - throw e; - } - } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { - // 密码认证 - if (StringUtils.isEmpty(machineInfo.getPassword())) { - throw new JSchException("Password is required for password-based authentication"); - } - } else { - throw new JSchException("Unsupported authentication type: " + machineInfo.getAuthenticationType()); - } - } - - /** - * 配置SSH会话参数（安全增强） - */ - private void configureSession(Session session) { - Properties config = new Properties(); - - // 安全增强：默认验证主机密钥 - if (isTrustedEnvironment()) { - log.warn("Running in trusted environment - disabling strict host key checking for {}", - machineInfo.getHostIp()); - config.put("StrictHostKeyChecking", "no"); - } else { - config.put("StrictHostKeyChecking", "yes"); - // 可选：配置已知主机文件路径 - //直接配置阿里云密钥地址 - config.put("UserKnownHostsFile", secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath()); - } - - // 其他安全配置 - config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); - config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 - config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 - - session.setConfig(config); - } - - /** - * 判断是否为可信环境（生产环境应返回false） - */ - private boolean isTrustedEnvironment() { - // todo实际项目中应基于配置或环境变量判断 - return System.getProperty("environment", "production").equalsIgnoreCase("development"); - } - - @Override - public synchronized void close() { - disconnect(); - } - - public synchronized void disconnect() { - if (sshSession != null && sshSession.isConnected()) { - try { - sshSession.disconnect(); - log.info("SSH connection closed: {}", machineInfo.getHostIp()); - } catch (Exception e) { - log.error("Error closing SSH session: {}", e.getMessage()); - } - } - status = ConnectionStatus.DISCONNECTED; - } - - /** - * 执行远程命令，支持超时和中断处理 - */ - public String executeCommand(String command) throws JSchException, IOException { - if (!isConnected()) { - throw new IllegalStateException("Session is not connected"); - } - - if (!isExecuting.compareAndSet(false, true)) { - throw new IllegalStateException("Another command is already executing"); - } - - Channel channel = null; - InputStream inputStream = null; - ByteArrayOutputStream outputStream = null; - - try { - channel = createExecChannel(command); - inputStream = channel.getInputStream(); - outputStream = new ByteArrayOutputStream(); - - // 连接通道并设置超时 - channel.connect(COMMAND_TIMEOUT); - - // 读取命令输出 - return readCommandOutput(inputStream, outputStream, channel); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("Command execution interrupted", e); - } finally { - // 释放资源 - closeResources(channel, inputStream, outputStream); - isExecuting.set(false); - } - } - - /** - * 创建并配置命令执行通道 - */ - private Channel createExecChannel(String command) throws JSchException { - Channel channel = sshSession.openChannel("exec"); - ((ChannelExec) channel).setCommand(command); - - // 配置通道 - channel.setInputStream(null); - ((ChannelExec) channel).setErrStream(new ByteArrayOutputStream()); // 捕获错误输出 - - return channel; - } - - /** - * 读取命令输出 - */ - private String readCommandOutput(InputStream inputStream, - ByteArrayOutputStream outputStream, - Channel channel) throws IOException, InterruptedException { - byte[] buffer = new byte[1024]; - - - // 使用线程中断机制实现超时控制 - Thread readerThread = new Thread(() -> { - int bytesRead; - try { - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - } catch (IOException e) { - // 通道关闭或读取异常 - if (channel.isConnected()) { - log.warn("Error reading command output: {}", e.getMessage()); - } - } - }); - - readerThread.start(); - - // 等待命令执行完成或超时 - readerThread.join(COMMAND_TIMEOUT); - - // 如果线程仍在运行，中断并关闭通道 - if (readerThread.isAlive()) { - readerThread.interrupt(); - channel.disconnect(); - throw new IOException("Command execution timed out after " + COMMAND_TIMEOUT + "ms"); - } - - // 等待通道完全关闭 - while (channel.isConnected()) { - Thread.sleep(100); - } - - return outputStream.toString(StandardCharsets.UTF_8); - } - - /** - * 关闭资源 - */ - private void closeResources(Channel channel, InputStream inputStream, OutputStream outputStream) { - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - log.warn("Error closing output stream: {}", e.getMessage()); - } - } - - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.warn("Error closing input stream: {}", e.getMessage()); - } - } - - if (channel != null && channel.isConnected()) { - channel.disconnect(); - } - } - - /** - * 上传文件到远程服务器 - */ - public boolean uploadFile(String localFilePath, String remoteFilePath) throws IOException { - if (!isConnected()) { - throw new IllegalStateException("Cannot upload file: SSH session is not connected"); - } - - // 检查本地文件是否存在且可读 - File localFile = new File(localFilePath); - if (!localFile.exists()) { - throw new FileNotFoundException("Local file not found: " + localFilePath); - } - if (!localFile.canRead()) { - throw new IOException("Cannot read local file: " + localFilePath); - } - - ChannelSftp channel = null; - boolean uploadSuccess = false; - - try { - // 创建并连接SFTP通道，设置超时 - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - - // 确保目标目录存在 - createRemoteDirectoryIfNotExists(channel, getParentDirectory(remoteFilePath)); - - // 使用更健壮的上传方式 - channel.put( - new FileInputStream(localFile), - remoteFilePath, - new ProgressMonitorAdapter(localFile.length()), - ChannelSftp.OVERWRITE - ); - - uploadSuccess = true; - log.info("File uploaded successfully: {} -> {}", localFilePath, remoteFilePath); - return true; - - } catch (SftpException e) { - log.error("SFTP error during file upload ({} -> {}): {}", - localFilePath, remoteFilePath, e.getMessage(), e); - throw new IOException("SFTP error: " + e.getMessage(), e); - } catch (FileNotFoundException e) { - log.error("Local file not found during upload: {}", localFilePath, e); - throw e; - } catch (IOException e) { - log.error("IO error during file upload: {}", e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error("Unexpected error during file upload: {}", e.getMessage(), e); - throw new IOException("Unexpected error: " + e.getMessage(), e); - } finally { - // 确保通道始终被关闭 - disconnectChannel(channel); - -// // 如果上传失败，尝试删除不完整的文件 -// if (!uploadSuccess && remoteFilePath != null && !remoteFilePath.isEmpty()) { -// tryDeleteIncompleteFile(remoteFilePath); -// } - } - } - - public boolean downloadFile(String remoteFilePath, String localFilePath) throws IOException { - if (!isConnected()) { - throw new IllegalStateException("Cannot download file: SSH session is not connected"); - } - - // 检查本地目录是否存在且可写 - File localFile = new File(localFilePath); - File parentDir = localFile.getParentFile(); - if (parentDir != null && !parentDir.exists()) { - if (!parentDir.mkdirs()) { - throw new IOException("Failed to create local directory: " + parentDir.getAbsolutePath()); - } - } - if (parentDir != null && !parentDir.canWrite()) { - throw new IOException("Cannot write to local directory: " + parentDir.getAbsolutePath()); - } - - ChannelSftp channel = null; - boolean downloadSuccess = false; - File tempFile = null; - - try { - // 创建并连接SFTP通道，设置超时 - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - - // 检查远程文件是否存在 - SftpATTRS attrs = channel.stat(remoteFilePath); - long fileSize = attrs.getSize(); - - // 使用临时文件避免部分下载覆盖完整文件 - tempFile = new File(localFilePath + ".part"); - - // 执行下载并监控进度 - channel.get( - remoteFilePath, - new FileOutputStream(tempFile).toString(), - new ProgressMonitorAdapter(fileSize), - ChannelSftp.OVERWRITE - ); - - // 验证下载完整性 - if (tempFile.length() != fileSize) { - throw new IOException("Download incomplete: expected " + fileSize + - " bytes, but got " + tempFile.length() + " bytes"); - } - - // 重命名临时文件为目标文件（原子操作） - if (!tempFile.renameTo(localFile)) { - throw new IOException("Failed to rename temporary file to: " + localFilePath); - } - - downloadSuccess = true; - log.info("File downloaded successfully: {} -> {}", remoteFilePath, localFilePath); - return true; - - } catch (SftpException e) { - log.error("SFTP error during file download ({} -> {}): {}", - remoteFilePath, localFilePath, e.getMessage(), e); - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - throw new FileNotFoundException("Remote file not found: " + remoteFilePath); - } - throw new IOException("SFTP error: " + e.getMessage(), e); - } catch (IOException e) { - log.error("IO error during file download: {}", e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error("Unexpected error during file download: {}", e.getMessage(), e); - throw new IOException("Unexpected error: " + e.getMessage(), e); - } finally { - // 确保通道始终被关闭 - disconnectChannel(channel); - - // 如果下载失败，清理临时文件 - if (!downloadSuccess && tempFile != null && tempFile.exists()) { - if (tempFile.delete()) { - log.debug("Deleted incomplete temporary file: {}", tempFile.getAbsolutePath()); - } else { - log.warn("Failed to delete incomplete temporary file: {}", tempFile.getAbsolutePath()); - } - } - } - } - - // 创建远程目录（如果不存在） - private void createRemoteDirectoryIfNotExists(ChannelSftp channel, String directory) throws SftpException { - if (directory == null || directory.isEmpty() || directory.equals("/")) { - return; - } - - try { - channel.stat(directory); - } catch (SftpException e) { - // 目录不存在，尝试创建 - createRemoteDirectoryIfNotExists(channel, getParentDirectory(directory)); - channel.mkdir(directory); - log.debug("Created remote directory: {}", directory); - } - } - - // 获取路径的父目录 - private String getParentDirectory(String path) { - int lastSlash = path.lastIndexOf('/'); - return lastSlash > 0 ? path.substring(0, lastSlash) : ""; - } - - // 断开SFTP通道 - private void disconnectChannel(Channel channel) { - if (channel != null && channel.isConnected()) { - try { - channel.disconnect(); - log.debug("SFTP channel disconnected"); - } catch (Exception e) { - log.warn("Error disconnecting SFTP channel: {}", e.getMessage()); - } - } - } - - // 尝试删除不完整的文件 - private void tryDeleteIncompleteFile(String remoteFilePath) { - ChannelSftp channel = null; - try { - channel = (ChannelSftp) sshSession.openChannel("sftp"); - channel.connect(CONNECTION_TIMEOUT); - channel.rm(remoteFilePath); - log.info("Deleted incomplete file: {}", remoteFilePath); - } catch (Exception e) { - log.warn("Failed to delete incomplete file {}: {}", remoteFilePath, e.getMessage()); - } finally { - disconnectChannel(channel); - } - } - - // 增强的进度监控器 - private static class ProgressMonitorAdapter implements SftpProgressMonitor { - private final long totalBytes; - private long bytesWritten = 0; - private int lastProgress = 0; - private final long startTime = System.currentTimeMillis(); - - public ProgressMonitorAdapter(long totalBytes) { - this.totalBytes = totalBytes; - } - - @Override - public boolean count(long count) { - bytesWritten += count; - - // 计算进度百分比 - int progress = (int) ((bytesWritten * 100) / totalBytes); - - // 每10%或每秒更新一次日志 - long elapsedTime = System.currentTimeMillis() - startTime; - if (progress - lastProgress >= 10 || elapsedTime >= 1000) { - double speed = bytesWritten / (elapsedTime / 1000.0); - String speedStr = formatTransferSpeed(speed); - - log.debug("Upload progress: {}% ({}/{} bytes, {})", - progress, bytesWritten, totalBytes, speedStr); - lastProgress = progress; - } - - return true; // 返回true继续传输，返回false中断传输 - } - - @Override - public void end() { - long elapsedTime = System.currentTimeMillis() - startTime; - double speed = totalBytes / (elapsedTime / 1000.0); - String speedStr = formatTransferSpeed(speed); - - log.info("Upload completed: {} bytes in {} ms (avg speed: {})", - totalBytes, elapsedTime, speedStr); - } - - @Override - public void init(int op, String src, String dest, long max) { - log.info("Starting upload: {} -> {} ({} bytes)", src, dest, max); - } - - // 格式化传输速度 - private String formatTransferSpeed(double bytesPerSecond) { - String[] units = {"B/s", "KB/s", "MB/s", "GB/s"}; - int unitIndex = 0; - - while (bytesPerSecond >= 1024 && unitIndex < units.length - 1) { - bytesPerSecond /= 1024; - unitIndex++; - } - - return String.format("%.2f %s", bytesPerSecond, units[unitIndex]); - } - } - - - /** - * 检查连接状态 - */ - public ConnectionStatus getStatus() { - if (status == ConnectionStatus.CONNECTED && - (sshSession == null || !sshSession.isConnected())) { - status = ConnectionStatus.DISCONNECTED; - } - return status; - } - - /** - * 检查是否已连接 - */ - public boolean isConnected() { - return status == ConnectionStatus.CONNECTED && - sshSession != null && - sshSession.isConnected(); - } - - - private String getPrivateKeyContent(Long secretKeyId) { - if (secretKeyId == null) { - return null; - } - SecretKeyVO secretKey = secretKeyService.getSecretKey(secretKeyId); - byte[] content; - try { - content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); - } catch (Exception e) { - throw new RuntimeException(e); - } - - //改为S3FileClient读取 - InputStream read = new ByteArrayInputStream(content); - - try { - return StreamUtils.copyToString(read, StandardCharsets.UTF_8); - } catch (IOException e) { - log.error("读取私钥文件失败", e); - throw new RuntimeException(e); - } - - - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java new file mode 100644 index 00000000..acd353ea --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java @@ -0,0 +1,67 @@ +package cd.casic.module.machine.handler; + +import cd.casic.module.machine.component.WebSocketConnection; +import cd.casic.module.machine.component.WebSocketSessionManager; +import cd.casic.module.machine.enums.ConnectionStatus; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.io.IOException; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +//WebSocket处理器 +@Component("machineWebSocketHandler") +public class MachineWebSocketHandler extends TextWebSocketHandler { + + @Override + public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { + Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); + //保存webSocketSession信息 + WebSocketSessionManager.addWebSocketSession(webSocketSession.getId(), webSocketSession); + WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); + try { + webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); + } catch (IOException e) { + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + // 处理文本消息 + @Override + protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { + String payload = message.getPayload(); + String sessionId = webSocketSession.getId(); + // 从管理器获取连接 + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); + + if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { + // 转发消息到远程机器 + webSocketConnection.executeCommand(webSocketSession, payload); + } else if (webSocketConnection != null) { + webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); + } else { + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + @Override + public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { + String sessionId = webSocketSession.getId(); + // 获取并关闭相关的 WebSocketConnection + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); + if (webSocketConnection != null) { + webSocketConnection.disconnect(); + } + // 从管理器中移除会话和连接 + WebSocketSessionManager.removeWebSocketSession(sessionId); + WebSocketSessionManager.removeWebSocketConnection(sessionId); + Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); + WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index b86538e0..6b54e02a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -5,15 +5,21 @@ import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; import jakarta.validation.Valid; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; public interface MachineInfoService { + /** + * 新增机器 + * @return 新增机器的id + */ Long createMachine(MachineInfoVO MachineInfoVO); + /** + * 查看机器列表 + * @return 分院 + */ PageResult listMachineInfo(@Valid MachineInfoVO MachineInfoVO); void updateMachineInfo(@Valid MachineInfoVO machineInfoVO); @@ -35,63 +41,61 @@ public interface MachineInfoService { */ boolean testConnection(Long id); + /** + * 连接远程机器 + * + * @param id 机器id + * @return 连接后端文件树 + */ + Map connect(Long id); + /** * 获取机器连接状态 * - * @param machineName 机器名称 * @return 连接状态 */ - ConnectionStatus getConnectionStatus(String machineName); + ConnectionStatus getConnectionStatus(Long id); /** * 获取所有连接状态 * * @return 机器名称到连接状态的映射 */ - Map getAllConnectionStatus(); + Map getAllConnectionStatus(); + +// /** +// * 上传文件到远程机器 +// * +// * @param sessionId 会话ID +// * @param localFilePath 本地文件路径 +// * @param remoteFilePath 远程文件路径 +// * @return 操作结果 +// */ +// boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath); +// +// /** +// * 从远程机器下载文件 +// * +// * @param sessionId 会话ID +// * @param remoteFilePath 远程文件路径 +// * @param localFilePath 本地文件路径 +// * @return 操作结果 +// */ +// boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); /** - * 建立机器连接 + * 校验机器是否存在 * - * @param machineInfoDO 机器信息 - * @return 连接会话ID + * @param id 机器id */ - String connect(MachineInfoDO machineInfoDO); + MachineInfoDO validateMachineInfoExists(Long id); /** - * 断开机器连接 + * 根据路径获得远程文件树 * - * @param sessionId 会话ID - * @return 操作结果 + * @param machineId 机器id + * @param path 文件夹路径 + * @return 远程文件树 */ - boolean disconnect(String sessionId); - - /** - * 执行远程命令 - * - * @param sessionId 会话ID - * @param command 命令 - * @return 命令执行结果 - */ - String executeCommand(String sessionId, String command); - - /** - * 上传文件到远程机器 - * - * @param sessionId 会话ID - * @param localFilePath 本地文件路径 - * @param remoteFilePath 远程文件路径 - * @return 操作结果 - */ - boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath); - - /** - * 从远程机器下载文件 - * - * @param sessionId 会话ID - * @param remoteFilePath 远程文件路径 - * @param localFilePath 本地文件路径 - * @return 操作结果 - */ - boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); + Map fileTreeNode(Long machineId, String path); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 0307cb28..98bd5009 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -1,9 +1,12 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.controller.vo.SecretKeyVO; import jakarta.validation.Valid; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.ResponseEntity; import java.util.List; @@ -20,6 +23,14 @@ public interface SecretKeyService { SecretKeyVO getSecretKey(Long id); + void deleteSecretKey(Long id); + void unbindMachine(@Valid SecretKeyVO secretKeyVO); + + ResponseEntity downloadSecretFile(Long id); + + List getBindMachine(Long secretKeyId); + + String getKeyContent(Long secretKeyId); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index 69b397be..9f8f430a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -1,18 +1,21 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; +import cd.casic.module.machine.component.FileTreeComponent; +import cd.casic.module.machine.component.WebSocketSessionManager; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.enums.AuthenticationType; import cd.casic.module.machine.enums.MachineInfoType; -import cd.casic.module.machine.handler.ConnectionSession; import cd.casic.module.machine.dal.mysql.MachineInfoMapper; import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.enums.MachineInfoStatus; +import cd.casic.module.machine.component.WebSocketConnection; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; +import com.jcraft.jsch.Session; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import cd.casic.framework.commons.util.object.BeanUtils; @@ -20,8 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; @@ -35,24 +37,12 @@ public class MachineInfoServiceImpl implements MachineInfoService { @Resource private SecretKeyService secretKeyService; + @Resource private MachineInfoMapper machineInfoMapper; + @Resource - private ConnectionSession connectionSession; - /** - * 会话ID生成器 - */ - private final AtomicInteger sessionIdGenerator = new AtomicInteger(1000); - - /** - * 会话管理：会话ID -> 连接会话 - */ - private final Map sessions = new ConcurrentHashMap<>(); - - /** - * 机器名称 -> 会话ID - */ - private final Map machineSessionMapping = new ConcurrentHashMap<>(); + private FileTreeComponent fileTreeComponent; @Override public Long createMachine(MachineInfoVO machineInfoVO) { @@ -124,162 +114,68 @@ public class MachineInfoServiceImpl implements MachineInfoService { MachineInfoDO machineInfoDO = validateMachineInfoExists(id); validateMachineUnEnable(machineInfoDO); log.info("测试机器连接: {}", machineInfoDO.getHostIp()); - connectionSession.setMachineInfo(machineInfoDO); - try { - connectionSession.connect(); - return true; - } catch (Exception e) { - log.error("机器连接测试失败: {}", e.getMessage(), e); - return false; - } + WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); + webSocketConnection.initConnection(machineInfoDO); + return true; } @Override - public ConnectionStatus getConnectionStatus(String machineName) { - String sessionId = machineSessionMapping.get(machineName); - if (sessionId == null) { - return ConnectionStatus.DISCONNECTED; - } - - ConnectionSession session = sessions.get(sessionId); - return session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED; + public Map connect(Long id) { + //todo使用代理机器的情况还未完成 + WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); + MachineInfoDO machineInfoDO = validateMachineInfoExists(id); + //初始化连接 + webSocketConnection.initConnection(machineInfoDO); + WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); + return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); } @Override - public Map getAllConnectionStatus() { - Map result = new HashMap<>(); - - machineSessionMapping.forEach((machineName, sessionId) -> { - ConnectionSession session = sessions.get(sessionId); - result.put(machineName, session != null ? session.getStatus() : ConnectionStatus.DISCONNECTED); - }); - - return result; + public ConnectionStatus getConnectionStatus(Long id) { + validateMachineInfoExists(id); + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); + return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); } @Override - public String connect(MachineInfoDO machineInfoDO) { - //先查询机器是否存在，在判断机器可用性 - validateMachineUnEnable(machineInfoDO); - log.info("建立机器连接: {}", machineInfoDO.getHostIp()); - - // 检查是否已连接 - String existingSessionId = machineSessionMapping.get(machineInfoDO.getName()); - if (existingSessionId != null) { - ConnectionSession existingSession = sessions.get(existingSessionId); - if (existingSession != null && existingSession.getStatus() == ConnectionStatus.CONNECTED) { - log.info("机器已连接，返回现有会话: {}", machineInfoDO.getHostIp()); - return existingSessionId; - } - } - - try { - connectionSession.setMachineInfo(machineInfoDO); - - connectionSession.connect(); - - // 生成会话ID - String sessionId = generateSessionId(); - - // 保存会话 - sessions.put(sessionId, connectionSession); - machineSessionMapping.put(machineInfoDO.getName(), sessionId); - - log.info("机器连接成功: {}, 会话ID: {}", machineInfoDO.getHostIp(), sessionId); - return sessionId; - } catch (Exception e) { - log.error("机器连接失败: {}", e.getMessage(), e); - throw new RuntimeException("机器连接失败: " + e.getMessage(), e); - } + public Map getAllConnectionStatus() { + return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() + .collect(Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue().getConnectionStatus() + )); } - @Override - public boolean disconnect(String sessionId) { - log.info("断开机器连接: {}", sessionId); +// @Override +// public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { +// log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); +// WebSocketConnection webSocketConnection = sessionConnectionMap.get(sessionId); +// if (webSocketConnection == null||webSocketConnection.getConnectionStatus() != ConnectionStatus.CONNECTED) { +// throw exception(SESSION_NOT_CONNECT); +// } +// try { +// return webSocketConnection.uploadFile(localFilePath, remoteFilePath); +// } catch (Exception e) { +// log.error("文件上传失败: {}", e.getMessage(), e); +// throw exception(FILE_UPLOAD_ERROR); +// } +// } - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - log.warn("会话不存在: {}", sessionId); - return false; - } - - try { - session.disconnect(); - - // 清理会话 - sessions.remove(sessionId); - machineSessionMapping.entrySet().removeIf(entry -> entry.getValue().equals(sessionId)); - - log.info("机器连接已断开: {}", sessionId); - return true; - } catch (Exception e) { - log.error("断开连接失败: {}", e.getMessage(), e); - return false; - } - } - - @Override - public String executeCommand(String sessionId, String command) { - log.info("执行命令: {}, 会话ID: {}", command, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.executeCommand(command); - } catch (Exception e) { - log.error("命令执行失败: {}", e.getMessage(), e); - throw new RuntimeException("命令执行失败: " + e.getMessage(), e); - } - } - - @Override - public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { - log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.uploadFile(localFilePath, remoteFilePath); - } catch (Exception e) { - log.error("文件上传失败: {}", e.getMessage(), e); - throw new RuntimeException("文件上传失败: " + e.getMessage(), e); - } - } - - @Override - public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { - log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); - - ConnectionSession session = sessions.get(sessionId); - if (session == null) { - throw new RuntimeException("会话不存在: " + sessionId); - } - - if (session.getStatus() != ConnectionStatus.CONNECTED) { - throw new RuntimeException("会话未连接: " + sessionId); - } - - try { - return session.downloadFile(remoteFilePath, localFilePath); - } catch (Exception e) { - log.error("文件下载失败: {}", e.getMessage(), e); - throw new RuntimeException("文件下载失败: " + e.getMessage(), e); - } - } +// @Override +// public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { +// log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); +// +// WebSocketConnection webSocketConnection = sessionConnectionMap.get(sessionId); +// if (webSocketConnection == null||webSocketConnection.getConnectionStatus() != ConnectionStatus.CONNECTED) { +// throw new RuntimeException("会话不存在: " + sessionId); +// } +// try { +// return webSocketConnection.downloadFile(remoteFilePath, localFilePath); +// } catch (Exception e) { +// log.error("文件下载失败: {}", e.getMessage(), e); +// throw exception(FILE_DOWNLOAD_ERROR); +// } +// } @VisibleForTesting void validateMachineEnvAdd(MachineInfoVO machineInfoVO) { @@ -333,8 +229,8 @@ public class MachineInfoServiceImpl implements MachineInfoService { } } - @VisibleForTesting - MachineInfoDO validateMachineInfoExists(Long id) { + @Override + public MachineInfoDO validateMachineInfoExists(Long id) { if (id == null) { throw exception(MACHINE_INFO_NULL); } @@ -345,6 +241,13 @@ public class MachineInfoServiceImpl implements MachineInfoService { return machineInfoDO; } + @Override + public Map fileTreeNode(Long machineId, String path) { + validateMachineInfoExists(machineId); + Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); + return fileTreeComponent.getRemoteFileTree(sshSession, path); + } + @VisibleForTesting void validateMachineEnable(MachineInfoDO machineInfoDO) { if (machineInfoDO.getStatus() == MachineInfoStatus.ENABLE.getCode()) { @@ -360,10 +263,12 @@ public class MachineInfoServiceImpl implements MachineInfoService { } } - /** - * 生成会话ID - */ - private String generateSessionId() { - return "session-" + sessionIdGenerator.incrementAndGet(); + @VisibleForTesting + WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { + if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { + return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); + } else { + return new WebSocketConnection(this.secretKeyService); + } } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java index 3f3fc764..84bd5e2e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineProxyServiceImpl.java @@ -14,7 +14,6 @@ import cd.casic.framework.commons.util.object.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestParam; import java.util.*; import java.util.function.Function; @@ -38,7 +37,6 @@ public class MachineProxyServiceImpl implements MachineProxyService { validateMachineProxyAdd(machineProxyVO); // 创建代理记录 MachineProxyDO machineProxyDO = BeanUtils.toBean(machineProxyVO, MachineProxyDO.class); - ; save(machineProxyDO); return machineProxyDO.getId(); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 1e37d57e..4fa6203c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -3,7 +3,9 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; +import cd.casic.module.machine.dal.mysql.MachineInfoMapper; import cd.casic.module.machine.dal.mysql.SecretKeyMapper; import cd.casic.module.machine.service.MachineInfoService; import cn.hutool.core.io.resource.ResourceUtil; @@ -12,9 +14,18 @@ import cd.casic.module.machine.utils.AliYunOssClient; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StreamUtils; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.List; import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; @@ -23,6 +34,7 @@ import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; /** * 密钥服务实现类 */ +@Slf4j @Service("secretKeyService") public class SecretKeyServiceImpl implements SecretKeyService { @@ -35,6 +47,8 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Resource private SecretKeyMapper secretKeyMapper; + @Resource + private MachineInfoMapper machineInfoMapper; @Override public SecretKeyVO getSecretKey(Long id) { @@ -42,33 +56,62 @@ public class SecretKeyServiceImpl implements SecretKeyService { return BeanUtils.toBean(secretKeyDO, SecretKeyVO.class); } + @Override + public void deleteSecretKey(Long id) { + validateSecretKeyExists(id); + secretKeyMapper.deleteById(id); + } + @Override public void unbindMachine(SecretKeyVO secretKeyVO) { - machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(),null); + machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(), null); + } + + @Override + public ResponseEntity downloadSecretFile(Long id) { + // 获取私钥内容 + String keyContent = getKeyContent(id); + if (keyContent == null || keyContent.isEmpty()) { + throw exception(SECRET_KEY_NULL); + } + // 将字符串转换为输入流 + ByteArrayInputStream inputStream = new ByteArrayInputStream(keyContent.getBytes(StandardCharsets.UTF_8)); + // 设置响应头 + HttpHeaders headers = new HttpHeaders(); + headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=private_key.pem"); + headers.add(HttpHeaders.CONTENT_TYPE, "application/octet-stream"); + headers.add(HttpHeaders.CONTENT_LENGTH, String.valueOf(keyContent.getBytes(StandardCharsets.UTF_8).length)); + // 返回带有文件流的响应实体 + return ResponseEntity.ok() + .headers(headers) + .body(new InputStreamResource(inputStream)); + } + + @Override + public List getBindMachine(Long secretKeyId) { + return machineInfoMapper.selectBindMachineBySecretKey(secretKeyId); } @Override public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); - String ossPath = upLoadSecretKey(secretKeyVO.getPath()); + String localPath = secretKeyVO.getPath(); + //将反斜杠替换为双反斜杠（Windows路径转义） + localPath = localPath.replace("\\", "\\\\"); + String ossPath = upLoadSecretKey(localPath); //检查得到的oss路径是否为空 validateSecretKeyPath(ossPath); secretKeyVO.setPath(ossPath); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); - //todo检查密钥合法 - secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); - - } @Override public void updateSecretKey(SecretKeyVO secretKeyVO) { SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyVO.getId()); - //如果路径改变==改变密钥 + //路径改变==改变密钥 if (!secretKeyDO.getPath().equals(secretKeyVO.getPath())) { - //todo检查密钥合法 String ossPath = upLoadSecretKey(secretKeyVO.getPath()); BeanUtils.copyProperties(secretKeyVO, secretKeyDO); secretKeyDO.setPath(ossPath); @@ -104,8 +147,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { ); //绑定的机器全部设置为空 - machineInfoService.bindingSecretKey(ids,null); - + machineInfoService.bindingSecretKey(ids, null); secretKeyMapper.deleteBatchIds(ids); } @@ -160,4 +202,25 @@ public class SecretKeyServiceImpl implements SecretKeyService { return secretKeyDO; } + @Override + public String getKeyContent(Long secretKeyId) { + if (secretKeyId == null) { + return null; + } + SecretKeyVO secretKey = getSecretKey(secretKeyId); + byte[] content; + try { + content = aliYunOssClient.getContent(secretKey.getPath().substring(secretKey.getPath().lastIndexOf("/") + 1)); + } catch (Exception e) { + log.error("读取密钥文件失败", e); + throw exception(READ_SECRET_CONTENT_ERROR); + } + //改为S3FileClient读取 + InputStream read = new ByteArrayInputStream(content); + try { + return StreamUtils.copyToString(read, StandardCharsets.UTF_8); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java index fff03244..dbe11d4f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java @@ -4,9 +4,8 @@ import cd.casic.module.infra.framework.file.core.client.s3.S3FileClient; import cd.casic.module.infra.framework.file.core.client.s3.S3FileClientConfig; -public class AliYunOssClient extends S3FileClient{ +public class AliYunOssClient extends S3FileClient { public AliYunOssClient(Long id, S3FileClientConfig config) { super(id, config); } - } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PropertyUtils.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PropertyUtils.java deleted file mode 100644 index 9919ea7a..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PropertyUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.machine.utils; - -import io.micrometer.common.util.StringUtils; - -import java.util.function.Consumer; - -/** - * 属性操作工具类 - */ -public class PropertyUtils { - - /** - * 如果不为空则设置值 - * - * @param value 值 - * @param setter 具体set操作 - */ - public static void setIfNotBlank(String value, Consumer setter) { - if (StringUtils.isNotBlank(value)) { - setter.accept(value); - } - } - - /** - * 如果不为空则设置值 - * - * @param value 值 - * @param setter 具体set操作 - */ - public static void setIfNotNull(T value, Consumer setter) { - if (value != null) { - setter.accept(value); - } - } -} From d4a3b9b1b95d6f41a145b0899ad840906e986de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 3 Jul 2025 09:30:38 +0800 Subject: [PATCH 30/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/controller/vo/SecretKeyVO.java | 13 ++-- .../machine/dal/dataobject/SecretKeyDO.java | 15 +++-- .../service/impl/SecretKeyServiceImpl.java | 63 ++----------------- 3 files changed, 20 insertions(+), 71 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java index b2f8145f..1468d5e2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -25,12 +25,6 @@ public class SecretKeyVO extends PageParam { @Schema(description = "密钥描述", example = "用于加密敏感数据的密钥") private String description; - @Schema(description = "存储路径（本地上传文件路径）", example = "/data/secret_keys/") - private String path; - - @Schema(description = "文件名", example = "key.pem") - private String fileName; - @Schema(description = "密钥密码", example = "******") private String password; @@ -42,4 +36,11 @@ public class SecretKeyVO extends PageParam { @Schema(description = "关联的机器ID列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1024, 2048]") private List machineInfoIds; + + @Schema(description = "私钥", requiredMode = Schema.RequiredMode.REQUIRED, example = "******") + private String private_key; + + @Schema(description = "公钥", requiredMode = Schema.RequiredMode.REQUIRED, example = "******") + private String public_key; + } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java index cab9d3b4..1cbeb723 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java @@ -28,14 +28,17 @@ public class SecretKeyDO extends BaseDO { @TableField(value = "description") private String description; - //oss存储路径 - @TableField(value = "path") - private String path; - - @TableField - private String fileName; //密钥密码 @TableField(value = "password") private String password; + + @TableField(value = "public_key") + private String public_key; + + + @TableField(value = "private_key") + private String private_key; + + } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 1e37d57e..22439f5b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -29,8 +29,6 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Resource private MachineInfoService machineInfoService; - @Resource - private AliYunOssClient aliYunOssClient; @Resource private SecretKeyMapper secretKeyMapper; @@ -50,31 +48,16 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Override public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); - String ossPath = upLoadSecretKey(secretKeyVO.getPath()); - //检查得到的oss路径是否为空 - validateSecretKeyPath(ossPath); - secretKeyVO.setPath(ossPath); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); //todo检查密钥合法 - secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); - - } @Override public void updateSecretKey(SecretKeyVO secretKeyVO) { SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyVO.getId()); - //如果路径改变==改变密钥 - if (!secretKeyDO.getPath().equals(secretKeyVO.getPath())) { - //todo检查密钥合法 - String ossPath = upLoadSecretKey(secretKeyVO.getPath()); - BeanUtils.copyProperties(secretKeyVO, secretKeyDO); - secretKeyDO.setPath(ossPath); - } else { - BeanUtils.copyProperties(secretKeyVO, secretKeyDO); - } + BeanUtils.copyProperties(secretKeyVO, secretKeyDO); secretKeyMapper.updateById(secretKeyDO); } @@ -87,25 +70,8 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Override @Transactional public void deleteSecretKeyList(List ids) { - ids.forEach( - secretKeyId -> { - SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyId); - if (secretKeyDO.getPath() != null && !secretKeyDO.getPath().isEmpty()) { - try { - //文件名 - //删除子目录文件，需要在前面加上根目录文件路径 - String fileName = secretKeyDO.getPath().substring(secretKeyDO.getPath().lastIndexOf("/") + 1); - aliYunOssClient.delete(fileName); - } catch (Exception e) { - throw exception(DELETE_FILE_FAIL); - } - } - } - ); - //绑定的机器全部设置为空 machineInfoService.bindingSecretKey(ids,null); - secretKeyMapper.deleteBatchIds(ids); } @@ -114,38 +80,17 @@ public class SecretKeyServiceImpl implements SecretKeyService { return secretKeyMapper.selectPage(secretKeyVO); } - public String upLoadSecretKey(String localPath) { - //使用S3FileClient上传文件 - aliYunOssClient.init(); - //传输到指定文件，需要在path前面加上文件路径 - String path = IdUtil.fastSimpleUUID() + ".txt"; - //上传文件是从本地上传，这里传的是本地文件地址 - byte[] content = ResourceUtil.readBytes(localPath); - String ossPath; - try { - ossPath = aliYunOssClient.upload(content, path, "txt"); - } catch (Exception e) { - throw exception(UPLOADING_FILE_FAIL); - } - return ossPath; - } + @VisibleForTesting void validateSecretKeyAdd(SecretKeyVO secretKeyVO) { if (secretKeyVO == null) { throw exception(SECRET_KEY_NULL); } - if (secretKeyVO.getPath().isEmpty()) { - throw exception(SECRET_KEY_PATH_NULL); - } + } - @VisibleForTesting - void validateSecretKeyPath(String path) { - if (path.isEmpty()) { - throw exception(SECRET_KEY_PATH_NULL); - } - } + @VisibleForTesting From 7a995e159fe3dfb434f71c406318e4effa22b01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 3 Jul 2025 09:53:16 +0800 Subject: [PATCH 31/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SecretKeyController.java | 10 +-- .../machine/service/MachineInfoService.java | 7 ++ .../machine/service/SecretKeyService.java | 4 +- .../service/impl/MachineInfoServiceImpl.java | 5 ++ .../service/impl/SecretKeyServiceImpl.java | 72 ++++--------------- 5 files changed, 30 insertions(+), 68 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 00ae348e..bf1e9b7a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -99,9 +99,9 @@ public class SecretKeyController { return success(BeanUtils.toBean(pageResult, SecretKeyVO.class)); } - @GetMapping("/download") - @Operation(summary = "下载密钥文件") - public ResponseEntity downloadSecretFile(@RequestParam("id") Long id) { - return secretKeyService.downloadSecretFile(id); - } +// @GetMapping("/download") +// @Operation(summary = "下载密钥文件") +// public ResponseEntity downloadSecretFile(@RequestParam("id") Long id) { +// return secretKeyService.downloadSecretFile(id); +// } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 6b54e02a..32efbadf 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -32,6 +32,13 @@ public interface MachineInfoService { void deleteMachineInfo(Long machineInfoId); + /** + * 获取绑定的密钥 + * @param secretKeyId 密钥id + * @return 绑定的机器列表 + */ + ListselectBindMachineBySecretKey(Long secretKeyId); + /** * 测试机器连接 diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 98bd5009..1436b582 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -27,10 +27,8 @@ public interface SecretKeyService { void unbindMachine(@Valid SecretKeyVO secretKeyVO); - ResponseEntity downloadSecretFile(Long id); - List getBindMachine(Long secretKeyId); - String getKeyContent(Long secretKeyId); +// String getKeyContent(Long secretKeyId); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index 9f8f430a..c26c2f23 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -107,6 +107,11 @@ public class MachineInfoServiceImpl implements MachineInfoService { machineInfoMapper.deleteById(machineInfoId); } + @Override + public List selectBindMachineBySecretKey(Long secretKeyId) { + return machineInfoMapper.selectBindMachineBySecretKey(secretKeyId); + } + @Override public boolean testConnection(Long id) { diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index 1e37d57e..eec46f33 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -3,6 +3,7 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.module.machine.controller.vo.SecretKeyVO; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.dal.mysql.SecretKeyMapper; import cd.casic.module.machine.service.MachineInfoService; @@ -29,12 +30,14 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Resource private MachineInfoService machineInfoService; - @Resource - private AliYunOssClient aliYunOssClient; - @Resource private SecretKeyMapper secretKeyMapper; + @Override + public void deleteSecretKey(Long id) { + validateSecretKeyExists(id); + secretKeyMapper.deleteById(id); + } @Override public SecretKeyVO getSecretKey(Long id) { @@ -47,16 +50,15 @@ public class SecretKeyServiceImpl implements SecretKeyService { machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(),null); } + @Override + public List getBindMachine(Long secretKeyId) { + return machineInfoService.selectBindMachineBySecretKey(secretKeyId); + } + @Override public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); - String ossPath = upLoadSecretKey(secretKeyVO.getPath()); - //检查得到的oss路径是否为空 - validateSecretKeyPath(ossPath); - secretKeyVO.setPath(ossPath); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); - //todo检查密钥合法 - secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); @@ -66,15 +68,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Override public void updateSecretKey(SecretKeyVO secretKeyVO) { SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyVO.getId()); - //如果路径改变==改变密钥 - if (!secretKeyDO.getPath().equals(secretKeyVO.getPath())) { - //todo检查密钥合法 - String ossPath = upLoadSecretKey(secretKeyVO.getPath()); - BeanUtils.copyProperties(secretKeyVO, secretKeyDO); - secretKeyDO.setPath(ossPath); - } else { - BeanUtils.copyProperties(secretKeyVO, secretKeyDO); - } + BeanUtils.copyProperties(secretKeyVO, secretKeyDO); secretKeyMapper.updateById(secretKeyDO); } @@ -87,25 +81,7 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Override @Transactional public void deleteSecretKeyList(List ids) { - ids.forEach( - secretKeyId -> { - SecretKeyDO secretKeyDO = validateSecretKeyExists(secretKeyId); - if (secretKeyDO.getPath() != null && !secretKeyDO.getPath().isEmpty()) { - try { - //文件名 - //删除子目录文件，需要在前面加上根目录文件路径 - String fileName = secretKeyDO.getPath().substring(secretKeyDO.getPath().lastIndexOf("/") + 1); - aliYunOssClient.delete(fileName); - } catch (Exception e) { - throw exception(DELETE_FILE_FAIL); - } - } - } - ); - - //绑定的机器全部设置为空 machineInfoService.bindingSecretKey(ids,null); - secretKeyMapper.deleteBatchIds(ids); } @@ -114,38 +90,14 @@ public class SecretKeyServiceImpl implements SecretKeyService { return secretKeyMapper.selectPage(secretKeyVO); } - public String upLoadSecretKey(String localPath) { - //使用S3FileClient上传文件 - aliYunOssClient.init(); - //传输到指定文件，需要在path前面加上文件路径 - String path = IdUtil.fastSimpleUUID() + ".txt"; - //上传文件是从本地上传，这里传的是本地文件地址 - byte[] content = ResourceUtil.readBytes(localPath); - String ossPath; - try { - ossPath = aliYunOssClient.upload(content, path, "txt"); - } catch (Exception e) { - throw exception(UPLOADING_FILE_FAIL); - } - return ossPath; - } @VisibleForTesting void validateSecretKeyAdd(SecretKeyVO secretKeyVO) { if (secretKeyVO == null) { throw exception(SECRET_KEY_NULL); } - if (secretKeyVO.getPath().isEmpty()) { - throw exception(SECRET_KEY_PATH_NULL); - } } - @VisibleForTesting - void validateSecretKeyPath(String path) { - if (path.isEmpty()) { - throw exception(SECRET_KEY_PATH_NULL); - } - } @VisibleForTesting From 242c9e282b362fc5f93c7a3a59eded7419a83cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 3 Jul 2025 09:58:31 +0800 Subject: [PATCH 32/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/casic/module/machine/dal/dataobject/SecretKeyDO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java index 1cbeb723..189d49a2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/SecretKeyDO.java @@ -34,11 +34,11 @@ public class SecretKeyDO extends BaseDO { private String password; @TableField(value = "public_key") - private String public_key; + private String publicKey; @TableField(value = "private_key") - private String private_key; + private String privateKey; } From 28ed6b5c92fc17bf02f2c3ec76271d03eeb46fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= Date: Thu, 3 Jul 2025 10:51:32 +0800 Subject: [PATCH 33/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81(=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/WebSocketConnection.java | 460 +++++++++--------- .../component/WebSocketSessionManager.java | 228 ++++----- .../configuration/WebSocketConfig.java | 80 +-- .../controller/MachineInfoController.java | 62 +-- .../machine/dal/dataobject/MachineInfoDO.java | 3 + .../dal/dataobject/MachineProxyDO.java | 2 - .../handler/MachineWebSocketHandler.java | 134 ++--- .../machine/service/MachineInfoService.java | 74 +-- .../service/impl/MachineInfoServiceImpl.java | 106 ++-- 9 files changed, 575 insertions(+), 574 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java index 1674e8f7..1a0b6770 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java @@ -1,230 +1,230 @@ -package cd.casic.module.machine.component; - -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.AuthenticationType; -import cd.casic.module.machine.enums.ConnectionStatus; -import cd.casic.module.machine.enums.SSHChanelType; -import cd.casic.module.machine.service.SecretKeyService; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.Properties; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.SECRET_KEY_NULL; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -@Slf4j -@Data -@Component -public class WebSocketConnection { - private SecretKeyService secretKeyService; - - private MachineInfoDO machineInfo; - private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; - private Session sshSession; - - public WebSocketConnection(SecretKeyService secretKeyService) { - this.secretKeyService = secretKeyService; - } - - private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) - - public void initConnection(MachineInfoDO machineInfo) { - try { - this.machineInfo = machineInfo; - this.sshSession = doConnect(machineInfo); - log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); - this.connectionStatus = ConnectionStatus.CONNECTING; - } catch (ServiceException e) { - log.warn("SSH 连接失败: {}", e.getMessage()); - throw e; - } - } - - public void disconnect() { - if (sshSession != null && sshSession.isConnected()) { - try { - sshSession.disconnect(); - log.info("SSH连接关闭: {}", machineInfo.getHostIp()); - } catch (Exception e) { - log.error("关闭SSH连接失败: {}", e.getMessage()); - throw exception(CLOSE_CLOSE_SESSION_ERROR); - } - } - connectionStatus = ConnectionStatus.DISCONNECTED; - } - - /** - * 执行远程命令，支持超时和中断处理 - */ - public void executeCommand(WebSocketSession webSocketSession, String command) { - // 1. 检查连接状态 - if (sshSession == null || !sshSession.isConnected()) { - sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); - return; - } - try { - // 2. 创建SSH命令执行通道 - Channel channel; - try { - channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); - } catch (JSchException e) { - throw exception(CREATE_CHANEL_ERROR); - } - ((ChannelExec) channel).setCommand(command); - // 3. 设置输入/输出流 - channel.setInputStream(null); - ((ChannelExec) channel).setErrStream(System.err); - // 4. 获取命令输出流 - InputStream inputStream = channel.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader reader = new BufferedReader(inputStreamReader); - // 5. 连接并执行命令 - channel.connect(); - // 6. 读取命令输出并实时发送给客户端 - String line; - while ((line = reader.readLine()) != null) { - // 实时发送输出到客户端 - webSocketSession.sendMessage(new TextMessage(line)); - } - // 7. 等待命令执行完成 - int exitStatus = channel.getExitStatus(); - // 8. 发送命令执行完毕的消息 - webSocketSession.sendMessage(new TextMessage( - "[系统] 命令执行完毕，退出状态: " + exitStatus - )); - // 9. 关闭通道 - channel.disconnect(); - } catch (JSchException | IOException e) { - throw exception(EXECUTE_COMMAND_FAIL); - } - } - - // 发送错误消息的辅助方法 - public void sendErrorMessage(WebSocketSession webSocketSession, String message) { - try { - if (webSocketSession.isOpen()) { - webSocketSession.sendMessage(new TextMessage("[错误] " + message)); - } - } catch (IOException e) { - log.error("发送错误消息失败", e); - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - /** - * 实际执行连接逻辑 - */ - private Session doConnect(MachineInfoDO machineInfo) { - JSch jsch = new JSch(); - // 配置认证方式 - configureAuthentication(jsch, machineInfo); - Session session; - // 创建SSH会话 - try { - session = jsch.getSession( - machineInfo.getUsername(), - machineInfo.getHostIp(), - machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 - ); - } catch (JSchException e) { - throw exception(CREATE_SESSION_ERROR); - } - // 配置连接参数 - configureSession(session, machineInfo); - // 建立连接 - try { - session.connect(CONNECTION_TIMEOUT); - } catch (JSchException e) { - throw exception(SESSION_CONNECT_ERROR); - } - return session; - } - - /** - * 配置认证方式（密码或密钥） - */ - private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { - if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { - // 密钥认证 - if (machineInfo.getSecretKeyId() == null) { - throw exception(SECRET_KEY_NULL); - } - String pubKeyContent = secretKeyService.getKeyContent(machineInfo.getSecretKeyId()); - // 验证秘钥格式 - if (!pubKeyContent.startsWith("-----BEGIN")) { - log.error("无效的密钥格式{}", pubKeyContent); - throw exception(INVALID_kEY_FORMAT); - } - try { - // 尝试加载秘钥私钥 - jsch.addIdentity( - machineInfo.getName(), - pubKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null - ); - log.info("密钥加载成功 {}", machineInfo.getHostIp()); - } catch (JSchException e) { - log.error("密钥加载失败: {}", e.getMessage()); - throw exception(READ_SECRET_CONTENT_ERROR); - } - } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { - // 密码认证 - if (!StringUtils.hasText(machineInfo.getPassword())) { - throw exception(PASSWORD_NOT_EXISTS); - } - } else { - log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); - throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); - } - } - - /** - * 配置SSH会话参数（安全增强） - */ - private void configureSession(Session session, MachineInfoDO machineInfo) { - Properties config = new Properties(); - // 根据认证类型配置不同的认证策略 - if (machineInfo.getAuthenticationType() == 1) { // 密码认证 - // 设置密码 - session.setPassword(machineInfo.getPassword()); - config.put("StrictHostKeyChecking", "no"); - // 仅使用密码认证（禁用其他认证方式） - config.put("PreferredAuthentications", "password"); - // 禁用公钥相关配置（避免干扰） - config.put("PubkeyAuthentication", "no"); - } else { // 密钥认证 - try { - String preKeyPath = secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath(); - JSch jsch = new JSch(); - jsch.addIdentity(preKeyPath); // 添加私钥 - // 保持默认认证顺序（公钥优先） - config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); - } catch (JSchException e) { - log.error("SSH密钥配置失败", e); - throw exception(SSH_KEY_CONFIGURATION_FAIL); - } - } - config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 - config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 - session.setConfig(config); - } - -} +//package cd.casic.module.machine.component; +// +//import cd.casic.framework.commons.exception.ServiceException; +//import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +//import cd.casic.module.machine.enums.AuthenticationType; +//import cd.casic.module.machine.enums.ConnectionStatus; +//import cd.casic.module.machine.enums.SSHChanelType; +//import cd.casic.module.machine.service.SecretKeyService; +//import com.jcraft.jsch.Channel; +//import com.jcraft.jsch.ChannelExec; +//import com.jcraft.jsch.JSch; +//import com.jcraft.jsch.JSchException; +//import com.jcraft.jsch.Session; +//import lombok.Data; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +//import org.springframework.util.StringUtils; +//import org.springframework.web.socket.TextMessage; +//import org.springframework.web.socket.WebSocketSession; +// +//import java.io.BufferedReader; +//import java.io.IOException; +//import java.io.InputStream; +//import java.io.InputStreamReader; +//import java.nio.charset.StandardCharsets; +//import java.util.Properties; +// +//import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.SECRET_KEY_NULL; +//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; +// +//@Slf4j +//@Data +//@Component +//public class WebSocketConnection { +// private SecretKeyService secretKeyService; +// +// private MachineInfoDO machineInfo; +// private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; +// private Session sshSession; +// +// public WebSocketConnection(SecretKeyService secretKeyService) { +// this.secretKeyService = secretKeyService; +// } +// +// private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) +// +// public void initConnection(MachineInfoDO machineInfo) { +// try { +// this.machineInfo = machineInfo; +// this.sshSession = doConnect(machineInfo); +// log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); +// this.connectionStatus = ConnectionStatus.CONNECTING; +// } catch (ServiceException e) { +// log.warn("SSH 连接失败: {}", e.getMessage()); +// throw e; +// } +// } +// +// public void disconnect() { +// if (sshSession != null && sshSession.isConnected()) { +// try { +// sshSession.disconnect(); +// log.info("SSH连接关闭: {}", machineInfo.getHostIp()); +// } catch (Exception e) { +// log.error("关闭SSH连接失败: {}", e.getMessage()); +// throw exception(CLOSE_CLOSE_SESSION_ERROR); +// } +// } +// connectionStatus = ConnectionStatus.DISCONNECTED; +// } +// +// /** +// * 执行远程命令，支持超时和中断处理 +// */ +// public void executeCommand(WebSocketSession webSocketSession, String command) { +// // 1. 检查连接状态 +// if (sshSession == null || !sshSession.isConnected()) { +// sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); +// return; +// } +// try { +// // 2. 创建SSH命令执行通道 +// Channel channel; +// try { +// channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); +// } catch (JSchException e) { +// throw exception(CREATE_CHANEL_ERROR); +// } +// ((ChannelExec) channel).setCommand(command); +// // 3. 设置输入/输出流 +// channel.setInputStream(null); +// ((ChannelExec) channel).setErrStream(System.err); +// // 4. 获取命令输出流 +// InputStream inputStream = channel.getInputStream(); +// InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); +// BufferedReader reader = new BufferedReader(inputStreamReader); +// // 5. 连接并执行命令 +// channel.connect(); +// // 6. 读取命令输出并实时发送给客户端 +// String line; +// while ((line = reader.readLine()) != null) { +// // 实时发送输出到客户端 +// webSocketSession.sendMessage(new TextMessage(line)); +// } +// // 7. 等待命令执行完成 +// int exitStatus = channel.getExitStatus(); +// // 8. 发送命令执行完毕的消息 +// webSocketSession.sendMessage(new TextMessage( +// "[系统] 命令执行完毕，退出状态: " + exitStatus +// )); +// // 9. 关闭通道 +// channel.disconnect(); +// } catch (JSchException | IOException e) { +// throw exception(EXECUTE_COMMAND_FAIL); +// } +// } +// +// // 发送错误消息的辅助方法 +// public void sendErrorMessage(WebSocketSession webSocketSession, String message) { +// try { +// if (webSocketSession.isOpen()) { +// webSocketSession.sendMessage(new TextMessage("[错误] " + message)); +// } +// } catch (IOException e) { +// log.error("发送错误消息失败", e); +// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); +// } +// } +// +// /** +// * 实际执行连接逻辑 +// */ +// private Session doConnect(MachineInfoDO machineInfo) { +// JSch jsch = new JSch(); +// // 配置认证方式 +// configureAuthentication(jsch, machineInfo); +// Session session; +// // 创建SSH会话 +// try { +// session = jsch.getSession( +// machineInfo.getUsername(), +// machineInfo.getHostIp(), +// machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 +// ); +// } catch (JSchException e) { +// throw exception(CREATE_SESSION_ERROR); +// } +// // 配置连接参数 +// configureSession(session, machineInfo); +// // 建立连接 +// try { +// session.connect(CONNECTION_TIMEOUT); +// } catch (JSchException e) { +// throw exception(SESSION_CONNECT_ERROR); +// } +// return session; +// } +// +//// /** +//// * 配置认证方式（密码或密钥） +//// */ +//// private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { +//// if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { +//// // 密钥认证 +//// if (machineInfo.getSecretKeyId() == null) { +//// throw exception(SECRET_KEY_NULL); +//// } +//// String pubKeyContent = secretKeyService.getKeyContent(machineInfo.getSecretKeyId()); +//// // 验证秘钥格式 +//// if (!pubKeyContent.startsWith("-----BEGIN")) { +//// log.error("无效的密钥格式{}", pubKeyContent); +//// throw exception(INVALID_kEY_FORMAT); +//// } +//// try { +//// // 尝试加载秘钥私钥 +//// jsch.addIdentity( +//// machineInfo.getName(), +//// pubKeyContent.getBytes(StandardCharsets.UTF_8), +//// null, +//// null +//// ); +//// log.info("密钥加载成功 {}", machineInfo.getHostIp()); +//// } catch (JSchException e) { +//// log.error("密钥加载失败: {}", e.getMessage()); +//// throw exception(READ_SECRET_CONTENT_ERROR); +//// } +//// } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { +//// // 密码认证 +//// if (!StringUtils.hasText(machineInfo.getPassword())) { +//// throw exception(PASSWORD_NOT_EXISTS); +//// } +//// } else { +//// log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); +//// throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); +//// } +//// } +// +// /** +// * 配置SSH会话参数（安全增强） +// */ +// private void configureSession(Session session, MachineInfoDO machineInfo) { +// Properties config = new Properties(); +// // 根据认证类型配置不同的认证策略 +// if (machineInfo.getAuthenticationType() == 1) { // 密码认证 +// // 设置密码 +// session.setPassword(machineInfo.getPassword()); +// config.put("StrictHostKeyChecking", "no"); +// // 仅使用密码认证（禁用其他认证方式） +// config.put("PreferredAuthentications", "password"); +// // 禁用公钥相关配置（避免干扰） +// config.put("PubkeyAuthentication", "no"); +// } else { // 密钥认证 +// try { +// String preKeyPath = secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath(); +// JSch jsch = new JSch(); +// jsch.addIdentity(preKeyPath); // 添加私钥 +// // 保持默认认证顺序（公钥优先） +// config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); +// } catch (JSchException e) { +// log.error("SSH密钥配置失败", e); +// throw exception(SSH_KEY_CONFIGURATION_FAIL); +// } +// } +// config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 +// config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 +// session.setConfig(config); +// } +// +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java index e07eab42..88c7acad 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java @@ -1,114 +1,114 @@ -package cd.casic.module.machine.component; - -import org.springframework.stereotype.Component; -import org.springframework.web.socket.WebSocketSession; - -import java.util.Collection; -import java.util.concurrent.ConcurrentHashMap; - -@Component("machineWebSocketSessionManger") -//管理webSocketSession -public class WebSocketSessionManager { - - //webSocketSessionId - WebSocketSession 保存 WebSocketSession 对象与会话 ID 的映射 - private static final ConcurrentHashMap WebSocketSessionMap = new ConcurrentHashMap<>(); - - //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 - private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); - - //机器id - WebSocketConnection - private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); - - public static void addWebSocketSession(String sessionId, WebSocketSession session) { - WebSocketSessionMap.put(sessionId, session); - } - - /** - * 获取 WebSocketSession - */ - public static WebSocketSession getWebSocketSession(String sessionId) { - return WebSocketSessionMap.get(sessionId); - } - - /** - * 移除 WebSocketSession - */ - public static void removeWebSocketSession(String sessionId) { - WebSocketSessionMap.remove(sessionId); - } - - /** - * 检查 sessionId 是否存在 - */ - public static boolean containsWebSocketSession(String sessionId) { - return WebSocketSessionMap.containsKey(sessionId); - } - - /** - * 获取所有 WebSocketSession - */ - public static Collection getAllWebSocketSessions() { - return WebSocketSessionMap.values(); - } - - public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { - sessionConnectionMap.put(sessionId, connection); - } - - /** - * 获取 WebSocketConnection - */ - public static WebSocketConnection getWebSocketConnection(String sessionId) { - return sessionConnectionMap.get(sessionId); - } - - /** - * 移除 WebSocketConnection - */ - public static void removeWebSocketConnection(String sessionId) { - sessionConnectionMap.remove(sessionId); - } - - /** - * 检查 sessionId 是否存在 - */ - public static boolean containsWebSocketConnection(String sessionId) { - return sessionConnectionMap.containsKey(sessionId); - } - - /** - * 获取所有 WebSocketConnection - */ - public static ConcurrentHashMap getAllWebSocketConnections() { - return webSocketSessionConnectionMap; - } - - /** - * 添加 WebSocketConnection - */ - public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { - webSocketSessionConnectionMap.put(machineId, connection); - } - - /** - * 获取 WebSocketConnection - */ - public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { - return webSocketSessionConnectionMap.get(machineId); - } - - /** - * 移除 WebSocketConnection - */ - public static void removeWebSocketConnectionByMachineId(Long machineId) { - webSocketSessionConnectionMap.remove(machineId); - } - - /** - * 检查 machineId 是否存在 - */ - public static boolean containsMachineId(Long machineId) { - return webSocketSessionConnectionMap.containsKey(machineId); - } - -} +//package cd.casic.module.machine.component; +// +//import org.springframework.stereotype.Component; +//import org.springframework.web.socket.WebSocketSession; +// +//import java.util.Collection; +//import java.util.concurrent.ConcurrentHashMap; +// +//@Component("machineWebSocketSessionManger") +////管理webSocketSession +//public class WebSocketSessionManager { +// +// //webSocketSessionId - WebSocketSession 保存 WebSocketSession 对象与会话 ID 的映射 +// private static final ConcurrentHashMap WebSocketSessionMap = new ConcurrentHashMap<>(); +// +// //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 +// private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); +// +// //机器id - WebSocketConnection +// private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); +// +// public static void addWebSocketSession(String sessionId, WebSocketSession session) { +// WebSocketSessionMap.put(sessionId, session); +// } +// +// /** +// * 获取 WebSocketSession +// */ +// public static WebSocketSession getWebSocketSession(String sessionId) { +// return WebSocketSessionMap.get(sessionId); +// } +// +// /** +// * 移除 WebSocketSession +// */ +// public static void removeWebSocketSession(String sessionId) { +// WebSocketSessionMap.remove(sessionId); +// } +// +// /** +// * 检查 sessionId 是否存在 +// */ +// public static boolean containsWebSocketSession(String sessionId) { +// return WebSocketSessionMap.containsKey(sessionId); +// } +// +// /** +// * 获取所有 WebSocketSession +// */ +// public static Collection getAllWebSocketSessions() { +// return WebSocketSessionMap.values(); +// } +// +// public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { +// sessionConnectionMap.put(sessionId, connection); +// } +// +// /** +// * 获取 WebSocketConnection +// */ +// public static WebSocketConnection getWebSocketConnection(String sessionId) { +// return sessionConnectionMap.get(sessionId); +// } +// +// /** +// * 移除 WebSocketConnection +// */ +// public static void removeWebSocketConnection(String sessionId) { +// sessionConnectionMap.remove(sessionId); +// } +// +// /** +// * 检查 sessionId 是否存在 +// */ +// public static boolean containsWebSocketConnection(String sessionId) { +// return sessionConnectionMap.containsKey(sessionId); +// } +// +// /** +// * 获取所有 WebSocketConnection +// */ +// public static ConcurrentHashMap getAllWebSocketConnections() { +// return webSocketSessionConnectionMap; +// } +// +// /** +// * 添加 WebSocketConnection +// */ +// public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { +// webSocketSessionConnectionMap.put(machineId, connection); +// } +// +// /** +// * 获取 WebSocketConnection +// */ +// public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { +// return webSocketSessionConnectionMap.get(machineId); +// } +// +// /** +// * 移除 WebSocketConnection +// */ +// public static void removeWebSocketConnectionByMachineId(Long machineId) { +// webSocketSessionConnectionMap.remove(machineId); +// } +// +// /** +// * 检查 machineId 是否存在 +// */ +// public static boolean containsMachineId(Long machineId) { +// return webSocketSessionConnectionMap.containsKey(machineId); +// } +// +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java index c44d5d9e..00b84285 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java @@ -1,40 +1,40 @@ -package cd.casic.module.machine.configuration; - -import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; -import cd.casic.module.machine.handler.MachineWebSocketHandler; -import jakarta.annotation.Resource; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; -import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; - -@Configuration -@EnableWebSocket -//WebSocket端点配置 -public class WebSocketConfig implements WebSocketConfigurer { - @Resource - private MachineWebSocketHandler machineWebSocketHandler; - - @Resource - private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(machineWebSocketHandler, "/ssh/terminal") - .addInterceptors(webSocketHandshakeInterceptor) - .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） - } - - @Bean - public ServletServerContainerFactoryBean createWebSocketContainer() { - return new ServletServerContainerFactoryBean(); - } - - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } -} +//package cd.casic.module.machine.configuration; +// +//import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; +//import cd.casic.module.machine.handler.MachineWebSocketHandler; +//import jakarta.annotation.Resource; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.socket.config.annotation.EnableWebSocket; +//import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +//import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +//import org.springframework.web.socket.server.standard.ServerEndpointExporter; +//import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; +// +//@Configuration +//@EnableWebSocket +////WebSocket端点配置 +//public class WebSocketConfig implements WebSocketConfigurer { +// @Resource +// private MachineWebSocketHandler machineWebSocketHandler; +// +// @Resource +// private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; +// +// @Override +// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { +// registry.addHandler(machineWebSocketHandler, "/ssh/terminal") +// .addInterceptors(webSocketHandshakeInterceptor) +// .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） +// } +// +// @Bean +// public ServletServerContainerFactoryBean createWebSocketContainer() { +// return new ServletServerContainerFactoryBean(); +// } +// +// @Bean +// public ServerEndpointExporter serverEndpointExporter() { +// return new ServerEndpointExporter(); +// } +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index 8e4fbe4f..d3f66d82 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -78,38 +78,38 @@ public class MachineInfoController { return success(true); } - @GetMapping("/test") - @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestParam("id") Long id) { - return success(machineInfoService.testConnection(id)); - } +// @GetMapping("/test") +// @Operation(summary = "测试机器连接") +// public CommonResult testConnection(@RequestParam("id") Long id) { +// return success(machineInfoService.testConnection(id)); +// } +// +// @GetMapping("/status") +// @Operation(summary = "获取机器连接状态") +// public CommonResult getConnectionStatus(@RequestParam Long id) { +// return success(machineInfoService.getConnectionStatus(id)); +// } +// +// @GetMapping("/status/all") +// @Operation(summary = "获取所有机器连接状态") +// public CommonResult> getAllConnectionStatus() { +// return success(machineInfoService.getAllConnectionStatus()); +// } +// +// @GetMapping("/connect") +// @Operation(summary = "建立连接") +// public CommonResult> connect(@RequestParam Long id) { +// return success(machineInfoService.connect(id)); +// } - @GetMapping("/status") - @Operation(summary = "获取机器连接状态") - public CommonResult getConnectionStatus(@RequestParam Long id) { - return success(machineInfoService.getConnectionStatus(id)); - } - - @GetMapping("/status/all") - @Operation(summary = "获取所有机器连接状态") - public CommonResult> getAllConnectionStatus() { - return success(machineInfoService.getAllConnectionStatus()); - } - - @GetMapping("/connect") - @Operation(summary = "建立连接") - public CommonResult> connect(@RequestParam Long id) { - return success(machineInfoService.connect(id)); - } - - @GetMapping("/fileTreeNode") - @Operation(summary = "获得文件树") - public CommonResult> fileTreeNode( - @RequestParam Long machineId, - @RequestParam(required = false, defaultValue = "/") String path - ) { - return CommonResult.success(machineInfoService.fileTreeNode(machineId, path)); - } +// @GetMapping("/fileTreeNode") +// @Operation(summary = "获得文件树") +// public CommonResult> fileTreeNode( +// @RequestParam Long machineId, +// @RequestParam(required = false, defaultValue = "/") String path +// ) { +// return CommonResult.success(machineInfoService.fileTreeNode(machineId, path)); +// } // @GetMapping("/upload") // @Operation(summary = "上传文件到远程机器") // public CommonResult uploadFile( diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java index 0b25a446..47d2810c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineInfoDO.java @@ -39,9 +39,11 @@ public class MachineInfoDO extends BaseDO { @TableField(value = "description") private String description; + //1：Linux 2：Windows @TableField(value = "machine_info_type") private Integer machineInfoType; + // 1：启用 0：停用 @TableField(value = "status") private Integer status; @@ -62,6 +64,7 @@ public class MachineInfoDO extends BaseDO { @TableField(value = "machine_proxy_id") private Long machineProxyId; + //1：密码认证 2：密钥认证 @TableField(value = "authentication_type") private Integer authenticationType; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java index 349fe8ca..710dbd19 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineProxyDO.java @@ -34,14 +34,12 @@ public class MachineProxyDO extends BaseDO { @TableField(value = "ssh_port") private String sshPort; - //todo 字典？？ @TableField(value = "proxy_type") private int proxyType; @TableField(value = "version") private String version; - //todo 字典？？ @TableField(value = "status") private int status; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java index acd353ea..ba6a0f6f 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java @@ -1,67 +1,67 @@ -package cd.casic.module.machine.handler; - -import cd.casic.module.machine.component.WebSocketConnection; -import cd.casic.module.machine.component.WebSocketSessionManager; -import cd.casic.module.machine.enums.ConnectionStatus; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -import java.io.IOException; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -//WebSocket处理器 -@Component("machineWebSocketHandler") -public class MachineWebSocketHandler extends TextWebSocketHandler { - - @Override - public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { - Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); - //保存webSocketSession信息 - WebSocketSessionManager.addWebSocketSession(webSocketSession.getId(), webSocketSession); - WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); - try { - webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); - } catch (IOException e) { - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - // 处理文本消息 - @Override - protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { - String payload = message.getPayload(); - String sessionId = webSocketSession.getId(); - // 从管理器获取连接 - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); - - if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { - // 转发消息到远程机器 - webSocketConnection.executeCommand(webSocketSession, payload); - } else if (webSocketConnection != null) { - webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); - } else { - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - @Override - public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { - String sessionId = webSocketSession.getId(); - // 获取并关闭相关的 WebSocketConnection - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); - if (webSocketConnection != null) { - webSocketConnection.disconnect(); - } - // 从管理器中移除会话和连接 - WebSocketSessionManager.removeWebSocketSession(sessionId); - WebSocketSessionManager.removeWebSocketConnection(sessionId); - Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); - WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); - } -} +//package cd.casic.module.machine.handler; +// +////import cd.casic.module.machine.component.WebSocketConnection; +////import cd.casic.module.machine.component.WebSocketSessionManager; +//import cd.casic.module.machine.enums.ConnectionStatus; +//import org.jetbrains.annotations.NotNull; +//import org.springframework.stereotype.Component; +//import org.springframework.web.socket.CloseStatus; +//import org.springframework.web.socket.TextMessage; +//import org.springframework.web.socket.WebSocketSession; +//import org.springframework.web.socket.handler.TextWebSocketHandler; +// +//import java.io.IOException; +// +//import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; +// +////WebSocket处理器 +//@Component("machineWebSocketHandler") +//public class MachineWebSocketHandler extends TextWebSocketHandler { +// +// @Override +// public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { +// Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); +// //保存webSocketSession信息 +// WebSocketSessionManager.addWebSocketSession(webSocketSession.getId(), webSocketSession); +// WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); +// try { +// webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); +// } catch (IOException e) { +// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); +// } +// } +// +// // 处理文本消息 +// @Override +// protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { +// String payload = message.getPayload(); +// String sessionId = webSocketSession.getId(); +// // 从管理器获取连接 +// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); +// +// if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { +// // 转发消息到远程机器 +// webSocketConnection.executeCommand(webSocketSession, payload); +// } else if (webSocketConnection != null) { +// webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); +// } else { +// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); +// } +// } +// +// @Override +// public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { +// String sessionId = webSocketSession.getId(); +// // 获取并关闭相关的 WebSocketConnection +// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); +// if (webSocketConnection != null) { +// webSocketConnection.disconnect(); +// } +// // 从管理器中移除会话和连接 +// WebSocketSessionManager.removeWebSocketSession(sessionId); +// WebSocketSessionManager.removeWebSocketConnection(sessionId); +// Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); +// WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); +// } +//} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 32efbadf..ea5fb26a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -40,35 +40,35 @@ public interface MachineInfoService { ListselectBindMachineBySecretKey(Long secretKeyId); - /** - * 测试机器连接 - * - * @param id 机器id - * @return 连接是否成功 - */ - boolean testConnection(Long id); - - /** - * 连接远程机器 - * - * @param id 机器id - * @return 连接后端文件树 - */ - Map connect(Long id); - - /** - * 获取机器连接状态 - * - * @return 连接状态 - */ - ConnectionStatus getConnectionStatus(Long id); - - /** - * 获取所有连接状态 - * - * @return 机器名称到连接状态的映射 - */ - Map getAllConnectionStatus(); +// /** +// * 测试机器连接 +// * +// * @param id 机器id +// * @return 连接是否成功 +// */ +// boolean testConnection(Long id); +// +// /** +// * 连接远程机器 +// * +// * @param id 机器id +// * @return 连接后端文件树 +// */ +// Map connect(Long id); +// +// /** +// * 获取机器连接状态 +// * +// * @return 连接状态 +// */ +// ConnectionStatus getConnectionStatus(Long id); +// +// /** +// * 获取所有连接状态 +// * +// * @return 机器名称到连接状态的映射 +// */ +// Map getAllConnectionStatus(); // /** // * 上传文件到远程机器 @@ -97,12 +97,12 @@ public interface MachineInfoService { */ MachineInfoDO validateMachineInfoExists(Long id); - /** - * 根据路径获得远程文件树 - * - * @param machineId 机器id - * @param path 文件夹路径 - * @return 远程文件树 - */ - Map fileTreeNode(Long machineId, String path); +// /** +// * 根据路径获得远程文件树 +// * +// * @param machineId 机器id +// * @param path 文件夹路径 +// * @return 远程文件树 +// */ +// Map fileTreeNode(Long machineId, String path); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index c26c2f23..99799623 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -2,7 +2,7 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.component.FileTreeComponent; -import cd.casic.module.machine.component.WebSocketSessionManager; +//import cd.casic.module.machine.component.WebSocketSessionManager; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.enums.AuthenticationType; import cd.casic.module.machine.enums.MachineInfoType; @@ -11,7 +11,7 @@ import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.enums.MachineInfoStatus; -import cd.casic.module.machine.component.WebSocketConnection; +//import cd.casic.module.machine.component.WebSocketConnection; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; @@ -113,43 +113,43 @@ public class MachineInfoServiceImpl implements MachineInfoService { } - @Override - public boolean testConnection(Long id) { - //先查询机器是否存在，在判断机器可用性 - MachineInfoDO machineInfoDO = validateMachineInfoExists(id); - validateMachineUnEnable(machineInfoDO); - log.info("测试机器连接: {}", machineInfoDO.getHostIp()); - WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); - webSocketConnection.initConnection(machineInfoDO); - return true; - } - - @Override - public Map connect(Long id) { - //todo使用代理机器的情况还未完成 - WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); - MachineInfoDO machineInfoDO = validateMachineInfoExists(id); - //初始化连接 - webSocketConnection.initConnection(machineInfoDO); - WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); - return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); - } - - @Override - public ConnectionStatus getConnectionStatus(Long id) { - validateMachineInfoExists(id); - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); - return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); - } - - @Override - public Map getAllConnectionStatus() { - return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, - entry -> entry.getValue().getConnectionStatus() - )); - } +// @Override +// public boolean testConnection(Long id) { +// //先查询机器是否存在，在判断机器可用性 +// MachineInfoDO machineInfoDO = validateMachineInfoExists(id); +// validateMachineUnEnable(machineInfoDO); +// log.info("测试机器连接: {}", machineInfoDO.getHostIp()); +// WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); +// webSocketConnection.initConnection(machineInfoDO); +// return true; +// } +// +// @Override +// public Map connect(Long id) { +// //todo使用代理机器的情况还未完成 +// WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); +// MachineInfoDO machineInfoDO = validateMachineInfoExists(id); +// //初始化连接 +// webSocketConnection.initConnection(machineInfoDO); +// WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); +// return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); +// } +// +// @Override +// public ConnectionStatus getConnectionStatus(Long id) { +// validateMachineInfoExists(id); +// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); +// return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); +// } +// +// @Override +// public Map getAllConnectionStatus() { +// return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() +// .collect(Collectors.toMap( +// Map.Entry::getKey, +// entry -> entry.getValue().getConnectionStatus() +// )); +// } // @Override // public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { @@ -246,12 +246,12 @@ public class MachineInfoServiceImpl implements MachineInfoService { return machineInfoDO; } - @Override - public Map fileTreeNode(Long machineId, String path) { - validateMachineInfoExists(machineId); - Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); - return fileTreeComponent.getRemoteFileTree(sshSession, path); - } +// @Override +// public Map fileTreeNode(Long machineId, String path) { +// validateMachineInfoExists(machineId); +// Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); +// return fileTreeComponent.getRemoteFileTree(sshSession, path); +// } @VisibleForTesting void validateMachineEnable(MachineInfoDO machineInfoDO) { @@ -268,12 +268,12 @@ public class MachineInfoServiceImpl implements MachineInfoService { } } - @VisibleForTesting - WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { - if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { - return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); - } else { - return new WebSocketConnection(this.secretKeyService); - } - } +// @VisibleForTesting +// WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { +// if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { +// return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); +// } else { +// return new WebSocketConnection(this.secretKeyService); +// } +// } } From 16edaef984f42d59a4b9b5cf92600f106c278941 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Mon, 7 Jul 2025 14:51:07 +0800 Subject: [PATCH 34/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/component/FileTreeComponent.java | 130 ++++- .../component/WebSocketConnection.java | 450 +++++++++--------- .../component/WebSocketSessionManager.java | 184 +++---- .../configuration/WebSocketConfig.java | 80 ++-- .../contants/MachineErrorCodeConstants.java | 41 +- .../controller/MachineInfoController.java | 108 +++-- .../controller/SecretKeyController.java | 35 +- .../machine/controller/vo/SecretKeyVO.java | 2 + .../machine/dal/mysql/MachineInfoMapper.java | 10 +- .../handler/MachineWebSocketHandler.java | 131 +++-- .../machine/service/MachineInfoService.java | 138 +++--- .../machine/service/MachineProxyService.java | 4 +- .../machine/service/SecretKeyService.java | 36 +- .../service/impl/MachineInfoServiceImpl.java | 193 ++++---- .../service/impl/SecretKeyServiceImpl.java | 38 +- 15 files changed, 833 insertions(+), 747 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java index d42fa416..5e967815 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java @@ -7,9 +7,18 @@ import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpATTRS; import com.jcraft.jsch.SftpException; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -66,8 +75,7 @@ public class FileTreeComponent { try { sftp.ls(path, selector); } catch (SftpException e) { - log.error("读取远程文件目录结构失败 [错误码: {}, 信息: {}]", - e.id, e.getMessage(), e); + log.error("读取远程文件目录结构失败, 信息: {}]", e.getMessage(), e); throw exception(READ_REMOTE_DIRECTORY_FAIL); } return new ArrayList<>(entries); @@ -211,4 +219,122 @@ public class FileTreeComponent { } return fileInfoMap; } + + // 上传到远程服务器 + public void uploadToRemoteServer(Path tempFilePath, String safeFilename, String remoteFilePath) { + // 上传文件（使用原始文件名） + try { + sftp.put(tempFilePath.toString(), remoteFilePath + safeFilename); + } catch (SftpException e) { + throw exception(UPLOAD_REMOTE_FILE_ERROR); + } finally { + // 清理临时文件 + cleanupTempFile(tempFilePath); + } + log.info("文件上传成功: {} -> {}{}", tempFilePath, remoteFilePath, safeFilename); + } + + //下载文件 + public void downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse) { + InputStream inputStream = null; + OutputStream outputStream = null; + try { + // 获取文件信息并判断是否为文件夹 + SftpATTRS attrs = sftp.lstat(remoteFilePath); + if (attrs.isDir()) { + httpServletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST); + log.error("无法下载文件夹: {}", remoteFilePath); + throw exception(DOWNLOAD_FOLDER_NOT_ALLOWED); + } + + // 处理文件下载逻辑 + String fileName = Paths.get(remoteFilePath).getFileName().toString(); + + // 设置响应头 + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setHeader("Content-Disposition", "attachment; filename=\"" + encodeFileName(fileName) + "\""); + httpServletResponse.setContentLengthLong(attrs.getSize()); + + // 流式传输文件 + inputStream = sftp.get(remoteFilePath); + outputStream = httpServletResponse.getOutputStream(); + + byte[] buffer = new byte[8192]; + int bytesRead; + while ((bytesRead = inputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + outputStream.flush(); + } catch (SftpException e) { + httpServletResponse.setStatus(HttpServletResponse.SC_NOT_FOUND); + log.error("远程文件不存在: {}", remoteFilePath, e); + throw exception(PATH_NOT_EXISTS); + } catch (IOException e) { + httpServletResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + log.error("远程文件传输失败:{}", e.getMessage()); + throw exception(REMOTE_FILE_TRANSFER_FAIL); + } finally { + // 关闭资源 + closeQuietly(outputStream); + closeQuietly(inputStream); + } + } + + //删除远程机器文件 + public void deleteRemoteFile(String remoteFilePath) { + try { + // 检查文件是否存在 + if (checkFileExists(remoteFilePath, sftp)) { + sftp.rm(remoteFilePath); + log.info("文件删除成功: {}", remoteFilePath); + } else { + log.error("文件不存在，无法删除"); + throw exception(PATH_NOT_EXISTS); + } + } catch (SftpException e) { + log.error("删除文件时出错: {}", e.getMessage()); + throw exception(DELETE_REMOTE_FILE_ERROR); + } + } + + // 清理临时文件 + private void cleanupTempFile(Path filePath) { + if (filePath != null && Files.exists(filePath)) { + try { + Files.delete(filePath); + log.debug("临时文件已删除: {}", filePath); + } catch (IOException e) { + log.warn("临时文件删除失败: {}", filePath, e); + } + } + } + + private String encodeFileName(String fileName) { + return URLEncoder.encode(fileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); + } + + + private void closeQuietly(AutoCloseable closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (Exception e) { + log.warn("关闭资源失败", e); + } + } + } + + + // 辅助方法：检查文件是否存在 + private boolean checkFileExists(String filePath, ChannelSftp sftp) { + try { + sftp.lstat(filePath); + return true; + } catch (SftpException e) { + if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { + return false; + } + } + return true; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java index 1a0b6770..16b4d7c2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java @@ -1,230 +1,220 @@ -//package cd.casic.module.machine.component; -// -//import cd.casic.framework.commons.exception.ServiceException; -//import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -//import cd.casic.module.machine.enums.AuthenticationType; -//import cd.casic.module.machine.enums.ConnectionStatus; -//import cd.casic.module.machine.enums.SSHChanelType; -//import cd.casic.module.machine.service.SecretKeyService; -//import com.jcraft.jsch.Channel; -//import com.jcraft.jsch.ChannelExec; -//import com.jcraft.jsch.JSch; -//import com.jcraft.jsch.JSchException; -//import com.jcraft.jsch.Session; -//import lombok.Data; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.stereotype.Component; -//import org.springframework.util.StringUtils; -//import org.springframework.web.socket.TextMessage; -//import org.springframework.web.socket.WebSocketSession; -// -//import java.io.BufferedReader; -//import java.io.IOException; -//import java.io.InputStream; -//import java.io.InputStreamReader; -//import java.nio.charset.StandardCharsets; -//import java.util.Properties; -// -//import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.SECRET_KEY_NULL; -//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; -// -//@Slf4j -//@Data -//@Component -//public class WebSocketConnection { -// private SecretKeyService secretKeyService; -// -// private MachineInfoDO machineInfo; -// private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; -// private Session sshSession; -// -// public WebSocketConnection(SecretKeyService secretKeyService) { -// this.secretKeyService = secretKeyService; -// } -// -// private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) -// -// public void initConnection(MachineInfoDO machineInfo) { -// try { -// this.machineInfo = machineInfo; -// this.sshSession = doConnect(machineInfo); -// log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); -// this.connectionStatus = ConnectionStatus.CONNECTING; -// } catch (ServiceException e) { -// log.warn("SSH 连接失败: {}", e.getMessage()); -// throw e; -// } -// } -// -// public void disconnect() { -// if (sshSession != null && sshSession.isConnected()) { -// try { -// sshSession.disconnect(); -// log.info("SSH连接关闭: {}", machineInfo.getHostIp()); -// } catch (Exception e) { -// log.error("关闭SSH连接失败: {}", e.getMessage()); -// throw exception(CLOSE_CLOSE_SESSION_ERROR); -// } -// } -// connectionStatus = ConnectionStatus.DISCONNECTED; -// } -// -// /** -// * 执行远程命令，支持超时和中断处理 -// */ -// public void executeCommand(WebSocketSession webSocketSession, String command) { -// // 1. 检查连接状态 -// if (sshSession == null || !sshSession.isConnected()) { -// sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); -// return; -// } -// try { -// // 2. 创建SSH命令执行通道 -// Channel channel; -// try { -// channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); -// } catch (JSchException e) { -// throw exception(CREATE_CHANEL_ERROR); -// } -// ((ChannelExec) channel).setCommand(command); -// // 3. 设置输入/输出流 -// channel.setInputStream(null); -// ((ChannelExec) channel).setErrStream(System.err); -// // 4. 获取命令输出流 -// InputStream inputStream = channel.getInputStream(); -// InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); -// BufferedReader reader = new BufferedReader(inputStreamReader); -// // 5. 连接并执行命令 -// channel.connect(); -// // 6. 读取命令输出并实时发送给客户端 -// String line; -// while ((line = reader.readLine()) != null) { -// // 实时发送输出到客户端 -// webSocketSession.sendMessage(new TextMessage(line)); -// } -// // 7. 等待命令执行完成 -// int exitStatus = channel.getExitStatus(); -// // 8. 发送命令执行完毕的消息 -// webSocketSession.sendMessage(new TextMessage( -// "[系统] 命令执行完毕，退出状态: " + exitStatus -// )); -// // 9. 关闭通道 -// channel.disconnect(); -// } catch (JSchException | IOException e) { -// throw exception(EXECUTE_COMMAND_FAIL); -// } -// } -// -// // 发送错误消息的辅助方法 -// public void sendErrorMessage(WebSocketSession webSocketSession, String message) { -// try { -// if (webSocketSession.isOpen()) { -// webSocketSession.sendMessage(new TextMessage("[错误] " + message)); -// } -// } catch (IOException e) { -// log.error("发送错误消息失败", e); -// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); -// } -// } -// -// /** -// * 实际执行连接逻辑 -// */ -// private Session doConnect(MachineInfoDO machineInfo) { -// JSch jsch = new JSch(); -// // 配置认证方式 -// configureAuthentication(jsch, machineInfo); -// Session session; -// // 创建SSH会话 -// try { -// session = jsch.getSession( -// machineInfo.getUsername(), -// machineInfo.getHostIp(), -// machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 -// ); -// } catch (JSchException e) { -// throw exception(CREATE_SESSION_ERROR); -// } -// // 配置连接参数 -// configureSession(session, machineInfo); -// // 建立连接 -// try { -// session.connect(CONNECTION_TIMEOUT); -// } catch (JSchException e) { -// throw exception(SESSION_CONNECT_ERROR); -// } -// return session; -// } -// -//// /** -//// * 配置认证方式（密码或密钥） -//// */ -//// private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { -//// if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { -//// // 密钥认证 -//// if (machineInfo.getSecretKeyId() == null) { -//// throw exception(SECRET_KEY_NULL); -//// } -//// String pubKeyContent = secretKeyService.getKeyContent(machineInfo.getSecretKeyId()); -//// // 验证秘钥格式 -//// if (!pubKeyContent.startsWith("-----BEGIN")) { -//// log.error("无效的密钥格式{}", pubKeyContent); -//// throw exception(INVALID_kEY_FORMAT); -//// } -//// try { -//// // 尝试加载秘钥私钥 -//// jsch.addIdentity( -//// machineInfo.getName(), -//// pubKeyContent.getBytes(StandardCharsets.UTF_8), -//// null, -//// null -//// ); -//// log.info("密钥加载成功 {}", machineInfo.getHostIp()); -//// } catch (JSchException e) { -//// log.error("密钥加载失败: {}", e.getMessage()); -//// throw exception(READ_SECRET_CONTENT_ERROR); -//// } -//// } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { -//// // 密码认证 -//// if (!StringUtils.hasText(machineInfo.getPassword())) { -//// throw exception(PASSWORD_NOT_EXISTS); -//// } -//// } else { -//// log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); -//// throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); -//// } -//// } -// -// /** -// * 配置SSH会话参数（安全增强） -// */ -// private void configureSession(Session session, MachineInfoDO machineInfo) { -// Properties config = new Properties(); -// // 根据认证类型配置不同的认证策略 -// if (machineInfo.getAuthenticationType() == 1) { // 密码认证 -// // 设置密码 -// session.setPassword(machineInfo.getPassword()); -// config.put("StrictHostKeyChecking", "no"); -// // 仅使用密码认证（禁用其他认证方式） -// config.put("PreferredAuthentications", "password"); -// // 禁用公钥相关配置（避免干扰） -// config.put("PubkeyAuthentication", "no"); -// } else { // 密钥认证 -// try { -// String preKeyPath = secretKeyService.getSecretKey(machineInfo.getSecretKeyId()).getPath(); -// JSch jsch = new JSch(); -// jsch.addIdentity(preKeyPath); // 添加私钥 -// // 保持默认认证顺序（公钥优先） -// config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); -// } catch (JSchException e) { -// log.error("SSH密钥配置失败", e); -// throw exception(SSH_KEY_CONFIGURATION_FAIL); -// } -// } -// config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 -// config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 -// session.setConfig(config); -// } -// -//} +package cd.casic.module.machine.component; + +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.module.machine.dal.dataobject.MachineInfoDO; +import cd.casic.module.machine.enums.AuthenticationType; +import cd.casic.module.machine.enums.ConnectionStatus; +import cd.casic.module.machine.enums.SSHChanelType; +import cd.casic.module.machine.service.SecretKeyService; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Properties; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +@Slf4j +@Data +@Component +public class WebSocketConnection { + private SecretKeyService secretKeyService; + private MachineInfoDO machineInfo; + private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; + private Session sshSession; + + public WebSocketConnection(SecretKeyService secretKeyService) { + this.secretKeyService = secretKeyService; + } + + private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) + + public void initConnection(MachineInfoDO machineInfo) { + try { + this.machineInfo = machineInfo; + this.sshSession = doConnect(machineInfo); + log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); + this.connectionStatus = ConnectionStatus.CONNECTING; + } catch (ServiceException e) { + log.warn("SSH 连接失败: {}", e.getMessage()); + throw e; + } + } + + public void disconnect() { + if (sshSession != null && sshSession.isConnected()) { + try { + sshSession.disconnect(); + log.info("SSH连接关闭: {}", machineInfo.getHostIp()); + } catch (Exception e) { + log.error("关闭SSH连接失败: {}", e.getMessage()); + throw exception(CLOSE_CLOSE_SESSION_ERROR); + } + } + connectionStatus = ConnectionStatus.DISCONNECTED; + } + + /** + * 执行远程命令，支持超时和中断处理 + */ + public void executeCommand(WebSocketSession webSocketSession, String command) { + // 1. 检查连接状态 + if (sshSession == null || !sshSession.isConnected()) { + sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); + return; + } + try { + // 2. 创建SSH命令执行通道 + Channel channel; + try { + channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); + } catch (JSchException e) { + throw exception(CREATE_CHANEL_ERROR); + } + ((ChannelExec) channel).setCommand(command); + // 3. 设置输入/输出流 + channel.setInputStream(null); + ((ChannelExec) channel).setErrStream(System.err); + // 4. 获取命令输出流 + InputStream inputStream = channel.getInputStream(); + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); + BufferedReader reader = new BufferedReader(inputStreamReader); + // 5. 连接并执行命令 + channel.connect(); + // 6. 读取命令输出并实时发送给客户端 + String line; + while ((line = reader.readLine()) != null) { + // 实时发送输出到客户端 + webSocketSession.sendMessage(new TextMessage(line)); + } + // 7. 等待命令执行完成 + int exitStatus = channel.getExitStatus(); + // 8. 发送命令执行完毕的消息 + webSocketSession.sendMessage(new TextMessage( + "[系统] 命令执行完毕，退出状态: " + exitStatus + )); + // 9. 关闭通道 + channel.disconnect(); + } catch (JSchException | IOException e) { + throw exception(EXECUTE_COMMAND_FAIL); + } + } + + // 发送错误消息的辅助方法 + public void sendErrorMessage(WebSocketSession webSocketSession, String message) { + try { + if (webSocketSession.isOpen()) { + webSocketSession.sendMessage(new TextMessage("[错误] " + message)); + } + } catch (IOException e) { + log.error("发送错误消息失败", e); + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + /** + * 实际执行连接逻辑 + */ + private Session doConnect(MachineInfoDO machineInfo) { + JSch jsch = new JSch(); + // 配置认证方式 + configureAuthentication(jsch, machineInfo); + Session session; + // 创建SSH会话 + try { + session = jsch.getSession( + machineInfo.getUsername(), + machineInfo.getHostIp(), + machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 + ); + } catch (JSchException e) { + throw exception(CREATE_SESSION_ERROR); + } + // 配置连接参数 + configureSession(session, machineInfo); + // 建立连接 + try { + session.connect(CONNECTION_TIMEOUT); + } catch (JSchException e) { + throw exception(SESSION_CONNECT_ERROR); + } + return session; + } + + /** + * 配置认证方式（密码或密钥） + */ + private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { + if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { + // 密钥认证 + if (machineInfo.getSecretKeyId() == null) { + throw exception(SECRET_KEY_NULL); + } + String pubKeyContent = secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId()); + // 验证秘钥格式 + if (!pubKeyContent.startsWith("-----BEGIN")) { + log.error("无效的密钥格式{}", pubKeyContent); + throw exception(INVALID_kEY_FORMAT); + } + try { + // 尝试加载秘钥私钥 + jsch.addIdentity( + machineInfo.getName(), + pubKeyContent.getBytes(StandardCharsets.UTF_8), + null, + null + ); + log.info("密钥加载成功 {}", machineInfo.getHostIp()); + } catch (JSchException e) { + log.error("密钥加载失败: {}", e.getMessage()); + throw exception(READ_SECRET_CONTENT_ERROR); + } + } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { + // 密码认证 + if (!StringUtils.hasText(machineInfo.getPassword())) { + throw exception(PASSWORD_NOT_EXISTS); + } + } else { + log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); + throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); + } + } + + /** + * 配置SSH会话参数（安全增强） + */ + private void configureSession(Session session, MachineInfoDO machineInfo) { + Properties config = new Properties(); + // 根据认证类型配置不同的认证策略 + if (machineInfo.getAuthenticationType() == 1) { // 密码认证 + // 设置密码 + session.setPassword(machineInfo.getPassword()); + config.put("StrictHostKeyChecking", "no"); + // 仅使用密码认证（禁用其他认证方式） + config.put("PreferredAuthentications", "password"); + // 禁用公钥相关配置（避免干扰） + config.put("PubkeyAuthentication", "no"); + } else { // 密钥认证 + // 保持默认认证顺序（公钥优先） + config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); + } + config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 + config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 + session.setConfig(config); + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java index 88c7acad..24e17f0b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java @@ -1,114 +1,70 @@ -//package cd.casic.module.machine.component; -// -//import org.springframework.stereotype.Component; -//import org.springframework.web.socket.WebSocketSession; -// -//import java.util.Collection; -//import java.util.concurrent.ConcurrentHashMap; -// -//@Component("machineWebSocketSessionManger") -////管理webSocketSession -//public class WebSocketSessionManager { -// -// //webSocketSessionId - WebSocketSession 保存 WebSocketSession 对象与会话 ID 的映射 -// private static final ConcurrentHashMap WebSocketSessionMap = new ConcurrentHashMap<>(); -// -// //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 -// private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); -// -// //机器id - WebSocketConnection -// private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); -// -// public static void addWebSocketSession(String sessionId, WebSocketSession session) { -// WebSocketSessionMap.put(sessionId, session); -// } -// -// /** -// * 获取 WebSocketSession -// */ -// public static WebSocketSession getWebSocketSession(String sessionId) { -// return WebSocketSessionMap.get(sessionId); -// } -// -// /** -// * 移除 WebSocketSession -// */ -// public static void removeWebSocketSession(String sessionId) { -// WebSocketSessionMap.remove(sessionId); -// } -// -// /** -// * 检查 sessionId 是否存在 -// */ -// public static boolean containsWebSocketSession(String sessionId) { -// return WebSocketSessionMap.containsKey(sessionId); -// } -// -// /** -// * 获取所有 WebSocketSession -// */ -// public static Collection getAllWebSocketSessions() { -// return WebSocketSessionMap.values(); -// } -// -// public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { -// sessionConnectionMap.put(sessionId, connection); -// } -// -// /** -// * 获取 WebSocketConnection -// */ -// public static WebSocketConnection getWebSocketConnection(String sessionId) { -// return sessionConnectionMap.get(sessionId); -// } -// -// /** -// * 移除 WebSocketConnection -// */ -// public static void removeWebSocketConnection(String sessionId) { -// sessionConnectionMap.remove(sessionId); -// } -// -// /** -// * 检查 sessionId 是否存在 -// */ -// public static boolean containsWebSocketConnection(String sessionId) { -// return sessionConnectionMap.containsKey(sessionId); -// } -// -// /** -// * 获取所有 WebSocketConnection -// */ -// public static ConcurrentHashMap getAllWebSocketConnections() { -// return webSocketSessionConnectionMap; -// } -// -// /** -// * 添加 WebSocketConnection -// */ -// public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { -// webSocketSessionConnectionMap.put(machineId, connection); -// } -// -// /** -// * 获取 WebSocketConnection -// */ -// public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { -// return webSocketSessionConnectionMap.get(machineId); -// } -// -// /** -// * 移除 WebSocketConnection -// */ -// public static void removeWebSocketConnectionByMachineId(Long machineId) { -// webSocketSessionConnectionMap.remove(machineId); -// } -// -// /** -// * 检查 machineId 是否存在 -// */ -// public static boolean containsMachineId(Long machineId) { -// return webSocketSessionConnectionMap.containsKey(machineId); -// } -// -//} +package cd.casic.module.machine.component; + +import org.springframework.stereotype.Component; + +import java.util.concurrent.ConcurrentHashMap; + +@Component("machineWebSocketSessionManger") +//管理webSocketSession +public class WebSocketSessionManager { + + //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 + private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); + + //机器id - WebSocketConnection + private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); + + public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { + sessionConnectionMap.put(sessionId, connection); + } + + /** + * 获取 WebSocketConnection + */ + public static WebSocketConnection getWebSocketConnection(String sessionId) { + return sessionConnectionMap.get(sessionId); + } + + /** + * 移除 WebSocketConnection + */ + public static void removeWebSocketConnection(String sessionId) { + sessionConnectionMap.remove(sessionId); + } + + /** + * 获取所有 WebSocketConnection + */ + public static ConcurrentHashMap getAllWebSocketConnections() { + return webSocketSessionConnectionMap; + } + + /** + * 添加 WebSocketConnection + */ + public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { + webSocketSessionConnectionMap.put(machineId, connection); + } + + /** + * 获取 WebSocketConnection + */ + public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { + return webSocketSessionConnectionMap.get(machineId); + } + + /** + * 移除 WebSocketConnection + */ + public static void removeWebSocketConnectionByMachineId(Long machineId) { + webSocketSessionConnectionMap.remove(machineId); + } + + /** + * 检查 machineId 是否存在 + */ + public static boolean containsMachineId(Long machineId) { + return webSocketSessionConnectionMap.containsKey(machineId); + } + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java index 00b84285..c44d5d9e 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java @@ -1,40 +1,40 @@ -//package cd.casic.module.machine.configuration; -// -//import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; -//import cd.casic.module.machine.handler.MachineWebSocketHandler; -//import jakarta.annotation.Resource; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.web.socket.config.annotation.EnableWebSocket; -//import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -//import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; -//import org.springframework.web.socket.server.standard.ServerEndpointExporter; -//import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; -// -//@Configuration -//@EnableWebSocket -////WebSocket端点配置 -//public class WebSocketConfig implements WebSocketConfigurer { -// @Resource -// private MachineWebSocketHandler machineWebSocketHandler; -// -// @Resource -// private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; -// -// @Override -// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { -// registry.addHandler(machineWebSocketHandler, "/ssh/terminal") -// .addInterceptors(webSocketHandshakeInterceptor) -// .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） -// } -// -// @Bean -// public ServletServerContainerFactoryBean createWebSocketContainer() { -// return new ServletServerContainerFactoryBean(); -// } -// -// @Bean -// public ServerEndpointExporter serverEndpointExporter() { -// return new ServerEndpointExporter(); -// } -//} +package cd.casic.module.machine.configuration; + +import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; +import cd.casic.module.machine.handler.MachineWebSocketHandler; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; +import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; + +@Configuration +@EnableWebSocket +//WebSocket端点配置 +public class WebSocketConfig implements WebSocketConfigurer { + @Resource + private MachineWebSocketHandler machineWebSocketHandler; + + @Resource + private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(machineWebSocketHandler, "/ssh/terminal") + .addInterceptors(webSocketHandshakeInterceptor) + .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） + } + + @Bean + public ServletServerContainerFactoryBean createWebSocketContainer() { + return new ServletServerContainerFactoryBean(); + } + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index 2d14d8e1..8d32153b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -19,13 +19,6 @@ public interface MachineErrorCodeConstants { ErrorCode MACHINE_ENABLE = new ErrorCode(1_003_000_009, "机器启用中"); ErrorCode MACHINE_UN_ENABLE = new ErrorCode(1_003_000_010, "机器不可用"); - // ========== 文件操作模块 1-003-001-000 ========== - ErrorCode UPLOADING_FILE_FAIL = new ErrorCode(1_003_001_000, "上传文件失败"); - ErrorCode DOWNLOAD_FILE_FAIL = new ErrorCode(1_003_001_001, "下载失败"); - ErrorCode FILENAME_NULL = new ErrorCode(1_003_001_002, "文件名为空"); - ErrorCode READ_FILE_FAIL = new ErrorCode(1_003_001_003, "读取文件失败"); - ErrorCode DELETE_FILE_FAIL = new ErrorCode(1_003_001_004, "删除文件失败"); - // ========== 机器环境变量模块 1-003-002-000 ========== ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_002_000, "机器环境变量为空"); ErrorCode MACHINE_ENV_NOT_EXISTS = new ErrorCode(1_003_002_001, "机器不存在"); @@ -41,28 +34,20 @@ public interface MachineErrorCodeConstants { // ========== 密钥模块 1-003-004-000 ========== ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_004_000, "密钥为空"); ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_004_001, "密钥不存在"); - ErrorCode SECRET_KEY_PATH_NULL = new ErrorCode(1_003_004_002, "密钥路径为空"); - ErrorCode INVALID_kEY_FORMAT = new ErrorCode(1_003_004_003, "无效的密钥格式"); - ErrorCode READ_SECRET_CONTENT_ERROR = new ErrorCode(1_003_004_004, "读取密钥加载失败"); - - // ========== 其他模块 1-003-005-000 ========== - ErrorCode OSS_PARAM_NULL = new ErrorCode(1_003_005_000, "oss参数无法读取"); - ErrorCode FILE_UPLOAD_ERROR = new ErrorCode(1_003_005_001, "文件上传失败"); - ErrorCode FILE_DOWNLOAD_ERROR = new ErrorCode(1_003_005_002, "文件下载失败"); + ErrorCode INVALID_kEY_FORMAT = new ErrorCode(1_003_004_002, "无效的密钥格式"); + ErrorCode READ_SECRET_CONTENT_ERROR = new ErrorCode(1_003_004_003, "读取密钥加载失败"); //========== 会话连接模块 1-003-006-000 ========== ErrorCode SESSION_CONNECT_ERROR = new ErrorCode(1_003_006_001, "会话连接失败"); ErrorCode CLOSE_CLOSE_SESSION_ERROR = new ErrorCode(1_003_006_002, "关闭连接失败"); - ErrorCode SESSION_NOT_CONNECT = new ErrorCode(1_003_006_003, "会话未连接"); - ErrorCode EXECUTE_COMMAND_FAIL = new ErrorCode(1_003_006_004, "命令执行失败"); - ErrorCode PASSWORD_NOT_EXISTS = new ErrorCode(1_003_006_005, "密码不存在"); - ErrorCode SSH_KEY_CONFIGURATION_FAIL = new ErrorCode(1_003_006_006, "SSH密钥配置失败"); - ErrorCode NOT_SUPPORT_AUTHENTICATION_TYPE = new ErrorCode(1_003_006_007, "认证类型不支持"); - ErrorCode CREATE_SESSION_ERROR = new ErrorCode(1_003_006_008, "创建会话失败"); - ErrorCode WEBSOCKET_SEND_MESSAGE_ERROR = new ErrorCode(1_003_006_009, "websocket发送消息失败"); - ErrorCode CREATE_CHANEL_ERROR = new ErrorCode(1_003_006_010, "执行通道创建失败"); - ErrorCode CHANEL_CONNECT_FAIL = new ErrorCode(1_003_006_011, "通道连接失败"); - ErrorCode FAILED_TO_PARSE_URL_PARAMETERS = new ErrorCode(1_003_006_012, "解析URL参数失败"); + ErrorCode EXECUTE_COMMAND_FAIL = new ErrorCode(1_003_006_003, "命令执行失败"); + ErrorCode PASSWORD_NOT_EXISTS = new ErrorCode(1_003_006_004, "密码不存在"); + ErrorCode NOT_SUPPORT_AUTHENTICATION_TYPE = new ErrorCode(1_003_006_005, "认证类型不支持"); + ErrorCode CREATE_SESSION_ERROR = new ErrorCode(1_003_006_006, "创建会话失败"); + ErrorCode WEBSOCKET_SEND_MESSAGE_ERROR = new ErrorCode(1_003_006_007, "websocket发送消息失败"); + ErrorCode CREATE_CHANEL_ERROR = new ErrorCode(1_003_006_008, "执行通道创建失败"); + ErrorCode CHANEL_CONNECT_FAIL = new ErrorCode(1_003_006_009, "通道连接失败"); + ErrorCode FAILED_TO_PARSE_URL_PARAMETERS = new ErrorCode(1_003_006_010, "解析URL参数失败"); //========== 远程文件树模块 1-003-007-000 ========== ErrorCode NOT_DIRECTORY_NODE = new ErrorCode(1_003_007_001, "非目录节点不能添加子节点"); @@ -70,4 +55,10 @@ public interface MachineErrorCodeConstants { ErrorCode CONNECTION_LOST = new ErrorCode(1_003_007_003, "SFTP连接无效，无法列出文件"); ErrorCode PATH_NOT_EXISTS = new ErrorCode(1_003_007_004, "路径不存在"); ErrorCode NO_PATH_PERMISSION = new ErrorCode(1_003_007_005, "无路径访问权限"); + ErrorCode INVALID_FILE_NAME = new ErrorCode(1_003_007_006, "无效的文件名"); + ErrorCode CREATE_TEMP_FILE_ERROR = new ErrorCode(1_003_007_007, "创建临时文件失败"); + ErrorCode UPLOAD_REMOTE_FILE_ERROR = new ErrorCode(1_003_007_008, "上传文件到远程机器出错"); + ErrorCode DOWNLOAD_FOLDER_NOT_ALLOWED = new ErrorCode(1_003_007_009, "无法下载文件夹"); + ErrorCode REMOTE_FILE_TRANSFER_FAIL = new ErrorCode(1_003_007_010, "远程文件传输失败"); + ErrorCode DELETE_REMOTE_FILE_ERROR = new ErrorCode(1_003_007_011, "删除文件时出错"); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index d3f66d82..a6cfd928 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -3,6 +3,7 @@ package cd.casic.module.machine.controller; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; @@ -11,9 +12,11 @@ import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.Map; @@ -35,7 +38,6 @@ public class MachineInfoController { return success(id); } - @PutMapping("/update") @Operation(summary = "编辑机器信息") // @PreAuthorize("@ss.hasPermission('ci:machineInfo:update')") @@ -78,54 +80,60 @@ public class MachineInfoController { return success(true); } -// @GetMapping("/test") -// @Operation(summary = "测试机器连接") -// public CommonResult testConnection(@RequestParam("id") Long id) { -// return success(machineInfoService.testConnection(id)); -// } -// -// @GetMapping("/status") -// @Operation(summary = "获取机器连接状态") -// public CommonResult getConnectionStatus(@RequestParam Long id) { -// return success(machineInfoService.getConnectionStatus(id)); -// } -// -// @GetMapping("/status/all") -// @Operation(summary = "获取所有机器连接状态") -// public CommonResult> getAllConnectionStatus() { -// return success(machineInfoService.getAllConnectionStatus()); -// } -// -// @GetMapping("/connect") -// @Operation(summary = "建立连接") -// public CommonResult> connect(@RequestParam Long id) { -// return success(machineInfoService.connect(id)); -// } + @PutMapping("/bindingSecretKey") + @Operation(summary = "绑定/解绑密钥") + public void bindingSecretKey(@RequestBody SecretKeyVO secretKeyVO) { + machineInfoService.bindingSecretKey(secretKeyVO); + } -// @GetMapping("/fileTreeNode") -// @Operation(summary = "获得文件树") -// public CommonResult> fileTreeNode( -// @RequestParam Long machineId, -// @RequestParam(required = false, defaultValue = "/") String path -// ) { -// return CommonResult.success(machineInfoService.fileTreeNode(machineId, path)); -// } -// @GetMapping("/upload") -// @Operation(summary = "上传文件到远程机器") -// public CommonResult uploadFile( -// @RequestParam String sessionId, -// @RequestParam String localFilePath, -// @RequestParam String remoteFilePath -// ) { -// return success(machineInfoService.uploadFile(sessionId, localFilePath, remoteFilePath)); -// } -// -// @GetMapping("/download") -// @Operation(summary = "从远程机器下载文件") -// public CommonResult downloadFile( -// @RequestParam String sessionId, -// @RequestParam String remoteFilePath, -// @RequestParam String localFilePath) { -// return success(machineInfoService.downloadFile(sessionId, remoteFilePath, localFilePath)); -// } + @GetMapping("/test") + @Operation(summary = "测试机器连接") + public CommonResult testConnection(@RequestParam("id") Long id) { + return success(machineInfoService.testConnection(id)); + } + + @GetMapping("/status") + @Operation(summary = "获取机器连接状态") + public CommonResult getConnectionStatus(@RequestParam Long id) { + return success(machineInfoService.getConnectionStatus(id)); + } + + @GetMapping("/status/all") + @Operation(summary = "获取所有机器连接状态") + public CommonResult> getAllConnectionStatus() { + return success(machineInfoService.getAllConnectionStatus()); + } + + @GetMapping("/connect") + @Operation(summary = "建立连接") + public CommonResult> connect(@RequestParam Long id) { + return success(machineInfoService.connect(id)); + } + + @GetMapping("/fileTreeNode") + @Operation(summary = "获得文件树") + public CommonResult> fileTreeNode( + @RequestParam Long machineId, + @RequestParam(required = false, defaultValue = "/") String path + ) { + return success(machineInfoService.fileTreeNode(machineId, path)); + } + + @PostMapping("/upload") + @Operation(summary = "上传文件到远程机器") + public CommonResult uploadFile(@RequestParam MultipartFile file, @RequestParam String remoteFilePath) { + return success(machineInfoService.uploadFile(file, remoteFilePath)); + } + + @GetMapping("/download") + @Operation(summary = "从远程机器下载文件") + public CommonResult downloadFile(@RequestParam String remoteFilePath, HttpServletResponse httpServletResponse) { + return success(machineInfoService.downloadFile(remoteFilePath, httpServletResponse)); + } + + @DeleteMapping("/deleteRemoteFile") + @Operation(summary = "删除远程机器选定文件") + public CommonResult deleteRemoteFile(@RequestParam String remoteFilePath) { + return success(machineInfoService.deleteRemoteFile(remoteFilePath)); + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index bf1e9b7a..1624b1c2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -12,9 +12,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,7 +30,7 @@ public class SecretKeyController { @PostMapping(value = "/create") @Operation(summary = "新增密钥") // @PreAuthorize("@ss.hasPermission('ci:secretKey:create')") - public CommonResult createSecretKey(@Valid @RequestBody SecretKeyVO secretKeyVO) throws Exception { + public CommonResult createSecretKey(@Valid @RequestBody SecretKeyVO secretKeyVO) { Long secretKeyId = secretKeyService.createSecretKey(secretKeyVO); return success(secretKeyId); } @@ -46,21 +43,6 @@ public class SecretKeyController { return success(true); } - @PutMapping("/bindingMachine") - @Operation(summary = "绑定机器") -// @PreAuthorize("@ss.hasPermission('ci:secretKey:binding')") - public CommonResult bindingMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { - secretKeyService.bindingMachine(secretKeyVO); - return success(true); - } - - @PutMapping("/unbindMachine") - @Operation(summary = "解绑机器") - public CommonResult unbindMachine(@Valid @RequestBody SecretKeyVO secretKeyVO) { - secretKeyService.unbindMachine(secretKeyVO); - return success(true); - } - @GetMapping("/getBindMachine") @Operation(summary = "获取密钥绑定的机器列表") public CommonResult> getBindMachine(@RequestParam Long secretKeyId) { @@ -74,13 +56,6 @@ public class SecretKeyController { return success(secretKeyVO); } - @DeleteMapping("/delete") - @Operation(summary = "密钥信息删除") - public CommonResult delete(@RequestParam("id") Long id) { - secretKeyService.deleteSecretKey(id); - return success(true); - } - @DeleteMapping("/deleteList") @Operation(summary = "批量删除密钥") // @PreAuthorize("@ss.hasPermission('ci:secretKey:delete')") @@ -92,16 +67,10 @@ public class SecretKeyController { @PostMapping("/list") @Operation(summary = "获取密钥信息列表") public CommonResult> getSecretKeyPage(@Valid @RequestBody SecretKeyVO secretKeyVO) { - PageResult pageResult = secretKeyService.getSecretKeypage(secretKeyVO); + PageResult pageResult = secretKeyService.getSecretKeyPage(secretKeyVO); if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); } return success(BeanUtils.toBean(pageResult, SecretKeyVO.class)); } - -// @GetMapping("/download") -// @Operation(summary = "下载密钥文件") -// public ResponseEntity downloadSecretFile(@RequestParam("id") Long id) { -// return secretKeyService.downloadSecretFile(id); -// } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java index 041780f6..211f9ce9 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -45,4 +45,6 @@ public class SecretKeyVO extends PageParam { @Schema(description = "公钥", requiredMode = Schema.RequiredMode.REQUIRED, example = "******") private String public_key; + @Schema(description = "绑定/解绑密钥",example = "true") + private Boolean enableBind; } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index 985a5a81..1502563d 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -28,10 +28,14 @@ public interface MachineInfoMapper extends BaseMapperX { this.update(null, set); } - default void bindingSecretKey(List machineInfoIds, Long secretKeyId) { + default void bindingSecretKey(List machineInfoIds, Long secretKeyId,Boolean enableBind) { UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.in("id", machineInfoIds) // 匹配 ID 集合 - .set("secret_key_id", secretKeyId); // 设置新的 status 值 + wrapper.in("id", machineInfoIds); + if (enableBind){ + wrapper.set("secret_key_id", secretKeyId);// 匹配 ID 集合 + }else { + wrapper.set("secret_key_id", null); + } this.update(null, wrapper); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java index ba6a0f6f..42a18762 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java @@ -1,67 +1,64 @@ -//package cd.casic.module.machine.handler; -// -////import cd.casic.module.machine.component.WebSocketConnection; -////import cd.casic.module.machine.component.WebSocketSessionManager; -//import cd.casic.module.machine.enums.ConnectionStatus; -//import org.jetbrains.annotations.NotNull; -//import org.springframework.stereotype.Component; -//import org.springframework.web.socket.CloseStatus; -//import org.springframework.web.socket.TextMessage; -//import org.springframework.web.socket.WebSocketSession; -//import org.springframework.web.socket.handler.TextWebSocketHandler; -// -//import java.io.IOException; -// -//import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -//import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; -// -////WebSocket处理器 -//@Component("machineWebSocketHandler") -//public class MachineWebSocketHandler extends TextWebSocketHandler { -// -// @Override -// public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { -// Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); -// //保存webSocketSession信息 -// WebSocketSessionManager.addWebSocketSession(webSocketSession.getId(), webSocketSession); -// WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); -// try { -// webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); -// } catch (IOException e) { -// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); -// } -// } -// -// // 处理文本消息 -// @Override -// protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { -// String payload = message.getPayload(); -// String sessionId = webSocketSession.getId(); -// // 从管理器获取连接 -// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); -// -// if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { -// // 转发消息到远程机器 -// webSocketConnection.executeCommand(webSocketSession, payload); -// } else if (webSocketConnection != null) { -// webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); -// } else { -// throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); -// } -// } -// -// @Override -// public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { -// String sessionId = webSocketSession.getId(); -// // 获取并关闭相关的 WebSocketConnection -// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); -// if (webSocketConnection != null) { -// webSocketConnection.disconnect(); -// } -// // 从管理器中移除会话和连接 -// WebSocketSessionManager.removeWebSocketSession(sessionId); -// WebSocketSessionManager.removeWebSocketConnection(sessionId); -// Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); -// WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); -// } -//} +package cd.casic.module.machine.handler; + +import cd.casic.module.machine.component.WebSocketConnection; +import cd.casic.module.machine.component.WebSocketSessionManager; +import cd.casic.module.machine.enums.ConnectionStatus; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.io.IOException; + +import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; +import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; + +//WebSocket处理器 +@Component("machineWebSocketHandler") +public class MachineWebSocketHandler extends TextWebSocketHandler { + + @Override + public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { + Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); + //保存webSocketSession信息 + WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); + try { + webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); + } catch (IOException e) { + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + // 处理文本消息 + @Override + protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { + String payload = message.getPayload(); + String sessionId = webSocketSession.getId(); + // 从管理器获取连接 + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); + if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { + // 转发消息到远程机器 + webSocketConnection.executeCommand(webSocketSession, payload); + } else if (webSocketConnection != null) { + webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); + } else { + throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); + } + } + + @Override + public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { + String sessionId = webSocketSession.getId(); + // 获取并关闭相关的 WebSocketConnection + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); + if (webSocketConnection != null) { + webSocketConnection.disconnect(); + } + // 从管理器中移除会话和连接 + WebSocketSessionManager.removeWebSocketConnection(sessionId); + Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); + WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); + } +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index ea5fb26a..6aa2eb92 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -2,9 +2,12 @@ package cd.casic.module.machine.service; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineInfoVO; +import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; @@ -18,18 +21,35 @@ public interface MachineInfoService { /** * 查看机器列表 - * @return 分院 + * @return 机器列表 */ PageResult listMachineInfo(@Valid MachineInfoVO MachineInfoVO); + /** + * 更新机器信息 + */ void updateMachineInfo(@Valid MachineInfoVO machineInfoVO); + /** + * 变更机器状态 + */ Integer updateStatus(@Valid MachineInfoVO machineInfoVO); - void bindingSecretKey(List machineInfoIds, Long secretKeyId); + /** + * 绑定密钥 + */ + void bindingSecretKey(SecretKeyVO secretKeyVO); + /** + * 批量删除机器 + * @param machineInfoIds 机器id列表 + */ void deleteMachineInfoList(String machineInfoIds); + /** + * 删除机器信息 + * @param machineInfoId 机器id + */ void deleteMachineInfo(Long machineInfoId); /** @@ -40,55 +60,51 @@ public interface MachineInfoService { ListselectBindMachineBySecretKey(Long secretKeyId); -// /** -// * 测试机器连接 -// * -// * @param id 机器id -// * @return 连接是否成功 -// */ -// boolean testConnection(Long id); -// -// /** -// * 连接远程机器 -// * -// * @param id 机器id -// * @return 连接后端文件树 -// */ -// Map connect(Long id); -// -// /** -// * 获取机器连接状态 -// * -// * @return 连接状态 -// */ -// ConnectionStatus getConnectionStatus(Long id); -// -// /** -// * 获取所有连接状态 -// * -// * @return 机器名称到连接状态的映射 -// */ -// Map getAllConnectionStatus(); + /** + * 测试机器连接 + * @param id 机器id + * @return 连接是否成功 + */ + boolean testConnection(Long id); -// /** -// * 上传文件到远程机器 -// * -// * @param sessionId 会话ID -// * @param localFilePath 本地文件路径 -// * @param remoteFilePath 远程文件路径 -// * @return 操作结果 -// */ -// boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath); -// -// /** -// * 从远程机器下载文件 -// * -// * @param sessionId 会话ID -// * @param remoteFilePath 远程文件路径 -// * @param localFilePath 本地文件路径 -// * @return 操作结果 -// */ -// boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath); + /** + * 连接远程机器 + * + * @param id 机器id + * @return 连接后端文件树 + */ + Map connect(Long id); + + /** + * 获取机器连接状态 + * + * @return 连接状态 + */ + ConnectionStatus getConnectionStatus(Long id); + + /** + * 获取所有连接状态 + * + * @return 机器名称到连接状态的映射 + */ + Map getAllConnectionStatus(); + + /** + * 上传文件到远程机器 + * + * @param file 上传文件 + * @param remoteFilePath 远程文件路径 + * @return 操作结果 + */ + boolean uploadFile(MultipartFile file, String remoteFilePath); + + /** + * 从远程机器下载文件 + * + * @param remoteFilePath 远程文件路径 + * @return 操作结果 + */ + boolean downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse); /** * 校验机器是否存在 @@ -97,12 +113,18 @@ public interface MachineInfoService { */ MachineInfoDO validateMachineInfoExists(Long id); -// /** -// * 根据路径获得远程文件树 -// * -// * @param machineId 机器id -// * @param path 文件夹路径 -// * @return 远程文件树 -// */ -// Map fileTreeNode(Long machineId, String path); + /** + * 根据路径获得远程文件树 + * + * @param machineId 机器id + * @param path 文件夹路径 + * @return 远程文件树 + */ + Map fileTreeNode(Long machineId, String path); + + /** + * 删除远程文件路径 + * @param remoteFilePath 远程文件路径 + */ + boolean deleteRemoteFile(String remoteFilePath); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index 0c699356..c92596ac 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -26,7 +26,6 @@ public interface MachineProxyService { /** * 删除代理 * - * @param */ void delete(Long id); @@ -45,5 +44,8 @@ public interface MachineProxyService { */ void deleteProxyList(String proxyIds); + /** + * 获取代理列表(分页) + */ PageResult getProxyPage(@Valid MachineProxyVO machineProxyVO); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java index 1436b582..19326057 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java @@ -5,30 +5,44 @@ import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.controller.vo.SecretKeyVO; import jakarta.validation.Valid; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; import java.util.List; public interface SecretKeyService { - Long createSecretKey(@Valid SecretKeyVO secretKeyVO) throws Exception; - - void bindingMachine(@Valid SecretKeyVO secretKeyVO); + /** + * 新增密钥 + */ + Long createSecretKey(@Valid SecretKeyVO secretKeyVO); + /** + * 更新密钥 + */ void updateSecretKey(@Valid SecretKeyVO secretKeyVO); - PageResult getSecretKeypage(@Valid SecretKeyVO secretKeyVO); + /** + * 获取密钥列表(分页) + */ + PageResult getSecretKeyPage(@Valid SecretKeyVO secretKeyVO); + /** + * 批量删除密钥 + * @param ids 密钥id集合 + */ void deleteSecretKeyList(List ids); + /** + * 根据id获取密钥对象 + */ SecretKeyVO getSecretKey(Long id); - void deleteSecretKey(Long id); - - void unbindMachine(@Valid SecretKeyVO secretKeyVO); - + /** + * 获取绑定的密钥的机器列表 + */ List getBindMachine(Long secretKeyId); -// String getKeyContent(Long secretKeyId); + /** + * 获取公钥内容 + */ + String getPublicKeyContent(Long secretKeyId); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index 99799623..3099f9fa 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -2,7 +2,8 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.component.FileTreeComponent; -//import cd.casic.module.machine.component.WebSocketSessionManager; +import cd.casic.module.machine.component.WebSocketConnection; +import cd.casic.module.machine.component.WebSocketSessionManager; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.enums.AuthenticationType; import cd.casic.module.machine.enums.MachineInfoType; @@ -11,17 +12,22 @@ import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.enums.MachineInfoStatus; -//import cd.casic.module.machine.component.WebSocketConnection; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; import com.jcraft.jsch.Session; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import cd.casic.framework.commons.util.object.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; @@ -44,6 +50,9 @@ public class MachineInfoServiceImpl implements MachineInfoService { @Resource private FileTreeComponent fileTreeComponent; + //todo，部署后更改 + private static final Path TEMP_DIR = Paths.get("D:\\桌面\\work\\ops-pro111\\temp"); + @Override public Long createMachine(MachineInfoVO machineInfoVO) { validateMachineEnvAdd(machineInfoVO); @@ -85,8 +94,8 @@ public class MachineInfoServiceImpl implements MachineInfoService { } @Override - public void bindingSecretKey(List machineInfoIds, Long secretKeyId) { - machineInfoMapper.bindingSecretKey(machineInfoIds, secretKeyId); + public void bindingSecretKey(SecretKeyVO secretKeyVO) { + machineInfoMapper.bindingSecretKey(secretKeyVO.getMachineInfoIds(), secretKeyVO.getId(),secretKeyVO.getEnableBind()); } @Override @@ -109,78 +118,73 @@ public class MachineInfoServiceImpl implements MachineInfoService { @Override public List selectBindMachineBySecretKey(Long secretKeyId) { - return machineInfoMapper.selectBindMachineBySecretKey(secretKeyId); + return machineInfoMapper.selectBindMachineBySecretKey(secretKeyId); } -// @Override -// public boolean testConnection(Long id) { -// //先查询机器是否存在，在判断机器可用性 -// MachineInfoDO machineInfoDO = validateMachineInfoExists(id); -// validateMachineUnEnable(machineInfoDO); -// log.info("测试机器连接: {}", machineInfoDO.getHostIp()); -// WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); -// webSocketConnection.initConnection(machineInfoDO); -// return true; -// } -// -// @Override -// public Map connect(Long id) { -// //todo使用代理机器的情况还未完成 -// WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); -// MachineInfoDO machineInfoDO = validateMachineInfoExists(id); -// //初始化连接 -// webSocketConnection.initConnection(machineInfoDO); -// WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); -// return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); -// } -// -// @Override -// public ConnectionStatus getConnectionStatus(Long id) { -// validateMachineInfoExists(id); -// WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); -// return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); -// } -// -// @Override -// public Map getAllConnectionStatus() { -// return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() -// .collect(Collectors.toMap( -// Map.Entry::getKey, -// entry -> entry.getValue().getConnectionStatus() -// )); -// } + @Override + public boolean testConnection(Long id) { + //先查询机器是否存在，在判断机器可用性 + MachineInfoDO machineInfoDO = validateMachineInfoExists(id); + validateMachineUnEnable(machineInfoDO); + log.info("测试机器连接: {}", machineInfoDO.getHostIp()); + WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); + webSocketConnection.initConnection(machineInfoDO); + return true; + } -// @Override -// public boolean uploadFile(String sessionId, String localFilePath, String remoteFilePath) { -// log.info("上传文件: {} -> {}, 会话ID: {}", localFilePath, remoteFilePath, sessionId); -// WebSocketConnection webSocketConnection = sessionConnectionMap.get(sessionId); -// if (webSocketConnection == null||webSocketConnection.getConnectionStatus() != ConnectionStatus.CONNECTED) { -// throw exception(SESSION_NOT_CONNECT); -// } -// try { -// return webSocketConnection.uploadFile(localFilePath, remoteFilePath); -// } catch (Exception e) { -// log.error("文件上传失败: {}", e.getMessage(), e); -// throw exception(FILE_UPLOAD_ERROR); -// } -// } + @Override + public Map connect(Long id) { + //todo使用代理机器的情况还未完成 + WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); + MachineInfoDO machineInfoDO = validateMachineInfoExists(id); + //初始化连接 + webSocketConnection.initConnection(machineInfoDO); + WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); + return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); + } -// @Override -// public boolean downloadFile(String sessionId, String remoteFilePath, String localFilePath) { -// log.info("下载文件: {} -> {}, 会话ID: {}", remoteFilePath, localFilePath, sessionId); -// -// WebSocketConnection webSocketConnection = sessionConnectionMap.get(sessionId); -// if (webSocketConnection == null||webSocketConnection.getConnectionStatus() != ConnectionStatus.CONNECTED) { -// throw new RuntimeException("会话不存在: " + sessionId); -// } -// try { -// return webSocketConnection.downloadFile(remoteFilePath, localFilePath); -// } catch (Exception e) { -// log.error("文件下载失败: {}", e.getMessage(), e); -// throw exception(FILE_DOWNLOAD_ERROR); -// } -// } + @Override + public ConnectionStatus getConnectionStatus(Long id) { + validateMachineInfoExists(id); + WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); + return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); + } + + @Override + public Map getAllConnectionStatus() { + return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() + .collect(Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue().getConnectionStatus() + )); + } + + @Override + public boolean uploadFile(MultipartFile file, String remoteFilePath) { + Path tempFilePath; + // 保存上传的文件到临时位置 + String originalFilename = file.getOriginalFilename(); + if (originalFilename == null || originalFilename.isEmpty()) { + throw exception(INVALID_FILE_NAME); + } + // 安全过滤文件名，防止路径遍历攻击 + String safeFilename = sanitizeFilename(originalFilename); + try { + tempFilePath = Files.createTempFile(TEMP_DIR, "upload-", safeFilename); + file.transferTo(tempFilePath.toFile()); + } catch (IOException e) { + throw exception(CREATE_TEMP_FILE_ERROR); + } + fileTreeComponent.uploadToRemoteServer(tempFilePath, safeFilename, remoteFilePath); + return true; + } + + @Override + public boolean downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse) { + fileTreeComponent.downloadFile(remoteFilePath, httpServletResponse); + return true; + } @VisibleForTesting void validateMachineEnvAdd(MachineInfoVO machineInfoVO) { @@ -246,12 +250,18 @@ public class MachineInfoServiceImpl implements MachineInfoService { return machineInfoDO; } -// @Override -// public Map fileTreeNode(Long machineId, String path) { -// validateMachineInfoExists(machineId); -// Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); -// return fileTreeComponent.getRemoteFileTree(sshSession, path); -// } + @Override + public Map fileTreeNode(Long machineId, String path) { + validateMachineInfoExists(machineId); + Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); + return fileTreeComponent.getRemoteFileTree(sshSession, path); + } + + @Override + public boolean deleteRemoteFile(String remoteFilePath) { + fileTreeComponent.deleteRemoteFile(remoteFilePath); + return true; + } @VisibleForTesting void validateMachineEnable(MachineInfoDO machineInfoDO) { @@ -268,12 +278,25 @@ public class MachineInfoServiceImpl implements MachineInfoService { } } -// @VisibleForTesting -// WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { -// if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { -// return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); -// } else { -// return new WebSocketConnection(this.secretKeyService); -// } -// } + @VisibleForTesting + WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { + if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { + return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); + } else { + return new WebSocketConnection(this.secretKeyService); + } + } + + @VisibleForTesting + // 安全过滤文件名，防止路径遍历攻击 + private String sanitizeFilename(String filename) { + // 移除路径相关字符，只保留文件名和扩展名 + filename = filename.replaceAll("[\\\\/:*?\"<>|]", "_"); + // 限制最大长度 + if (filename.length() > 255) { + filename = filename.substring(0, 255); + } + + return filename; + } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index eec46f33..c20e31ba 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -7,9 +7,6 @@ import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.dal.mysql.SecretKeyMapper; import cd.casic.module.machine.service.MachineInfoService; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -import cd.casic.module.machine.utils.AliYunOssClient; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Resource; @@ -33,36 +30,28 @@ public class SecretKeyServiceImpl implements SecretKeyService { @Resource private SecretKeyMapper secretKeyMapper; - @Override - public void deleteSecretKey(Long id) { - validateSecretKeyExists(id); - secretKeyMapper.deleteById(id); - } - @Override public SecretKeyVO getSecretKey(Long id) { SecretKeyDO secretKeyDO = validateSecretKeyExists(id); return BeanUtils.toBean(secretKeyDO, SecretKeyVO.class); } - @Override - public void unbindMachine(SecretKeyVO secretKeyVO) { - machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(),null); - } - @Override public List getBindMachine(Long secretKeyId) { return machineInfoService.selectBindMachineBySecretKey(secretKeyId); } + @Override + public String getPublicKeyContent(Long secretKeyId) { + return secretKeyMapper.selectById(secretKeyId).getPublicKey(); + } + @Override public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); - - } @Override @@ -72,25 +61,21 @@ public class SecretKeyServiceImpl implements SecretKeyService { secretKeyMapper.updateById(secretKeyDO); } - @Override - public void bindingMachine(SecretKeyVO secretKeyVO) { - validateSecretKeyExists(secretKeyVO.getId()); - machineInfoService.bindingSecretKey(secretKeyVO.getMachineInfoIds(), secretKeyVO.getId()); - } - @Override @Transactional public void deleteSecretKeyList(List ids) { - machineInfoService.bindingSecretKey(ids,null); + SecretKeyVO secretKeyVO = new SecretKeyVO() + .setMachineInfoIds(ids) + .setEnableBind(false); + machineInfoService.bindingSecretKey(secretKeyVO); secretKeyMapper.deleteBatchIds(ids); } @Override - public PageResult getSecretKeypage(SecretKeyVO secretKeyVO) { + public PageResult getSecretKeyPage(SecretKeyVO secretKeyVO) { return secretKeyMapper.selectPage(secretKeyVO); } - @VisibleForTesting void validateSecretKeyAdd(SecretKeyVO secretKeyVO) { if (secretKeyVO == null) { @@ -98,8 +83,6 @@ public class SecretKeyServiceImpl implements SecretKeyService { } } - - @VisibleForTesting SecretKeyDO validateSecretKeyExists(Long id) { if (id == null) { @@ -111,5 +94,4 @@ public class SecretKeyServiceImpl implements SecretKeyService { } return secretKeyDO; } - } From eb7e756fd779fb4cf6b6255c8de28d4821b40c19 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Mon, 7 Jul 2025 14:52:21 +0800 Subject: [PATCH 35/46] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/casic/module/machine/controller/vo/SecretKeyVO.java | 2 -- .../cd/casic/module/machine/dal/mysql/MachineInfoMapper.java | 5 ----- .../cd/casic/module/machine/service/MachineProxyService.java | 2 -- 3 files changed, 9 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java index 211f9ce9..81d4cd56 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/SecretKeyVO.java @@ -4,9 +4,7 @@ import cd.casic.framework.commons.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.time.LocalDateTime; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java index 1502563d..1f3f2013 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineInfoMapper.java @@ -3,15 +3,10 @@ package cd.casic.module.machine.dal.mysql; import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; -import cd.casic.module.machine.controller.vo.MachineEnvVO; import cd.casic.module.machine.controller.vo.MachineInfoVO; -import cd.casic.module.machine.dal.dataobject.MachineEnvDO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import jakarta.annotation.Resource; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java index c92596ac..9dd8beb5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineProxyService.java @@ -4,8 +4,6 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineProxyVO; import cd.casic.module.machine.dal.dataobject.MachineProxyDO; import jakarta.validation.Valid; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.Map; From 495165a9303de909153006c9b04c9e85a3f80707 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Tue, 8 Jul 2025 09:30:32 +0800 Subject: [PATCH 36/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E3=80=81=E5=AF=86=E9=92=A5=E5=AF=86=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=AF=86/=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/WebSocketConnection.java | 4 +- .../module/machine/dal/model/Keypair.java | 26 +++++ .../service/impl/SecretKeyServiceImpl.java | 5 + .../module/machine/utils/CryptogramUtil.java | 109 ++++++++++++++++++ 4 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/Keypair.java create mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java index 16b4d7c2..cc8a63da 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java @@ -6,6 +6,7 @@ import cd.casic.module.machine.enums.AuthenticationType; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.enums.SSHChanelType; import cd.casic.module.machine.service.SecretKeyService; +import cd.casic.module.machine.utils.CryptogramUtil; import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.JSch; @@ -164,7 +165,8 @@ public class WebSocketConnection { if (machineInfo.getSecretKeyId() == null) { throw exception(SECRET_KEY_NULL); } - String pubKeyContent = secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId()); + //公钥解密 + String pubKeyContent = CryptogramUtil.doDecrypt(secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId())); // 验证秘钥格式 if (!pubKeyContent.startsWith("-----BEGIN")) { log.error("无效的密钥格式{}", pubKeyContent); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/Keypair.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/Keypair.java new file mode 100644 index 00000000..3a58737a --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/Keypair.java @@ -0,0 +1,26 @@ +package cd.casic.module.machine.dal.model; + +/** + * 基于SM2的秘钥对 + * （本项目中配置的，自己使用可根据自己的需求进行更换） + * + */ +public class Keypair { + + /** + * 公钥 + */ + public static String PUBLIC_KEY = "04298364ec840088475eae92a591e01284d1abefcda348b47eb324bb521bb03b0b2a5bc393f6b71dabb8f15c99a0050818b56b23f31743b93df9cf8948f15ddb54"; + + /** + * 私钥 + */ + public static String PRIVATE_KEY = "3037723d47292171677ec8bd7dc9af696c7472bc5f251b2cec07e65fdef22e25"; + + /** + * SM4的对称秘钥（生产环境需要改成自己使用的） + * 16 进制字符串，要求为 128 比特 + */ + public static String KEY = "0123456789abcdeffedcba9876543210"; + +} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index c20e31ba..f7eaf377 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -8,6 +8,7 @@ import cd.casic.module.machine.dal.dataobject.SecretKeyDO; import cd.casic.module.machine.dal.mysql.SecretKeyMapper; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.service.SecretKeyService; +import cd.casic.module.machine.utils.CryptogramUtil; import com.google.common.annotations.VisibleForTesting; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -50,6 +51,10 @@ public class SecretKeyServiceImpl implements SecretKeyService { public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); + //密码加密 + secretKeyDO.setPassword(CryptogramUtil.doEncrypt(secretKeyVO.getPassword())); + //公钥加密 + secretKeyDO.setPublicKey(CryptogramUtil.doEncrypt(secretKeyVO.getPublic_key())); secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java new file mode 100644 index 00000000..ca99dac7 --- /dev/null +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java @@ -0,0 +1,109 @@ +package cd.casic.module.machine.utils; + +import cd.casic.module.machine.dal.model.Keypair; +import cn.hutool.log.Log; +import com.antherd.smcrypto.sm2.Sm2; +import com.antherd.smcrypto.sm3.Sm3; +import com.antherd.smcrypto.sm4.Sm4; +import com.antherd.smcrypto.sm4.Sm4Options; + +public class CryptogramUtil { + + private static final Log log = Log.get(); + + /** + * 加密方法（Sm2 的专门针对前后端分离，非对称秘钥对的方式，暴露出去的公钥，对传输过程中的密码加个密） + * + * @author yubaoshan + * @param str 待加密数据 + * @return 加密后的密文 + */ + public static String doSm2Encrypt (String str) { + return Sm2.doEncrypt(str, Keypair.PUBLIC_KEY); + } + + /** + * 解密方法 + * 如果采用加密机的方法，用try catch 捕捉异常，返回原文值即可 + * + * @author yubaoshan + * @param str 密文 + * @return 解密后的明文 + */ + public static String doSm2Decrypt (String str) { + // 解密 + return Sm2.doDecrypt(str, Keypair.PRIVATE_KEY); + } + + /** + * 加密方法 + * + * @author yubaoshan + * @param str 待加密数据 + * @return 加密后的密文 + */ + public static String doEncrypt (String str) { + // SM4 加密 cbc模式 + Sm4Options sm4Options4 = new Sm4Options(); + sm4Options4.setMode("cbc"); + sm4Options4.setIv("fedcba98765432100123456789abcdef"); + return Sm4.encrypt(str, Keypair.KEY, sm4Options4); + } + + /** + * 解密方法 + * 如果采用加密机的方法，用try catch 捕捉异常，返回原文值即可 + * + * @author yubaoshan + * @param str 密文 + * @return 解密后的明文 + */ + public static String doDecrypt (String str) { + // 解密，cbc 模式，输出 utf8 字符串 + Sm4Options sm4Options8 = new Sm4Options(); + sm4Options8.setMode("cbc"); + sm4Options8.setIv("fedcba98765432100123456789abcdef"); + String docString = Sm4.decrypt(str, Keypair.KEY, sm4Options8); + if (docString.isEmpty()) { + log.warn(">>> 字段解密失败，返回原文值：{}", str); + return str; + } else { + return docString; + } + } + + /** + * 纯签名 + * + * @author yubaoshan + * @param str 待签名数据 + * @return 签名结果 + */ + public static String doSignature (String str) { + return Sm2.doSignature(str, Keypair.PRIVATE_KEY); + } + + /** + * 验证签名结果 + * + * @author yubaoshan + * @param originalStr 签名原文数据 + * @param str 签名结果 + * @return 是否通过 + */ + public static boolean doVerifySignature (String originalStr, String str) { + return Sm2.doVerifySignature(originalStr, str, Keypair.PUBLIC_KEY); + } + + /** + * 通过杂凑算法取得hash值，用于做数据完整性保护 + * + * @author yubaoshan + * @param str 字符串 + * @return hash 值 + */ + public static String doHashValue (String str) { + return Sm3.sm3(str); + } + +} From de12ccfd9e60497e48de83af00c7f1ea40b1ebab Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Tue, 8 Jul 2025 14:40:20 +0800 Subject: [PATCH 37/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E3=80=81=E5=AF=86=E9=92=A5=E5=AF=86=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=AF=86/=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index 6f221741..fcc46f95 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -40,7 +40,11 @@ jsch 0.1.55 - + + com.antherd + sm-crypto + 0.3.2 + org.projectlombok lombok From de817f1060eec3225fec76e6dfd35fb6e0a08bbf Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Tue, 8 Jul 2025 16:59:09 +0800 Subject: [PATCH 38/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E3=80=81=E5=AF=86=E9=92=A5=E5=AF=86=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=AF=86/=E8=A7=A3=E5=AF=86=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=8C=85=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 19 ++++++++++++++++++- .../component/WebSocketConnection.java | 8 +++++++- .../contants/MachineErrorCodeConstants.java | 1 + .../service/impl/SecretKeyServiceImpl.java | 13 +++++++++---- .../module/machine/utils/CryptogramUtil.java | 16 +++++++++------- 5 files changed, 44 insertions(+), 13 deletions(-) diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index fcc46f95..6f97ecf3 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -11,6 +11,18 @@ module-ci-machine jar + + + + org.apache.maven.plugins + maven-compiler-plugin + + 16 + 16 + + + + ${revision} ${project.artifactId} @@ -43,7 +55,12 @@ com.antherd sm-crypto - 0.3.2 + 0.3.2.1-RELEASE + + + org.openjdk.nashorn + nashorn-core + 15.4 org.projectlombok diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java index cc8a63da..6f9fcd91 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java @@ -19,6 +19,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; +import javax.script.ScriptException; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -166,7 +167,12 @@ public class WebSocketConnection { throw exception(SECRET_KEY_NULL); } //公钥解密 - String pubKeyContent = CryptogramUtil.doDecrypt(secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId())); + String pubKeyContent; + try { + pubKeyContent = CryptogramUtil.doDecrypt(secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId())); + } catch (ScriptException e) { + throw exception(ENCRYPT_OR_DECRYPT_FAIL); + } // 验证秘钥格式 if (!pubKeyContent.startsWith("-----BEGIN")) { log.error("无效的密钥格式{}", pubKeyContent); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index 8d32153b..bc3b9614 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -36,6 +36,7 @@ public interface MachineErrorCodeConstants { ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_004_001, "密钥不存在"); ErrorCode INVALID_kEY_FORMAT = new ErrorCode(1_003_004_002, "无效的密钥格式"); ErrorCode READ_SECRET_CONTENT_ERROR = new ErrorCode(1_003_004_003, "读取密钥加载失败"); + ErrorCode ENCRYPT_OR_DECRYPT_FAIL = new ErrorCode(1_003_004_004, "加密/解密失败"); //========== 会话连接模块 1-003-006-000 ========== ErrorCode SESSION_CONNECT_ERROR = new ErrorCode(1_003_006_001, "会话连接失败"); diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java index f7eaf377..1ab43d9c 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java @@ -14,6 +14,7 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.script.ScriptException; import java.util.List; import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; @@ -51,10 +52,14 @@ public class SecretKeyServiceImpl implements SecretKeyService { public Long createSecretKey(SecretKeyVO secretKeyVO) { validateSecretKeyAdd(secretKeyVO); SecretKeyDO secretKeyDO = BeanUtils.toBean(secretKeyVO, SecretKeyDO.class); - //密码加密 - secretKeyDO.setPassword(CryptogramUtil.doEncrypt(secretKeyVO.getPassword())); - //公钥加密 - secretKeyDO.setPublicKey(CryptogramUtil.doEncrypt(secretKeyVO.getPublic_key())); + try { + //密码加密 + secretKeyDO.setPassword(CryptogramUtil.doEncrypt(secretKeyVO.getPassword())); + //公钥加密 + secretKeyDO.setPublicKey(CryptogramUtil.doEncrypt(secretKeyVO.getPublic_key())); + } catch (ScriptException e) { + throw exception(ENCRYPT_OR_DECRYPT_FAIL); + } secretKeyMapper.insert(secretKeyDO); return secretKeyDO.getId(); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java index ca99dac7..46a52e7a 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java @@ -7,6 +7,8 @@ import com.antherd.smcrypto.sm3.Sm3; import com.antherd.smcrypto.sm4.Sm4; import com.antherd.smcrypto.sm4.Sm4Options; +import javax.script.ScriptException; + public class CryptogramUtil { private static final Log log = Log.get(); @@ -18,7 +20,7 @@ public class CryptogramUtil { * @param str 待加密数据 * @return 加密后的密文 */ - public static String doSm2Encrypt (String str) { + public static String doSm2Encrypt (String str) throws ScriptException { return Sm2.doEncrypt(str, Keypair.PUBLIC_KEY); } @@ -30,7 +32,7 @@ public class CryptogramUtil { * @param str 密文 * @return 解密后的明文 */ - public static String doSm2Decrypt (String str) { + public static String doSm2Decrypt (String str) throws ScriptException { // 解密 return Sm2.doDecrypt(str, Keypair.PRIVATE_KEY); } @@ -42,7 +44,7 @@ public class CryptogramUtil { * @param str 待加密数据 * @return 加密后的密文 */ - public static String doEncrypt (String str) { + public static String doEncrypt (String str) throws ScriptException { // SM4 加密 cbc模式 Sm4Options sm4Options4 = new Sm4Options(); sm4Options4.setMode("cbc"); @@ -58,7 +60,7 @@ public class CryptogramUtil { * @param str 密文 * @return 解密后的明文 */ - public static String doDecrypt (String str) { + public static String doDecrypt (String str) throws ScriptException { // 解密，cbc 模式，输出 utf8 字符串 Sm4Options sm4Options8 = new Sm4Options(); sm4Options8.setMode("cbc"); @@ -79,7 +81,7 @@ public class CryptogramUtil { * @param str 待签名数据 * @return 签名结果 */ - public static String doSignature (String str) { + public static String doSignature (String str) throws ScriptException { return Sm2.doSignature(str, Keypair.PRIVATE_KEY); } @@ -91,7 +93,7 @@ public class CryptogramUtil { * @param str 签名结果 * @return 是否通过 */ - public static boolean doVerifySignature (String originalStr, String str) { + public static boolean doVerifySignature (String originalStr, String str) throws ScriptException { return Sm2.doVerifySignature(originalStr, str, Keypair.PUBLIC_KEY); } @@ -102,7 +104,7 @@ public class CryptogramUtil { * @param str 字符串 * @return hash 值 */ - public static String doHashValue (String str) { + public static String doHashValue (String str) throws ScriptException { return Sm3.sm3(str); } From d30f11a47a2bfa6cf83d884b432e343342188011 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Wed, 9 Jul 2025 11:33:06 +0800 Subject: [PATCH 39/46] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 13 - .../WebSocketHandshakeInterceptor.java | 85 ----- .../machine/component/FileTreeComponent.java | 340 ------------------ .../component/WebSocketConnection.java | 228 ------------ .../component/WebSocketSessionManager.java | 70 ---- .../configuration/AliYunOssConfig.java | 33 -- .../configuration/WebSocketConfig.java | 40 --- .../contants/MachineErrorCodeConstants.java | 30 +- .../controller/MachineInfoController.java | 56 --- .../module/machine/dal/model/FileNode.java | 56 --- .../machine/dal/mysql/SecretKeyMapper.java | 10 - .../machine/enums/ConnectionStatus.java | 33 -- .../module/machine/enums/SSHChanelType.java | 35 -- .../handler/MachineWebSocketHandler.java | 64 ---- .../machine/service/MachineInfoService.java | 75 +--- .../service/impl/MachineInfoServiceImpl.java | 128 +------ .../module/machine/utils/AliYunOssClient.java | 11 - .../module/machine/utils/CryptogramUtil.java | 32 +- 18 files changed, 25 insertions(+), 1314 deletions(-) delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java delete mode 100644 modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index 6f97ecf3..2e8e1b2c 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -34,24 +34,11 @@ - - com.aliyun.oss - aliyun-sdk-oss - 3.15.1 - - - org.springframework.boot spring-boot-starter-websocket - - - com.jcraft - jsch - 0.1.55 - com.antherd sm-crypto diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java deleted file mode 100644 index a0a6f890..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/Interceptor/WebSocketHandshakeInterceptor.java +++ /dev/null @@ -1,85 +0,0 @@ -package cd.casic.module.machine.Interceptor; - -import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; -import org.springframework.http.HttpStatus; -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.HandshakeInterceptor; - -import java.net.URI; -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; -import java.util.Map; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -@Component -@Slf4j -public class WebSocketHandshakeInterceptor implements HandshakeInterceptor { - @Override - public boolean beforeHandshake( - @NotNull ServerHttpRequest request, - @NotNull ServerHttpResponse response, - @NotNull WebSocketHandler wsHandler, - @NotNull Map attributes - ) { - log.info("WebSocket握手请求: {}", request.getURI()); - - // 从URL参数中获取id - String id = extractIdFromUrl(request.getURI()); - - System.out.println("-----------------------------------------"); - if (id != null) { - attributes.put("machineId", id); // 将id存入attributes - log.info("握手验证成功 - ID: {}", id); - return true; - } else { - response.setStatusCode(HttpStatus.BAD_REQUEST); - log.warn("握手验证失败 - 缺少 id URL 参数"); - return false; - } - } - - @Override - public void afterHandshake( - @NotNull ServerHttpRequest request, - @NotNull ServerHttpResponse response, - @NotNull WebSocketHandler wsHandler, - Exception exception - ) { - if (exception == null) { - log.info("WebSocket握手完成 - URI: {}", - request.getURI()); - } else { - log.error("WebSocket握手异常 - URI: {}, 异常信息: {}", - request.getURI(), - exception.getMessage(), - exception); - } - } - - // 从URI中提取id参数的辅助方法 - private String extractIdFromUrl(URI uri) { - try { - String query = uri.getQuery(); - if (query != null) { - String[] params = query.split("&"); - for (String param : params) { - String[] keyValue = param.split("="); - if (keyValue.length == 2 && "id".equalsIgnoreCase(keyValue[0])) { // 修改为匹配id - return URLDecoder.decode(keyValue[1], StandardCharsets.UTF_8); - } - } - } - } catch (Exception e) { - log.error("解析URL参数失败", e); - throw exception(FAILED_TO_PARSE_URL_PARAMETERS); - } - return null; - } - -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java deleted file mode 100644 index 5e967815..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/FileTreeComponent.java +++ /dev/null @@ -1,340 +0,0 @@ -package cd.casic.module.machine.component; - -import cd.casic.module.machine.dal.model.FileNode; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.SftpATTRS; -import com.jcraft.jsch.SftpException; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -@Slf4j -@Component -public class FileTreeComponent { - - private ChannelSftp sftp; - //todo缓存过期还未设置 - private final Map directoryCache = new ConcurrentHashMap<>(); - private static final long CACHE_EXPIRE_TIME = 60 * 1000; // 缓存过期时间：1分钟 - private final Map cacheTimeStamp = new ConcurrentHashMap<>(); - - // 将文件树转换为JSON友好的Map结构（仅一级目录） - public static Map convertToMap(FileNode node) { - Map map = new HashMap<>(); - map.put("name", node.getName()); - map.put("isDirectory", node.isDirectory()); - map.put("size", node.getSize()); - map.put("permissions", node.getPermissions()); - map.put("modifiedTime", node.getModifiedTime()); - // 仅添加直接子项，不递归 - if (node.isDirectory() && !node.getChildren().isEmpty()) { - List> children = node.getChildren().stream() - .map(FileTreeComponent::convertToMap) - .collect(Collectors.toList()); - map.put("children", children); - } - return map; - } - - // 获取指定路径的直接子项（不递归） - public List listDirectChildren(String path) { - if (sftp == null || !isSftpConnected()) { - log.error("SFTP连接无效，无法列出文件"); - throw exception(CONNECTION_LOST); - } - - List entries = Collections.synchronizedList(new ArrayList<>()); - //定义ChannelSftp下LsEntrySelector接口中select方法 - ChannelSftp.LsEntrySelector selector = entry -> { - entries.add(entry); - return ChannelSftp.LsEntrySelector.CONTINUE; - }; - - try { - sftp.ls(path, selector); - } catch (SftpException e) { - log.error("读取远程文件目录结构失败, 信息: {}]", e.getMessage(), e); - throw exception(READ_REMOTE_DIRECTORY_FAIL); - } - return new ArrayList<>(entries); - } - - // 创建文件节点（支持使用完整路径或文件名） - private static FileNode createFileNode(String name, SftpATTRS attrs, boolean useFullPath) { - String displayName = useFullPath ? name : name.substring(name.lastIndexOf('/') + 1); - return new FileNode( - displayName, - attrs.isDir(), - attrs.getSize(), - attrs.getPermissionsString(), - attrs.getMTime() * 1000L // 转换为毫秒 - ); - } - - // 获取远程文件树的方法（仅展示下一级） - public Map getRemoteFileTree(Session session, String path) { - path = normalizePath(path); - Channel channel = null; - try { - // 缓存有效性检查 - String cacheKey = "ls:" + path; - long currentTime = System.currentTimeMillis(); - - // 检查缓存是否存在且未过期 - if (directoryCache.containsKey(cacheKey) && - currentTime - cacheTimeStamp.getOrDefault(cacheKey, 0L) < CACHE_EXPIRE_TIME) { - log.debug("从缓存获取目录内容: {}", path); - // 构建缓存中的根节点 - FileNode root = directoryCache.get(cacheKey); - return sortFileInfo(convertToMap(root)); - } - - // 打开SFTP通道 - channel = session.openChannel("sftp"); - channel.connect(); - sftp = (ChannelSftp) channel; - - // 先通过stat获取当前路径信息 - SftpATTRS rootAttrs = sftp.stat(path); - FileNode root = createFileNode(path, rootAttrs, true); - - // 仅获取直接子项，不递归 - List entries = listDirectChildren(path); - //循环添加子节点 - for (ChannelSftp.LsEntry entry : entries) { - String fileName = entry.getFilename(); - if (fileName.equals(".") || fileName.equals("..")) continue; - SftpATTRS attrs = entry.getAttrs(); - FileNode childNode = createFileNode(fileName, attrs, false); - root.addChild(childNode); - } - // 更新缓 - directoryCache.put(cacheKey, root); - cacheTimeStamp.put(cacheKey, currentTime); - return sortFileInfo(convertToMap(root)); - } catch (JSchException e) { - log.error("SFTP通道创建或连接失败: {}", e.getMessage(), e); - if (e.getMessage().contains("open")) { - throw exception(CREATE_CHANEL_ERROR); - } else { - throw exception(CHANEL_CONNECT_FAIL); - } - } catch (SftpException e) { - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - // 仅捕获路径不存在的错误 - log.error("路径不存在: {}", path); - throw exception(PATH_NOT_EXISTS); // 自定义异常 - } else if (e.id == ChannelSftp.SSH_FX_PERMISSION_DENIED) { - // 处理权限问题（非路径不存在） - log.error("无路径访问权限: {}", path); - throw exception(NO_PATH_PERMISSION); - } else { - log.error("获取目录内容失败: {}", e.getMessage(), e); - throw exception(READ_REMOTE_DIRECTORY_FAIL); - } - } finally { - // 确保资源释放 - if (sftp != null) { - try { - sftp.disconnect(); - } catch (Exception ex) { - log.warn("关闭SFTP连接失败", ex); - } - } - if (channel != null && channel.isConnected()) { - channel.disconnect(); - } - } - } - - // 检查SFTP连接状态 - private boolean isSftpConnected() { - if (sftp == null) return false; - try { - sftp.pwd(); - return true; - } catch (Exception e) { - log.warn("SFTP连接状态检查失败", e); - return false; - } - } - - // 规范化路径：确保末尾有斜杠（根路径除外） - private String normalizePath(String path) { - // 移除多余的斜杠（多个连续的斜杠会被替换为一个） - path = path.replaceAll("/+", "/"); - - // 如果路径不为根路径且末尾没有斜杠，则添加斜杠 - if (!"/".equals(path) && !path.endsWith("/")) { - path += "/"; - } - - return path; - } - - /** - * 对文件和目录信息进行排序（仅处理直接子级） - * - * @param fileInfoMap 文件/目录信息映射 - * @return 排序后的映射 - */ - public Map sortFileInfo(Map fileInfoMap) { - // 检查是否包含子节点 - if (fileInfoMap.containsKey("children")) { - List> children = (List>) fileInfoMap.get("children"); - // 对子节点列表进行排序 - if (children != null && !children.isEmpty()) { - children.sort((a, b) -> { - // 获取isDirectory属性并比较 - boolean isADirectory = (boolean) a.get("isDirectory"); - boolean isBDirectory = (boolean) b.get("isDirectory"); - // 目录排在文件前面 - return Boolean.compare(isBDirectory, isADirectory); - }); - // 更新排序后的子节点列表 - fileInfoMap.put("children", children); - } - } - return fileInfoMap; - } - - // 上传到远程服务器 - public void uploadToRemoteServer(Path tempFilePath, String safeFilename, String remoteFilePath) { - // 上传文件（使用原始文件名） - try { - sftp.put(tempFilePath.toString(), remoteFilePath + safeFilename); - } catch (SftpException e) { - throw exception(UPLOAD_REMOTE_FILE_ERROR); - } finally { - // 清理临时文件 - cleanupTempFile(tempFilePath); - } - log.info("文件上传成功: {} -> {}{}", tempFilePath, remoteFilePath, safeFilename); - } - - //下载文件 - public void downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse) { - InputStream inputStream = null; - OutputStream outputStream = null; - try { - // 获取文件信息并判断是否为文件夹 - SftpATTRS attrs = sftp.lstat(remoteFilePath); - if (attrs.isDir()) { - httpServletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST); - log.error("无法下载文件夹: {}", remoteFilePath); - throw exception(DOWNLOAD_FOLDER_NOT_ALLOWED); - } - - // 处理文件下载逻辑 - String fileName = Paths.get(remoteFilePath).getFileName().toString(); - - // 设置响应头 - httpServletResponse.setContentType("application/octet-stream"); - httpServletResponse.setHeader("Content-Disposition", "attachment; filename=\"" + encodeFileName(fileName) + "\""); - httpServletResponse.setContentLengthLong(attrs.getSize()); - - // 流式传输文件 - inputStream = sftp.get(remoteFilePath); - outputStream = httpServletResponse.getOutputStream(); - - byte[] buffer = new byte[8192]; - int bytesRead; - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - outputStream.flush(); - } catch (SftpException e) { - httpServletResponse.setStatus(HttpServletResponse.SC_NOT_FOUND); - log.error("远程文件不存在: {}", remoteFilePath, e); - throw exception(PATH_NOT_EXISTS); - } catch (IOException e) { - httpServletResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - log.error("远程文件传输失败:{}", e.getMessage()); - throw exception(REMOTE_FILE_TRANSFER_FAIL); - } finally { - // 关闭资源 - closeQuietly(outputStream); - closeQuietly(inputStream); - } - } - - //删除远程机器文件 - public void deleteRemoteFile(String remoteFilePath) { - try { - // 检查文件是否存在 - if (checkFileExists(remoteFilePath, sftp)) { - sftp.rm(remoteFilePath); - log.info("文件删除成功: {}", remoteFilePath); - } else { - log.error("文件不存在，无法删除"); - throw exception(PATH_NOT_EXISTS); - } - } catch (SftpException e) { - log.error("删除文件时出错: {}", e.getMessage()); - throw exception(DELETE_REMOTE_FILE_ERROR); - } - } - - // 清理临时文件 - private void cleanupTempFile(Path filePath) { - if (filePath != null && Files.exists(filePath)) { - try { - Files.delete(filePath); - log.debug("临时文件已删除: {}", filePath); - } catch (IOException e) { - log.warn("临时文件删除失败: {}", filePath, e); - } - } - } - - private String encodeFileName(String fileName) { - return URLEncoder.encode(fileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); - } - - - private void closeQuietly(AutoCloseable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (Exception e) { - log.warn("关闭资源失败", e); - } - } - } - - - // 辅助方法：检查文件是否存在 - private boolean checkFileExists(String filePath, ChannelSftp sftp) { - try { - sftp.lstat(filePath); - return true; - } catch (SftpException e) { - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - return false; - } - } - return true; - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java deleted file mode 100644 index 6f9fcd91..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketConnection.java +++ /dev/null @@ -1,228 +0,0 @@ -package cd.casic.module.machine.component; - -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.AuthenticationType; -import cd.casic.module.machine.enums.ConnectionStatus; -import cd.casic.module.machine.enums.SSHChanelType; -import cd.casic.module.machine.service.SecretKeyService; -import cd.casic.module.machine.utils.CryptogramUtil; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; - -import javax.script.ScriptException; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.Properties; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -@Slf4j -@Data -@Component -public class WebSocketConnection { - private SecretKeyService secretKeyService; - private MachineInfoDO machineInfo; - private ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED; - private Session sshSession; - - public WebSocketConnection(SecretKeyService secretKeyService) { - this.secretKeyService = secretKeyService; - } - - private static final int CONNECTION_TIMEOUT = 5000; // 连接超时时间(毫秒) - - public void initConnection(MachineInfoDO machineInfo) { - try { - this.machineInfo = machineInfo; - this.sshSession = doConnect(machineInfo); - log.info("已成功建立 SSH 连接至 {} ", machineInfo.getHostIp()); - this.connectionStatus = ConnectionStatus.CONNECTING; - } catch (ServiceException e) { - log.warn("SSH 连接失败: {}", e.getMessage()); - throw e; - } - } - - public void disconnect() { - if (sshSession != null && sshSession.isConnected()) { - try { - sshSession.disconnect(); - log.info("SSH连接关闭: {}", machineInfo.getHostIp()); - } catch (Exception e) { - log.error("关闭SSH连接失败: {}", e.getMessage()); - throw exception(CLOSE_CLOSE_SESSION_ERROR); - } - } - connectionStatus = ConnectionStatus.DISCONNECTED; - } - - /** - * 执行远程命令，支持超时和中断处理 - */ - public void executeCommand(WebSocketSession webSocketSession, String command) { - // 1. 检查连接状态 - if (sshSession == null || !sshSession.isConnected()) { - sendErrorMessage(webSocketSession, "SSH连接未建立或已断开"); - return; - } - try { - // 2. 创建SSH命令执行通道 - Channel channel; - try { - channel = sshSession.openChannel(SSHChanelType.EXEC.getMessage()); - } catch (JSchException e) { - throw exception(CREATE_CHANEL_ERROR); - } - ((ChannelExec) channel).setCommand(command); - // 3. 设置输入/输出流 - channel.setInputStream(null); - ((ChannelExec) channel).setErrStream(System.err); - // 4. 获取命令输出流 - InputStream inputStream = channel.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader reader = new BufferedReader(inputStreamReader); - // 5. 连接并执行命令 - channel.connect(); - // 6. 读取命令输出并实时发送给客户端 - String line; - while ((line = reader.readLine()) != null) { - // 实时发送输出到客户端 - webSocketSession.sendMessage(new TextMessage(line)); - } - // 7. 等待命令执行完成 - int exitStatus = channel.getExitStatus(); - // 8. 发送命令执行完毕的消息 - webSocketSession.sendMessage(new TextMessage( - "[系统] 命令执行完毕，退出状态: " + exitStatus - )); - // 9. 关闭通道 - channel.disconnect(); - } catch (JSchException | IOException e) { - throw exception(EXECUTE_COMMAND_FAIL); - } - } - - // 发送错误消息的辅助方法 - public void sendErrorMessage(WebSocketSession webSocketSession, String message) { - try { - if (webSocketSession.isOpen()) { - webSocketSession.sendMessage(new TextMessage("[错误] " + message)); - } - } catch (IOException e) { - log.error("发送错误消息失败", e); - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - /** - * 实际执行连接逻辑 - */ - private Session doConnect(MachineInfoDO machineInfo) { - JSch jsch = new JSch(); - // 配置认证方式 - configureAuthentication(jsch, machineInfo); - Session session; - // 创建SSH会话 - try { - session = jsch.getSession( - machineInfo.getUsername(), - machineInfo.getHostIp(), - machineInfo.getSshPort() != null ? machineInfo.getSshPort() : 22 - ); - } catch (JSchException e) { - throw exception(CREATE_SESSION_ERROR); - } - // 配置连接参数 - configureSession(session, machineInfo); - // 建立连接 - try { - session.connect(CONNECTION_TIMEOUT); - } catch (JSchException e) { - throw exception(SESSION_CONNECT_ERROR); - } - return session; - } - - /** - * 配置认证方式（密码或密钥） - */ - private void configureAuthentication(JSch jsch, MachineInfoDO machineInfo) { - if (machineInfo.getAuthenticationType() == AuthenticationType.SECRET_KEY.getCode()) { - // 密钥认证 - if (machineInfo.getSecretKeyId() == null) { - throw exception(SECRET_KEY_NULL); - } - //公钥解密 - String pubKeyContent; - try { - pubKeyContent = CryptogramUtil.doDecrypt(secretKeyService.getPublicKeyContent(machineInfo.getSecretKeyId())); - } catch (ScriptException e) { - throw exception(ENCRYPT_OR_DECRYPT_FAIL); - } - // 验证秘钥格式 - if (!pubKeyContent.startsWith("-----BEGIN")) { - log.error("无效的密钥格式{}", pubKeyContent); - throw exception(INVALID_kEY_FORMAT); - } - try { - // 尝试加载秘钥私钥 - jsch.addIdentity( - machineInfo.getName(), - pubKeyContent.getBytes(StandardCharsets.UTF_8), - null, - null - ); - log.info("密钥加载成功 {}", machineInfo.getHostIp()); - } catch (JSchException e) { - log.error("密钥加载失败: {}", e.getMessage()); - throw exception(READ_SECRET_CONTENT_ERROR); - } - } else if (machineInfo.getAuthenticationType() == AuthenticationType.PASSWORD.getCode()) { - // 密码认证 - if (!StringUtils.hasText(machineInfo.getPassword())) { - throw exception(PASSWORD_NOT_EXISTS); - } - } else { - log.error("不支持该验证类型:{}", machineInfo.getAuthenticationType()); - throw exception(NOT_SUPPORT_AUTHENTICATION_TYPE); - } - } - - /** - * 配置SSH会话参数（安全增强） - */ - private void configureSession(Session session, MachineInfoDO machineInfo) { - Properties config = new Properties(); - // 根据认证类型配置不同的认证策略 - if (machineInfo.getAuthenticationType() == 1) { // 密码认证 - // 设置密码 - session.setPassword(machineInfo.getPassword()); - config.put("StrictHostKeyChecking", "no"); - // 仅使用密码认证（禁用其他认证方式） - config.put("PreferredAuthentications", "password"); - // 禁用公钥相关配置（避免干扰） - config.put("PubkeyAuthentication", "no"); - } else { // 密钥认证 - // 保持默认认证顺序（公钥优先） - config.put("PreferredAuthentications", "publicKey,password,keyboard-interactive"); - } - config.put("ServerAliveInterval", "30"); // 每30秒发送一次心跳 - config.put("ServerAliveCountMax", "3"); // 允许3次心跳失败 - session.setConfig(config); - } - -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java deleted file mode 100644 index 24e17f0b..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/component/WebSocketSessionManager.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.machine.component; - -import org.springframework.stereotype.Component; - -import java.util.concurrent.ConcurrentHashMap; - -@Component("machineWebSocketSessionManger") -//管理webSocketSession -public class WebSocketSessionManager { - - //webSocketSessionId - WebSocketConnection 与远程机器的会话管理 - private static final ConcurrentHashMap sessionConnectionMap = new ConcurrentHashMap<>(); - - //机器id - WebSocketConnection - private static final ConcurrentHashMap webSocketSessionConnectionMap = new ConcurrentHashMap<>(); - - public static void addWebSocketConnection(String sessionId, WebSocketConnection connection) { - sessionConnectionMap.put(sessionId, connection); - } - - /** - * 获取 WebSocketConnection - */ - public static WebSocketConnection getWebSocketConnection(String sessionId) { - return sessionConnectionMap.get(sessionId); - } - - /** - * 移除 WebSocketConnection - */ - public static void removeWebSocketConnection(String sessionId) { - sessionConnectionMap.remove(sessionId); - } - - /** - * 获取所有 WebSocketConnection - */ - public static ConcurrentHashMap getAllWebSocketConnections() { - return webSocketSessionConnectionMap; - } - - /** - * 添加 WebSocketConnection - */ - public static void addWebSocketConnectionByMachineId(Long machineId, WebSocketConnection connection) { - webSocketSessionConnectionMap.put(machineId, connection); - } - - /** - * 获取 WebSocketConnection - */ - public static WebSocketConnection getWebSocketConnectionByMachineId(Long machineId) { - return webSocketSessionConnectionMap.get(machineId); - } - - /** - * 移除 WebSocketConnection - */ - public static void removeWebSocketConnectionByMachineId(Long machineId) { - webSocketSessionConnectionMap.remove(machineId); - } - - /** - * 检查 machineId 是否存在 - */ - public static boolean containsMachineId(Long machineId) { - return webSocketSessionConnectionMap.containsKey(machineId); - } - -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java deleted file mode 100644 index fc66eda6..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/AliYunOssConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package cd.casic.module.machine.configuration; - -import cd.casic.module.infra.framework.file.core.client.s3.S3FileClientConfig; -import cd.casic.module.machine.utils.AliYunOssClient; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class AliYunOssConfig extends S3FileClientConfig{ - @Value("${aliyun.oss.endpoint}") - private String endpoint; - @Value("${aliyun.oss.accessKeyId}") - private String accessKey; - @Value("${aliyun.oss.accessKeySecret}") - private String accessSecret; - @Value("${aliyun.oss.bucketName}") - private String bucket; - // 定义 S3 客户端 Bean - @Bean - public AliYunOssClient aliYunClient() { - // 创建配置对象 - S3FileClientConfig config = new AliYunOssConfig(); - config.setEndpoint(endpoint); - config.setAccessKey(accessKey); - config.setAccessSecret(accessSecret); - config.setBucket(bucket); - AliYunOssClient aliYunOssClient = new AliYunOssClient(1L, config); - // 创建并返回客户端实例 - aliYunOssClient.init(); - return aliYunOssClient; - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java deleted file mode 100644 index c44d5d9e..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/configuration/WebSocketConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package cd.casic.module.machine.configuration; - -import cd.casic.module.machine.Interceptor.WebSocketHandshakeInterceptor; -import cd.casic.module.machine.handler.MachineWebSocketHandler; -import jakarta.annotation.Resource; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; -import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; - -@Configuration -@EnableWebSocket -//WebSocket端点配置 -public class WebSocketConfig implements WebSocketConfigurer { - @Resource - private MachineWebSocketHandler machineWebSocketHandler; - - @Resource - private WebSocketHandshakeInterceptor webSocketHandshakeInterceptor; - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(machineWebSocketHandler, "/ssh/terminal") - .addInterceptors(webSocketHandshakeInterceptor) - .setAllowedOrigins("*"); // 允许跨域（生产环境需限制） - } - - @Bean - public ServletServerContainerFactoryBean createWebSocketContainer() { - return new ServletServerContainerFactoryBean(); - } - - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java index bc3b9614..a526d9e5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/contants/MachineErrorCodeConstants.java @@ -17,7 +17,6 @@ public interface MachineErrorCodeConstants { ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NULL = new ErrorCode(1_003_000_007, "机器认证类型为空"); ErrorCode MACHINE_INFO_AUTHENTICATION_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_008, "机器认证类型不存在"); ErrorCode MACHINE_ENABLE = new ErrorCode(1_003_000_009, "机器启用中"); - ErrorCode MACHINE_UN_ENABLE = new ErrorCode(1_003_000_010, "机器不可用"); // ========== 机器环境变量模块 1-003-002-000 ========== ErrorCode MACHINE_ENV_NULL = new ErrorCode(1_003_002_000, "机器环境变量为空"); @@ -34,32 +33,5 @@ public interface MachineErrorCodeConstants { // ========== 密钥模块 1-003-004-000 ========== ErrorCode SECRET_KEY_NULL = new ErrorCode(1_003_004_000, "密钥为空"); ErrorCode SECRET_KEY_NOT_EXISTS = new ErrorCode(1_003_004_001, "密钥不存在"); - ErrorCode INVALID_kEY_FORMAT = new ErrorCode(1_003_004_002, "无效的密钥格式"); - ErrorCode READ_SECRET_CONTENT_ERROR = new ErrorCode(1_003_004_003, "读取密钥加载失败"); - ErrorCode ENCRYPT_OR_DECRYPT_FAIL = new ErrorCode(1_003_004_004, "加密/解密失败"); - - //========== 会话连接模块 1-003-006-000 ========== - ErrorCode SESSION_CONNECT_ERROR = new ErrorCode(1_003_006_001, "会话连接失败"); - ErrorCode CLOSE_CLOSE_SESSION_ERROR = new ErrorCode(1_003_006_002, "关闭连接失败"); - ErrorCode EXECUTE_COMMAND_FAIL = new ErrorCode(1_003_006_003, "命令执行失败"); - ErrorCode PASSWORD_NOT_EXISTS = new ErrorCode(1_003_006_004, "密码不存在"); - ErrorCode NOT_SUPPORT_AUTHENTICATION_TYPE = new ErrorCode(1_003_006_005, "认证类型不支持"); - ErrorCode CREATE_SESSION_ERROR = new ErrorCode(1_003_006_006, "创建会话失败"); - ErrorCode WEBSOCKET_SEND_MESSAGE_ERROR = new ErrorCode(1_003_006_007, "websocket发送消息失败"); - ErrorCode CREATE_CHANEL_ERROR = new ErrorCode(1_003_006_008, "执行通道创建失败"); - ErrorCode CHANEL_CONNECT_FAIL = new ErrorCode(1_003_006_009, "通道连接失败"); - ErrorCode FAILED_TO_PARSE_URL_PARAMETERS = new ErrorCode(1_003_006_010, "解析URL参数失败"); - - //========== 远程文件树模块 1-003-007-000 ========== - ErrorCode NOT_DIRECTORY_NODE = new ErrorCode(1_003_007_001, "非目录节点不能添加子节点"); - ErrorCode READ_REMOTE_DIRECTORY_FAIL = new ErrorCode(1_003_007_002, "读取远程文件目录结构失败"); - ErrorCode CONNECTION_LOST = new ErrorCode(1_003_007_003, "SFTP连接无效，无法列出文件"); - ErrorCode PATH_NOT_EXISTS = new ErrorCode(1_003_007_004, "路径不存在"); - ErrorCode NO_PATH_PERMISSION = new ErrorCode(1_003_007_005, "无路径访问权限"); - ErrorCode INVALID_FILE_NAME = new ErrorCode(1_003_007_006, "无效的文件名"); - ErrorCode CREATE_TEMP_FILE_ERROR = new ErrorCode(1_003_007_007, "创建临时文件失败"); - ErrorCode UPLOAD_REMOTE_FILE_ERROR = new ErrorCode(1_003_007_008, "上传文件到远程机器出错"); - ErrorCode DOWNLOAD_FOLDER_NOT_ALLOWED = new ErrorCode(1_003_007_009, "无法下载文件夹"); - ErrorCode REMOTE_FILE_TRANSFER_FAIL = new ErrorCode(1_003_007_010, "远程文件传输失败"); - ErrorCode DELETE_REMOTE_FILE_ERROR = new ErrorCode(1_003_007_011, "删除文件时出错"); + ErrorCode ENCRYPT_OR_DECRYPT_FAIL = new ErrorCode(1_003_004_002, "加密/解密失败"); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index a6cfd928..e0abd893 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -5,20 +5,15 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.controller.vo.MachineInfoVO; import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Map; import static cd.casic.framework.commons.pojo.CommonResult.success; @@ -85,55 +80,4 @@ public class MachineInfoController { public void bindingSecretKey(@RequestBody SecretKeyVO secretKeyVO) { machineInfoService.bindingSecretKey(secretKeyVO); } - - @GetMapping("/test") - @Operation(summary = "测试机器连接") - public CommonResult testConnection(@RequestParam("id") Long id) { - return success(machineInfoService.testConnection(id)); - } - - @GetMapping("/status") - @Operation(summary = "获取机器连接状态") - public CommonResult getConnectionStatus(@RequestParam Long id) { - return success(machineInfoService.getConnectionStatus(id)); - } - - @GetMapping("/status/all") - @Operation(summary = "获取所有机器连接状态") - public CommonResult> getAllConnectionStatus() { - return success(machineInfoService.getAllConnectionStatus()); - } - - @GetMapping("/connect") - @Operation(summary = "建立连接") - public CommonResult> connect(@RequestParam Long id) { - return success(machineInfoService.connect(id)); - } - - @GetMapping("/fileTreeNode") - @Operation(summary = "获得文件树") - public CommonResult> fileTreeNode( - @RequestParam Long machineId, - @RequestParam(required = false, defaultValue = "/") String path - ) { - return success(machineInfoService.fileTreeNode(machineId, path)); - } - - @PostMapping("/upload") - @Operation(summary = "上传文件到远程机器") - public CommonResult uploadFile(@RequestParam MultipartFile file, @RequestParam String remoteFilePath) { - return success(machineInfoService.uploadFile(file, remoteFilePath)); - } - - @GetMapping("/download") - @Operation(summary = "从远程机器下载文件") - public CommonResult downloadFile(@RequestParam String remoteFilePath, HttpServletResponse httpServletResponse) { - return success(machineInfoService.downloadFile(remoteFilePath, httpServletResponse)); - } - - @DeleteMapping("/deleteRemoteFile") - @Operation(summary = "删除远程机器选定文件") - public CommonResult deleteRemoteFile(@RequestParam String remoteFilePath) { - return success(machineInfoService.deleteRemoteFile(remoteFilePath)); - } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java deleted file mode 100644 index 9741fa0d..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/model/FileNode.java +++ /dev/null @@ -1,56 +0,0 @@ -package cd.casic.module.machine.dal.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -import java.util.ArrayList; -import java.util.List; - -//文件节点类 -@Data -/* - * 远程文件系统的节点信息，用于构建文件树结构 - */ -@Schema(description = "远程文件系统节点") -public class FileNode { - @Schema(description = "文件名或目录名") - private String name; - - @Schema(description = "是否为目录") - private boolean isDirectory; - - @Schema(description = "文件大小（字节）") - private long size; - - @Schema(description = "文件权限字符串（如 rwxr-xr-x）") - private String permissions; - - @Schema(description = "最后修改时间（时间戳，毫秒）") - private long modifiedTime; - - @Schema(description = "子节点列表（仅目录有此属性）") - private List children; - - public FileNode(String name, boolean isDirectory, long size, String permissions, long modifiedTime) { - this.name = name; - this.isDirectory = isDirectory; - this.size = size; - this.permissions = permissions; - this.modifiedTime = modifiedTime; - - if (isDirectory) { - this.children = new ArrayList<>(); - } - - } - - public void addChild(FileNode child) { - if (this.children == null) { - throw exception(NOT_DIRECTORY_NODE); - } - this.children.add(child); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java index f159c478..bb530946 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/SecretKeyMapper.java @@ -4,13 +4,9 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; import cd.casic.module.machine.controller.vo.SecretKeyVO; -import cd.casic.module.machine.dal.dataobject.MachineInfoDO; import cd.casic.module.machine.dal.dataobject.SecretKeyDO; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface SecretKeyMapper extends BaseMapperX { //查询列表 @@ -19,10 +15,4 @@ public interface SecretKeyMapper extends BaseMapperX { .likeIfPresent(SecretKeyDO::getName, secretKeyVO.getName()) .likeIfPresent(SecretKeyDO::getDescription, secretKeyVO.getDescription())); } - - default void bindingMachine(Long machineInfoId, List secretKeyId) { - UpdateWrapper set = new UpdateWrapper<>(); - set.eq("id", secretKeyId).set("machineInfoId", machineInfoId); - this.update(null, set); - } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java deleted file mode 100644 index a4c81e5f..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/ConnectionStatus.java +++ /dev/null @@ -1,33 +0,0 @@ -package cd.casic.module.machine.enums; - -import cd.casic.framework.commons.core.IntArrayValuable; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Arrays; - -/** - * 连接状态枚举 - */ -@Getter -@AllArgsConstructor -public enum ConnectionStatus implements IntArrayValuable { - DISCONNECTED(1, "断开连接"), - CONNECTING(2, "正在连接"), - CONNECTED(3, "已连接"), - AUTH_FAILED(4, "认证失败"), - CONNECTION_TIMEOUT(5, "连接超时"), - CONNECTION_ERROR(6, "连接错误"), - CLOSED(7, "已关闭"); - - private final int code; - - private final String message; - - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ConnectionStatus::getCode).toArray(); - - @Override - public int[] array() { - return ARRAYS; - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java deleted file mode 100644 index c915797e..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/enums/SSHChanelType.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.machine.enums; - -import cd.casic.framework.commons.core.IntArrayValuable; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Arrays; - -@Getter -@AllArgsConstructor -//ssh远程连接管道类型 -public enum SSHChanelType implements IntArrayValuable { - EXEC(1, "单条命令返回结果"), - SHELL(2, "多行命令持续交互"), - SUBSYSTEM(3, "文件传输或其它特点服务"), - DIRECT_TCP_IP(4, "TCP 端口转发"), - X11(5, "X Window 系统转发"); - - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SSHChanelType::getCode).toArray(); - - /** - * 状态值 - */ - private final Integer code; - - /** - * 状态名 - */ - private final String message; - - @Override - public int[] array() { - return ARRAYS; - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java deleted file mode 100644 index 42a18762..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/handler/MachineWebSocketHandler.java +++ /dev/null @@ -1,64 +0,0 @@ -package cd.casic.module.machine.handler; - -import cd.casic.module.machine.component.WebSocketConnection; -import cd.casic.module.machine.component.WebSocketSessionManager; -import cd.casic.module.machine.enums.ConnectionStatus; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -import java.io.IOException; - -import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; -import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; - -//WebSocket处理器 -@Component("machineWebSocketHandler") -public class MachineWebSocketHandler extends TextWebSocketHandler { - - @Override - public void afterConnectionEstablished(@NotNull WebSocketSession webSocketSession) { - Long machineId = (Long) webSocketSession.getAttributes().get("machineId"); - //保存webSocketSession信息 - WebSocketSessionManager.addWebSocketConnection(webSocketSession.getId(), WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId)); - try { - webSocketSession.sendMessage(new TextMessage("欢迎连接到 WebSocket 服务器!")); - } catch (IOException e) { - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - // 处理文本消息 - @Override - protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) { - String payload = message.getPayload(); - String sessionId = webSocketSession.getId(); - // 从管理器获取连接 - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); - if (webSocketConnection != null && ConnectionStatus.CONNECTING.equals(webSocketConnection.getConnectionStatus())) { - // 转发消息到远程机器 - webSocketConnection.executeCommand(webSocketSession, payload); - } else if (webSocketConnection != null) { - webSocketConnection.sendErrorMessage(webSocketSession, "连接已断开，无法发送消息"); - } else { - throw exception(WEBSOCKET_SEND_MESSAGE_ERROR); - } - } - - @Override - public void afterConnectionClosed(WebSocketSession webSocketSession, @NotNull CloseStatus status) { - String sessionId = webSocketSession.getId(); - // 获取并关闭相关的 WebSocketConnection - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnection(sessionId); - if (webSocketConnection != null) { - webSocketConnection.disconnect(); - } - // 从管理器中移除会话和连接 - WebSocketSessionManager.removeWebSocketConnection(sessionId); - Long machineInfoId = (Long) webSocketSession.getAttributes().get("machineId"); - WebSocketSessionManager.removeWebSocketConnectionByMachineId(machineInfoId); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java index 6aa2eb92..23c1f5d0 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/MachineInfoService.java @@ -4,23 +4,21 @@ import cd.casic.framework.commons.pojo.PageResult; import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.ConnectionStatus; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; -import org.springframework.web.multipart.MultipartFile; import java.util.List; -import java.util.Map; public interface MachineInfoService { /** * 新增机器 + * * @return 新增机器的id */ Long createMachine(MachineInfoVO MachineInfoVO); /** * 查看机器列表 + * * @return 机器列表 */ PageResult listMachineInfo(@Valid MachineInfoVO MachineInfoVO); @@ -42,89 +40,30 @@ public interface MachineInfoService { /** * 批量删除机器 + * * @param machineInfoIds 机器id列表 */ void deleteMachineInfoList(String machineInfoIds); /** * 删除机器信息 + * * @param machineInfoId 机器id */ void deleteMachineInfo(Long machineInfoId); /** * 获取绑定的密钥 + * * @param secretKeyId 密钥id * @return 绑定的机器列表 */ - ListselectBindMachineBySecretKey(Long secretKeyId); - + List selectBindMachineBySecretKey(Long secretKeyId); /** - * 测试机器连接 - * @param id 机器id - * @return 连接是否成功 - */ - boolean testConnection(Long id); - - /** - * 连接远程机器 - * - * @param id 机器id - * @return 连接后端文件树 - */ - Map connect(Long id); - - /** - * 获取机器连接状态 - * - * @return 连接状态 - */ - ConnectionStatus getConnectionStatus(Long id); - - /** - * 获取所有连接状态 - * - * @return 机器名称到连接状态的映射 - */ - Map getAllConnectionStatus(); - - /** - * 上传文件到远程机器 - * - * @param file 上传文件 - * @param remoteFilePath 远程文件路径 - * @return 操作结果 - */ - boolean uploadFile(MultipartFile file, String remoteFilePath); - - /** - * 从远程机器下载文件 - * - * @param remoteFilePath 远程文件路径 - * @return 操作结果 - */ - boolean downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse); - - /** - * 校验机器是否存在 + * 验证机器是否存在 * * @param id 机器id */ MachineInfoDO validateMachineInfoExists(Long id); - - /** - * 根据路径获得远程文件树 - * - * @param machineId 机器id - * @param path 文件夹路径 - * @return 远程文件树 - */ - Map fileTreeNode(Long machineId, String path); - - /** - * 删除远程文件路径 - * @param remoteFilePath 远程文件路径 - */ - boolean deleteRemoteFile(String remoteFilePath); } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java index 3099f9fa..ff82abbe 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineInfoServiceImpl.java @@ -1,35 +1,23 @@ package cd.casic.module.machine.service.impl; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.machine.component.FileTreeComponent; -import cd.casic.module.machine.component.WebSocketConnection; -import cd.casic.module.machine.component.WebSocketSessionManager; import cd.casic.module.machine.controller.vo.SecretKeyVO; import cd.casic.module.machine.enums.AuthenticationType; import cd.casic.module.machine.enums.MachineInfoType; import cd.casic.module.machine.dal.mysql.MachineInfoMapper; import cd.casic.module.machine.controller.vo.MachineInfoVO; import cd.casic.module.machine.dal.dataobject.MachineInfoDO; -import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.enums.MachineInfoStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.service.SecretKeyService; import com.google.common.annotations.VisibleForTesting; -import com.jcraft.jsch.Session; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import cd.casic.framework.commons.util.object.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; -import java.util.stream.Collectors; import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception; import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*; @@ -47,12 +35,6 @@ public class MachineInfoServiceImpl implements MachineInfoService { @Resource private MachineInfoMapper machineInfoMapper; - @Resource - private FileTreeComponent fileTreeComponent; - - //todo，部署后更改 - private static final Path TEMP_DIR = Paths.get("D:\\桌面\\work\\ops-pro111\\temp"); - @Override public Long createMachine(MachineInfoVO machineInfoVO) { validateMachineEnvAdd(machineInfoVO); @@ -95,7 +77,7 @@ public class MachineInfoServiceImpl implements MachineInfoService { @Override public void bindingSecretKey(SecretKeyVO secretKeyVO) { - machineInfoMapper.bindingSecretKey(secretKeyVO.getMachineInfoIds(), secretKeyVO.getId(),secretKeyVO.getEnableBind()); + machineInfoMapper.bindingSecretKey(secretKeyVO.getMachineInfoIds(), secretKeyVO.getId(), secretKeyVO.getEnableBind()); } @Override @@ -121,71 +103,6 @@ public class MachineInfoServiceImpl implements MachineInfoService { return machineInfoMapper.selectBindMachineBySecretKey(secretKeyId); } - - @Override - public boolean testConnection(Long id) { - //先查询机器是否存在，在判断机器可用性 - MachineInfoDO machineInfoDO = validateMachineInfoExists(id); - validateMachineUnEnable(machineInfoDO); - log.info("测试机器连接: {}", machineInfoDO.getHostIp()); - WebSocketConnection webSocketConnection = createWebSocketConnection(machineInfoDO); - webSocketConnection.initConnection(machineInfoDO); - return true; - } - - @Override - public Map connect(Long id) { - //todo使用代理机器的情况还未完成 - WebSocketConnection webSocketConnection = new WebSocketConnection(this.secretKeyService); - MachineInfoDO machineInfoDO = validateMachineInfoExists(id); - //初始化连接 - webSocketConnection.initConnection(machineInfoDO); - WebSocketSessionManager.addWebSocketConnectionByMachineId(id, webSocketConnection); - return fileTreeComponent.getRemoteFileTree(webSocketConnection.getSshSession(), "/"); - } - - @Override - public ConnectionStatus getConnectionStatus(Long id) { - validateMachineInfoExists(id); - WebSocketConnection webSocketConnection = WebSocketSessionManager.getWebSocketConnectionByMachineId(id); - return webSocketConnection == null ? ConnectionStatus.DISCONNECTED : webSocketConnection.getConnectionStatus(); - } - - @Override - public Map getAllConnectionStatus() { - return WebSocketSessionManager.getAllWebSocketConnections().entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, - entry -> entry.getValue().getConnectionStatus() - )); - } - - @Override - public boolean uploadFile(MultipartFile file, String remoteFilePath) { - Path tempFilePath; - // 保存上传的文件到临时位置 - String originalFilename = file.getOriginalFilename(); - if (originalFilename == null || originalFilename.isEmpty()) { - throw exception(INVALID_FILE_NAME); - } - // 安全过滤文件名，防止路径遍历攻击 - String safeFilename = sanitizeFilename(originalFilename); - try { - tempFilePath = Files.createTempFile(TEMP_DIR, "upload-", safeFilename); - file.transferTo(tempFilePath.toFile()); - } catch (IOException e) { - throw exception(CREATE_TEMP_FILE_ERROR); - } - fileTreeComponent.uploadToRemoteServer(tempFilePath, safeFilename, remoteFilePath); - return true; - } - - @Override - public boolean downloadFile(String remoteFilePath, HttpServletResponse httpServletResponse) { - fileTreeComponent.downloadFile(remoteFilePath, httpServletResponse); - return true; - } - @VisibleForTesting void validateMachineEnvAdd(MachineInfoVO machineInfoVO) { if (machineInfoVO.getHostIp().isEmpty()) { @@ -250,53 +167,10 @@ public class MachineInfoServiceImpl implements MachineInfoService { return machineInfoDO; } - @Override - public Map fileTreeNode(Long machineId, String path) { - validateMachineInfoExists(machineId); - Session sshSession = WebSocketSessionManager.getWebSocketConnectionByMachineId(machineId).getSshSession(); - return fileTreeComponent.getRemoteFileTree(sshSession, path); - } - - @Override - public boolean deleteRemoteFile(String remoteFilePath) { - fileTreeComponent.deleteRemoteFile(remoteFilePath); - return true; - } - @VisibleForTesting void validateMachineEnable(MachineInfoDO machineInfoDO) { if (machineInfoDO.getStatus() == MachineInfoStatus.ENABLE.getCode()) { throw exception(MACHINE_ENABLE); } } - - @VisibleForTesting - void validateMachineUnEnable(MachineInfoDO machineInfoDO) { - - if (machineInfoDO.getStatus() == MachineInfoStatus.UN_ENABLE.getCode()) { - throw exception(MACHINE_UN_ENABLE); - } - } - - @VisibleForTesting - WebSocketConnection createWebSocketConnection(MachineInfoDO machineInfoDO) { - if (WebSocketSessionManager.containsMachineId(machineInfoDO.getId())) { - return WebSocketSessionManager.getWebSocketConnectionByMachineId((machineInfoDO.getId())); - } else { - return new WebSocketConnection(this.secretKeyService); - } - } - - @VisibleForTesting - // 安全过滤文件名，防止路径遍历攻击 - private String sanitizeFilename(String filename) { - // 移除路径相关字符，只保留文件名和扩展名 - filename = filename.replaceAll("[\\\\/:*?\"<>|]", "_"); - // 限制最大长度 - if (filename.length() > 255) { - filename = filename.substring(0, 255); - } - - return filename; - } } diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java deleted file mode 100644 index dbe11d4f..00000000 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliYunOssClient.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.machine.utils; - -import cd.casic.module.infra.framework.file.core.client.s3.S3FileClient; -import cd.casic.module.infra.framework.file.core.client.s3.S3FileClientConfig; - - -public class AliYunOssClient extends S3FileClient { - public AliYunOssClient(Long id, S3FileClientConfig config) { - super(id, config); - } -} diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java index 46a52e7a..0a91bfd1 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/CryptogramUtil.java @@ -16,11 +16,11 @@ public class CryptogramUtil { /** * 加密方法（Sm2 的专门针对前后端分离，非对称秘钥对的方式，暴露出去的公钥，对传输过程中的密码加个密） * - * @author yubaoshan * @param str 待加密数据 * @return 加密后的密文 + * @author yubaoshan */ - public static String doSm2Encrypt (String str) throws ScriptException { + public static String doSm2Encrypt(String str) throws ScriptException { return Sm2.doEncrypt(str, Keypair.PUBLIC_KEY); } @@ -28,11 +28,11 @@ public class CryptogramUtil { * 解密方法 * 如果采用加密机的方法，用try catch 捕捉异常，返回原文值即可 * - * @author yubaoshan * @param str 密文 * @return 解密后的明文 + * @author yubaoshan */ - public static String doSm2Decrypt (String str) throws ScriptException { + public static String doSm2Decrypt(String str) throws ScriptException { // 解密 return Sm2.doDecrypt(str, Keypair.PRIVATE_KEY); } @@ -40,11 +40,11 @@ public class CryptogramUtil { /** * 加密方法 * - * @author yubaoshan * @param str 待加密数据 * @return 加密后的密文 + * @author yubaoshan */ - public static String doEncrypt (String str) throws ScriptException { + public static String doEncrypt(String str) throws ScriptException { // SM4 加密 cbc模式 Sm4Options sm4Options4 = new Sm4Options(); sm4Options4.setMode("cbc"); @@ -56,16 +56,16 @@ public class CryptogramUtil { * 解密方法 * 如果采用加密机的方法，用try catch 捕捉异常，返回原文值即可 * - * @author yubaoshan * @param str 密文 * @return 解密后的明文 + * @author yubaoshan */ - public static String doDecrypt (String str) throws ScriptException { + public static String doDecrypt(String str) throws ScriptException { // 解密，cbc 模式，输出 utf8 字符串 Sm4Options sm4Options8 = new Sm4Options(); sm4Options8.setMode("cbc"); sm4Options8.setIv("fedcba98765432100123456789abcdef"); - String docString = Sm4.decrypt(str, Keypair.KEY, sm4Options8); + String docString = Sm4.decrypt(str, Keypair.KEY, sm4Options8); if (docString.isEmpty()) { log.warn(">>> 字段解密失败，返回原文值：{}", str); return str; @@ -77,34 +77,34 @@ public class CryptogramUtil { /** * 纯签名 * - * @author yubaoshan * @param str 待签名数据 * @return 签名结果 + * @author yubaoshan */ - public static String doSignature (String str) throws ScriptException { + public static String doSignature(String str) throws ScriptException { return Sm2.doSignature(str, Keypair.PRIVATE_KEY); } /** * 验证签名结果 * - * @author yubaoshan * @param originalStr 签名原文数据 - * @param str 签名结果 + * @param str 签名结果 * @return 是否通过 + * @author yubaoshan */ - public static boolean doVerifySignature (String originalStr, String str) throws ScriptException { + public static boolean doVerifySignature(String originalStr, String str) throws ScriptException { return Sm2.doVerifySignature(originalStr, str, Keypair.PUBLIC_KEY); } /** * 通过杂凑算法取得hash值，用于做数据完整性保护 * - * @author yubaoshan * @param str 字符串 * @return hash 值 + * @author yubaoshan */ - public static String doHashValue (String str) throws ScriptException { + public static String doHashValue(String str) throws ScriptException { return Sm3.sm3(str); } From 70552a714abd4b952199fa4dd4b82e76bd51c088 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 9 Jul 2025 14:50:01 +0800 Subject: [PATCH 40/46] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8Bzip?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/api/TestCaseManagerController.java | 14 ++- .../dto/resp/testCase/TestCaseInfoResp.java | 2 + .../engine/worker/DBFuzzTestingWorker.java | 103 +++++++++++++++++- .../testCase/TestCaseManagerService.java | 6 + .../impl/TestCaseManagerServiceImpl.java | 62 +++++++++-- .../TargetFileUploadProperties.java | 10 +- .../test/java/cd/casic/server/SftpTest.java | 2 + .../java/cd/casic/server/ZipFileTest.java | 69 ++++++++++++ 8 files changed, 244 insertions(+), 24 deletions(-) create mode 100644 ops-server/src/test/java/cd/casic/server/ZipFileTest.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java index 6b77e5fb..859b5d1b 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java @@ -8,14 +8,15 @@ import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.testCase.TestCaseManagerService; import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.framework.commons.pojo.PageResult; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.SftpException; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.io.IOException; import java.util.List; /** @@ -83,5 +84,8 @@ public class TestCaseManagerController { return CommonResult.success(resp); } - + @GetMapping("/downLoadById") + public void downLoadByManagerId(@RequestParam String managerId, HttpServletResponse response){ + testCaseManagerService.downLoadById(managerId,response); + } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseInfoResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseInfoResp.java index a58dbb2e..b81ef46b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseInfoResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseInfoResp.java @@ -22,6 +22,8 @@ public class TestCaseInfoResp { // 测试文件地址（存储路径或URL） private String testFileList; + private String testFilePath; + // 描述信息 private String remark; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java index 859f257b..209f4eb9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java @@ -4,9 +4,14 @@ import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import java.util.HashMap; + /** * 数据库模糊测试 * */ @@ -17,9 +22,99 @@ public class DBFuzzTestingWorker extends BaseWorker { @Override public void execute(TaskRunContext context) { - PipBaseElement contextDef = context.getContextDef(); - String id = contextDef.getId(); - log.info("==============触发worker执行========"); - log.info("==========运行context：{}===========", JSON.toJSONString(context)); +// PipBaseElement contextDef = context.getContextDef(); +// String id = contextDef.getId(); +// log.info("==============触发worker执行========"); +// log.info("==========运行context：{}===========", JSON.toJSONString(context)); +// int statusCode = -1; +// +// String login = "http://192.168.100.100:10200/oauth/token"; +// String create = "http://192.168.100.100:10200/api/fuzz/add"; +// String control = "http://192.168.100.100:10200/api/fuzz/control"; +// String getTestDetail = "http://192.168.100.100:10200/api/fuzz/getTestDetail"; +// String genReport = "http://192.168.100.100:10200/api/fuzz/genReport"; +//// static String = "http://192.168.100.100:10200/api/fuzz/add"; +// PipelineNodeConfigInfo nodeConfigInfo = workerParam.getPipelineNodeConfigInfo(); +// String taskId = workerParam.getPipelineLogger().getUuid(); +// NodeLogger nodeLogger = nodeLoggerThreadLocal.get(); +// +// try { +// log.info("attr : {}", nodeConfigInfo.getInfo()); +// log.info("节点信息:" + nodeConfigInfo.getInfo()); +// //将节点的配置信息反编译成对象 +// DbTestConfigInfo dbTestConfigInfo = JSON.parseObject(nodeConfigInfo.getInfo(), DbTestConfigInfo.class); +// HashMap hashMap = new HashMap<>(); +// hashMap.put("code", "f258d8cc7585bc71a10e9f9edba017f7"); +// hashMap.put("grant_type", "client_code"); +// hashMap.put("client_id", "client"); +// HttpResponse logRes = HttpRequest.post(login) +// .form(hashMap)/*.header(Header.CONTENT_TYPE, String.valueOf(ContentType.APPLICATION_JSON))*/.execute(); +// log.info(String.valueOf(logRes.isOk())); +// if (!logRes.isOk()) { +// nodeLogger.appendNow("获取token失败"); +// } +// JSONObject loginJson = JSONObject.parseObject(logRes.body()); +// String accessToken = loginJson.get("access_token").toString(); +// nodeLogger.appendNow("authorize success\n"); +// nodeLogger.appendNow("access_token is " + accessToken); +//// 2、 create project +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("node", dbTestConfigInfo.getNode()); +// jsonObject.put("engineType", "1"); +// jsonObject.put("taskId", taskId); +// jsonObject.put("taskParams", ""); +// jsonObject.put("taskName", dbTestConfigInfo.getTaskName()); +// HttpResponse createRes = HttpRequest.post(create) +// .body(String.valueOf(jsonObject)).bearerAuth(accessToken).execute(); +// if (!createRes.isOk()) { +// nodeLogger.appendNow("创建项目失败"); +// return String.valueOf(statusCode); +// } +// JSONObject taskjson = JSONObject.parseObject(createRes.body()); +// nodeLogger.appendNow("create project success\n"); +// nodeLogger.appendNow("project taskId is " + taskId); +//// 3、 启动停止测试 +// JSONObject controlObject = new JSONObject(); +// controlObject.put("taskId", taskId); +// // 1 start other stop +// controlObject.put("code", 1); +// HttpResponse controlRes = HttpRequest.post(control) +// .body(String.valueOf(controlObject)).bearerAuth(accessToken).execute(); +// log.info(String.valueOf(controlRes.isOk())); +// if (!controlRes.isOk()) { +// nodeLogger.appendNow("启动项目失败"); +// return String.valueOf(statusCode); +// +// } +// JSONObject controlJson = JSONObject.parseObject(createRes.body()); +// nodeLogger.appendNow("control start success\n"); +// nodeLogger.appendNow("control start code is " + controlJson.get("data\n")); +//// 4、 获取测试详情保存历史数据 +// HashMap haap = new HashMap<>(); +// haap.put("taskId", taskId); +// HttpResponse testDetail = HttpRequest.get(getTestDetail) +// .form(haap).bearerAuth(accessToken).execute(); +// if (!testDetail.isOk()) { +// nodeLogger.appendNow("获取测试详情失败"); +// return String.valueOf(statusCode); +// } +// JSONObject testDetailBody = JSONObject.parseObject(testDetail.body()); +// log.info(testDetailBody.toString()); +// FuzzDbTest fuzzDbTest = new FuzzDbTest(); +// fuzzDbTest.setNodeUuid(nodeConfigInfo.getNodeUuid()); +// fuzzDbTest.setTaskId(taskId); +// fuzzDbTestService.save(fuzzDbTest); +// statusCode = 0; +// } catch (Exception e) { +// String errorMessage = "该节点配置信息为空，请先配置该节点信息" + "\r\n"; +// errorHandle(e, errorMessage); +// } +// +// if (statusCode == 0) { +// log.info("{}节点执行完成", getName()); +// } else { +// log.error("{}节点执行失败", getName()); +// } +// return String.valueOf(statusCode); } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java index 936cff83..db62fa16 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java @@ -7,8 +7,12 @@ import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.testCase.TestCaseManager; import cd.casic.framework.commons.pojo.PageResult; import com.baomidou.mybatisplus.extension.service.IService; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.SftpException; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import java.io.IOException; import java.util.List; /** @@ -32,4 +36,6 @@ public interface TestCaseManagerService extends IService { TestCaseManagerResp findById(String id); + void downLoadById(String id , HttpServletResponse response); + } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java index 32c94c9e..631e62dc 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java @@ -23,21 +23,24 @@ import com.alibaba.fastjson.JSONObject; 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.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; +import com.jcraft.jsch.*; import jakarta.annotation.Resource; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.*; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * @author HopeLi @@ -64,7 +67,8 @@ public class TestCaseManagerServiceImpl extends ServiceImpl byManagerIds = testCaseInfoService.findByManagerIds(Collections.singletonList(id)); + + for (TestCaseInfoResp byManagerId : byManagerIds) { + InputStream inputStream = sftp.get(byManagerId.getTestFilePath()); + String fileName = byManagerId.getFileName(); + ZipEntry zipEntry = new ZipEntry(fileName); + zipOutputStream.putNextEntry(zipEntry); + IOUtils.copy(inputStream,zipOutputStream); + zipOutputStream.closeEntry(); + inputStream.close(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + private void setUserName(TestCaseManagerResp testCaseManagerResp) { if (!StringUtils.isEmpty(testCaseManagerResp.getCreator())){ @@ -219,9 +257,11 @@ public class TestCaseManagerServiceImpl extends ServiceImpl Date: Wed, 9 Jul 2025 16:14:14 +0800 Subject: [PATCH 41/46] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8Bzip?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casic/ci/api/TestCaseManagerController.java | 5 +++-- .../testCase/TestCaseManagerDownloadResp.java | 9 +++++++++ .../converter/TargetVersionConverter.java | 1 + .../dataObject/target/TargetVersion.java | 4 ++++ .../target/impl/TargetManagerServiceImpl.java | 12 +++++++----- .../testCase/TestCaseManagerService.java | 3 ++- .../impl/TestCaseManagerServiceImpl.java | 17 ++++++++++------- 7 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java index 859b5d1b..7c2ba034 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java @@ -3,6 +3,7 @@ package cd.casic.ci.api; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.testCase.TestCaseManagerService; @@ -85,7 +86,7 @@ public class TestCaseManagerController { return CommonResult.success(resp); } @GetMapping("/downLoadById") - public void downLoadByManagerId(@RequestParam String managerId, HttpServletResponse response){ - testCaseManagerService.downLoadById(managerId,response); + public CommonResult downLoadByManagerId(@RequestParam String managerId){ + return CommonResult.success(testCaseManagerService.downLoadById(managerId)); } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java new file mode 100644 index 00000000..8e536cef --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java @@ -0,0 +1,9 @@ +package cd.casic.ci.process.dto.resp.testCase; + +import lombok.Data; + +@Data +public class TestCaseManagerDownloadResp { + private String fileName; + private String file; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java index c1e4a40c..0e7dc1a8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java @@ -29,6 +29,7 @@ public interface TargetVersionConverter { void updateReqCopyToTargetVersion(TargetVersionUpdateReq req,@MappingTarget TargetVersion targetVersion); TargetVersion targetCreateReqToTargetVersionBean(TargetManagerCreateReq req); + TargetVersionCreateReq targetCreateReqToTargetVersionCreateReq(TargetManagerCreateReq req); TargetVersion versionCreateReqToTargetVersionBean(TargetVersionCreateReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java index a5939a1d..70e99cd0 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java @@ -46,4 +46,8 @@ public class TargetVersion extends PipBaseElement { * 文件地址路径 */ private String filePath; + /** + * 目标版本 + * */ + private String versionCompose; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index 283df5bb..601b1dad 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; @@ -77,11 +78,12 @@ public class TargetManagerServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("version",targetVersion.getVersion()); wrapper.eq("target_id",targetVersion.getTargetId()); - if (!ObjectUtils.isEmpty(targetVersionDao.selectList(wrapper))){ + if (!CollectionUtils.isEmpty(targetVersionDao.selectList(wrapper))){ throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"版本已存在"); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java index db62fa16..cb9bdaad 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java @@ -3,6 +3,7 @@ package cd.casic.ci.process.process.service.testCase; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.testCase.TestCaseManager; import cd.casic.framework.commons.pojo.PageResult; @@ -36,6 +37,6 @@ public interface TestCaseManagerService extends IService { TestCaseManagerResp findById(String id); - void downLoadById(String id , HttpServletResponse response); + TestCaseManagerDownloadResp downLoadById(String id ); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java index 631e62dc..aea0fdf7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java @@ -4,6 +4,7 @@ package cd.casic.ci.process.process.service.testCase.impl; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; import cd.casic.ci.process.dto.resp.testCase.TestCaseInfoResp; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.converter.TestCaseManagerConverter; import cd.casic.ci.process.process.dao.testCase.TestCaseInfoDao; @@ -25,7 +26,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcraft.jsch.*; import jakarta.annotation.Resource; -import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -35,7 +35,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -152,11 +151,9 @@ public class TestCaseManagerServiceImpl extends ServiceImpl Date: Wed, 9 Jul 2025 16:47:50 +0800 Subject: [PATCH 42/46] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97pom.xml=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module-ci-machine/pom.xml | 60 ++----------------- .../src/main/resources/application-local.yaml | 8 --- 2 files changed, 6 insertions(+), 62 deletions(-) diff --git a/modules/module-ci-machine/pom.xml b/modules/module-ci-machine/pom.xml index 2e8e1b2c..25f67d55 100644 --- a/modules/module-ci-machine/pom.xml +++ b/modules/module-ci-machine/pom.xml @@ -11,34 +11,23 @@ module-ci-machine jar - - - - org.apache.maven.plugins - maven-compiler-plugin - - 16 - 16 - - - - ${revision} ${project.artifactId} - cd.casic.boot commons - - - org.springframework.boot + cd.casic.boot + module-infra-biz + ${revision} + + + cd.casic.boot spring-boot-starter-websocket - com.antherd sm-crypto @@ -49,42 +38,5 @@ nashorn-core 15.4 - - org.projectlombok - lombok - 1.18.32 - provided - - - com.baomidou - mybatis-plus-spring-boot3-starter - 3.5.5 - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.3.0 - - - - cd.casic.boot - module-infra-biz - ${revision} - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - diff --git a/ops-server/src/main/resources/application-local.yaml b/ops-server/src/main/resources/application-local.yaml index 53dfb263..5cf5919a 100644 --- a/ops-server/src/main/resources/application-local.yaml +++ b/ops-server/src/main/resources/application-local.yaml @@ -157,11 +157,3 @@ logging: debug: false - -#阿里云oss -aliyun: - oss: - endpoint: https://oss-cn-beijing.aliyuncs.com - accessKeyId: LTAI5tPCKES4ZxdRKybGjJf4 - accessKeySecret: mtX94qmxnWR2FDem0z38qjv0rrILSE - bucketName: kkt-web-tlias From 2fdbc97fffa05b95cbd0ccce991f9af9b68f8f94 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 10 Jul 2025 09:59:52 +0800 Subject: [PATCH 43/46] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataObject/target/TargetVersion.java | 2 +- .../target/impl/TargetManagerServiceImpl.java | 3 + .../template/TemplateManagerService.java | 9 - .../impl/TemplateManagerServiceImpl.java | 297 ------------------ .../impl/TestCaseManagerServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 308 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java index 70e99cd0..6eda8472 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java @@ -47,7 +47,7 @@ public class TargetVersion extends PipBaseElement { */ private String filePath; /** - * 目标版本 + * 目标版本构成成分 * */ private String versionCompose; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index 601b1dad..e7dd38f6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -293,4 +293,7 @@ public class TargetManagerServiceImpl extends ServiceImpl { -// String createTemplate(@Valid TemplateCreateReq req); -// -// void deletePipeline(@Valid PipelineReq req); -// -// void updatePipeline(@Valid PipelineUpdateReq pipeline); -// -// void pipelineClone(@Valid PipelineReq req); -// -// TreeRunContextResp getPipelineRunState(String pipelineId); PageResult findTemplatePage(@Valid TemplateQueryReq query); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java index f063151f..3e669fd3 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java @@ -59,303 +59,6 @@ public class TemplateManagerServiceImpl extends ServiceImpl stageReqList = templateService.findStageById(pipelineReq.getTemplateId()); -//// stageReqList.forEach(o->{ -//// o.setPipelineId(pipeline.getId()); -//// }); -// //新增初始阶段，无串行并行任务 -// PipStage stageReq1 = new PipStage(); -// stageReq1.setPipelineId(pipeline.getId()); -// stageReq1.setStageName("阶段-1"); -// stageReq1.setCreateTime(LocalDateTime.now()); -// stageReq1.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// stageReq1.setStageSort(1); -// stageReq1.setParentId("-1"); -// stageReq1.setCode(true); -// stageService.save(stageReq1); -// -// PipStage childStage1 = new PipStage(); -// childStage1.setPipelineId(pipeline.getId()); -// childStage1.setStageName("源码"); -// childStage1.setCreateTime(LocalDateTime.now()); -// childStage1.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childStage1.setStageSort(1); -// childStage1.setCode(false); -// childStage1.setParentId(stageReq1.getId()); -// stageService.save(childStage1); -// -// PipTask childTask11 = new PipTask(); -// childTask11.setCreateTime(LocalDateTime.now()); -// childTask11.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childTask11.setTaskName("串行任务-1-1"); -// childTask11.setPipelineId(pipeline.getId()); -// childTask11.setTaskType("CODE"); -// childTask11.setTaskSort(1); -// childTask11.setStageId(childStage1.getId()); -// taskService.save(childTask11); -// -// //新增第二个阶段，包含串行和并行任务 -// PipStage stageReq2 = new PipStage(); -// stageReq2.setPipelineId(pipeline.getId()); -// stageReq2.setStageName("阶段-2"); -// stageReq2.setCreateTime(LocalDateTime.now()); -// stageReq2.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// stageReq2.setStageSort(2); -// stageReq2.setParentId("-1"); -// stageReq2.setCode(true); -// stageService.save(stageReq2); -// -// //新增并行阶段 -// PipStage childStage21 = new PipStage(); -// childStage21.setStageName("并行阶段-2-1"); -// childStage21.setPipelineId(pipeline.getId()); -// childStage21.setCreateTime(LocalDateTime.now()); -// childStage21.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childStage21.setStageSort(1); -// childStage21.setCode(false); -// childStage21.setParentId(stageReq2.getId()); -// stageService.save(childStage21); -// -// //新增串行阶段 -// PipTask childTask21 = new PipTask(); -// childTask21.setPipelineId(pipeline.getId()); -// childTask21.setTaskName("串行任务-2-1"); -// childTask21.setCreateTime(LocalDateTime.now()); -// childTask21.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childTask21.setTaskType("TEST_CASE_GENERATION"); -// childTask21.setTaskSort(1); -// childTask21.setStageId(childStage21.getId()); -// taskService.save(childTask21); -// -// //------------------------------------------------------------------ -//// PipStage childStage22 = new PipStage(); -//// childStage22.setStageName("并行阶段-2-2"); -//// childStage22.setPipelineId(pipeline.getId()); -//// childStage22.setCreateTime(LocalDateTime.now()); -//// childStage22.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -//// childStage22.setStageSort(2); -//// childStage22.setCode(false); -//// childStage22.setParentId(stageReq2.getId()); -//// stageService.save(childStage22); -//// -//// PipTask childTask22 = new PipTask(); -//// childTask22.setCreateTime(LocalDateTime.now()); -//// childTask22.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -//// childTask22.setTaskName("串行任务-2-2"); -//// childTask22.setPipelineId(pipeline.getId()); -//// childTask22.setTaskType("test"); -//// childTask22.setTaskSort(2); -//// childTask22.setStageId(childStage22.getId()); -//// taskService.save(childTask22); -// -// //创建第三个阶段 -// PipStage stageReq3 = new PipStage(); -// stageReq3.setPipelineId(pipeline.getId()); -// stageReq3.setStageName("阶段-3"); -// stageReq3.setCreateTime(LocalDateTime.now()); -// stageReq3.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// stageReq3.setStageSort(3); -// stageReq3.setParentId("-1"); -// stageReq3.setCode(true); -// stageService.save(stageReq3); -// -// PipStage childStage31 = new PipStage(); -// childStage31.setStageName("并行任务-3-1"); -// childStage31.setPipelineId(pipeline.getId()); -// childStage31.setCreateTime(LocalDateTime.now()); -// childStage31.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childStage31.setStageSort(1); -// childStage31.setCode(false); -// childStage31.setParentId(stageReq3.getId()); -// stageService.save(childStage31); -// -// PipTask childTask31 = new PipTask(); -// childTask31.setCreateTime(LocalDateTime.now()); -// childTask31.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// childTask31.setTaskName("串行任务-3-1"); -// childTask31.setPipelineId(pipeline.getId()); -// childTask31.setTaskType("AFL"); -// childTask31.setTaskSort(1); -// childTask31.setStageId(childStage31.getId()); -// taskService.save(childTask31); -// -// //创建第四个阶段 -// //TODO -//// PipStage stageReq4 = new PipStage(); -//// stageReq4.setPipelineId(pipeline.getId()); -//// stageReq4.setStageName("阶段-4"); -//// stageReq4.setCreateTime(LocalDateTime.now()); -//// stageReq4.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -//// stageReq4.setStageSort(4); -//// stageReq4.setParentId("-1"); -//// stageReq4.setCode(true); -//// stageService.save(stageReq4); -//// -//// PipStage childStage41 = new PipStage(); -//// childStage41.setStageName("并行任务-4-1"); -//// childStage41.setPipelineId(pipeline.getId()); -//// childStage41.setCreateTime(LocalDateTime.now()); -//// childStage41.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -//// childStage41.setStageSort(1); -//// childStage41.setCode(false); -//// childStage41.setParentId(stageReq4.getId()); -//// stageService.save(childStage41); -//// -//// PipTask childTask41 = new PipTask(); -//// childTask41.setCreateTime(LocalDateTime.now()); -//// childTask41.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); -//// childTask41.setTaskName("串行任务-4-1"); -//// childTask41.setPipelineId(pipeline.getId()); -//// childTask41.setTaskType("REPORT"); -//// childTask41.setTaskSort(1); -//// childTask41.setStageId(childStage41.getId()); -//// taskService.save(childTask41); -// -// //TODO 创建对应的鉴权关系 -// //TODO 创建对应的消息分发 -// return pipeline.getId(); -// } -// -// @Override -// public List findPipelineList(PipelineQueryReq pipelineQueryReq) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getId())){ -// wrapper.eq("id",pipelineQueryReq.getId()); -// } -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getIdList())){ -// wrapper.in("id",pipelineQueryReq.getId()); -// } -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getName())){ -// wrapper.like("name",pipelineQueryReq.getName()); -// } -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getCreator())){ -// wrapper.eq("creator",pipelineQueryReq.getCreator()); -// } -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getCollect())){ -// wrapper.eq("collect",pipelineQueryReq.getCollect()); -// } -// if (!ObjectUtils.isEmpty(pipelineQueryReq.getGroupId())){ -// wrapper.eq("group_id",pipelineQueryReq.getGroupId()); -// } -//// Page page = new Page<>(pipelineQueryReq.getPageNo(), pipelineQueryReq.getPageSize()); -//// Page pipPipelinePage = pipelineDao.selectPage(page, wrapper); -// -// List pipPipelines = pipelineDao.selectList(wrapper); -// if (ObjectUtils.isEmpty(pipPipelines)){ -// return new ArrayList<>(0); -// } -// -// List respList = PipelineConverter.INSTANCE.toRespList(pipPipelines); -// -// //对流水线进行流水线信息赋值 -// respList.forEach(this::setStageAndTask); -// //对用户姓名进行赋值 -// respList.forEach(this::setUserName); -// return respList; -// } -// -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void deletePipeline(PipelineReq req) { -// if (StringUtils.isEmpty(req.getId())){ -// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id不能为空"); -// } -// -// String pipelineId = req.getId(); -// -// if (ObjectUtils.isEmpty(pipelineId)){ -// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"请求参数不能为空"); -// } -// -// PipPipeline pipeline = pipelineDao.selectById(pipelineId); -// if (ObjectUtils.isEmpty(pipeline)){ -// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"流水线不存在"); -// } -// pipelineDao.deleteById(pipelineId); -// -// //根据流水线id查询节点和配置信息 -// PipStage pipStage = new PipStage(); -// pipStage.setPipelineId(pipelineId); -// List pipStageList = stageService.getPipStageList(pipStage); -// if (!CollectionUtils.isEmpty(pipStageList)){ -// List list = pipStageList.stream().map(PipStage::getId).toList(); -// pipStageDao.deleteByIds(list); -// } -// -// PipTask pipTask = new PipTask(); -// pipTask.setPipelineId(pipelineId); -// List task = taskService.getTask(pipTask); -// if (!CollectionUtils.isEmpty(task)){ -// List list = task.stream().map(PipTask::getId).toList(); -// pipTaskDao.deleteByIds(list); -// } -// -// //删除resource表数据 -// if (StringUtils.isNotEmpty(pipeline.getResourceId())){ -// PipResource pipResource = pipResourceDao.selectById(pipeline.getResourceId()); -// -// if (!ObjectUtils.isEmpty(pipResource)){ -// pipResourceDao.deleteById(pipeline.getResourceId()); -// } -// } -// } -// -// @Override -// public void updatePipeline(PipelineUpdateReq pipeline) { -// PipPipeline pipPipeline = new PipPipeline(); -// BeanUtils.copyProperties(pipeline,pipPipeline); -// pipPipeline.setUpdateTime(LocalDateTime.now()); -// pipPipeline.setUpdater(String.valueOf(WebFrameworkUtils.getLoginUserId())); -// pipelineDao.updateById(pipPipeline); -// } -// -// @Override -// public PipelineFindResp findPipelineById(PipelineQueryReq pipelineQueryReq) { -// if (StringUtils.isEmpty(pipelineQueryReq.getId())){ -// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id参数不能为空"); -// } -// PipPipeline pipeline = pipelineDao.selectById(pipelineQueryReq.getId()); -// if (ObjectUtils.isEmpty(pipeline)){ -// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"数据错误，请联系管理员"); -// } -// PipelineFindResp resp = PipelineConverter.INSTANCE.toResp(pipeline); -// setStageAndTask(resp); -// -// return resp; -// } @Override public PageResult findTemplatePage(TemplateQueryReq query) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java index aea0fdf7..c193169b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java @@ -268,7 +268,7 @@ public class TestCaseManagerServiceImpl extends ServiceImpl Date: Thu, 10 Jul 2025 10:03:01 +0800 Subject: [PATCH 44/46] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=88=90=E5=88=86?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/cd/casic/server/ClocTest.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ops-server/src/test/java/cd/casic/server/ClocTest.java diff --git a/ops-server/src/test/java/cd/casic/server/ClocTest.java b/ops-server/src/test/java/cd/casic/server/ClocTest.java new file mode 100644 index 00000000..895b3d9d --- /dev/null +++ b/ops-server/src/test/java/cd/casic/server/ClocTest.java @@ -0,0 +1,41 @@ +package cd.casic.server; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +@SpringBootTest(classes = {OpsServerApplication.class}) +@ActiveProfiles("local") +public class ClocTest { + public void fileExit(){ + File file = new File("/ops-pro/ops-server/src/test/resources/java.zip"); + } + + @Test + public void test01() throws IOException, InterruptedException { + // 构建命令 + ProcessBuilder pb = new ProcessBuilder("D:/cloc/cloc.exe", "/ops-pro/ops-server/src/test/resources/java.zip", "--json"); + pb.redirectErrorStream(true); // 合并标准输出和错误输出 + + // 启动进程 + Process process = pb.start(); + StringBuilder stringBuilder = new StringBuilder(); + + + // 读取输出 + try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { + String line; + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + } + } + System.out.println(stringBuilder.toString()); + // 等待进程结束并获取返回值 + int exitCode = process.waitFor(); + System.out.println("命令执行结束，返回值：" + exitCode); + } +} From 086ccf5f5242bc5a96a70d6979fc53a1fa43a498 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 10 Jul 2025 11:08:27 +0800 Subject: [PATCH 45/46] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B9=E6=B3=95CV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cd/casic/ci/api/StageController.java | 2 +- .../casic/ci/api/TemplateStageController.java | 129 ++++++ .../casic/ci/api/TemplateTasksController.java | 46 +++ .../req/template/TemplateStageCreateReq.java | 13 + .../req/template/TemplateStageUpdateReq.java | 13 + .../req/template/TemplateTaskCreateReq.java | 16 + .../req/template/TemplateTaskUpdateReq.java | 14 + .../converter/TemplateStageConverter.java | 18 + .../converter/TemplateTaskConverter.java | 14 + .../process/service/stage/StageService.java | 6 +- .../service/stage/impl/StageServiceImpl.java | 2 +- .../template/TemplateStageService.java | 43 ++ .../service/template/TemplateTaskService.java | 24 ++ .../impl/TemplateStageServiceImpl.java | 368 ++++++++++++++++++ .../impl/TemplateTaskServiceImpl.java | 76 ++++ 15 files changed, 780 insertions(+), 4 deletions(-) create mode 100644 modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateStageController.java create mode 100644 modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateTasksController.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageCreateReq.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageUpdateReq.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskCreateReq.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskUpdateReq.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateStageConverter.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateTaskConverter.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateStageService.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateTaskService.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateStageServiceImpl.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateTaskServiceImpl.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java index 980a0c57..faafb1ae 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java @@ -77,7 +77,7 @@ public class StageController { */ @PostMapping(path="/deleteTasksOrStage/{taskId}") public CommonResult deleteTasksOrStage(@NotNull@PathVariable String taskId){ - stageService.deleteStagesOrTask(taskId); + stageService.deleteStagesAndTask(taskId); return CommonResult.success(); } /** diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateStageController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateStageController.java new file mode 100644 index 00000000..b4797356 --- /dev/null +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateStageController.java @@ -0,0 +1,129 @@ +package cd.casic.ci.api; + + +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageCreateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageUpdateReq; +import cd.casic.ci.process.dto.resp.context.SingletonRunContextResp; +import cd.casic.ci.process.dto.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import cd.casic.ci.process.process.service.stage.StageService; +import cd.casic.ci.process.process.service.template.TemplateStageService; +import cd.casic.framework.commons.pojo.CommonResult; +import jakarta.annotation.Resource; +import jakarta.annotation.security.PermitAll; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * @pi.protocol: http + * @pi.groupName: 流水线多阶段控制器 + */ +@RestController +@RequestMapping("/templateStage") +public class TemplateStageController { + + @Resource + private TemplateStageService stageService; + + /** + * @pi.name:创建流水线阶段及任务 + * @pi.path:/stage/createStage + * @pi.methodType:post + * @pi.request-type:json + * @pi.param: model=stage + */ + @PostMapping(path="/createStage") + public CommonResult createStagesOrTask(@RequestBody TemplateStageCreateReq stage){ + String taskId = stageService.createStagesOrTask(stage); + return CommonResult.success(taskId); + } + + /** + * @pi.name:查询流水线阶段信息 + * @pi.path:/stage/finAllStage + * @pi.methodType:post + * @pi.request-type: formdata + * @pi.param: name=pipelineId;dataType=string;value=pipelineId; + */ + @PermitAll + @PostMapping(path="/findAllStage/{templateId}") + public CommonResult> findAllPipelineTaskOrTask(@NotNull @PathVariable String templateId){ + List stageRespList = stageService.findAllStagesTask(templateId); + return CommonResult.success(stageRespList); + } + + /** + * @pi.name:更新流水线阶段任务名称Or移动流水线阶段 + * @pi.path:/stage/createStage + * @pi.methodType:post + * @pi.request-type:json + * @pi.param: model=stage + */ + @PostMapping(path="/updateStage") + public CommonResult updateStageTask(@RequestBody @Valid @NotNull TemplateStageUpdateReq stage){ + stageService.updateStagesTask(stage); + return CommonResult.success(); + } + + /** + * @pi.name:删除流水线阶段及任务 + * @pi.path:/stage/deleteStage + * @pi.methodType:post + * @pi.request-type: formdata + * @pi.param: name=taskId;dataType=string;value=taskId; + */ + @PostMapping(path="/deleteTasksOrStage/{taskId}") + public CommonResult deleteTasksOrStage(@NotNull@PathVariable String taskId){ + stageService.deleteStagesAndTask(taskId); + return CommonResult.success(); + } +// /** +// * 复制stage节点 +// * */ +// @PostMapping(path="/copyStage/{stageId}") +// public CommonResult copyStage(@NotEmpty@PathVariable String stageId){ +// stageService.copyStage(stageId); +// return CommonResult.success(); +// } + @PostMapping("/deleteFirstStage/{stageId}") + public CommonResult deleteFirstStage(@PathVariable String stageId){ + stageService.deleteFirstStage(stageId); + return CommonResult.success(); + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateTasksController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateTasksController.java new file mode 100644 index 00000000..5b99c508 --- /dev/null +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateTasksController.java @@ -0,0 +1,46 @@ +package cd.casic.ci.api; + + +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateTaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; +import cd.casic.ci.process.process.service.task.TaskService; +import cd.casic.ci.process.process.service.template.TemplateTaskService; +import cd.casic.framework.commons.pojo.CommonResult; +import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/templateTask") +public class TemplateTasksController { + @Resource + private TemplateTaskService taskService; + /** + * @pi.name:查询任务及任务详情 + * @pi.path:/tasks/findOneTasksOrTask + * @pi.methodType:post + * @pi.request-type: formdata + * @pi.param: name=taskId;dataType=string;value=taskId; + */ + @PostMapping(path="/findOneTasksOrTask/{taskId}") + public CommonResult findOneTasksOrTask(@NotNull @PathVariable String taskId){ + return CommonResult.success(taskService.getRespById(taskId)); + } +// /** +// * 复制task节点 +// * */ +// @PostMapping(path="/copyTask/{taskId}") +// public CommonResult copyTask(@NotEmpty @PathVariable String taskId){ +// taskService.copyTask(taskId); +// return CommonResult.success(); +// } + @PostMapping(path="/updateTask") + public CommonResult updateTask(@RequestBody TemplateTaskUpdateReq req){ + Boolean b = taskService.updateTask(req); + return CommonResult.success(b); + } + +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageCreateReq.java new file mode 100644 index 00000000..8fe3c438 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageCreateReq.java @@ -0,0 +1,13 @@ +package cd.casic.ci.process.dto.req.template; + +import cd.casic.ci.process.dto.req.task.TaskCreateReq; +import lombok.Data; + +@Data +public class TemplateStageCreateReq { + // 阶段stageId + private String stageId; + // 如果需要新增阶段则传这个 + private Integer stageSort; + private TemplateTaskCreateReq task; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageUpdateReq.java new file mode 100644 index 00000000..b410fd6d --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateStageUpdateReq.java @@ -0,0 +1,13 @@ +package cd.casic.ci.process.dto.req.template; + +import lombok.Data; + +@Data +public class TemplateStageUpdateReq { + // 更新名称 + private String stageName; + // 更新sort + private Integer stageSort; + private String id; + private String pipelineId; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskCreateReq.java new file mode 100644 index 00000000..1138245b --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskCreateReq.java @@ -0,0 +1,16 @@ +package cd.casic.ci.process.dto.req.template; + +import lombok.Data; + +import java.util.Map; + +@Data +public class TemplateTaskCreateReq { + // 第二级stageId，如果没有值则新建第二级stage + private String stageId; + private String taskName; + private String templateId; + private String taskType; + private Integer taskSort; + private Map taskProperties; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskUpdateReq.java new file mode 100644 index 00000000..f5d0293e --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateTaskUpdateReq.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.dto.req.template; + +import lombok.Data; + +import java.util.Map; + +@Data +public class TemplateTaskUpdateReq { + // 第二级stageId，如果没有值则新建第二级stage + private String id; + private String taskName; + private String taskType; + private Map taskProperties; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateStageConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateStageConverter.java new file mode 100644 index 00000000..f83aeb9a --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateStageConverter.java @@ -0,0 +1,18 @@ +package cd.casic.ci.process.process.converter; + +import cd.casic.ci.process.dto.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; +import cd.casic.ci.process.process.dataObject.stage.PipStage; +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface TemplateStageConverter { + TemplateStageConverter INSTANCE = Mappers.getMapper(TemplateStageConverter.class); + public TemplateStageResp converter(TemplateStage stage); + public List converter(List stage); + +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateTaskConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateTaskConverter.java new file mode 100644 index 00000000..9bfc1181 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateTaskConverter.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.process.converter; + +import cd.casic.ci.process.dto.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; +import cd.casic.ci.process.process.dataObject.task.PipTask; +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper(componentModel = "spring") +public interface TemplateTaskConverter { + TemplateTaskConverter INSTANCE = Mappers.getMapper(TemplateTaskConverter.class); + TemplateTasksResp doToResp(TemplateTask task); +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java index 6e0e1c39..7035ab23 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java @@ -31,10 +31,12 @@ public interface StageService extends IService { List findAllFirstStagesAndChild(String pipelineId); /** - * 删除阶段及任务 + * 删除阶段及任务,如果当前节点是当前阶段最后一个节点， + * 会自动删除阶段 + * * @param taskId 配置id */ - void deleteStagesOrTask(String taskId); + void deleteStagesAndTask(String taskId); /** * 删除流水线所有阶段 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 056e8e75..dd011eb0 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -189,7 +189,7 @@ public class StageServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) - public void deleteStagesOrTask(String taskId) { + public void deleteStagesAndTask(String taskId) { PipTask taskQuery = new PipTask(); taskQuery.setId(taskId); List taskList = taskService.getTask(taskQuery); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateStageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateStageService.java new file mode 100644 index 00000000..91fba9ef --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateStageService.java @@ -0,0 +1,43 @@ +package cd.casic.ci.process.process.service.template; + +import cd.casic.ci.process.dto.req.stage.StageCreateReq; +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageCreateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageUpdateReq; +import cd.casic.ci.process.dto.resp.stage.StageResp; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; +import cd.casic.ci.process.process.dataObject.stage.PipStage; +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.constraints.NotEmpty; + +import java.util.List; + +public interface TemplateStageService extends IService { + /** + * 创建阶段及关联任务 + * @param stage 阶段信息 + * @return 阶段id + */ + String createStagesOrTask(TemplateStageCreateReq stage); + + + /** + * 查询所有阶段任务 + * @param templateId 流水线id + * @return 任务 + */ + List findAllStagesTask(String templateId); + List findAllFirstStagesAndChild(String templateId); + + + + void deleteFirstStage(String stageId); + /** + * 删除阶段及任务 + * @param taskId 配置id + */ + void deleteStagesAndTask(String taskId); + + public void updateStagesTask(TemplateStageUpdateReq stage); +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateTaskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateTaskService.java new file mode 100644 index 00000000..2a4ee024 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateTaskService.java @@ -0,0 +1,24 @@ +package cd.casic.ci.process.process.service.template; + +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateTaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; +import cd.casic.ci.process.process.dataObject.task.PipTask; +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import cd.casic.ci.process.util.WebFrameworkUtils; +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.commons.lang3.StringUtils; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +public interface TemplateTaskService extends IService { + List getTask(TemplateTask pipTask); + List getTaskByStageIdList(List stageIdList); + TemplateTasksResp getRespById(String taskId); + public Boolean updateTask(TemplateTaskUpdateReq req); +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateStageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateStageServiceImpl.java new file mode 100644 index 00000000..d901b66d --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateStageServiceImpl.java @@ -0,0 +1,368 @@ +package cd.casic.ci.process.process.service.template.impl; + +import cd.casic.ci.process.dto.req.stage.StageUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageCreateReq; +import cd.casic.ci.process.dto.req.template.TemplateStageUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateTaskCreateReq; +import cd.casic.ci.process.dto.resp.template.TemplateStageResp; + +import cd.casic.ci.process.process.converter.TemplateStageConverter; +import cd.casic.ci.process.process.dao.template.TemplateStageDao; +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import cd.casic.ci.process.process.service.template.TemplateStageService; +import cd.casic.ci.process.process.service.template.TemplateTaskService; +import cd.casic.ci.process.util.WebFrameworkUtils; +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; +@Service +public class TemplateStageServiceImpl extends ServiceImpl implements TemplateStageService { + @Resource + private TemplateStageDao stageDao; + @Resource + private TemplateTaskService templateTaskService; + @Resource + private TemplateStageConverter stageConverter; + @Transactional(rollbackFor = Exception.class) + @Override + public String createStagesOrTask(TemplateStageCreateReq stageReq) { + String firstStageId = stageReq.getStageId(); + Integer stageSort = stageReq.getStageSort(); + TemplateTaskCreateReq task = stageReq.getTask(); + String taskName = task.getTaskName(); + String secondStageId = task.getStageId(); + Map taskProperties = task.getTaskProperties(); + String taskType = task.getTaskType(); + Integer taskSort = task.getTaskSort(); + String templateId = task.getTemplateId(); + Long loginUserId = WebFrameworkUtils.getLoginUserId(); + TemplateStage firstStage = null; + // 判断是否需要新建阶段,如果没有传第一级tageId而传了sort就是需要创建阶段 + if (StringUtils.isEmpty(firstStageId)) { + // 新建stage + firstStage = new TemplateStage(); + firstStage.setStageName("阶段-"+stageSort); + if (stageSort == null) { + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"参数有误"); + } + firstStage.setStageSort(stageSort); + firstStage.setCreateTime(LocalDateTime.now()); + firstStage.setParentId("-1"); + firstStage.setTemplateId(templateId); + + firstStage.setCreator(String.valueOf(loginUserId)); + firstStage.setUpdater(String.valueOf(loginUserId)); + firstStage.setUpdateTime(LocalDateTime.now()); + TemplateStage stageQuery = new TemplateStage(); + stageQuery.setTemplateId(templateId); + stageQuery.setParentId("-1"); + List otherStageList = getTemplateStageList(stageQuery); + if (!CollectionUtils.isEmpty(otherStageList)) { + for (TemplateStage stage : otherStageList) { + if (stageSort<=stage.getStageSort()) { + stage.setStageSort(stage.getStageSort()+1); + } + } + updateBatchById(otherStageList); + } + save(firstStage); + } else { + TemplateStage stageQuery = new TemplateStage(); + stageQuery.setId(firstStageId); + stageQuery.setParentId("-1"); + List pipStageList = getTemplateStageList(stageQuery); + if (!CollectionUtils.isEmpty(pipStageList)) { + firstStage = pipStageList.get(0); + } else { + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"阶段不存在"); + } + } + if (firstStage == null) { + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"创建节点失败"); + } + TemplateStage secondStage = null; + if (secondStageId==null||taskSort==null) { + // 添加并行节点 + secondStage = new TemplateStage(); + TemplateStage stageQuery = new TemplateStage(); + stageQuery.setParentId(firstStage.getId()); + stageQuery.setTemplateId(templateId); + List pipStageList = getTemplateStageList(stageQuery); + if (CollectionUtils.isEmpty(pipStageList)) { + secondStage.setStageSort(1); + } else { + secondStage.setStageSort(pipStageList.size()+1); + } + secondStage.setCreateTime(LocalDateTime.now()); + secondStage.setUpdateTime(LocalDateTime.now()); + secondStage.setCreator(String.valueOf(loginUserId)); + secondStage.setParentId(firstStage.getId()); + secondStage.setTemplateId(templateId); + secondStage.setUpdater(String.valueOf(loginUserId)); + save(secondStage); + taskSort=1; + secondStageId = secondStage.getId(); + } else { + secondStage = getById(secondStageId); + } + if (secondStage == null) { + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"创建节点失败"); + } + List taskValues = templateTaskService.getTaskByStageIdList(Arrays.asList(secondStage.getId())); + if (!CollectionUtils.isEmpty(taskValues)) { + for (TemplateTask taskValue : taskValues) { + if (taskValue.getTaskSort()>=taskSort) { + taskValue.setTaskSort(taskValue.getTaskSort()+1); + } + } + templateTaskService.updateBatchById(taskValues); + } + // 保存task + TemplateTask pipTask = new TemplateTask(); + pipTask.setTaskType(taskType); + pipTask.setTaskSort(taskSort); + pipTask.setStageId(secondStageId); + pipTask.setTaskName(taskName); + pipTask.setCreateTime(LocalDateTime.now()); + pipTask.setTaskProperties(taskProperties); + pipTask.setTemplateId(templateId); + pipTask.setUpdateTime(LocalDateTime.now()); + pipTask.setCreator(String.valueOf(loginUserId)); + pipTask.setUpdater(String.valueOf(loginUserId)); + templateTaskService.save(pipTask); + return pipTask.getId(); + } + + @Override + public List findAllStagesTask(String pipelineId) { + //获取流水线主节点 + List stageMainStage = findAllMainStage(pipelineId); + if (stageMainStage.isEmpty()){ + return Collections.emptyList(); + } + List list = new ArrayList<>(); + for (TemplateStage stage : stageMainStage) { + String stagesId = stage.getId(); + //获取从节点 + List allSecondStage = findSecondStageAndTask(stagesId); + List stageRespList = stageConverter.converter(allSecondStage); + TemplateStageResp stageResp = stageConverter.converter(stage); + stageResp.setStageList(stageRespList); + list.add(stageResp); + } + list.sort(Comparator.comparing(TemplateStageResp::getStageSort)); + return list; + } + + @Override + public List findAllFirstStagesAndChild(String pipelineId) { + //获取流水线主节点 + List stageMainStage = findAllMainStage(pipelineId); + if (stageMainStage.isEmpty()){ + return Collections.emptyList(); + } + for (TemplateStage stage : stageMainStage) { + String stagesId = stage.getId(); + //获取从节点 + List allStageStage = findSecondStageAndTask(stagesId); + stage.setStageList(allStageStage); + } + stageMainStage.sort(Comparator.comparing(TemplateStage::getStageSort)); + return stageMainStage; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteStagesAndTask(String taskId) { + TemplateTask taskQuery = new TemplateTask(); + taskQuery.setId(taskId); + List taskList = templateTaskService.getTask(taskQuery); + if (CollectionUtils.isEmpty(taskList)) { + return; + } + TemplateTask task = taskList.get(0); + templateTaskService.removeById(taskId); + // 查询上一级stage下有无其他task 没有则连着stage删除 + String stageId = task.getStageId(); + String pipelineId = task.getTemplateId(); + taskQuery = new TemplateTask(); + taskQuery.setStageId(stageId); + List otherTask = templateTaskService.getTask(taskQuery); + if (CollectionUtils.isEmpty(otherTask)) { + // 删除当前task的父stage，然后判断父stage的父级有无其他子级如果没有就继续删除当前阶段 + TemplateStage stageQuery = new TemplateStage(); + stageQuery.setTemplateId(pipelineId); + stageQuery.setId(stageId); + List currStageList = getTemplateStageList(stageQuery); + if (CollectionUtils.isEmpty(currStageList)) { + throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"stage不存在"); + } + TemplateStage currStage = currStageList.get(0); + deleteStages(stageId); + String parentId = currStage.getParentId(); + stageQuery = new TemplateStage(); + stageQuery.setParentId(parentId); + // 查询同阶段其他二级stage，如果不存在其他stage则删除阶段stage并整理sort值 + List otherStageList = getTemplateStageList(stageQuery); + if (CollectionUtils.isEmpty(otherStageList)) { + //没有其他并行路径就需要删除当前阶段 + deleteStages(parentId); + } else { + for (TemplateStage stage : otherStageList) { + if (currStage.getStageSort() getTemplateStageList(TemplateStage pipStage){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotEmpty(pipStage.getId()),TemplateStage::getId,pipStage.getId()); + wrapper.eq(StringUtils.isNotEmpty(pipStage.getTemplateId()),TemplateStage::getTemplateId,pipStage.getTemplateId()); + wrapper.eq(StringUtils.isNotEmpty(pipStage.getParentId()),TemplateStage::getParentId,pipStage.getParentId()); + return stageDao.selectList(wrapper); + } + + + public List findAllMainStage(String pipelineId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TemplateStage::getTemplateId,pipelineId); + wrapper.eq(TemplateStage::getParentId,"-1"); + return stageDao.selectList(wrapper); + } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateStagesTask(TemplateStageUpdateReq stage) { + String id = stage.getId(); + String stageName = stage.getStageName(); + Integer currStageSort = stage.getStageSort(); + Long loginUserId = WebFrameworkUtils.getLoginUserId(); + TemplateStage updateStage = getById(id); + if (updateStage==null) { + return; + } + + updateStage.setUpdater(String.valueOf(loginUserId)); + updateStage.setUpdateTime(LocalDateTime.now()); + if (currStageSort == null) { + updateStage.setStageName(stageName); + updateById(updateStage); + } else{ + Integer oldStageSort = updateStage.getStageSort(); + if (oldStageSort.equals(currStageSort)) { + return; + } + TemplateStage query = new TemplateStage(); + query.setTemplateId(updateStage.getTemplateId()); + query.setParentId("-1"); + List stageList = getTemplateStageList(query); + if (oldStageSortoldStageSort&&pipStage.getStageSort()<=currStageSort) { + pipStage.setStageSort(pipStage.getStageSort()-1); + } + } else{ + pipStage.setStageSort(currStageSort); + } + } + } else { + // 往左移动 + for (TemplateStage pipStage : stageList) { + if (!pipStage.getId().equals(updateStage.getId())) { + if (pipStage.getStageSort()=currStageSort) { + pipStage.setStageSort(pipStage.getStageSort()+1); + } + } else { + pipStage.setStageSort(currStageSort); + } + } + } + updateBatchById(stageList); + } + + } + public void deleteStages(String stageId) { + stageDao.deleteById(stageId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteFirstStage(String stageId) { + List secondStageAndTask = findSecondStageAndTask(stageId); + for (TemplateStage stage : secondStageAndTask) { + List taskValues = stage.getTaskValues(); + if (!CollectionUtils.isEmpty(taskValues)) { + List taskIdList = taskValues.stream().map(TemplateTask::getId).toList(); + templateTaskService.removeBatchByIds(taskIdList); + } + } + List secondStageIdList = secondStageAndTask.stream().map(TemplateStage::getId).toList(); + removeBatchByIds(secondStageIdList); + TemplateStage byId = getById(stageId); + List allMainStage = findAllMainStage(byId.getTemplateId()); + List updateList = new ArrayList<>(allMainStage.size()); + for (TemplateStage stage : allMainStage) { + if (byId.getStageSort() findSecondStageAndTask(String stagesId){ + List otherStage = findSecondStage(stagesId); + List list = new ArrayList<>(); + List stageIdList = otherStage.stream().map(TemplateStage::getId).toList(); + if (stageIdList.isEmpty()) { + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"当前阶段下不存在节点"); + } + Map> stageIdTaskMap = templateTaskService.getTaskByStageIdList(stageIdList).stream().collect(Collectors.groupingBy(TemplateTask::getStageId)); + for (TemplateStage stage : otherStage) { + //获取阶段配置及任务 + String otherId = stage.getId(); + List allStageTask = stageIdTaskMap.get(otherId); + allStageTask.sort(Comparator.comparing(TemplateTask::getTaskSort)); + stage.setTaskValues(allStageTask); + list.add(stage); + } + return list; + } + // 获取主stage（阶段）下的子stage + public List findSecondStage(String stageId){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TemplateStage::getParentId,stageId); + return stageDao.selectList(wrapper); + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateTaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateTaskServiceImpl.java new file mode 100644 index 00000000..43b20c69 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateTaskServiceImpl.java @@ -0,0 +1,76 @@ +package cd.casic.ci.process.process.service.template.impl; + +import cd.casic.ci.process.dto.req.task.TaskUpdateReq; +import cd.casic.ci.process.dto.req.template.TemplateTaskUpdateReq; +import cd.casic.ci.process.dto.resp.task.TasksResp; +import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; +import cd.casic.ci.process.process.converter.TemplateTaskConverter; +import cd.casic.ci.process.process.dao.template.TemplateTaskDao; +import cd.casic.ci.process.process.dataObject.task.PipTask; +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import cd.casic.ci.process.process.service.template.TemplateTaskService; +import cd.casic.ci.process.util.WebFrameworkUtils; +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +@Service +public class TemplateTaskServiceImpl extends ServiceImpl implements TemplateTaskService { + @Resource + private TemplateTaskDao taskDao; + @Resource + private TemplateTaskConverter taskConverter; + @Override + public List getTask(TemplateTask task) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotEmpty(task.getId()),TemplateTask::getId,task.getId()); + wrapper.eq(StringUtils.isNotEmpty(task.getTemplateId()),TemplateTask::getTemplateId,task.getTemplateId()); + wrapper.eq(StringUtils.isNotEmpty(task.getStageId()),TemplateTask::getStageId,task.getStageId()); + return taskDao.selectList(wrapper); + } + @Override + public List getTaskByStageIdList(List stageIdList){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(TemplateTask::getStageId,stageIdList); + return taskDao.selectList(wrapper); + } + @Override + public TemplateTasksResp getRespById(String taskId){ + TemplateTask pipTask = new TemplateTask(); + pipTask.setId(taskId); + List taskList = getTask(pipTask); + if (CollectionUtils.isEmpty(taskList)) { + return null; + } + return taskConverter.doToResp(taskList.get(0)); + } + + @Override + public Boolean updateTask(TemplateTaskUpdateReq req) { + if (StringUtils.isEmpty(req.getId())) { + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"传入id有问题"); + } + TemplateTask byId = getById(req.getId()); + if (byId == null) { + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"task不存在"); + } + String taskName = req.getTaskName(); + Map taskProperties = req.getTaskProperties(); + String taskType = req.getTaskType(); + byId.setTaskProperties(taskProperties); + byId.setTaskType(taskType); + byId.setTaskName(taskName); + byId.setUpdater(WebFrameworkUtils.getLoginUserIdStr()); + byId.setUpdateTime(LocalDateTime.now()); + return updateById(byId); + } +} From 8965c57f35dfaea9f98b3b38ea5a6095450e2c47 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 10 Jul 2025 15:07:59 +0800 Subject: [PATCH 46/46] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=B8=8E?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AE=9A=E4=B9=89=E3=80=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/api/TemplateManagerController.java | 32 ++++--------------- .../constant/PipelineTargetTypeConstant.java | 17 ++++++++++ .../dto/req/template/TemplateCreateReq.java | 14 ++++++++ .../engine/worker/DBFuzzTestingWorker.java | 6 ---- .../worker/DIYImageExecuteCommandWorker.java | 1 - .../TargetBinWorker.java} | 7 ++-- .../TargetFirmWareWorker.java} | 7 ++-- .../TargetSourceCodeWorker.java} | 7 ++-- .../worker/target/TargetWebSiteWorker.java | 14 ++++++++ .../process/enums/PiplineTargetTypeEnum.java | 29 ----------------- .../process/converter/TemplateConverter.java | 3 +- .../dataObject/template/TemplateManager.java | 10 ------ .../template/TemplateManagerService.java | 2 ++ .../impl/TemplateManagerServiceImpl.java | 7 +++- 14 files changed, 73 insertions(+), 83 deletions(-) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/{TestGitWorker.java => target/TargetBinWorker.java} (74%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/{TestWorker.java => target/TargetFirmWareWorker.java} (73%) rename modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/{TargetHandleWorker.java => target/TargetSourceCodeWorker.java} (92%) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java delete mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java index 06f019b1..2570fcab 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java @@ -1,6 +1,7 @@ package cd.casic.ci.api; +import cd.casic.ci.process.dto.req.template.TemplateCreateReq; import cd.casic.ci.process.dto.req.template.TemplateQueryReq; import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; @@ -31,32 +32,11 @@ public class TemplateManagerController { @Resource private TemplateManagerService templateManagerService; -// @PostMapping(path="/createTemplate") -// public CommonResult createTemplate(@RequestBody @Valid TemplateCreateReq req){ -// -// String templateId = templateManagerService.createTemplate(req); -// -// return CommonResult.success(templateId); -// } -// -// -// @PostMapping(path="/deletePipeline") -// public CommonResult deletePipeline(@RequestBody @Valid PipelineReq req){ -// -// templateManagerService.deletePipeline(req); -// -// return CommonResult.success(); -// } -// -// -// @PostMapping(path="/updatePipeline") -// public CommonResult updatePipeline(@RequestBody @NotNull @Valid PipelineUpdateReq pipeline){ -// -// templateManagerService.updatePipeline(pipeline); -// -// return CommonResult.success(); -// } - + @PostMapping(path="/createTemplate") + public CommonResult createTemplate(@RequestBody @Valid TemplateCreateReq req){ + String templateId = templateManagerService.createTemplateManager(req); + return CommonResult.success(templateId); + } @PostMapping(path="/findTemplatePage") public CommonResult> findTemplatePage(@RequestBody @NotNull @Valid TemplateQueryReq query){ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java new file mode 100644 index 00000000..e7499b99 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java @@ -0,0 +1,17 @@ +package cd.casic.ci.process.constant; + +import lombok.Getter; + +@Getter +public class PipelineTargetTypeConstant { + public static final String SOURCE_CODE="SOURCE_CODE"; + public static final String BIN="BIN"; + public static final String FIRM_WARE="FIRM_WARE"; + public static final String WEB_SITE="WEB_SITE"; + + private final String msg; + + PipelineTargetTypeConstant(String msg) { + this.msg = msg; + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java index edf15f59..f0bd6258 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java @@ -12,4 +12,18 @@ import lombok.Data; @Data public class TemplateCreateReq{ + /** + * 模板名称 + */ + private String templateName; + + /** + * 模板分类 + */ + private String templateType; + + /** + * 描述 + */ + private String remark; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java index 209f4eb9..4abf432f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java @@ -3,14 +3,8 @@ package cd.casic.ci.process.engine.worker; import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; -import cd.casic.ci.process.process.dataObject.base.PipBaseElement; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import java.util.HashMap; /** * 数据库模糊测试 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java index e9241a0a..3fdf041d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java @@ -24,7 +24,6 @@ import java.util.Map; */ @Slf4j @WorkAtom(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND") -//@Plugin(taskType = "testSSH") public class DIYImageExecuteCommandWorker extends SshWorker { @Override diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java similarity index 74% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java index 876d6778..5de0ba0b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java @@ -1,17 +1,18 @@ -package cd.casic.ci.process.engine.worker; +package cd.casic.ci.process.engine.worker.target; import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; +import cd.casic.ci.process.constant.PipelineTargetTypeConstant; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; @Slf4j -@WorkAtom(taskType = "Github") -public class TestGitWorker extends BaseWorker { +@WorkAtom(taskType = PipelineTargetTypeConstant.BIN) +public class TargetBinWorker extends BaseWorker { @Override diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java similarity index 73% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java index 1425d8ae..68721f24 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java @@ -1,17 +1,18 @@ -package cd.casic.ci.process.engine.worker; +package cd.casic.ci.process.engine.worker.target; import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; +import cd.casic.ci.process.constant.PipelineTargetTypeConstant; import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; @Slf4j -@WorkAtom(taskType = "GIT") -public class TestWorker extends BaseWorker { +@WorkAtom(taskType = PipelineTargetTypeConstant.FIRM_WARE) +public class TargetFirmWareWorker extends BaseWorker { @Override diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java similarity index 92% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java index 4481cf6a..4cbb8433 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java @@ -1,9 +1,10 @@ -package cd.casic.ci.process.engine.worker; +package cd.casic.ci.process.engine.worker.target; import cd.casic.ci.process.common.WorkAtom; import cd.casic.ci.process.engine.runContext.TaskRunContext; import cd.casic.ci.process.engine.worker.base.BaseWorker; +import cd.casic.ci.process.constant.PipelineTargetTypeConstant; import cd.casic.ci.process.process.service.machine.MachineInfoService; import cd.casic.ci.process.process.service.target.TargetVersionService; import jakarta.annotation.Resource; @@ -14,8 +15,8 @@ import lombok.extern.slf4j.Slf4j; * * */ @Slf4j -@WorkAtom(taskType = "code") -public class TargetHandleWorker extends BaseWorker { +@WorkAtom(taskType = PipelineTargetTypeConstant.SOURCE_CODE) +public class TargetSourceCodeWorker extends BaseWorker { @Resource private TargetVersionService targetVersionService; @Resource diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java new file mode 100644 index 00000000..bb352961 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.engine.worker.target; + +import cd.casic.ci.process.common.WorkAtom; +import cd.casic.ci.process.engine.runContext.TaskRunContext; +import cd.casic.ci.process.engine.worker.base.BaseWorker; +import cd.casic.ci.process.constant.PipelineTargetTypeConstant; + +@WorkAtom(taskType = PipelineTargetTypeConstant.WEB_SITE) +public class TargetWebSiteWorker extends BaseWorker { + @Override + public void execute(TaskRunContext context) { + + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java deleted file mode 100644 index 366adbb2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.ci.process.enums; - -import lombok.Getter; - -import java.util.HashMap; -import java.util.Map; - -@Getter -public enum PiplineTargetTypeEnum { - SOURCE_CODE("1","源程序"), - BIN("2","二进制"), - FIRM_WARE("3","二进制"), - WEB_SITE("4","web网站") - ; - private final String code; - private final String msg; - - PiplineTargetTypeEnum(String code, String msg) { - this.code = code; - this.msg = msg; - } - public static Map getCodeMap(){ - Map map = new HashMap<>(); - for (PiplineTargetTypeEnum value : values()) { - map.put(value.code, value); - } - return map; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java index 114e6667..1621a1a8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java @@ -1,5 +1,6 @@ package cd.casic.ci.process.process.converter; +import cd.casic.ci.process.dto.req.template.TemplateCreateReq; import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.dto.resp.template.TemplateStageResp; import cd.casic.ci.process.dto.resp.template.TemplateTasksResp; @@ -27,5 +28,5 @@ public interface TemplateConverter { PipStage respToStage(TemplateStageResp resp); TemplateStageResp stageTemplateToResp(TemplateStage stage); PipTask templateTaskToTask(TemplateTasksResp resp); - + TemplateManager managerCreateReqToManager(TemplateCreateReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java index 9faeadb8..c26200c4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java @@ -25,16 +25,6 @@ public class TemplateManager extends PipBaseElement { */ private String templateType; - /** - * 模板编码 - */ - private String templateCode; - - /** - * 排序 - */ - private Integer sort; - /** * 描述 */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java index 48c34d1b..1159118a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java @@ -1,6 +1,7 @@ package cd.casic.ci.process.process.service.template; +import cd.casic.ci.process.dto.req.template.TemplateCreateReq; import cd.casic.ci.process.dto.req.template.TemplateQueryReq; import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.process.dataObject.template.TemplateManager; @@ -18,6 +19,7 @@ import java.util.List; * @Description: */ public interface TemplateManagerService extends IService { + String createTemplateManager(TemplateCreateReq req); PageResult findTemplatePage(@Valid TemplateQueryReq query); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java index 3e669fd3..c2601de8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java @@ -1,6 +1,7 @@ package cd.casic.ci.process.process.service.template.impl; +import cd.casic.ci.process.dto.req.template.TemplateCreateReq; import cd.casic.ci.process.dto.req.template.TemplateQueryReq; import cd.casic.ci.process.dto.resp.template.TemplateFindResp; import cd.casic.ci.process.dto.resp.template.TemplateStageResp; @@ -59,7 +60,11 @@ public class TemplateManagerServiceImpl extends ServiceImpl findTemplatePage(TemplateQueryReq query) {