diff --git a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue index 42cddb89..4e5de78a 100644 --- a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue +++ b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue @@ -5,6 +5,7 @@ clearable placeholder="请选择产品线" :disabled="disabled" + style="width: 100%" @change="handleChange" > diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsArgs.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsArgs.java index 81583f87..424a0e53 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsArgs.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsArgs.java @@ -33,4 +33,11 @@ public class CsArgs { @NotNull(message = "id必填") private Long id; } + + @Getter + @Setter + public static class DeleteById extends CsObject { + @NotNull(message = "id必填") + private Long id; + } } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResult.java similarity index 78% rename from cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResult.java index 3162c3cc..6b42ee97 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResult.java @@ -31,19 +31,19 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class CsPageResultVo extends CsObject { - private T content; +public class CsPageResult extends CsObject { + private List content; private long totalElements; - public static CsPageResultVo> emptyListData() { - CsPageResultVo> result = new CsPageResultVo<>(); + public static CsPageResult emptyListData() { + CsPageResult result = new CsPageResult<>(); result.setTotalElements(0); result.setContent(new ArrayList<>()); return result; } - public static CsPageResultVo> listData(IPage page) { - CsPageResultVo> result = new CsPageResultVo<>(); + public static CsPageResult listData(IPage page) { + CsPageResult result = new CsPageResult<>(); result.setTotalElements(page.getTotal()); result.setContent(page.getRecords()); return result; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java index 175fc515..c5abc355 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java @@ -18,8 +18,8 @@ package cn.odboy.framework.doc; import cn.odboy.constant.SystemConst; import cn.odboy.framework.properties.AppProperties; import cn.odboy.util.CsAnonTagUtil; -import lombok.RequiredArgsConstructor; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ApplicationContext; @@ -49,12 +49,13 @@ import java.util.stream.Collectors; */ @Configuration @EnableSwagger2 -@RequiredArgsConstructor public class SwaggerConfig { @Value("${server.servlet.context-path:}") private String apiPath; - private final AppProperties properties; - private final ApplicationContext applicationContext; + @Autowired + private AppProperties properties; + @Autowired + private ApplicationContext applicationContext; @Bean public Docket createRestApi() { diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java index 66c40ab0..1fa6f257 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java @@ -18,7 +18,6 @@ package cn.odboy.framework.monitor.controller; import cn.odboy.annotation.AnonymousGetMapping; import cn.odboy.framework.monitor.service.CsHealthCheckPointService; import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController; * 健康检查接口 */ @RestController -@RequiredArgsConstructor @RequestMapping("/healthCheck") @Api(tags = "系统：健康检查接口") public class HealthCheckController { diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java index 7c34b592..0f07243e 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java @@ -15,7 +15,7 @@ */ package cn.odboy.framework.mybatisplus.core.interfaces; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; @@ -56,13 +56,13 @@ public interface CsMpEasyService extends IService { List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); - CsPageResultVo> queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); + CsPageResult queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); - CsPageResultVo> queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); + CsPageResult queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); - CsPageResultVo> queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); + CsPageResult queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); - CsPageResultVo> queryClazzPageByArgs(Q criteria, IPage pageable); + CsPageResult queryClazzPageByArgs(Q criteria, IPage pageable); int modifyClazzByArgs(LambdaQueryWrapper wrapper, T entity); diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java index 2dc50075..62cbddd5 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java @@ -18,7 +18,7 @@ package cn.odboy.framework.mybatisplus.core.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -136,16 +136,16 @@ public interface CsMpMapper extends BaseMapper { * @param clazz 期望的对象类型 * @return IPage */ - default CsPageResultVo> queryFeatureClazzPage(Pageable pageable, LambdaQueryWrapper wrapper, Class clazz) { + default CsPageResult queryFeatureClazzPage(Pageable pageable, LambdaQueryWrapper wrapper, Class clazz) { int pageNumber = pageable.getPageNumber(); int pageSize = pageable.getPageSize(); pageNumber = pageNumber <= 0 ? 1 : pageNumber; pageSize = pageSize <= 0 ? 10 : pageSize; IPage pageInfo = this.selectPage(new Page<>(pageNumber, pageSize), wrapper); if (CollUtil.isEmpty(pageInfo.getRecords())) { - return new CsPageResultVo<>(new ArrayList<>(), pageInfo.getTotal()); + return new CsPageResult<>(new ArrayList<>(), pageInfo.getTotal()); } - return new CsPageResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); + return new CsPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); } /** @@ -156,7 +156,7 @@ public interface CsMpMapper extends BaseMapper { * @param clazz 期望的对象类型 * @return IPage */ - default CsPageResultVo> queryFeatureClazzPage(Pageable pageable, LambdaQueryChainWrapper wrapper, Class clazz) { + default CsPageResult queryFeatureClazzPage(Pageable pageable, LambdaQueryChainWrapper wrapper, Class clazz) { int pageNumber = pageable.getPageNumber(); int pageSize = pageable.getPageSize(); pageNumber = pageNumber <= 0 ? 1 : pageNumber; @@ -165,7 +165,7 @@ public interface CsMpMapper extends BaseMapper { if (CollUtil.isEmpty(pageInfo.getRecords())) { return CsPageUtil.emptyListData(); } - return new CsPageResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); + return new CsPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); } /** diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java index 2671e332..755bd147 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java @@ -17,7 +17,7 @@ package cn.odboy.framework.mybatisplus.core.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.mybatisplus.core.CsMpQUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -193,12 +193,12 @@ public class CsMpServiceImpl, T> extends ServiceImpl> queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { + public CsPageResult queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } IPage originPageData = baseMapper.selectPage(pageable, wrapper); - return new CsPageResultVo<>(originPageData.getRecords(), originPageData.getTotal()); + return new CsPageResult<>(originPageData.getRecords(), originPageData.getTotal()); } /** @@ -208,24 +208,24 @@ public class CsMpServiceImpl, T> extends ServiceImpl CsPageResultVo> queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { + public CsPageResult queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } IPage originPageData = baseMapper.selectPage(pageable, wrapper); - return new CsPageResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); + return new CsPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); } - public CsPageResultVo> queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz) { + public CsPageResult queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz) { QueryWrapper wrapper = CsMpQUtil.build(criteria); IPage originPageData = baseMapper.selectPage(pageable, wrapper); - return new CsPageResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); + return new CsPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); } - public CsPageResultVo> queryClazzPageByArgs(Q criteria, IPage pageable) { + public CsPageResult queryClazzPageByArgs(Q criteria, IPage pageable) { QueryWrapper wrapper = CsMpQUtil.build(criteria); IPage originPageData = baseMapper.selectPage(pageable, wrapper); - return new CsPageResultVo<>(originPageData.getRecords(), originPageData.getTotal()); + return new CsPageResult<>(originPageData.getRecords(), originPageData.getTotal()); } /** diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java index 8c86dbc9..4efb0aa7 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java @@ -46,7 +46,7 @@ public class AsyncTheadPoolConfig implements AsyncConfigurer { public Executor getAsyncExecutor() { ThreadPoolSettingModel asyncTaskPool = properties.getAsyncTaskPool(); // 自定义工厂 - ThreadFactory factory = r -> new Thread(r, "default-async-" + new AtomicInteger(1).getAndIncrement()); + ThreadFactory factory = r -> new Thread(r, "DefaultAsync-" + new AtomicInteger(1).getAndIncrement()); // 自定义线程池 return new ThreadPoolExecutor(asyncTaskPool.getCorePoolSize(), asyncTaskPool.getMaxPoolSize(), asyncTaskPool.getKeepAliveSeconds(), TimeUnit.SECONDS, new ArrayBlockingQueue<>(asyncTaskPool.getQueueCapacity()), factory, new ThreadPoolExecutor.CallerRunsPolicy()); @@ -63,7 +63,7 @@ public class AsyncTheadPoolConfig implements AsyncConfigurer { executor.setCorePoolSize(asyncTaskPool.getCorePoolSize()); executor.setMaxPoolSize(asyncTaskPool.getMaxPoolSize()); executor.setQueueCapacity(asyncTaskPool.getQueueCapacity()); - executor.setThreadNamePrefix("task-async-"); + executor.setThreadNamePrefix("TaskAsync-"); executor.setKeepAliveSeconds(asyncTaskPool.getKeepAliveSeconds()); // DiscardOldestPolicy，抛弃最早的任务，将新任务加入队列。 // AbortPolicy，拒绝执行新任务，并抛出异常。 @@ -75,4 +75,20 @@ public class AsyncTheadPoolConfig implements AsyncConfigurer { executor.initialize(); return executor; } + + @Bean("longTimeTaskAsync") + public ThreadPoolTaskExecutor longTimeTaskAsync() { + ThreadPoolSettingModel asyncTaskPool = properties.getAsyncTaskPool(); + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(asyncTaskPool.getCorePoolSize()); + executor.setMaxPoolSize(asyncTaskPool.getMaxPoolSize()); + executor.setQueueCapacity(asyncTaskPool.getQueueCapacity()); + executor.setThreadNamePrefix("LongTimeTaskAsync-"); + executor.setKeepAliveSeconds(asyncTaskPool.getKeepAliveSeconds()); + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy()); + // 设置包装器 + executor.setTaskDecorator(TtlRunnable::get); + executor.initialize(); + return executor; + } } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java index 90985ad9..26933d21 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java @@ -20,7 +20,7 @@ import cn.odboy.framework.server.converters.DateStringToDateConverter; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.support.config.FastJsonConfig; import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; @@ -46,11 +46,13 @@ import java.util.List; */ @Configuration @EnableWebMvc -@RequiredArgsConstructor public class ConfigurerAdapter implements WebMvcConfigurer { - private final DateStringArraysToListDateConverter dateStringArraysToListDateConverter; - private final DateStringToDateConverter dateStringToDateConverter; - private final CsFileLocalUploadHelper fileUploadPathHelper; + @Autowired + private DateStringArraysToListDateConverter dateStringArraysToListDateConverter; + @Autowired + private DateStringToDateConverter dateStringToDateConverter; + @Autowired + private CsFileLocalUploadHelper fileUploadPathHelper; @Bean public CorsFilter corsFilter() { diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java index 69b9eab0..af20d77d 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java @@ -15,7 +15,7 @@ */ package cn.odboy.util; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -52,36 +52,36 @@ public final class CsPageUtil extends cn.hutool.core.util.PageUtil { /** * Page 数据处理 */ - public static CsPageResultVo> toPage(IPage page) { - return new CsPageResultVo<>(page.getRecords(), page.getTotal()); + public static CsPageResult toPage(IPage page) { + return new CsPageResult<>(page.getRecords(), page.getTotal()); } /** * 自定义分页 */ - public static CsPageResultVo> toPage(List list) { - return new CsPageResultVo<>(list, list.size()); + public static CsPageResult toPage(List list) { + return new CsPageResult<>(list, list.size()); } /** * 返回空数据 */ - public static CsPageResultVo> emptyListData() { - return new CsPageResultVo<>(new ArrayList<>(), 0); + public static CsPageResult emptyListData() { + return new CsPageResult<>(new ArrayList<>(), 0); } /** * 返回空数据 */ - public static CsPageResultVo emptyData() { - return new CsPageResultVo<>(null, 0); + public static CsPageResult emptyData() { + return new CsPageResult<>(null, 0); } /** * 自定义分页 */ - public static CsPageResultVo> toPage(List list, long totalElements) { - return new CsPageResultVo<>(list, totalElements); + public static CsPageResult toPage(List list, long totalElements) { + return new CsPageResult<>(list, totalElements); } public static Page getCount(BaseMapper baseMapper) { diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsReturnValueHandleUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsReturnValueHandleUtil.java new file mode 100644 index 00000000..8633f5ef --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsReturnValueHandleUtil.java @@ -0,0 +1,56 @@ +package cn.odboy.util; + +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; + +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +/** + * 返回值处理 工具 + * + * @author odboy + * @date 2025-05-08 + */ +public class CsReturnValueHandleUtil { + public static Object getDefaultValue(ProceedingJoinPoint joinPoint) { + MethodSignature signature = (MethodSignature)joinPoint.getSignature(); + Method method = signature.getMethod(); + // 获取目标方法的返回值类型 + Class returnType = method.getReturnType(); + if (returnType.isArray()) { + return getEmptyArray(returnType); + } else if (List.class.isAssignableFrom(returnType)) { + return Collections.emptyList(); + } else if (Set.class.isAssignableFrom(returnType)) { + return Collections.emptySet(); + } else if (Collection.class.isAssignableFrom(returnType)) { + // 默认返回空 List + return Collections.emptyList(); + } else { + // 普通对象返回 null + return null; + } + } + + /** + * 根据数组类型返回空数组 + */ + private static Object getEmptyArray(Class arrayType) { + if (arrayType == int[].class) { + return new int[0]; + } else if (arrayType == long[].class) { + return new long[0]; + } else if (arrayType == double[].class) { + return new double[0]; + } else if (arrayType == String[].class) { + return new String[0]; + } else { + // 其他引用类型数组 + return java.lang.reflect.Array.newInstance(arrayType.getComponentType(), 0); + } + } +} diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java index c34b8e7a..53cccb20 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java @@ -25,7 +25,6 @@ import cn.odboy.devops.service.core.PipelineInstanceService; import cn.odboy.devops.service.core.PipelineTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -38,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController -@RequiredArgsConstructor @RequestMapping("/api/devops/pipelineInstance") @Api(tags = "DevOps：流水线实例管理") public class DevopsPipelineInstanceController { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java index 38c84c74..e007433f 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java @@ -19,7 +19,6 @@ import cn.odboy.base.CsArgs; import cn.odboy.devops.service.core.PipelineTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController -@RequiredArgsConstructor @RequestMapping("/api/devops/pipelineTemplate") @Api(tags = "DevOps：流水线模板管理") public class DevopsPipelineTemplateController { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java index a18acc95..5a8d1810 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java @@ -15,16 +15,16 @@ */ package cn.odboy.devops.dal.redis; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.framework.redis.CsRedisHelper; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component -@RequiredArgsConstructor public class PipelineInstanceDAO { - private final CsRedisHelper redisHelper; + @Autowired + private CsRedisHelper redisHelper; /** * 全局锁，对应上下文，只能有一次 diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java index b63dbc3b..321f0c10 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java @@ -15,8 +15,8 @@ */ package cn.odboy.devops.framework.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService; import cn.odboy.devops.service.core.PipelineInstanceNodeService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java index 8dca238a..883d06d1 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java @@ -17,12 +17,12 @@ package cn.odboy.devops.framework.pipeline.core; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; import cn.odboy.devops.dal.mysql.PipelineInstanceMapper; import cn.odboy.devops.dal.redis.PipelineInstanceDAO; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.core.PipelineInstanceNodeService; import cn.odboy.framework.context.CsSpringBeanHolder; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java index 0c4f8163..320ca5be 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java @@ -16,8 +16,8 @@ package cn.odboy.devops.framework.pipeline.core; import cn.hutool.core.util.IdUtil; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.quartz.*; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java index 9b5cea2f..3a850ed7 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java @@ -15,8 +15,8 @@ */ package cn.odboy.devops.framework.pipeline.core; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java index 1b811c32..ba84947f 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java @@ -15,9 +15,9 @@ */ package cn.odboy.devops.framework.pipeline.log; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java index bbc8131c..93c8bfc4 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java @@ -15,9 +15,9 @@ */ package cn.odboy.devops.service.core; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import com.anwen.mongo.service.IService; import java.util.Date; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java index 68885986..b3328fa8 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java @@ -15,9 +15,9 @@ */ package cn.odboy.devops.service.core; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import com.anwen.mongo.service.IService; import java.util.Date; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java index 524d0764..c3e725f0 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java @@ -18,7 +18,7 @@ package cn.odboy.devops.service.core; import cn.odboy.devops.dal.dataobject.PipelineTemplateTb; import cn.odboy.devops.dal.mysql.PipelineTemplateMapper; import cn.odboy.framework.exception.BadRequestException; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -30,9 +30,9 @@ import org.springframework.stereotype.Service; * @since 2025-06-26 */ @Service -@RequiredArgsConstructor public class PipelineTemplateService { - private final PipelineTemplateMapper pipelineTemplateMapper; + @Autowired + private PipelineTemplateMapper pipelineTemplateMapper; public PipelineTemplateTb getPipelineTemplateById(Long id) { PipelineTemplateTb pipelineTemplateTb = pipelineTemplateMapper.selectById(id); diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java index c4e1dbc4..fadd1203 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java @@ -16,9 +16,9 @@ package cn.odboy.devops.service.core.impl; import cn.hutool.core.collection.CollUtil; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService; import com.anwen.mongo.conditions.query.LambdaQueryChainWrapper; import com.anwen.mongo.conditions.update.LambdaUpdateChainWrapper; diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java index 979bd844..c6a8db02 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java @@ -16,17 +16,17 @@ package cn.odboy.devops.service.core.impl; import cn.hutool.core.collection.CollUtil; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService; import cn.odboy.devops.service.core.PipelineInstanceNodeService; import com.alibaba.fastjson2.JSON; import com.anwen.mongo.conditions.query.LambdaQueryChainWrapper; import com.anwen.mongo.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -36,9 +36,9 @@ import java.util.stream.Collectors; @Slf4j @Service -@RequiredArgsConstructor public class PipelineInstanceNodeServiceImpl extends ServiceImpl implements PipelineInstanceNodeService { - private final PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService; + @Autowired + private PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService; @Override public void createPipelineInstanceDetail(PipelineInstanceTb pipelineInstanceTb) { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java index 9a487b62..446b8954 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java @@ -18,8 +18,6 @@ package cn.odboy.devops.service.core.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; -import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; @@ -27,6 +25,8 @@ import cn.odboy.devops.dal.model.RestartPipelineArgs; import cn.odboy.devops.dal.model.StartPipelineResultVo; import cn.odboy.devops.dal.mysql.PipelineInstanceMapper; import cn.odboy.devops.dal.redis.PipelineInstanceDAO; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; +import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum; import cn.odboy.devops.framework.pipeline.core.PipelineJobManage; import cn.odboy.devops.framework.pipeline.model.PipelineInstanceNodeVo; import cn.odboy.devops.framework.pipeline.model.PipelineInstanceVo; @@ -40,8 +40,8 @@ import cn.odboy.framework.websocket.context.CsWsServer; import cn.odboy.framework.websocket.model.WsSidVo; import cn.odboy.framework.websocket.util.WsMessageUtil; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -49,13 +49,17 @@ import java.util.List; @Slf4j @Service -@RequiredArgsConstructor public class PipelineInstanceServiceImpl implements PipelineInstanceService { - private final PipelineJobManage pipelineJobManage; - private final PipelineInstanceMapper pipelineInstanceMapper; - private final PipelineInstanceDAO pipelineInstanceDAO; - private final PipelineInstanceNodeService pipelineInstanceNodeService; - private final PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService; + @Autowired + private PipelineJobManage pipelineJobManage; + @Autowired + private PipelineInstanceMapper pipelineInstanceMapper; + @Autowired + private PipelineInstanceDAO pipelineInstanceDAO; + @Autowired + private PipelineInstanceNodeService pipelineInstanceNodeService; + @Autowired + private PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService; @Override public StartPipelineResultVo startPipeline(PipelineInstanceTb pipelineInstanceTb) { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java index 788728c6..813f8426 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_sign_android_apk") public class PipelineNodeApkSignAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java index 90289445..aab06498 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_approve_cplus") public class PipelineNodeApproveCPlusService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java index 9dcdac10..fdc08985 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_approve_deploy") public class PipelineNodeApproveDeployService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java index 0ac9d85b..c856de32 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_approve_test_android") public class PipelineNodeApproveTestAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java index f29dc2ea..55f8d2cf 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_android") public class PipelineNodeBuildAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java index e1dba43c..e9b50b78 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_cplus") public class PipelineNodeBuildCPlusService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java index 53b33094..bdd44075 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_ios") public class PipelineNodeBuildIOSService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java index aac201ab..07b7756a 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeBuildJavaBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_java") public class PipelineNodeBuildJavaService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeBuildJavaBiz pipelineNodeBuildJavaBiz; + @Autowired + private PipelineNodeBuildJavaBiz pipelineNodeBuildJavaBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java index 934909ef..4532b69a 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_node") public class PipelineNodeBuildNodeService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java index e72dbfa8..c1bcd0db 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_npm") public class PipelineNodeBuildNpmService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java index 1fc311bb..10aaffb0 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_python") public class PipelineNodeBuildPythonService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java index 745ac93e..de5873ab 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build") public class PipelineNodeBuildService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java index b813fb75..41895a5f 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_check_flutter_version") public class PipelineNodeCheckFlutterVersionService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java index 9dcd6603..abd291da 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java @@ -15,9 +15,9 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; @@ -25,8 +25,8 @@ import cn.odboy.devops.service.core.PipelineTemplateService; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -37,11 +37,12 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_api") public class PipelineNodeDeployApiService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; - private final PipelineTemplateService pipelineTemplateService; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineTemplateService pipelineTemplateService; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java index 13969be1..83cbb231 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java @@ -15,10 +15,10 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineTemplateTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; @@ -26,8 +26,8 @@ import cn.odboy.devops.service.core.PipelineTemplateService; import cn.odboy.devops.service.pipeline.node.PipelineNodeDeployJavaBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -38,11 +38,12 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_java") public class PipelineNodeDeployJavaService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDeployJavaBiz pipelineNodeDeployJavaBiz; - private final PipelineTemplateService pipelineTemplateService; + @Autowired + private PipelineNodeDeployJavaBiz pipelineNodeDeployJavaBiz; + @Autowired + private PipelineTemplateService pipelineTemplateService; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java index 4658e524..45357f44 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_node") public class PipelineNodeDeployNodeService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java index 8b90f67b..c58cb9d6 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java @@ -15,10 +15,10 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.dal.dataobject.PipelineTemplateTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; @@ -26,8 +26,8 @@ import cn.odboy.devops.service.core.PipelineTemplateService; import cn.odboy.devops.service.pipeline.node.PipelineNodeDeployJavaBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -38,11 +38,12 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_python") public class PipelineNodeDeployPythonService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDeployJavaBiz pipelineNodeDeployJavaBiz; - private final PipelineTemplateService pipelineTemplateService; + @Autowired + private PipelineNodeDeployJavaBiz pipelineNodeDeployJavaBiz; + @Autowired + private PipelineTemplateService pipelineTemplateService; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java index abe196e0..e1d19a3f 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_http_get_plugin") public class PipelineNodeHttpGetPluginService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java index 3df5ca6a..f91bb01e 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_http_post_plugin") public class PipelineNodeHttpPostPluginService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java index 4be93b33..4d02bbdf 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_image_scan") public class PipelineNodeImageScanService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java index e94caf3b..ab14f3b3 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java @@ -15,18 +15,18 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeInitBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -39,9 +39,9 @@ import java.util.List; */ @Slf4j @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_init") -@RequiredArgsConstructor public class PipelineNodeInitService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeInitBiz pipelineNodeInitBiz; + @Autowired + private PipelineNodeInitBiz pipelineNodeInitBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java index 178f5272..d83edf7a 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java @@ -15,16 +15,16 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeMergeBranchBiz; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -35,10 +35,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_branch") public class PipelineNodeMergeBranchService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeMergeBranchBiz pipelineNodeMergeBranchBiz; + @Autowired + private PipelineNodeMergeBranchBiz pipelineNodeMergeBranchBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws Exception { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java index e24dc5e2..a6d57e64 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_confirm") public class PipelineNodeMergeConfirmService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java index 7b980458..ed0a3734 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_master") public class PipelineNodeMergeMasterService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java index 932aa7cf..bacfac0a 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_reinforce_android_apk") public class PipelineNodeReinforceAndroidApkService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java index 5e12e61b..e50ca8c9 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java @@ -15,17 +15,17 @@ */ package cn.odboy.devops.service.pipeline; -import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb; import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService; +import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor; import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz; import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import lombok.RequiredArgsConstructor; import org.quartz.JobDataMap; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; * @author odboy * @date 2025-07-24 */ -@RequiredArgsConstructor @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_upload_android_apk") public class PipelineNodeUploadAndroidApkService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor { - private final PipelineNodeDemoBiz pipelineNodeDemoBiz; + @Autowired + private PipelineNodeDemoBiz pipelineNodeDemoBiz; @Override public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 41adc73d..d1c9bfbe 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -21,8 +21,8 @@ import cn.odboy.util.CsStringUtil; import com.wf.captcha.base.Captcha; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -46,15 +46,20 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") -@RequiredArgsConstructor @Api(tags = "系统：系统授权接口") public class SystemAuthController { - private final CsRedisHelper redisHelper; - private final SystemUserOnlineInfoDAO onlineUserService; - private final TokenProvider tokenProvider; - private final AppProperties properties; - private final PasswordEncoder passwordEncoder; - private final UserDetailsHandler userDetailsService; + @Autowired + private CsRedisHelper redisHelper; + @Autowired + private SystemUserOnlineInfoDAO onlineUserService; + @Autowired + private TokenProvider tokenProvider; + @Autowired + private AppProperties properties; + @Autowired + private PasswordEncoder passwordEncoder; + @Autowired + private UserDetailsHandler userDetailsService; @ApiOperation("登录授权") @AnonymousPostMapping(value = "/login") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index b53febaa..aabd54dd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -5,18 +5,18 @@ import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @RestController -@RequiredArgsConstructor @RequestMapping("/api/captcha") @Api(tags = "系统：验证码管理") public class SystemCaptchaController { - private final SystemEmailService systemEmailService; + @Autowired + private SystemEmailService systemEmailService; @ApiOperation("重置邮箱, 发送验证码") @PostMapping(value = "/sendResetEmailCaptcha") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java index 836b0efd..9bfeaa00 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java @@ -3,7 +3,7 @@ package cn.odboy.system.controller; import cn.odboy.system.service.SystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequiredArgsConstructor @Api(tags = "系统：组件数据源") @RequestMapping("/api/component") public class SystemComponentController { - private final SystemDeptService systemDeptService; + @Autowired + private SystemDeptService systemDeptService; @ApiOperation("查询部门下拉选择数据源") @PostMapping(value = "/queryDeptSelectDataSource") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 96135ebb..24fdb3f7 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.SystemCreateDeptArgs; import cn.odboy.system.dal.model.SystemQueryDeptArgs; @@ -9,7 +9,7 @@ import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -24,11 +24,11 @@ import java.util.Set; import java.util.stream.Collectors; @RestController -@RequiredArgsConstructor @Api(tags = "系统：部门管理") @RequestMapping("/api/dept") public class SystemDeptController { - private final SystemDeptService systemDeptService; + @Autowired + private SystemDeptService systemDeptService; @ApiOperation("导出部门数据") @GetMapping(value = "/download") @@ -40,7 +40,7 @@ public class SystemDeptController { @ApiOperation("查询部门") @PostMapping @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity>> queryDept(@Validated @RequestBody CsPageArgs args) throws Exception { + public ResponseEntity> queryDept(@Validated @RequestBody CsPageArgs args) throws Exception { SystemQueryDeptArgs criteria = args.getArgs(); List depts = systemDeptService.queryAllDept(criteria, true); return new ResponseEntity<>(CsPageUtil.toPage(depts), HttpStatus.OK); @@ -49,7 +49,7 @@ public class SystemDeptController { @ApiOperation("查询部门:根据ID获取同级与上级数据") @PostMapping("/queryDeptSuperiorTree") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity>> queryDeptSuperiorTree(@RequestBody List ids, + public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { Set deptSet = new LinkedHashSet<>(); for (Long id : ids) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 54aa3307..6c76f914 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.SystemCreateDictArgs; import cn.odboy.system.dal.model.SystemQueryDictArgs; @@ -9,7 +9,7 @@ import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -22,11 +22,11 @@ import java.util.List; import java.util.Set; @RestController -@RequiredArgsConstructor @Api(tags = "系统：字典管理") @RequestMapping("/api/dict") public class SystemDictController { - private final SystemDictService systemDictService; + @Autowired + private SystemDictService systemDictService; @ApiOperation("导出字典数据") @GetMapping(value = "/download") @@ -45,7 +45,7 @@ public class SystemDictController { @ApiOperation("查询字典") @PostMapping @PreAuthorize("@el.check('dict:list')") - public ResponseEntity>> queryDictByArgs(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryDictByArgs(@Validated @RequestBody CsPageArgs args) { Page page; SystemQueryDictArgs criteria = args.getArgs(); if (args.getSize() != null) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 354c9adf..dd4dea2a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; @@ -9,7 +9,7 @@ import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -21,21 +21,21 @@ import java.util.List; import java.util.Map; @RestController -@RequiredArgsConstructor @Api(tags = "系统：字典详情管理") @RequestMapping("/api/dictDetail") public class SystemDictDetailController { - private final SystemDictDetailService systemDictDetailService; + @Autowired + private SystemDictDetailService systemDictDetailService; @ApiOperation("查询字典详情") @PostMapping - public ResponseEntity>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs args) { return queryDictDetailByArgs(args); } @ApiOperation("查询字典详情") @PostMapping(value = "/queryDictDetailByArgs") - public ResponseEntity>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs args) { SystemQueryDictDetailArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemDictDetailService.queryDictDetailByArgs(criteria, page), HttpStatus.OK); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 4bf730f5..f4222d22 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -5,7 +5,7 @@ import cn.odboy.system.dal.model.SystemSendEmailArgs; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -18,11 +18,11 @@ import org.springframework.web.bind.annotation.RestController; * 发送邮件 */ @RestController -@RequiredArgsConstructor @RequestMapping("api/email") @Api(tags = "工具：邮件管理") public class SystemEmailController { - private final SystemEmailService systemEmailService; + @Autowired + private SystemEmailService systemEmailService; @ApiOperation("查询配置") @PostMapping(value = "/getLastEmailConfig") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 6f291f64..a4303893 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; import cn.odboy.system.dal.model.SystemQueryJobArgs; @@ -9,7 +9,7 @@ import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -18,15 +18,14 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; import java.util.Set; @RestController -@RequiredArgsConstructor @Api(tags = "系统：岗位管理") @RequestMapping("/api/job") public class SystemJobController { - private final SystemJobService systemJobService; + @Autowired + private SystemJobService systemJobService; @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @@ -38,7 +37,7 @@ public class SystemJobController { @ApiOperation("查询岗位") @PostMapping(value = "/queryAllEnableJob") @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity>> queryJobByArgs(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryJobByArgs(@Validated @RequestBody CsPageArgs args) { SystemQueryJobArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemJobService.queryJobByArgs(criteria, page), HttpStatus.OK); @@ -47,7 +46,7 @@ public class SystemJobController { @ApiOperation("查询岗位") @PostMapping @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity>> queryJobByCrud(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryJobByCrud(@Validated @RequestBody CsPageArgs args) { return queryJobByArgs(args); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 2d6c0354..6c0c1e3c 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.constant.FileTypeEnum; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; @@ -11,7 +11,7 @@ import cn.odboy.util.CsFileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -21,19 +21,18 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; @RestController -@RequiredArgsConstructor @Api(tags = "工具：本地存储管理") @RequestMapping("/api/localStorage") public class SystemLocalStorageController { - private final SystemLocalStorageService localStorageService; + @Autowired + private SystemLocalStorageService localStorageService; @ApiOperation("查询文件") @PostMapping @PreAuthorize("@el.check('storage:list')") - public ResponseEntity>> queryLocalStorage(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryLocalStorage(@Validated @RequestBody CsPageArgs args) { SystemQueryStorageArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(localStorageService.queryLocalStorage(criteria, page), HttpStatus.OK); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 2f83970c..98e81ada 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -2,7 +2,7 @@ package cn.odboy.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.SystemMenuVo; @@ -12,7 +12,7 @@ import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -24,11 +24,11 @@ import java.util.*; import java.util.stream.Collectors; @RestController -@RequiredArgsConstructor @Api(tags = "系统：菜单管理") @RequestMapping("/api/menu") public class SystemMenuController { - private final SystemMenuService systemMenuService; + @Autowired + private SystemMenuService systemMenuService; @ApiOperation("导出菜单数据") @GetMapping(value = "/download") @@ -67,14 +67,14 @@ public class SystemMenuController { @PostMapping @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity>> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs args) throws Exception { + public ResponseEntity> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs args) throws Exception { return queryAllMenu(args); } @PostMapping(value = "/queryMenuByArgs") @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity>> queryAllMenu(@Validated @RequestBody CsPageArgs args) throws Exception { + public ResponseEntity> queryAllMenu(@Validated @RequestBody CsPageArgs args) throws Exception { SystemQueryMenuArgs criteria = args.getArgs(); List menuList = systemMenuService.queryAllMenu(criteria, true); return new ResponseEntity<>(CsPageUtil.toPage(menuList), HttpStatus.OK); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index 63b0abfb..20ef0c77 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -3,7 +3,7 @@ package cn.odboy.system.controller; import cn.odboy.system.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Map; @RestController -@RequiredArgsConstructor @Api(tags = "系统-服务监控管理") @RequestMapping("/api/monitor") public class SystemMonitorController { - private final SystemMonitorService systemMonitorService; + @Autowired + private SystemMonitorService systemMonitorService; @PostMapping(value = "/queryServerMonitorInfo") @ApiOperation("查询服务监控") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 683f681d..668b2150 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.model.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.util.CsDesEncryptUtil; @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -18,20 +18,19 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; import java.util.Set; @RestController -@RequiredArgsConstructor @RequestMapping("/api/user/online") @Api(tags = "系统：在线用户管理") public class SystemOnlineController { - private final SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired + private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; @ApiOperation("查询在线用户") @PostMapping @PreAuthorize("@el.check()") - public ResponseEntity>> queryOnlineUser(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryOnlineUser(@Validated @RequestBody CsPageArgs args) { IPage page = new Page<>(args.getPage(), args.getSize()); return new ResponseEntity<>(systemUserOnlineInfoDAO.queryUserOnlineModelPage(args.getArgs(), page), HttpStatus.OK); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index a27d7c59..8cf58fdb 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.SystemOssStorageVo; import cn.odboy.system.dal.model.SystemQueryStorageArgs; @@ -9,8 +9,8 @@ import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -20,20 +20,19 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; @Slf4j @RestController -@RequiredArgsConstructor @Api(tags = "工具：OSS存储管理") @RequestMapping("/api/ossStorage") public class SystemOssStorageController { - private final SystemOssStorageService systemOssStorageService; + @Autowired + private SystemOssStorageService systemOssStorageService; @ApiOperation("查询文件") @PostMapping @PreAuthorize("@el.check('storage:list')") - public ResponseEntity>> queryOssStorage(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryOssStorage(@Validated @RequestBody CsPageArgs args) { SystemQueryStorageArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemOssStorageService.queryOssStorage(criteria, page), HttpStatus.OK); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index f8e9a4ea..bfb53dbd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -1,7 +1,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.context.CsSpringBeanHolder; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; @@ -12,8 +12,8 @@ import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -22,21 +22,20 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; import java.util.Set; @Slf4j @RestController -@RequiredArgsConstructor @RequestMapping("/api/quartzJob") @Api(tags = "系统:定时任务管理") public class SystemQuartzJobController { - private final SystemQuartzJobService systemQuartzJobService; + @Autowired + private SystemQuartzJobService systemQuartzJobService; @ApiOperation("查询定时任务") @PostMapping @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity>> queryQuartzJobByCrud(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryQuartzJobByCrud(@Validated @RequestBody CsPageArgs args) { SystemQueryQuartzJobArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemQuartzJobService.queryQuartzJobByArgs(criteria, page), HttpStatus.OK); @@ -59,7 +58,7 @@ public class SystemQuartzJobController { @ApiOperation("查询任务执行日志") @PostMapping(value = "/logs") @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity>> queryQuartzJobLog(SystemQueryQuartzJobArgs criteria) { + public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemQuartzJobService.queryQuartzLogByArgs(criteria, page), HttpStatus.OK); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 6fbda96c..e6918ca6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -2,7 +2,7 @@ package cn.odboy.system.controller; import cn.hutool.core.lang.Dict; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.SystemCreateRoleArgs; @@ -12,7 +12,7 @@ import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,11 +27,11 @@ import java.util.Set; import java.util.stream.Collectors; @RestController -@RequiredArgsConstructor @Api(tags = "系统：角色管理") @RequestMapping("/api/role") public class SystemRoleController { - private final SystemRoleService systemRoleService; + @Autowired + private SystemRoleService systemRoleService; @ApiOperation("获取单个role") @PostMapping(value = "/queryRoleById") @@ -57,7 +57,7 @@ public class SystemRoleController { @ApiOperation("查询角色") @PostMapping @PreAuthorize("@el.check('roles:list')") - public ResponseEntity>> queryRoleByArgs(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryRoleByArgs(@Validated @RequestBody CsPageArgs args) { SystemQueryRoleArgs criteria = args.getArgs(); Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(systemRoleService.queryRoleByArgs(criteria, page), HttpStatus.OK); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 5d996d29..fcc4a6ec 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -2,7 +2,7 @@ package cn.odboy.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.base.CsSelectOptionVo; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,15 +39,21 @@ import java.util.stream.Collectors; @Api(tags = "系统：用户管理") @RestController @RequestMapping("/api/user") -@RequiredArgsConstructor public class SystemUserController { - private final PasswordEncoder passwordEncoder; - private final SystemUserService systemUserService; - private final SystemDataService systemDataService; - private final SystemDeptService systemDeptService; - private final SystemRoleService systemRoleService; - private final SystemEmailService systemEmailService; - private final AppProperties properties; + @Autowired + private PasswordEncoder passwordEncoder; + @Autowired + private SystemUserService systemUserService; + @Autowired + private SystemDataService systemDataService; + @Autowired + private SystemDeptService systemDeptService; + @Autowired + private SystemRoleService systemRoleService; + @Autowired + private SystemEmailService systemEmailService; + @Autowired + private AppProperties properties; @ApiOperation("导出用户数据") @GetMapping(value = "/download") @@ -59,7 +65,7 @@ public class SystemUserController { @ApiOperation("查询用户") @PostMapping @PreAuthorize("@el.check('user:list')") - public ResponseEntity>> queryUserByArgs(@Validated @RequestBody CsPageArgs args) { + public ResponseEntity> queryUserByArgs(@Validated @RequestBody CsPageArgs args) { Page page = new Page<>(args.getPage(), args.getSize()); SystemQueryUserArgs criteria = args.getArgs(); if (!ObjectUtils.isEmpty(criteria.getDeptId())) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java new file mode 100644 index 00000000..2ef2dddf --- /dev/null +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java @@ -0,0 +1,85 @@ +package cn.odboy.system.dal.dataobject; + +import cn.odboy.base.CsObject; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Date; + +/** + *

+ * 系统审计日志 + *

+ * + * @author codegen + * @since 2025-05-12 + */ +@Getter +@Setter +@ToString +@TableName("system_operation_log") +@ApiModel(value = "SystemOperationLog对象", description = "审计日志") +public class SystemOperationLogTb extends CsObject { + + /** + * id + */ + @ApiModelProperty("id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 业务名称 + */ + @TableField("biz_name") + private String bizName; + /** + * 业务方法 + */ + @TableField("method") + private String method; + /** + * 业务参数 + */ + @TableField("params") + private String params; + /** + * 访问来源IP + */ + @TableField("request_ip") + private String requestIp; + /** + * 执行时间 + */ + @TableField("execute_time") + private Long executeTime; + /** + * 用户名 + */ + @TableField("username") + private String username; + /** + * 访问来源地址 + */ + @TableField("address") + private String address; + /** + * 浏览器信息 + */ + @TableField("browser_info") + private String browserInfo; + /** + * 异常详情 + */ + @TableField("exception_detail") + private String exceptionDetail; + /** + * 创建时间 + */ + @TableField(value = "create_time", fill = FieldFill.INSERT) + private Date createTime; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemOperationLogMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemOperationLogMapper.java new file mode 100644 index 00000000..3c0a4696 --- /dev/null +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemOperationLogMapper.java @@ -0,0 +1,9 @@ +package cn.odboy.system.dal.mysql; + +import cn.odboy.system.dal.dataobject.SystemOperationLogTb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SystemOperationLogMapper extends BaseMapper { +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index fa31c360..0a99db9b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.RandomUtil; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.util.CsStringUtil; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -12,9 +12,9 @@ import org.springframework.stereotype.Component; * 用户缓存管理 */ @Component -@RequiredArgsConstructor public class SystemUserInfoDAO { - private final CsRedisHelper redisHelper; + @Autowired + private CsRedisHelper redisHelper; /** * 添加缓存到Redis diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 646a66c4..feca7119 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -1,6 +1,6 @@ package cn.odboy.system.dal.redis; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.dal.model.SystemUserJwtVo; @@ -112,7 +112,7 @@ public class SystemUserOnlineInfoDAO { * @return / */ - public CsPageResultVo> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage pageable) { + public CsPageResult queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage pageable) { String username = null; if (onlineVo != null) { username = onlineVo.getUserName(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java new file mode 100644 index 00000000..3fbee830 --- /dev/null +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java @@ -0,0 +1,32 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed 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. + */ +package cn.odboy.system.framework.operalog.annotaions; + +import java.lang.annotation.*; + +/** + * 捕捉操作日志 + * + * @author odboy + * @date 2025-05-12 + */ +@Inherited +@Documented +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface OperationLog { + String bizName() default ""; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java new file mode 100644 index 00000000..1f82c23c --- /dev/null +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java @@ -0,0 +1,122 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed 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. + */ +package cn.odboy.system.framework.operalog.core; + +import cn.hutool.core.date.TimeInterval; +import cn.hutool.core.exceptions.ExceptionUtil; +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.StrUtil; +import cn.odboy.framework.context.CsRequestHolder; +import cn.odboy.system.dal.dataobject.SystemOperationLogTb; +import cn.odboy.system.dal.mysql.SystemOperationLogMapper; +import cn.odboy.system.framework.operalog.annotaions.OperationLog; +import cn.odboy.system.framework.permission.core.CsSecurityHelper; +import cn.odboy.util.CsBrowserUtil; +import cn.odboy.util.CsIPUtil; +import com.alibaba.fastjson2.JSON; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Method; + +/** + * 捕捉操作日志 + * + * @author odboy + * @date 2025-05-12 + */ +@Slf4j +@Aspect +@Component +public class SystemOperationLogAspect { + @Autowired + private SystemOperationLogMapper systemOperationLogMapper; + + @Around("@annotation(operationLog)") + public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable { + return handleLog(joinPoint, operationLog); + } + + private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable { + TimeInterval timeInterval = new TimeInterval(); + try { + Object result = joinPoint.proceed(); + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // log.error("保存审计日志失败", e); + // 忽略 + } + }); + return result; + } catch (Throwable exception) { + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception)); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // log.error("保存审计日志失败", e); + // 忽略 + } + }); + throw exception; + } + } + + private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, TimeInterval timeInterval) { + long executeTime = timeInterval.intervalMs(); + MethodSignature signature = (MethodSignature)joinPoint.getSignature(); + String bizName = annotation.bizName(); + if (StrUtil.isBlank(bizName)) { + Method method = signature.getMethod(); + ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); + if (apiOperation != null) { + bizName = apiOperation.value(); + } + } + if (StrUtil.isBlank(bizName)) { + bizName = "默认业务"; + } + String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; + Object[] args = joinPoint.getArgs(); + String params = JSON.toJSONString(args); + HttpServletRequest request = CsRequestHolder.getHttpServletRequest(); + String requestIp = CsBrowserUtil.getIp(request); + String browserInfo = CsBrowserUtil.getVersion(request); + String address = CsIPUtil.getCityInfo(requestIp); + String username = CsSecurityHelper.getCurrentUsername(); + SystemOperationLogTb record = new SystemOperationLogTb(); + record.setBizName(bizName); + record.setMethod(method); + record.setParams(params); + record.setRequestIp(requestIp); + record.setExecuteTime(executeTime); + record.setUsername(username); + record.setAddress(address); + record.setBrowserInfo(browserInfo); + return record; + } +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java index a4015ba5..02b7cab9 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java @@ -6,7 +6,7 @@ import cn.odboy.system.framework.permission.core.handler.JwtAccessDeniedHandler; import cn.odboy.system.framework.permission.core.handler.JwtAuthenticationEntryPoint; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.CsAnonTagUtil; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,16 +24,20 @@ import java.util.Map; import java.util.Set; @Configuration -@RequiredArgsConstructor @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SpringSecurityConfig { - - private final TokenProvider tokenProvider; - private final CorsFilter corsFilter; - private final JwtAuthenticationEntryPoint authenticationErrorHandler; - private final JwtAccessDeniedHandler jwtAccessDeniedHandler; - private final ApplicationContext applicationContext; - private final SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired + private TokenProvider tokenProvider; + @Autowired + private CorsFilter corsFilter; + @Autowired + private JwtAuthenticationEntryPoint authenticationErrorHandler; + @Autowired + private JwtAccessDeniedHandler jwtAccessDeniedHandler; + @Autowired + private ApplicationContext applicationContext; + @Autowired + private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; @Bean public GrantedAuthorityDefaults grantedAuthorityDefaults() { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java index 6368081c..8e66cf7f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java @@ -3,17 +3,20 @@ package cn.odboy.system.framework.permission.config; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.permission.core.handler.TokenFilter; import cn.odboy.system.framework.permission.core.handler.TokenProvider; -import lombok.RequiredArgsConstructor; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.DefaultSecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -@RequiredArgsConstructor public class TokenConfigurer extends SecurityConfigurerAdapter { private final TokenProvider tokenProvider; private final SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + public TokenConfigurer(TokenProvider tokenProvider, SystemUserOnlineInfoDAO systemUserOnlineInfoDAO) { + this.tokenProvider = tokenProvider; + this.systemUserOnlineInfoDAO = systemUserOnlineInfoDAO; + } + @Override public void configure(HttpSecurity http) { TokenFilter customFilter = new TokenFilter(tokenProvider, systemUserOnlineInfoDAO); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java index a674a2b4..0ade548a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java @@ -14,9 +14,9 @@ import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.User; @@ -32,13 +32,13 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component -@RequiredArgsConstructor public class TokenProvider implements InitializingBean { - + @Autowired + private CsRedisHelper redisHelper; + @Autowired + private AppProperties properties; private Key signingKey; private JwtParser jwtParser; - private final CsRedisHelper redisHelper; - private final AppProperties properties; public static final String AUTHORITIES_UUID_KEY = "uid"; public static final String AUTHORITIES_UID_KEY = "userId"; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index 1e6faa88..64ddc415 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -8,21 +8,24 @@ import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.service.SystemDataService; import cn.odboy.system.service.SystemRoleService; import cn.odboy.system.service.SystemUserService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; import java.util.List; @Slf4j -@RequiredArgsConstructor @Service("userDetailsService") public class UserDetailsHandler implements UserDetailsService { - private final SystemRoleService systemRoleService; - private final SystemUserService systemUserService; - private final SystemDataService systemDataService; - private final SystemUserInfoDAO systemUserInfoDAO; + @Autowired + private SystemRoleService systemRoleService; + @Autowired + private SystemUserService systemUserService; + @Autowired + private SystemDataService systemDataService; + @Autowired + private SystemUserInfoDAO systemUserInfoDAO; @Override public SystemUserJwtVo loadUserByUsername(String username) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java index f182bcaa..8b3735a4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java @@ -2,8 +2,8 @@ package cn.odboy.system.framework.quartz; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; @@ -12,10 +12,11 @@ import java.util.List; @Slf4j @Component -@RequiredArgsConstructor public class InitialActiveJobApplicationRunner implements ApplicationRunner { - private final SystemQuartzJobMapper quartzJobMapper; - private final QuartzManage quartzManage; + @Autowired + private SystemQuartzJobMapper quartzJobMapper; + @Autowired + private QuartzManage quartzManage; /** * 项目启动时重新激活启用的定时任务 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java index 012f7ee4..e103f300 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java @@ -17,8 +17,8 @@ import io.minio.*; import io.minio.http.Method; import io.minio.messages.Bucket; import io.minio.messages.Item; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; @@ -32,10 +32,11 @@ import java.util.List; @Slf4j @Component -@RequiredArgsConstructor public class MinioRepository { - private final AppProperties properties; - private final MinioClient minioClient; + @Autowired + private AppProperties properties; + @Autowired + private MinioClient minioClient; /** * 检查存储bucket是否存在 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index 6ccd1049..b13abd2b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -5,7 +5,7 @@ import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -19,10 +19,11 @@ import java.util.stream.Collectors; * @author odboy */ @Service -@RequiredArgsConstructor public class SystemDataService { - private final SystemRoleService systemRoleService; - private final SystemDeptService systemDeptService; + @Autowired + private SystemRoleService systemRoleService; + @Autowired + private SystemDeptService systemDeptService; /** * 获取数据权限 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 05324008..a147e130 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; @@ -20,7 +20,7 @@ import cn.odboy.util.CsClassUtil; import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsStringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,11 +32,13 @@ import java.util.function.Function; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor public class SystemDeptService { - private final SystemDeptMapper systemDeptMapper; - private final SystemUserMapper systemUserMapper; - private final SystemRoleMapper systemRoleMapper; + @Autowired + private SystemDeptMapper systemDeptMapper; + @Autowired + private SystemUserMapper systemUserMapper; + @Autowired + private SystemRoleMapper systemRoleMapper; /** * 创建 @@ -273,7 +275,7 @@ public class SystemDeptService { * @return / */ - public CsPageResultVo> buildDeptTree(List deptList) { + public CsPageResult buildDeptTree(List deptList) { Set trees = new LinkedHashSet<>(); Set deptSet = new LinkedHashSet<>(); List deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList()); @@ -301,8 +303,8 @@ public class SystemDeptService { if (CollectionUtil.isEmpty(trees)) { trees = deptSet; } - CsPageResultVo> baseResult = new CsPageResultVo<>(); - baseResult.setContent(CollectionUtil.isEmpty(trees) ? deptSet : trees); + CsPageResult baseResult = new CsPageResult<>(); + baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees)); baseResult.setTotalElements(deptSet.size()); return baseResult; } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index b8e9bace..f9fe3e01 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -1,23 +1,23 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service -@RequiredArgsConstructor public class SystemDictDetailService { - private final SystemDictDetailMapper systemDictDetailMapper; + @Autowired + private SystemDictDetailMapper systemDictDetailMapper; /** * 创建 @@ -64,7 +64,7 @@ public class SystemDictDetailService { * @return / */ - public CsPageResultVo> queryDictDetailByArgs(SystemQueryDictDetailArgs criteria, Page page) { + public CsPageResult queryDictDetailByArgs(SystemQueryDictDetailArgs criteria, Page page) { return CsPageUtil.toPage(systemDictDetailMapper.selectDictDetailByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index 916bdc8f..188f50cd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -2,7 +2,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.SystemCreateDictArgs; @@ -13,7 +13,7 @@ import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,10 +22,11 @@ import java.io.IOException; import java.util.*; @Service -@RequiredArgsConstructor public class SystemDictService { - private final SystemDictMapper systemDictMapper; - private final SystemDictDetailMapper systemDictDetailMapper; + @Autowired + private SystemDictMapper systemDictMapper; + @Autowired + private SystemDictDetailMapper systemDictDetailMapper; /** * 创建 @@ -111,7 +112,7 @@ public class SystemDictService { * @return / */ - public CsPageResultVo> queryDictByArgs(SystemQueryDictArgs criteria, Page page) { + public CsPageResult queryDictByArgs(SystemQueryDictArgs criteria, Page page) { return CsPageUtil.toPage(systemDictMapper.selectDictByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index fe347351..59ced041 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -13,8 +13,8 @@ import cn.odboy.system.dal.model.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemEmailConfigMapper; import cn.odboy.util.CsDesEncryptUtil; import cn.odboy.util.CsResourceTemplateUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,11 +23,13 @@ import java.util.Collections; @Slf4j @Service -@RequiredArgsConstructor public class SystemEmailService { - private final SystemEmailConfigMapper systemEmailConfigMapper; - private final CsRedisHelper redisHelper; - private final AppProperties properties; + @Autowired + private SystemEmailConfigMapper systemEmailConfigMapper; + @Autowired + private CsRedisHelper redisHelper; + @Autowired + private AppProperties properties; @Value("${spring.application.title}") private String applicationTitle; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index d11ea7a0..5028a3f4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -1,7 +1,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; @@ -11,7 +11,7 @@ import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +20,11 @@ import java.io.IOException; import java.util.*; @Service -@RequiredArgsConstructor public class SystemJobService { - private final SystemJobMapper systemJobMapper; - private final SystemUserMapper systemUserMapper; + @Autowired + private SystemJobMapper systemJobMapper; + @Autowired + private SystemUserMapper systemUserMapper; /** * 创建 @@ -96,7 +97,7 @@ public class SystemJobService { * @return */ - public CsPageResultVo> queryJobByArgs(SystemQueryJobArgs criteria, Page page) { + public CsPageResult queryJobByArgs(SystemQueryJobArgs criteria, Page page) { return CsPageUtil.toPage(systemJobMapper.selectJobByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 1785cf0e..cbf4e1ab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -3,7 +3,7 @@ package cn.odboy.system.service; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IORuntimeException; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.server.core.CsFileLocalUploadHelper; @@ -14,7 +14,7 @@ import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsStringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -25,11 +25,13 @@ import java.io.IOException; import java.util.*; @Service -@RequiredArgsConstructor public class SystemLocalStorageService { - private final SystemLocalStorageMapper systemLocalStorageMapper; - private final CsFileLocalUploadHelper fileUploadPathHelper; - private final AppProperties properties; + @Autowired + private SystemLocalStorageMapper systemLocalStorageMapper; + @Autowired + private CsFileLocalUploadHelper fileUploadPathHelper; + @Autowired + private AppProperties properties; /** * 上传 @@ -127,7 +129,7 @@ public class SystemLocalStorageService { * @param page 分页参数 * @return / */ - public CsPageResultVo> queryLocalStorage(SystemQueryStorageArgs criteria, Page page) { + public CsPageResult queryLocalStorage(SystemQueryStorageArgs criteria, Page page) { return CsPageUtil.toPage(systemLocalStorageMapper.selectLocalStorageByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 6cd3936b..e76b33e5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -15,7 +15,7 @@ import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; import cn.odboy.util.CsClassUtil; import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsStringUtil; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,11 +26,13 @@ import java.util.*; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor public class SystemMenuService { - private final SystemMenuMapper systemMenuMapper; - private final SystemRoleMenuMapper systemRoleMenuMapper; - private final SystemRoleService systemRoleService; + @Autowired + private SystemMenuMapper systemMenuMapper; + @Autowired + private SystemRoleMenuMapper systemRoleMenuMapper; + @Autowired + private SystemRoleService systemRoleService; private static final String YES_STR = "是"; private static final String NO_STR = "否"; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index 0973efc2..beb7b2a6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -1,6 +1,6 @@ package cn.odboy.system.service; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.SystemOssStorageVo; import cn.odboy.system.dal.model.SystemQueryStorageArgs; @@ -21,7 +21,7 @@ import java.util.List; * @since 2025-07-15 */ public interface SystemOssStorageService extends IService { - CsPageResultVo> queryOssStorage(SystemQueryStorageArgs criteria, Page page); + CsPageResult queryOssStorage(SystemQueryStorageArgs criteria, Page page); List queryOssStorage(SystemQueryStorageArgs criteria); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 9a118210..0e75db8a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -3,7 +3,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; @@ -17,8 +17,8 @@ import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsStringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; import org.quartz.CronExpression; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,12 +27,15 @@ import java.io.IOException; import java.util.*; @Service -@RequiredArgsConstructor public class SystemQuartzJobService { - private final SystemQuartzJobMapper systemQuartzJobMapper; - private final SystemQuartzLogMapper systemQuartzLogMapper; - private final QuartzManage quartzManage; - private final CsRedisHelper redisHelper; + @Autowired + private SystemQuartzJobMapper systemQuartzJobMapper; + @Autowired + private SystemQuartzLogMapper systemQuartzLogMapper; + @Autowired + private QuartzManage quartzManage; + @Autowired + private CsRedisHelper redisHelper; /** * 创建 @@ -212,7 +215,7 @@ public class SystemQuartzJobService { * @return / */ - public CsPageResultVo> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page page) { + public CsPageResult queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page page) { return CsPageUtil.toPage(systemQuartzJobMapper.selectQuartzJobByArgs(criteria, page)); } @@ -224,7 +227,7 @@ public class SystemQuartzJobService { * @return / */ - public CsPageResultVo> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page page) { + public CsPageResult queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page page) { return CsPageUtil.toPage(systemQuartzLogMapper.selectQuartzLogByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 1b462f01..4e137bd6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -3,7 +3,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; @@ -19,7 +19,7 @@ import cn.odboy.util.CsFileUtil; import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsStringUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,12 +29,15 @@ import java.util.*; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor public class SystemRoleService { - private final SystemRoleMapper systemRoleMapper; - private final SystemRoleDeptMapper systemRoleDeptMapper; - private final SystemRoleMenuMapper systemRoleMenuMapper; - private final SystemUserMapper systemUserMapper; + @Autowired + private SystemRoleMapper systemRoleMapper; + @Autowired + private SystemRoleDeptMapper systemRoleDeptMapper; + @Autowired + private SystemRoleMenuMapper systemRoleMenuMapper; + @Autowired + private SystemUserMapper systemUserMapper; /** * 创建 @@ -161,7 +164,7 @@ public class SystemRoleService { * @return */ - public CsPageResultVo> queryRoleByArgs(SystemQueryRoleArgs criteria, Page page) { + public CsPageResult queryRoleByArgs(SystemQueryRoleArgs criteria, Page page) { criteria.setOffset(page.offset()); List roles = systemRoleMapper.selectRoleByArgs(criteria); Long total = systemRoleMapper.countRoleByArgs(criteria); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index 6b7a304d..8bd0708b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -1,9 +1,8 @@ package cn.odboy.system.service; import cn.hutool.core.util.StrUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; -import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.server.core.CsFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; @@ -21,7 +20,7 @@ import cn.odboy.util.CsStringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -33,15 +32,19 @@ import java.util.*; import java.util.stream.Collectors; @Service -@RequiredArgsConstructor public class SystemUserService { - private final SystemUserMapper systemUserMapper; - private final SystemUserJobMapper systemUserJobMapper; - private final SystemUserRoleMapper systemUserRoleMapper; - private final AppProperties properties; - private final SystemUserInfoDAO systemUserInfoDAO; - private final SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; - private final CsFileLocalUploadHelper fileUploadPathHelper; + @Autowired + private SystemUserMapper systemUserMapper; + @Autowired + private SystemUserJobMapper systemUserJobMapper; + @Autowired + private SystemUserRoleMapper systemUserRoleMapper; + @Autowired + private SystemUserInfoDAO systemUserInfoDAO; + @Autowired + private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired + private CsFileLocalUploadHelper fileUploadPathHelper; /** * 新增用户 @@ -273,7 +276,7 @@ public class SystemUserService { * @return / */ - public CsPageResultVo> queryUserByArgs(SystemQueryUserArgs criteria, Page page) { + public CsPageResult queryUserByArgs(SystemQueryUserArgs criteria, Page page) { criteria.setOffset(page.offset()); List users = systemUserMapper.selectUserByArgs(criteria, CsPageUtil.getCount(systemUserMapper)).getRecords(); Long total = systemUserMapper.countUserByArgs(criteria); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java index 34327908..dedfdfa3 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java @@ -2,7 +2,7 @@ package cn.odboy.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.base.CsPageResultVo; +import cn.odboy.base.CsPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.StorageOSSModel; @@ -19,7 +19,7 @@ import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -41,14 +41,16 @@ import java.util.Map; * @since 2025-07-15 */ @Service -@RequiredArgsConstructor public class SystemOssStorageServiceImpl extends ServiceImpl implements SystemOssStorageService { - private final MinioRepository minioRepository; - private final AppProperties properties; - private final CsFileLocalUploadHelper fileUploadPathHelper; + @Autowired + private MinioRepository minioRepository; + @Autowired + private AppProperties properties; + @Autowired + private CsFileLocalUploadHelper fileLocalUploadHelper; @Override - public CsPageResultVo> queryOssStorage(SystemQueryStorageArgs criteria, Page page) { + public CsPageResult queryOssStorage(SystemQueryStorageArgs criteria, Page page) { IPage ossStorageTbs = baseMapper.selectOssStorageByArgs(criteria, page); IPage convert = ossStorageTbs.convert(c -> { SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class); @@ -97,7 +99,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl -