调整完毕

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);

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";

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;

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;

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;

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;

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.*;
 

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;

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;

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;
 

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;

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;

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.*;

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;

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;

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;

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;

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();

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 
 /**

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

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;

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;
 

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 {
 

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;

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;

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;

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;

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;

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;

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;

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<SecretServiceMapper, Secre
     @Resource
     private MachineInfoService machineInfoService;
 
-    @Resource
+//    @Resource
     private AliYunConfig aliYunConfig;
 
     @Resource

modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java

@@ -1,9 +1,9 @@
-package cd.casic.module.utils;
+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 cd.casic.module.configuration.AliYunConfig;
-import cd.casic.module.exception.ServiceException;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,10 +23,10 @@ import java.nio.charset.StandardCharsets;
 @Component
 public class AliOssUtil{
 
-    @Autowired
+//    @Autowired
     private OSS ossClient;
 
-    @Resource
+//    @Resource
     private AliYunConfig aliyunConfig;
 
     private static final Logger logger = LoggerFactory.getLogger(AliOssUtil.class);

modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/EnumUtils.java

@@ -1,7 +1,7 @@
-package cd.casic.module.utils;
+package cd.casic.module.machine.utils;
 
 
-import cd.casic.module.enums.CodeEnum;
+import cd.casic.module.machine.enums.CodeEnum;
 
 public class EnumUtils {
     /**

modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PageResult.java

@@ -1,4 +1,4 @@
-package cd.casic.module.utils;
+package cd.casic.module.machine.utils;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/PropertyUtils.java

@@ -1,4 +1,4 @@
-package cd.casic.module.utils;
+package cd.casic.module.machine.utils;
 
 import io.micrometer.common.util.StringUtils;