From 883dac55b98516af7b8f0a45ec09a79d6acc59e9 Mon Sep 17 00:00:00 2001 From: Odboy Date: Fri, 27 Jun 2025 00:49:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(project):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97=E5=92=8C=E5=8C=85=E5=90=8D?= =?UTF-8?q?=20-=20=E6=96=B0=E5=A2=9E=20cutejava-module-devops=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20-=20=E6=96=B0=E5=A2=9E=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=B5=81=E6=B0=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-front/src/api/login.js | 2 +- cutejava-front/src/api/system/code.js | 6 +- cutejava-front/src/api/system/menu.js | 16 +- cutejava-front/src/api/system/online.js | 2 +- cutejava-front/src/api/system/role.js | 14 +- cutejava-front/src/api/system/user.js | 16 +- cutejava-front/src/store/modules/api.js | 4 +- .../src/views/system/menu/index.vue | 2 +- .../src/views/system/role/index.vue | 2 +- .../src/views/system/user/index.vue | 2 +- cutejava/README.md | 5 + .../java/cn/odboy/constant/SystemConst.java | 37 --- cutejava/cutejava-framework/pom.xml | 12 + .../cn/odboy/annotation/AnonymousAccess.java | 0 .../annotation/AnonymousDeleteMapping.java | 1 + .../odboy/annotation/AnonymousGetMapping.java | 0 .../annotation/AnonymousPatchMapping.java | 0 .../annotation/AnonymousPostMapping.java | 0 .../odboy/annotation/AnonymousPutMapping.java | 0 .../cn/odboy/base/CsBaseUserTimeLogicTb.java | 2 +- .../java/cn/odboy/base/CsBaseUserTimeTb.java | 2 +- .../main/java/cn/odboy/base/CsObject.java} | 2 +- .../main/java/cn/odboy/base/CsPageArgs.java | 0 .../main/java/cn/odboy/base/CsResultVo.java | 2 +- .../cn/odboy/base/CsSelectOptionItemVo.java | 2 +- .../cn/odboy}/constant/CaptchaCodeEnum.java | 2 +- .../java/cn/odboy/constant/FileTypeEnum.java | 0 .../cn/odboy/constant/RequestMethodEnum.java | 0 .../java/cn/odboy/constant/SystemConst.java | 37 +++ .../context/CsBeanLoadFinishListener.java | 2 +- .../framework}/context/CsBootApplication.java | 4 +- .../framework}/context/CsScriptHelper.java | 4 +- .../framework}/context/RequestHolder.java | 2 +- .../framework}/context/SpringBeanHolder.java | 11 +- .../odboy}/framework/doc/SwaggerConfig.java | 4 +- .../exception/BadRequestException.java | 2 +- .../exception/EntityExistException.java | 2 +- .../exception/EntityNotFoundException.java | 2 +- .../exception/handler/ApiError.java | 2 +- .../handler/GlobalExceptionHandler.java | 8 +- .../framework/flow/core/PipelineManager.java | 99 +++++++ .../flow/core/PipelineProcessManager.java | 212 +++++++++++++++ .../framework/flow/core/PipelineTaskPool.java | 245 +++++++++++++++++ .../handler/SerialPipelineNodeHandler.java | 129 +++++++++ ...CreateReleaseBranchHandlerServiceImpl.java | 44 ++++ .../framework/flow/model/PipelineNodeVo.java | 68 +++++ .../controller/CsHealthCheckController.java | 4 +- .../service/CsHealthCheckPointService.java | 2 +- .../mybatisplus/config/CsMpQTypeEnum.java | 2 +- .../mybatisplus/config/CsMpQuery.java | 2 +- .../mybatisplus/config/DataTypeEnum.java | 4 +- .../config/MpCustomP6SpyLogger.java | 2 +- .../config/MpInsertBatchSqlInjector.java | 2 +- .../mybatisplus/config/MybatisPlusConfig.java | 2 +- .../config/RemoveDruidAdConfig.java | 2 +- .../mybatisplus/core/CsMpAnyQUtil.java | 2 +- .../mybatisplus/core/CsMpCmdGenUtil.java | 11 +- .../framework/mybatisplus/core/CsMpQUtil.java | 6 +- .../core/interfaces/CsMpEasyService.java | 2 +- .../core/interfaces/CsMpMapper.java | 2 +- .../core/interfaces/CsMpServiceImpl.java | 6 +- .../framework/properties/AppProperties.java | 4 +- .../model/ContentRsaEncodeSettingModel.java | 2 +- .../properties/model/JwtAuthSettingModel.java | 2 +- .../model/SwaggerApiDocSettingModel.java | 2 +- .../model/ThreadPoolSettingModel.java | 2 +- .../model/UserLoginCaptchaSettingModel.java | 6 +- .../model/UserLoginSettingModel.java | 2 +- .../framework/quartz/config/QuartzConfig.java | 2 +- .../framework/quartz/core/QuartzRunnable.java | 6 +- .../framework}/redis/RedisConfiguration.java | 14 +- .../odboy/framework}/redis/RedisHelper.java | 2 +- .../redis/RedissonConfiguration.java | 2 +- .../server/config/AsyncTheadPoolConfig.java} | 8 +- .../server/config/MultipartConfig.java | 4 +- .../DateStringArraysToListDateConverter.java | 2 +- .../converters/DateStringToDateConverter.java | 2 +- .../server/core/ConfigurerAdapter.java | 8 +- .../server/core/FileUploadPathHelper.java | 2 +- .../websocket/config/CsWebSocketFactory.java} | 4 +- .../websocket/config/WebSocketConfig.java | 2 +- .../constant/CsWebSocketBizTypeEnum.java | 2 +- .../context/CsWebSocketClientManager.java | 2 +- .../websocket/context/CsWebSocketMessage.java | 4 +- .../websocket/context/WebSocketServer.java | 4 +- .../main/java/cn/odboy/util/AnonTagUtil.java | 26 +- .../java/cn/odboy/util/BigDecimalUtil.java | 3 + .../main/java/cn/odboy/util/BrowserUtil.java | 2 + .../main/java/cn/odboy/util/ClassUtil.java | 3 + .../main/java/cn/odboy/util/CloseUtil.java | 3 + .../cn/odboy/util/CsBase64SecretUtil.java | 4 +- .../main/java/cn/odboy/util/CsCollUtil.java | 2 + .../cn/odboy/util/CsDistributedIdUtil.java | 0 .../main/java/cn/odboy/util/CsJsonUtil.java | 2 + .../main/java/cn/odboy/util/CsListUtil.java | 2 + .../main/java/cn/odboy/util/CsLogFmtUtil.java | 3 + .../main/java/cn/odboy/util/CsPageUtil.java | 2 + .../odboy/util}/CsResourceTemplateUtil.java | 4 +- .../main/java/cn/odboy/util/CsValidUtil.java | 3 + .../java/cn/odboy/util/DesEncryptUtil.java | 3 + .../src/main/java/cn/odboy/util/FileUtil.java | 7 +- .../src/main/java/cn/odboy/util/IpUtil.java | 4 +- .../java/cn/odboy/util/RsaEncryptUtil.java | 2 + .../main/java/cn/odboy/util/StringUtil.java | 4 +- .../pom.xml | 14 +- .../constant/pipeline/PipelineConst.java | 23 ++ .../pipeline/PipelineNodeBizCodeConst.java | 77 ++++++ .../constant/pipeline/PipelineStatusEnum.java | 28 ++ .../PipelineInstanceNodeDetailTb.java | 82 ++++++ .../pipeline/PipelineInstanceTb.java | 124 +++++++++ .../pipeline/PipelineTemplateTb.java | 82 ++++++ .../pipeline/PipelineInstanceMapper.java | 18 ++ .../PipelineInstanceNodeDetailMapper.java | 18 ++ .../pipeline/PipelineTemplateMapper.java | 18 ++ .../framework/pipeline/PipelineJobBean.java | 70 +++++ .../framework/pipeline/PipelineJobManage.java | 59 +++++ .../pipeline/PipelineNodeJobExecutor.java | 11 + .../pipeline/PipelineNodeJobRunnable.java | 29 ++ .../model/PipelineNodeJobExecuteResult.java | 27 ++ .../model/PipelineNodeTemplateButtonVo.java | 39 +++ .../model/PipelineNodeTemplateVo.java | 48 ++++ .../odboy/devops/job/PipelineNodeInitJob.java | 19 ++ .../job/app/PipelineNodeBuildGoJob.java | 18 ++ .../job/app/PipelineNodeBuildJavaJob.java | 18 ++ .../job/app/PipelineNodeBuildPythonJob.java | 18 ++ .../job/app/PipelineNodeDeployApproveJob.java | 18 ++ .../job/app/PipelineNodeDeployGoJob.java | 18 ++ .../job/app/PipelineNodeDeployJavaJob.java | 18 ++ .../job/app/PipelineNodeDeployPythonJob.java | 18 ++ .../job/app/PipelineNodeImageScanJob.java | 18 ++ .../job/app/PipelineNodeMergeBranchJob.java | 18 ++ .../job/app/PipelineNodeMergeMasterJob.java | 18 ++ .../PipelineInstanceNodeDetailService.java | 16 ++ .../pipeline/PipelineInstanceService.java | 30 +++ .../pipeline/PipelineTemplateService.java | 24 ++ .../pipeline/PipelineInstanceMapper.xml | 5 + .../PipelineInstanceNodeDetailMapper.xml | 5 + .../pipeline/PipelineTemplateMapper.xml | 5 + cutejava/cutejava-module-system/pom.xml | 21 ++ .../constant/SystemCaptchaBizEnum.java | 2 +- .../system}/constant/SystemDataScopeEnum.java | 2 +- .../constant/TransferProtocolConst.java | 2 +- .../controller/SystemAuthController.java | 28 +- .../controller/SystemCaptchaController.java | 10 +- .../controller/SystemDeptController.java | 10 +- .../controller/SystemDictController.java | 10 +- .../SystemDictDetailController.java | 10 +- .../controller/SystemEmailController.java | 8 +- .../controller/SystemJobController.java | 10 +- .../SystemLocalStorageController.java | 10 +- .../controller/SystemMenuController.java | 16 +- .../controller/SystemMonitorController.java | 4 +- .../controller/SystemOnlineController.java | 7 +- .../controller/SystemQiniuController.java | 12 +- .../controller/SystemQuartzJobController.java | 16 +- .../controller/SystemRoleController.java | 16 +- .../controller/SystemUserController.java | 24 +- .../system}/dal/dataobject/SystemDeptTb.java | 2 +- .../dal/dataobject/SystemDictDetailTb.java | 2 +- .../system}/dal/dataobject/SystemDictTb.java | 2 +- .../dal/dataobject/SystemEmailConfigTb.java | 6 +- .../system}/dal/dataobject/SystemJobTb.java | 2 +- .../dal/dataobject/SystemLocalStorageTb.java | 2 +- .../system}/dal/dataobject/SystemMenuTb.java | 2 +- .../dal/dataobject/SystemQiniuConfigTb.java | 6 +- .../dal/dataobject/SystemQiniuContentTb.java | 6 +- .../dal/dataobject/SystemQuartzJobTb.java | 2 +- .../dal/dataobject/SystemQuartzLogTb.java | 6 +- .../system}/dal/dataobject/SystemRoleTb.java | 4 +- .../system}/dal/dataobject/SystemUserTb.java | 2 +- .../dal/model/CreateSystemDeptArgs.java | 6 +- .../dal/model/CreateSystemDictArgs.java | 6 +- .../dal/model/CreateSystemDictDetailArgs.java | 8 +- .../dal/model/CreateSystemJobArgs.java | 6 +- .../dal/model/CreateSystemRoleArgs.java | 8 +- .../dal/model/QuerySystemDeptArgs.java | 2 +- .../dal/model/QuerySystemDictArgs.java | 2 +- .../dal/model/QuerySystemDictDetailArgs.java | 2 +- .../system}/dal/model/QuerySystemJobArgs.java | 2 +- .../model/QuerySystemLocalStorageArgs.java | 2 +- .../dal/model/QuerySystemMenuArgs.java | 2 +- .../dal/model/QuerySystemQiniuArgs.java | 2 +- .../dal/model/QuerySystemQuartzJobArgs.java | 2 +- .../dal/model/QuerySystemRoleArgs.java | 2 +- .../dal/model/QuerySystemUserArgs.java | 6 +- .../dal/model/SendSystemEmailArgs.java | 2 +- .../model/SystemCheckEmailCaptchaArgs.java | 6 +- .../system}/dal/model/SystemMenuMetaVo.java | 6 +- .../odboy/system}/dal/model/SystemMenuVo.java | 6 +- .../system}/dal/model/SystemRoleCodeVo.java | 2 +- .../system}/dal/model/SystemSimpleUserVo.java | 12 +- .../system}/dal/model/SystemUserInfoVo.java | 6 +- .../system}/dal/model/SystemUserJwtVo.java | 4 +- .../dal/model/SystemUserLoginArgs.java | 2 +- .../system}/dal/model/SystemUserOnlineVo.java | 2 +- .../dal/model/UpdateSystemQuartzJobArgs.java | 6 +- .../model/UpdateSystemUserPasswordArgs.java | 2 +- .../system}/dal/mysql/SystemDeptMapper.java | 6 +- .../dal/mysql/SystemDictDetailMapper.java | 6 +- .../system}/dal/mysql/SystemDictMapper.java | 6 +- .../dal/mysql/SystemEmailConfigMapper.java | 4 +- .../system}/dal/mysql/SystemJobMapper.java | 6 +- .../dal/mysql/SystemLocalStorageMapper.java | 6 +- .../system}/dal/mysql/SystemMenuMapper.java | 6 +- .../dal/mysql/SystemQiniuConfigMapper.java | 4 +- .../dal/mysql/SystemQiniuContentMapper.java | 6 +- .../dal/mysql/SystemQuartzJobMapper.java | 6 +- .../dal/mysql/SystemQuartzLogMapper.java | 6 +- .../dal/mysql/SystemRoleDeptMapper.java | 4 +- .../system}/dal/mysql/SystemRoleMapper.java | 6 +- .../dal/mysql/SystemRoleMenuMapper.java | 4 +- .../dal/mysql/SystemUserJobMapper.java | 4 +- .../system}/dal/mysql/SystemUserMapper.java | 6 +- .../dal/mysql/SystemUserRoleMapper.java | 4 +- .../system}/dal/redis/SystemRedisKey.java | 2 +- .../system}/dal/redis/SystemUserInfoDAO.java | 6 +- .../dal/redis/SystemUserOnlineInfoDAO.java | 12 +- .../mybatisplus}/MpMetaObjectHandler.java | 4 +- .../permission/config/AuthorityConfig.java | 4 +- .../config/SpringSecurityConfig.java | 10 +- .../permission/config/TokenConfigurer.java | 8 +- .../permission/core/SecurityHelper.java | 6 +- .../core/handler/JwtAccessDeniedHandler.java | 4 +- .../handler/JwtAuthenticationEntryPoint.java | 4 +- .../permission/core/handler/TokenFilter.java | 6 +- .../core/handler/TokenProvider.java | 10 +- .../core/handler/UserDetailsHandler.java | 18 +- .../framework/quartz}/ExecutionJobBean.java | 19 +- .../InitialActiveJobApplicationRunner.java | 6 +- .../framework/quartz}/QuartzManage.java | 6 +- .../java/cn/odboy/system}/job/TestTask.java | 2 +- .../system}/service/SystemDataService.java | 10 +- .../system}/service/SystemDeptService.java | 20 +- .../service/SystemDictDetailService.java | 10 +- .../system}/service/SystemDictService.java | 16 +- .../system}/service/SystemEmailService.java | 16 +- .../system}/service/SystemJobService.java | 14 +- .../service/SystemLocalStorageService.java | 14 +- .../system}/service/SystemMenuService.java | 20 +- .../system}/service/SystemMonitorService.java | 2 +- .../service/SystemQiniuConfigService.java | 10 +- .../service/SystemQiniuContentService.java | 14 +- .../service/SystemQuartzJobService.java | 20 +- .../system}/service/SystemRoleService.java | 24 +- .../system}/service/SystemUserService.java | 28 +- .../java/cn/odboy/system}/util/QiniuUtil.java | 2 +- .../java/cn/odboy/system}/util/SqlUtil.java | 6 +- .../resources/mapper/SystemDeptMapper.xml | 6 +- .../mapper/SystemDictDetailMapper.xml | 6 +- .../resources/mapper/SystemDictMapper.xml | 4 +- .../main/resources/mapper/SystemJobMapper.xml | 6 +- .../mapper/SystemLocalStorageMapper.xml | 4 +- .../resources/mapper/SystemMenuMapper.xml | 8 +- .../mapper/SystemQiniuContentMapper.xml | 6 +- .../mapper/SystemQuartzJobMapper.xml | 6 +- .../mapper/SystemQuartzLogMapper.xml | 4 +- .../resources/mapper/SystemRoleDeptMapper.xml | 2 +- .../resources/mapper/SystemRoleMapper.xml | 14 +- .../resources/mapper/SystemRoleMenuMapper.xml | 2 +- .../resources/mapper/SystemUserJobMapper.xml | 2 +- .../resources/mapper/SystemUserMapper.xml | 20 +- .../resources/mapper/SystemUserRoleMapper.xml | 2 +- .../template/SystemEmailCaptchaTemplate.ftl | 0 .../SystemQuartzJobTaskAlarmTemplate.ftl | 0 cutejava/cutejava-starter/pom.xml | 11 +- .../src/main/java/cn/odboy/AppRun.java | 17 +- .../src/main/java/cn/odboy/GenCode.java | 25 +- ...interImpl.java => HealthCheckPointer.java} | 8 +- .../src/main/resources/banner.txt | 2 +- .../src/main/resources/spy.properties | 2 +- .../{util => }/SystemApplicationTests.java | 2 +- .../odboy/pipeline/PipelineReleaseTests.java | 72 +++++ .../java/cn/odboy/pipeline/PipelineTests.java | 247 ++++++++++++++++++ .../java/cn/odboy/util/PipelineTests.java | 26 -- .../java/cn/odboy/util/StringUtilTest.java | 3 +- .../cn/odboy/util/pipeline/PipelineTests.java | 247 ------------------ cutejava/cutejava-system/pom.xml | 101 ------- .../framework/flow/core/PipelineManager.java | 99 ------- .../flow/core/PipelineProcessManager.java | 212 --------------- .../framework/flow/core/PipelineTaskPool.java | 245 ----------------- .../handler/SerialPipelineNodeHandler.java | 129 --------- ...CreateReleaseBranchHandlerServiceImpl.java | 44 ---- .../framework/flow/model/PipelineNodeVo.java | 68 ----- cutejava/pom.xml | 91 ++++++- doc/cutejava.sql | 158 ++++++++++- 285 files changed, 3148 insertions(+), 1853 deletions(-) delete mode 100644 cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java create mode 100644 cutejava/cutejava-framework/pom.xml rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousAccess.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java (96%) rename cutejava/{cutejava-common/src/main/java/cn/odboy/base/CsSerializeObject.java => cutejava-framework/src/main/java/cn/odboy/base/CsObject.java} (75%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/base/CsPageArgs.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/base/CsResultVo.java (91%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/constant/CaptchaCodeEnum.java (89%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/constant/FileTypeEnum.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/constant/RequestMethodEnum.java (100%) create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/constant/SystemConst.java rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/context/CsBeanLoadFinishListener.java (96%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/context/CsBootApplication.java (96%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/context/CsScriptHelper.java (97%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/context/RequestHolder.java (93%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/context/SpringBeanHolder.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/doc/SwaggerConfig.java (98%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/exception/BadRequestException.java (92%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/exception/EntityExistException.java (92%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/exception/EntityNotFoundException.java (92%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/exception/handler/ApiError.java (93%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/exception/handler/GlobalExceptionHandler.java (93%) create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineManager.java create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineProcessManager.java create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineTaskPool.java create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/SerialPipelineNodeHandler.java create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/model/PipelineNodeVo.java rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/monitor/controller/CsHealthCheckController.java (93%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/monitor/service/CsHealthCheckPointService.java (84%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/CsMpQTypeEnum.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/CsMpQuery.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/DataTypeEnum.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/MpCustomP6SpyLogger.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/MpInsertBatchSqlInjector.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/MybatisPlusConfig.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/config/RemoveDruidAdConfig.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/CsMpAnyQUtil.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/CsMpCmdGenUtil.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/CsMpQUtil.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/interfaces/CsMpEasyService.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/interfaces/CsMpMapper.java (99%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/AppProperties.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/ContentRsaEncodeSettingModel.java (80%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/JwtAuthSettingModel.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/SwaggerApiDocSettingModel.java (78%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/ThreadPoolSettingModel.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/UserLoginCaptchaSettingModel.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/properties/model/UserLoginSettingModel.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/quartz/config/QuartzConfig.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/quartz/core/QuartzRunnable.java (82%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/redis/RedisConfiguration.java (95%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/redis/RedisHelper.java (99%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/redis/RedissonConfiguration.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/threadpool/AsyncExecutor.java => cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java} (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/server/config/MultipartConfig.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/server/converters/DateStringArraysToListDateConverter.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/server/converters/DateStringToDateConverter.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/server/core/ConfigurerAdapter.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-framework/src/main/java/cn/odboy}/framework/server/core/FileUploadPathHelper.java (96%) rename cutejava/{cutejava-common/src/main/java/cn/odboy/websocket/config/CsWebSocketServerFactory.java => cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/CsWebSocketFactory.java} (86%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/websocket/config/WebSocketConfig.java (89%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/websocket/constant/CsWebSocketBizTypeEnum.java (81%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/websocket/context/CsWebSocketClientManager.java (95%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/websocket/context/CsWebSocketMessage.java (71%) rename cutejava/{cutejava-common/src/main/java/cn/odboy => cutejava-framework/src/main/java/cn/odboy/framework}/websocket/context/WebSocketServer.java (97%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/AnonTagUtil.java (77%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/BigDecimalUtil.java (98%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/BrowserUtil.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/ClassUtil.java (89%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CloseUtil.java (91%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsBase64SecretUtil.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsCollUtil.java (99%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsDistributedIdUtil.java (100%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsJsonUtil.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsListUtil.java (97%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsLogFmtUtil.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsPageUtil.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/templatefile => cutejava-framework/src/main/java/cn/odboy/util}/CsResourceTemplateUtil.java (90%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/CsValidUtil.java (96%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/DesEncryptUtil.java (97%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/FileUtil.java (99%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/IpUtil.java (95%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/RsaEncryptUtil.java (99%) rename cutejava/{cutejava-common => cutejava-framework}/src/main/java/cn/odboy/util/StringUtil.java (96%) rename cutejava/{cutejava-common => cutejava-module-devops}/pom.xml (64%) create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineNodeBizCodeConst.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceNodeDetailTb.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceTb.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineTemplateTb.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceMapper.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceNodeDetailMapper.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineTemplateMapper.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobBean.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobManage.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobExecutor.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobRunnable.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateButtonVo.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildGoJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildJavaJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildPythonJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployApproveJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployGoJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployJavaJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployPythonJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeImageScanJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeBranchJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeMasterJob.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceNodeDetailService.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceService.java create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineTemplateService.java create mode 100644 cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceMapper.xml create mode 100644 cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceNodeDetailMapper.xml create mode 100644 cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineTemplateMapper.xml create mode 100644 cutejava/cutejava-module-system/pom.xml rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/constant/SystemCaptchaBizEnum.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/constant/SystemDataScopeEnum.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/constant/TransferProtocolConst.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemAuthController.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemCaptchaController.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemDeptController.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemDictController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemDictDetailController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemEmailController.java (88%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemJobController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemLocalStorageController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemMenuController.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemMonitorController.java (91%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemOnlineController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemQiniuController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemQuartzJobController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemRoleController.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/controller/SystemUserController.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemDeptTb.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemDictDetailTb.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemDictTb.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemEmailConfigTb.java (86%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemJobTb.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemLocalStorageTb.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemMenuTb.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemQiniuConfigTb.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemQiniuContentTb.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemQuartzJobTb.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemQuartzLogTb.java (89%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemRoleTb.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/dataobject/SystemUserTb.java (98%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/CreateSystemDeptArgs.java (76%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/CreateSystemDictArgs.java (65%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/CreateSystemDictDetailArgs.java (71%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/CreateSystemJobArgs.java (73%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/CreateSystemRoleArgs.java (75%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemDeptArgs.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemDictArgs.java (91%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemDictDetailArgs.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemJobArgs.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemLocalStorageArgs.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemMenuArgs.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemQiniuArgs.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemQuartzJobArgs.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemRoleArgs.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/QuerySystemUserArgs.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SendSystemEmailArgs.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemCheckEmailCaptchaArgs.java (70%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemMenuMetaVo.java (76%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemMenuVo.java (86%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemRoleCodeVo.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemSimpleUserVo.java (80%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemUserInfoVo.java (77%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemUserJwtVo.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemUserLoginArgs.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/SystemUserOnlineVo.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/UpdateSystemQuartzJobArgs.java (82%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/model/UpdateSystemUserPasswordArgs.java (89%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemDeptMapper.java (83%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemDictDetailMapper.java (83%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemDictMapper.java (81%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemEmailConfigMapper.java (72%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemJobMapper.java (80%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemLocalStorageMapper.java (78%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemMenuMapper.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemQiniuConfigMapper.java (72%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemQiniuContentMapper.java (81%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemQuartzJobMapper.java (80%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemQuartzLogMapper.java (78%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemRoleDeptMapper.java (81%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemRoleMapper.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemRoleMenuMapper.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemUserJobMapper.java (81%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemUserMapper.java (91%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/mysql/SystemUserRoleMapper.java (79%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/redis/SystemRedisKey.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/redis/SystemUserInfoDAO.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/dal/redis/SystemUserOnlineInfoDAO.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config => cutejava-module-system/src/main/java/cn/odboy/system/framework/mybatisplus}/MpMetaObjectHandler.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/config/AuthorityConfig.java (87%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/config/SpringSecurityConfig.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/config/TokenConfigurer.java (77%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/SecurityHelper.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/handler/JwtAccessDeniedHandler.java (91%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/handler/JwtAuthenticationEntryPoint.java (91%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/handler/TokenFilter.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/handler/TokenProvider.java (94%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/framework/permission/core/handler/UserDetailsHandler.java (77%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core => cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz}/ExecutionJobBean.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core => cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz}/InitialActiveJobApplicationRunner.java (84%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core => cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz}/QuartzManage.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/job/TestTask.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemDataService.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemDeptService.java (95%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemDictDetailService.java (89%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemDictService.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemEmailService.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemJobService.java (90%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemLocalStorageService.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemMenuService.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemMonitorService.java (99%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemQiniuConfigService.java (85%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemQiniuContentService.java (96%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemQuartzJobService.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemRoleService.java (92%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/service/SystemUserService.java (93%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/util/QiniuUtil.java (97%) rename cutejava/{cutejava-system/src/main/java/cn/odboy/core => cutejava-module-system/src/main/java/cn/odboy/system}/util/SqlUtil.java (97%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemDeptMapper.xml (93%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemDictDetailMapper.xml (87%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemDictMapper.xml (78%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemJobMapper.xml (77%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemLocalStorageMapper.xml (83%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemMenuMapper.xml (92%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemQiniuContentMapper.xml (72%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemQuartzJobMapper.xml (72%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemQuartzLogMapper.xml (81%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemRoleDeptMapper.xml (90%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemRoleMapper.xml (91%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemRoleMenuMapper.xml (93%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemUserJobMapper.xml (90%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemUserMapper.xml (91%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/mapper/SystemUserRoleMapper.xml (90%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/template/SystemEmailCaptchaTemplate.ftl (100%) rename cutejava/{cutejava-system => cutejava-module-system}/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl (100%) rename cutejava/cutejava-starter/src/main/java/cn/odboy/{monitor/HealthCheckPointerImpl.java => HealthCheckPointer.java} (69%) rename cutejava/cutejava-starter/src/test/java/cn/odboy/{util => }/SystemApplicationTests.java (93%) create mode 100644 cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java create mode 100644 cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineTests.java delete mode 100644 cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java delete mode 100644 cutejava/cutejava-starter/src/test/java/cn/odboy/util/pipeline/PipelineTests.java delete mode 100644 cutejava/cutejava-system/pom.xml delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineManager.java delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineProcessManager.java delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineTaskPool.java delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/SerialPipelineNodeHandler.java delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java delete mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/model/PipelineNodeVo.java diff --git a/cutejava-front/src/api/login.js b/cutejava-front/src/api/login.js index afc97387..1a0bbd6c 100644 --- a/cutejava-front/src/api/login.js +++ b/cutejava-front/src/api/login.js @@ -22,7 +22,7 @@ export function getInfo() { export function getCodeImg() { return request({ - url: 'auth/code', + url: 'auth/captcha/getImage', method: 'post' }) } diff --git a/cutejava-front/src/api/system/code.js b/cutejava-front/src/api/system/code.js index ee2e35f8..8e0fd805 100644 --- a/cutejava-front/src/api/system/code.js +++ b/cutejava-front/src/api/system/code.js @@ -2,14 +2,14 @@ import request from '@/utils/request' export function sendResetEmailCaptcha(email) { return request({ - url: 'api/code/sendResetEmailCaptcha?email=' + email, + url: 'api/captcha/sendResetEmailCaptcha?email=' + email, method: 'post' }) } export function sendResetPasswordCaptcha(email) { return request({ - url: 'api/code/sendResetPasswordCaptcha?email=' + email, + url: 'api/captcha/sendResetPasswordCaptcha?email=' + email, method: 'post' }) } @@ -21,7 +21,7 @@ export function checkEmailCaptcha(email, code, bizCode) { bizCode: bizCode } return request({ - url: 'api/code/checkEmailCaptcha', + url: 'api/captcha/checkEmailCaptcha', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js index edc0308c..e4e20779 100644 --- a/cutejava-front/src/api/system/menu.js +++ b/cutejava-front/src/api/system/menu.js @@ -2,14 +2,14 @@ import request from '@/utils/request' export function queryMenuListByPid(pid) { return request({ - url: 'api/menus/queryMenuListByPid?pid=' + pid, + url: 'api/menu/queryMenuListByPid?pid=' + pid, method: 'post' }) } export function queryMenuByArgs(params) { return request({ - url: 'api/menus/queryMenuByArgs', + url: 'api/menu/queryMenuByArgs', method: 'post', data: params }) @@ -18,7 +18,7 @@ export function queryMenuByArgs(params) { export function queryMenuSuperior(ids) { const data = Array.isArray(ids) ? ids : [ids] return request({ - url: 'api/menus/queryMenuSuperior', + url: 'api/menu/queryMenuSuperior', method: 'post', data: data }) @@ -26,21 +26,21 @@ export function queryMenuSuperior(ids) { export function queryChildMenuSet(id) { return request({ - url: 'api/menus/queryChildMenuSet?id=' + id, + url: 'api/menu/queryChildMenuSet?id=' + id, method: 'post' }) } export function buildMenus() { return request({ - url: 'api/menus/buildMenus', + url: 'api/menu/buildMenus', method: 'post' }) } export function add(data) { return request({ - url: 'api/menus/saveMenu', + url: 'api/menu/saveMenu', method: 'post', data: data }) @@ -48,7 +48,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/menus/removeMenuByIds', + url: 'api/menu/removeMenuByIds', method: 'post', data: ids }) @@ -56,7 +56,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/menus/modifyMenuById', + url: 'api/menu/modifyMenuById', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/online.js b/cutejava-front/src/api/system/online.js index 8118ea0e..d9f7fccd 100644 --- a/cutejava-front/src/api/system/online.js +++ b/cutejava-front/src/api/system/online.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function kickOutUser(keys) { return request({ - url: 'auth/online/kickOutUser', + url: 'api/user/online/kickOutUser', method: 'post', data: keys }) diff --git a/cutejava-front/src/api/system/role.js b/cutejava-front/src/api/system/role.js index 4c491b39..c897d1e5 100644 --- a/cutejava-front/src/api/system/role.js +++ b/cutejava-front/src/api/system/role.js @@ -3,14 +3,14 @@ import request from '@/utils/request' // 获取所有的Role export function queryRoleList() { return request({ - url: 'api/roles/queryRoleList', + url: 'api/role/queryRoleList', method: 'post' }) } export function add(data) { return request({ - url: 'api/roles/saveRole', + url: 'api/role/saveRole', method: 'post', data: data }) @@ -18,7 +18,7 @@ export function add(data) { export function get(id) { return request({ - url: 'api/roles/queryRoleById', + url: 'api/role/queryRoleById', method: 'post', data: { id: id } }) @@ -26,14 +26,14 @@ export function get(id) { export function getLevel() { return request({ - url: 'api/roles/queryRoleLevel', + url: 'api/role/queryRoleLevel', method: 'post' }) } export function del(ids) { return request({ - url: 'api/roles/removeRoleByIds', + url: 'api/role/removeRoleByIds', method: 'post', data: ids }) @@ -41,7 +41,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/roles/modifyRoleById', + url: 'api/role/modifyRoleById', method: 'post', data: data }) @@ -49,7 +49,7 @@ export function edit(data) { export function editMenu(data) { return request({ - url: 'api/roles/modifyBindMenuById', + url: 'api/role/modifyBindMenuById', method: 'post', data }) diff --git a/cutejava-front/src/api/system/user.js b/cutejava-front/src/api/system/user.js index 5220ff6a..e9ce3e18 100644 --- a/cutejava-front/src/api/system/user.js +++ b/cutejava-front/src/api/system/user.js @@ -3,7 +3,7 @@ import { encrypt } from '@/utils/rsaEncrypt' export function add(data) { return request({ - url: 'api/users/saveUser', + url: 'api/user/saveUser', method: 'post', data: data }) @@ -11,7 +11,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/users/removeUserByIds', + url: 'api/user/removeUserByIds', method: 'post', data: ids }) @@ -19,7 +19,7 @@ export function del(ids) { export function resetPwd(ids) { return request({ - url: 'api/users/resetUserPasswordByIds', + url: 'api/user/resetUserPasswordByIds', method: 'post', data: ids }) @@ -27,7 +27,7 @@ export function resetPwd(ids) { export function edit(data) { return request({ - url: 'api/users/modifyUserById', + url: 'api/user/modifyUserById', method: 'post', data: data }) @@ -35,7 +35,7 @@ export function edit(data) { export function editUser(data) { return request({ - url: 'api/users/modifyUserCenterInfoById', + url: 'api/user/modifyUserCenterInfoById', method: 'post', data: data }) @@ -47,7 +47,7 @@ export function updatePass(user) { newPass: encrypt(user.newPass) } return request({ - url: 'api/users/modifyUserPasswordByUsername', + url: 'api/user/modifyUserPasswordByUsername', method: 'post', data: data }) @@ -59,7 +59,7 @@ export function updateEmail(form) { email: form.email } return request({ - url: 'api/users/modifyUserEmailByUsername/' + form.code, + url: 'api/user/modifyUserEmailByUsername/' + form.code, method: 'post', data: data }) @@ -74,7 +74,7 @@ export function queryUserMetaPage(query) { } } return request({ - url: 'api/users/queryUserMetadataOptions', + url: 'api/user/queryUserMetadataOptions', method: 'post', data: params }) diff --git a/cutejava-front/src/store/modules/api.js b/cutejava-front/src/store/modules/api.js index 5c562d6a..0610a58a 100644 --- a/cutejava-front/src/store/modules/api.js +++ b/cutejava-front/src/store/modules/api.js @@ -5,9 +5,9 @@ const api = { // 图片上传 imagesUploadApi: baseUrl + '/api/localStorage/uploadPicture', // 修改头像 - updateAvatarApi: baseUrl + '/api/users/modifyUserAvatar', + updateAvatarApi: baseUrl + '/api/user/modifyUserAvatar', // 上传文件到七牛云 - qiNiuUploadApi: baseUrl + '/api/qiNiuContent', + qiNiuUploadApi: baseUrl + '/api/qiNiuContent/uploadFile', // Sql 监控 druidSqlApi: baseUrl + '/druid/index.html', // websocket diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue index bffbc1ac..f3d772f4 100644 --- a/cutejava-front/src/views/system/menu/index.vue +++ b/cutejava-front/src/views/system/menu/index.vue @@ -165,7 +165,7 @@ export default { name: 'Menu', components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }}) + return CRUD({ title: '菜单', url: 'api/menu', crudMethod: { ...crudMenu }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/role/index.vue b/cutejava-front/src/views/system/role/index.vue index d98e67f5..c45f6733 100644 --- a/cutejava-front/src/views/system/role/index.vue +++ b/cutejava-front/src/views/system/role/index.vue @@ -139,7 +139,7 @@ export default { name: 'Role', components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '角色', url: 'api/roles', crudMethod: { ...crudRoles }}) + return CRUD({ title: '角色', url: 'api/role', crudMethod: { ...crudRoles }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue index ceb68c77..242ae4b9 100644 --- a/cutejava-front/src/views/system/user/index.vue +++ b/cutejava-front/src/views/system/user/index.vue @@ -204,7 +204,7 @@ export default { name: 'User', components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, cruds() { - return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', url: 'api/user', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 diff --git a/cutejava/README.md b/cutejava/README.md index 1c3718ad..f9f26000 100644 --- a/cutejava/README.md +++ b/cutejava/README.md @@ -52,6 +52,11 @@ https://github.com/odboy-tianjun/cutejava - 七牛云存储：可同步七牛云存储的数据到系统，无需登录七牛云直接操作云数据 - 服务监控：监控服务器的负载情况 +#### 系统模块 +- cutejava-framework：系统基础框架，提供核心功能，如：权限、数据权限、异常处理、日志、缓存、工具类、代码生成器、接口限流、接口防重、接口幂等。 +- cutejava-system：系统功能模块，提供用户、角色、菜单、部门、岗位、字典、日志、定时任务、邮件、七牛云存储、服务监控等功能 +- cutejava-pipeline：流水线模块，参考阿里云云效，提供流水线功能，可配置流水线任务，并支持任务依赖、任务参数、任务参数校验、任务参数回填。 + #### 特别鸣谢 - 感谢 [PanJiaChen](https://github.com/PanJiaChen/vue-element-admin) 大佬提供的前端模板 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java b/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java deleted file mode 100644 index 5995a527..00000000 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.odboy.constant; - -/** - * 常用静态常量 - */ -public class SystemConst { - /** - * win 系统 - */ - public static final String WIN = "win"; - - /** - * mac 系统 - */ - public static final String MAC = "mac"; - - /** - * 请求头名称 - */ - public static final String HEADER_NAME = "Authorization"; - - /** - * Token前缀 - */ - public static final String TOKEN_PREFIX = "Bearer"; - - /** - * 小数点 - */ - public static final String SYMBOL_DOT = "."; - public static final String SYMBOL_EQUAL = "="; - public static final String SYMBOL_ADD = "+"; - public static final String SYMBOL_SUBTRACT = "-"; - public static final String SYMBOL_AT = "@"; - public static final String PROPERTY_OS_NAME = "os.name"; - public static final String OS_NAME_WINDOWS = "Windows"; -} diff --git a/cutejava/cutejava-framework/pom.xml b/cutejava/cutejava-framework/pom.xml new file mode 100644 index 00000000..cfdb3b22 --- /dev/null +++ b/cutejava/cutejava-framework/pom.xml @@ -0,0 +1,12 @@ + + + + cutejava + cn.odboy + 1.4.1 + + 4.0.0 + cutejava-framework + 公共模块 + \ No newline at end of file diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousAccess.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousAccess.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousAccess.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java index 7d8ae30b..754fd953 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java @@ -1,6 +1,7 @@ package cn.odboy.annotation; import org.springframework.core.annotation.AliasFor; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java index cd2ec84f..e1d32058 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java @@ -21,7 +21,7 @@ import java.util.Date; */ @Getter @Setter -public class CsBaseUserTimeLogicTb extends CsSerializeObject { +public class CsBaseUserTimeLogicTb extends CsObject { @CreatedBy @TableField(value = "create_by", fill = FieldFill.INSERT) @ApiModelProperty(value = "创建人", hidden = true) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java index 7965ad75..29d96407 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java @@ -17,7 +17,7 @@ import java.util.Date; @Getter @Setter @EqualsAndHashCode(callSuper = false) -public class CsBaseUserTimeTb extends CsSerializeObject { +public class CsBaseUserTimeTb extends CsObject { @CreatedBy @TableField(fill = FieldFill.INSERT) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSerializeObject.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsObject.java similarity index 75% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSerializeObject.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsObject.java index 0f58eb82..94cea761 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSerializeObject.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsObject.java @@ -8,6 +8,6 @@ import java.io.Serializable; * @author odboy * @date 2022-01-12 */ -public class CsSerializeObject implements Serializable { +public class CsObject implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsPageArgs.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageArgs.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsPageArgs.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageArgs.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsResultVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java similarity index 91% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsResultVo.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java index 518c2a28..1929193f 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsResultVo.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java @@ -15,7 +15,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class CsResultVo extends CsSerializeObject { +public class CsResultVo extends CsObject { private T content; private long totalElements; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java index a8856b59..ff6041a5 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsSelectOptionItemVo.java @@ -30,7 +30,7 @@ import java.util.Map; @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = false) -public class CsSelectOptionItemVo extends CsSerializeObject { +public class CsSelectOptionItemVo extends CsObject { private String label; private String value; private Map ext; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/CaptchaCodeEnum.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/constant/CaptchaCodeEnum.java index afed51ae..a1073b13 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/CaptchaCodeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant; +package cn.odboy.constant; /** * 验证码配置枚举 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/FileTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/FileTypeEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/RequestMethodEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/RequestMethodEnum.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/RequestMethodEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/constant/RequestMethodEnum.java diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/SystemConst.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/SystemConst.java new file mode 100644 index 00000000..7750c99b --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/SystemConst.java @@ -0,0 +1,37 @@ +package cn.odboy.constant; + +/** + * 常用静态常量 + */ +public interface SystemConst { + /** + * win 系统 + */ + String WIN = "win"; + + /** + * mac 系统 + */ + String MAC = "mac"; + + /** + * 请求头名称 + */ + String HEADER_NAME = "Authorization"; + + /** + * Token前缀 + */ + String TOKEN_PREFIX = "Bearer"; + + /** + * 小数点 + */ + String SYMBOL_DOT = "."; + String SYMBOL_EQUAL = "="; + String SYMBOL_ADD = "+"; + String SYMBOL_SUBTRACT = "-"; + String SYMBOL_AT = "@"; + String PROPERTY_OS_NAME = "os.name"; + String OS_NAME_WINDOWS = "Windows"; +} diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBeanLoadFinishListener.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBeanLoadFinishListener.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBeanLoadFinishListener.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBeanLoadFinishListener.java index 0891a465..8fdbb570 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBeanLoadFinishListener.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBeanLoadFinishListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.context; +package cn.odboy.framework.context; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBootApplication.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBootApplication.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBootApplication.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBootApplication.java index 9dc7880b..3c99d002 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsBootApplication.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsBootApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.context; +package cn.odboy.framework.context; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; @@ -33,7 +33,7 @@ import java.net.UnknownHostException; @Slf4j public class CsBootApplication { @Bean - public SpringBeanHolder springContextHolder() { + public SpringBeanHolder springBeanHolder() { return new SpringBeanHolder(); } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsScriptHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/CsScriptHelper.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java index c76a756a..6cec72f5 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/CsScriptHelper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.context; +package cn.odboy.framework.context; import cn.hutool.core.util.ReflectUtil; import cn.hutool.script.ScriptRuntimeException; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import org.springframework.stereotype.Component; import javax.script.*; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/RequestHolder.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/RequestHolder.java index 12f1a976..94c27068 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/RequestHolder.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/RequestHolder.java @@ -1,4 +1,4 @@ -package cn.odboy.context; +package cn.odboy.framework.context; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/SpringBeanHolder.java similarity index 92% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/SpringBeanHolder.java index e0293b38..e1e55121 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SpringBeanHolder.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/SpringBeanHolder.java @@ -1,4 +1,4 @@ -package cn.odboy.context; +package cn.odboy.framework.context; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; @@ -95,8 +95,7 @@ public class SpringBeanHolder implements ApplicationContextAware, DisposableBean */ private static void assertContextInjected() { if (applicationContext == null) { - throw new IllegalStateException("applicaitonContext属性未注入, 请在applicationContext" + - ".xml中定义SpringContextHolder或在SpringBoot启动类中注册SpringContextHolder."); + throw new IllegalStateException("applicaitonContext属性未注入, 请在applicationContext" + ".xml中定义SpringContextHolder或在SpringBoot启动类中注册SpringContextHolder."); } } @@ -104,8 +103,7 @@ public class SpringBeanHolder implements ApplicationContextAware, DisposableBean * 清除SpringContextHolder中的ApplicationContext为Null. */ private static void clearHolder() { - log.debug("清除SpringContextHolder中的ApplicationContext:" - + applicationContext); + log.debug("清除SpringContextHolder中的ApplicationContext:" + applicationContext); applicationContext = null; } @@ -135,8 +133,7 @@ public class SpringBeanHolder implements ApplicationContextAware, DisposableBean * @return / */ public static List getAllServiceBeanName() { - return new ArrayList<>(Arrays.asList(applicationContext - .getBeanNamesForAnnotation(Service.class))); + return new ArrayList<>(Arrays.asList(applicationContext.getBeanNamesForAnnotation(Service.class))); } interface CallBack { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java index 9232c005..1b6a0694 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.doc; +package cn.odboy.framework.doc; import cn.odboy.constant.SystemConst; import cn.odboy.util.AnonTagUtil; @@ -63,7 +63,7 @@ public class SwaggerConfig { return new ApiInfoBuilder() .description("一个简单且易上手的 Spring boot 后台管理框架") .title("CuteJava 接口文档") - .version("1.4.0") + .version("1.4.1") .build(); } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java similarity index 92% rename from cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java index 44bfe37f..3722b25e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/BadRequestException.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java @@ -1,4 +1,4 @@ -package cn.odboy.exception; +package cn.odboy.framework.exception; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityExistException.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityExistException.java similarity index 92% rename from cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityExistException.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityExistException.java index ae5929b3..98fd7055 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityExistException.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityExistException.java @@ -1,4 +1,4 @@ -package cn.odboy.exception; +package cn.odboy.framework.exception; import org.springframework.util.StringUtils; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityNotFoundException.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityNotFoundException.java similarity index 92% rename from cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityNotFoundException.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityNotFoundException.java index 92b43a19..36b17998 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/EntityNotFoundException.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package cn.odboy.exception; +package cn.odboy.framework.exception; import org.springframework.util.StringUtils; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java index 6b4ca6cd..3009d833 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/ApiError.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java @@ -1,4 +1,4 @@ -package cn.odboy.exception.handler; +package cn.odboy.framework.exception.handler; import lombok.Data; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java index a3b6e492..9a5c54b7 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/exception/handler/GlobalExceptionHandler.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ -package cn.odboy.exception.handler; +package cn.odboy.framework.exception.handler; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.odboy.exception.BadRequestException; -import cn.odboy.exception.EntityExistException; -import cn.odboy.exception.EntityNotFoundException; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.framework.exception.EntityExistException; +import cn.odboy.framework.exception.EntityNotFoundException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineManager.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineManager.java new file mode 100644 index 00000000..a949d55e --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineManager.java @@ -0,0 +1,99 @@ +//package cn.odboy.system.framework.flow.core; +// +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.thread.ThreadUtil; +//import cn.hutool.core.util.IdUtil; +//import cn.odboy.context.SpringBeanHolder; +//import cn.odboy.system.framework.flow.core.handler.SerialPipelineNodeHandler; +//import cn.odboy.system.framework.flow.model.PipelineNodeVo; +//import cn.odboy.exception.BadRequestException; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +// +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * 流水线管理工具 +// * +// * @author odboy +// */ +//@Slf4j +//@Component +//public class PipelineManager { +// private static final PipelineTaskPool pipelineTaskPool = new PipelineTaskPool("DefaultPipelineTaskPool"); +// +// public void test() { +// String pipelineId = IdUtil.objectId(); +// List pipelineNodeVos = initialize(); +// execute(pipelineId, pipelineNodeVos); +// +// ThreadUtil.safeSleep(5000); +// pipelineTaskPool.stopTaskForcibly(pipelineId); +// ThreadUtil.safeSleep(1000000); +// } +// +// public void execute(String pipelineId, List pipelineNodeVos) { +// pipelineTaskPool.submitTask(pipelineId, () -> { +// for (PipelineNodeVo pipelineNodeVo : pipelineNodeVos) { +// executePipeline(pipelineId, pipelineNodeVo); +// // 要么成功，要么失败 +// boolean interrupted = Thread.currentThread().isInterrupted(); +// while (!interrupted && "running".equals(pipelineNodeVo.getExecuteStatus())) { +// log.info("流水线执行中..."); +// ThreadUtil.safeSleep(2000); +// } +// if (interrupted) { +// log.info("流水线被中断..."); +// return; +// } +// } +// }); +// } +// +// private void executePipeline(String pipelineId, PipelineNodeVo pipelineNodeVo) { +// String pipelineServiceName = String.format("pipeline:%s", pipelineNodeVo.getBizCode()); +// SerialPipelineNodeHandler pipelineNodeHandler = SpringBeanHolder.getBean(pipelineServiceName); +// try { +// Object o = pipelineNodeHandler.doProcess(pipelineId, pipelineNodeVo); +// log.info("运行结果, {}", o); +// } catch (BadRequestException e) { +// log.error("运行流水线异常", e); +// if (pipelineTaskPool.isTaskRunning(pipelineId)) { +// pipelineTaskPool.stopTaskForcibly(pipelineId); +// } +// } catch (Exception e) { +// log.error("其他异常", e); +// if (pipelineTaskPool.isTaskRunning(pipelineId)) { +// pipelineTaskPool.stopTaskForcibly(pipelineId); +// } +// } +// } +// +// public List initialize() { +// List pipelineNodeVos = new ArrayList<>(); +// PipelineNodeVo createReleaseBranchNodeVo = new PipelineNodeVo(); +// createReleaseBranchNodeVo.setName("初始化"); +// createReleaseBranchNodeVo.setClick(true); +// createReleaseBranchNodeVo.setButtonList(null); +// createReleaseBranchNodeVo.setBizCode("create_release_branch"); +// createReleaseBranchNodeVo.setStartTimeMillis(DateTime.now().getTime()); +// createReleaseBranchNodeVo.setDurationMillis(0L); +// createReleaseBranchNodeVo.setExecuteStatus("running"); +// createReleaseBranchNodeVo.setResultDesc(null); +// pipelineNodeVos.add(createReleaseBranchNodeVo); +// +// PipelineNodeVo createReleaseBranchNodeVo1 = new PipelineNodeVo(); +// createReleaseBranchNodeVo1.setName("代码构建"); +// createReleaseBranchNodeVo1.setClick(true); +// createReleaseBranchNodeVo1.setButtonList(null); +// createReleaseBranchNodeVo1.setBizCode("build_code"); +// createReleaseBranchNodeVo1.setStartTimeMillis(DateTime.now().getTime()); +// createReleaseBranchNodeVo1.setDurationMillis(0L); +// createReleaseBranchNodeVo1.setExecuteStatus("running"); +// createReleaseBranchNodeVo1.setResultDesc(null); +// pipelineNodeVos.add(createReleaseBranchNodeVo1); +// +// return pipelineNodeVos; +// } +//} \ No newline at end of file diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineProcessManager.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineProcessManager.java new file mode 100644 index 00000000..4bef6777 --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineProcessManager.java @@ -0,0 +1,212 @@ +//package cn.odboy.system.framework.flow.core; +// +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.thread.ThreadUtil; +//import cn.hutool.core.util.IdUtil; +//import cn.odboy.context.SpringBeanHolder; +//import cn.odboy.system.framework.flow.core.handler.SerialPipelineNodeHandler; +//import cn.odboy.system.framework.flow.model.PipelineNodeVo; +//import cn.odboy.exception.BadRequestException; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +// +//import java.util.ArrayList; +//import java.util.List; +//import java.util.Map; +//import java.util.Optional; +//import java.util.concurrent.ConcurrentHashMap; +//import java.util.concurrent.atomic.AtomicBoolean; +// +///** +// * 流水线进程管理工具 +// * +// * @author odboy +// */ +//@Slf4j +//@Component +//public class PipelineProcessManager { +// // 使用ConcurrentHashMap保证线程安全 +// private final Map runningTasks = new ConcurrentHashMap<>(); +// // 使用AtomicBoolean作为停止标志，保证原子性操作 +// private final Map stopFlags = new ConcurrentHashMap<>(); +// // 常量定义 +// private static final String PIPELINE_THREAD_PREFIX = "pipeline-"; +// private static final String PIPELINE_SERVICE_PREFIX = "pipeline:"; +// private static final String RUNNING_STATUS = "running"; +// private static final long DEFAULT_SLEEP_MS = 2000L; +// +// /** +// * 测试方法 +// */ +// public void test() { +// String pipelineId = IdUtil.objectId(); +// List pipelineNodes = initialize(); +// execute(pipelineId, pipelineNodes); +// +// ThreadUtil.safeSleep(5000); +// stopForcibly(pipelineId); +// ThreadUtil.safeSleep(1000000); +// } +// +// /** +// * 执行流水线 +// * +// * @param pipelineId 流水线ID +// * @param pipelineNodes 流水线节点列表 +// */ +// public void execute(String pipelineId, List pipelineNodes) { +// if (runningTasks.containsKey(pipelineId)) { +// log.warn("Pipeline [{}] is already running", pipelineId); +// return; +// } +// +// stopFlags.put(pipelineId, new AtomicBoolean(false)); +// +// Thread pipelineThread = new Thread(() -> processPipeline(pipelineId, pipelineNodes)); +// pipelineThread.setDaemon(true); +// pipelineThread.setName(PIPELINE_THREAD_PREFIX + pipelineId); +// +// runningTasks.put(pipelineId, pipelineThread); +// pipelineThread.start(); +// } +// +// /** +// * 处理流水线任务 +// */ +// private void processPipeline(String pipelineId, List pipelineNodes) { +// try { +// for (PipelineNodeVo node : pipelineNodes) { +// if (shouldStop(pipelineId)) { +// log.info("Pipeline [{}] was interrupted", pipelineId); +// return; +// } +// +// executePipelineNode(pipelineId, node); +// +// while (!shouldStop(pipelineId) && RUNNING_STATUS.equals(node.getExecuteStatus())) { +// log.debug("Pipeline [{}] is running...", pipelineId); +// sleepInterruptibly(DEFAULT_SLEEP_MS, pipelineId); +// } +// +// if (shouldStop(pipelineId)) { +// log.info("Pipeline [{}] was interrupted", pipelineId); +// return; +// } +// } +// } catch (Exception e) { +// log.error("流水线异常", e); +// } finally { +// cleanup(pipelineId); +// } +// } +// +// /** +// * 检查是否应该停止 +// */ +// private boolean shouldStop(String pipelineId) { +// return Optional.ofNullable(stopFlags.get(pipelineId)) +// .map(AtomicBoolean::get) +// .orElse(true); +// } +// +// /** +// * 可中断的睡眠 +// */ +// private void sleepInterruptibly(long millis, String pipelineId) { +// try { +// Thread.sleep(millis); +// } catch (InterruptedException e) { +// log.info("Pipeline [{}] sleep interrupted", pipelineId); +// Thread.currentThread().interrupt(); +// } +// } +// +// /** +// * 清理资源 +// */ +// private void cleanup(String pipelineId) { +// runningTasks.remove(pipelineId); +// stopFlags.remove(pipelineId); +// log.info("Pipeline [{}] resources cleaned up", pipelineId); +// } +// +// /** +// * 检查流水线是否在运行 +// */ +// public boolean isRunning(String pipelineId) { +// return Optional.ofNullable(runningTasks.get(pipelineId)) +// .map(Thread::isAlive) +// .orElse(false); +// } +// +// /** +// * 执行单个流水线节点 +// */ +// private void executePipelineNode(String pipelineId, PipelineNodeVo node) { +// String serviceName = PIPELINE_SERVICE_PREFIX + node.getBizCode(); +// SerialPipelineNodeHandler handler = SpringBeanHolder.getBean(serviceName); +// try { +// Object result = handler.doProcess(pipelineId, node); +// log.info("Pipeline [{}] node [{}] executed, result: {}", pipelineId, node.getName(), result); +// } catch (BadRequestException e) { +// handlePipelineError(pipelineId, "Business error in pipeline", e); +// } catch (Exception e) { +// handlePipelineError(pipelineId, "Unexpected error in pipeline", e); +// } +// } +// +// /** +// * 处理流水线错误 +// */ +// private void handlePipelineError(String pipelineId, String message, Exception e) { +// log.error(message, e); +// if (isRunning(pipelineId)) { +// stopForcibly(pipelineId); +// } +// } +// +// /** +// * 强制停止流水线 +// */ +// public void stopForcibly(String pipelineId) { +// Optional.ofNullable(stopFlags.get(pipelineId)) +// .ifPresent(flag -> flag.set(true)); +// +// Optional.ofNullable(runningTasks.get(pipelineId)) +// .ifPresent(thread -> { +// try { +// thread.interrupt(); +// } catch (SecurityException e) { +// log.error("Failed to interrupt pipeline [{}]", pipelineId, e); +// } +// }); +// } +// +// /** +// * 初始化测试流水线节点 +// */ +// public List initialize() { +// List nodes = new ArrayList<>(); +// +// nodes.add(createNode("初始化", "create_release_branch")); +// nodes.add(createNode("代码构建", "build_code")); +// +// return nodes; +// } +// +// /** +// * 创建流水线节点 +// */ +// private PipelineNodeVo createNode(String name, String bizCode) { +// PipelineNodeVo node = new PipelineNodeVo(); +// node.setName(name); +// node.setClick(true); +// node.setButtonList(null); +// node.setBizCode(bizCode); +// node.setStartTimeMillis(DateTime.now().getTime()); +// node.setDurationMillis(0L); +// node.setExecuteStatus(RUNNING_STATUS); +// node.setResultDesc(null); +// return node; +// } +//} \ No newline at end of file diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineTaskPool.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineTaskPool.java new file mode 100644 index 00000000..5756e90d --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/PipelineTaskPool.java @@ -0,0 +1,245 @@ +//package cn.odboy.system.framework.flow.core; +// +//import java.util.Map; +//import java.util.concurrent.*; +//import java.util.concurrent.atomic.AtomicBoolean; +//import java.util.concurrent.atomic.AtomicInteger; +// +///** +// * 流水线任务池 +// * +// * @author odboy +// */ +//public class PipelineTaskPool { +// // 默认线程池参数 +// private static final int DEFAULT_CORE_POOL_SIZE = 5; +// private static final int DEFAULT_MAX_POOL_SIZE = 10; +// private static final long DEFAULT_KEEP_ALIVE_TIME = 60L; +// private static final TimeUnit DEFAULT_TIME_UNIT = TimeUnit.SECONDS; +// private static final int DEFAULT_QUEUE_CAPACITY = 100; +// +// // 线程池实例 +// private final ThreadPoolExecutor executor; +// // 存储正在运行的任务 +// private final Map runningTasks = new ConcurrentHashMap<>(); +// // 线程池管理器名称 +// private final String name; +// +// /** +// * 使用默认参数创建线程池管理器 +// */ +// public PipelineTaskPool(String name) { +// this(name, DEFAULT_CORE_POOL_SIZE, DEFAULT_MAX_POOL_SIZE, +// DEFAULT_KEEP_ALIVE_TIME, DEFAULT_TIME_UNIT, +// new LinkedBlockingQueue<>(DEFAULT_QUEUE_CAPACITY)); +// } +// +// /** +// * 自定义参数创建线程池管理器 +// */ +// public PipelineTaskPool(String name, int corePoolSize, int maxPoolSize, +// long keepAliveTime, TimeUnit unit, +// BlockingQueue workQueue) { +// this.name = name; +// this.executor = new ThreadPoolExecutor( +// corePoolSize, +// maxPoolSize, +// keepAliveTime, +// unit, +// workQueue, +// new ThreadFactory() { +// private final AtomicInteger threadNumber = new AtomicInteger(1); +// +// @Override +// public Thread newThread(Runnable r) { +// return new Thread(r, name + "-thread-" + threadNumber.getAndIncrement()); +// } +// }, +// new ThreadPoolExecutor.AbortPolicy() +// ); +// } +// +// /** +// * 提交任务并管理 +// * +// * @param taskId 任务ID +// * @param task 任务逻辑 +// * @return true表示提交成功，false表示任务已存在 +// */ +// public boolean submitTask(String taskId, Runnable task) { +// if (runningTasks.containsKey(taskId)) { +// return false; +// } +// +// ManagedTask managedTask = new ManagedTask(taskId, task); +// runningTasks.put(taskId, managedTask); +// executor.execute(managedTask); +// return true; +// } +// +// /** +// * 正常停止任务 +// * +// * @param taskId 任务ID +// * @return true表示停止成功，false表示任务不存在或已停止 +// */ +// public boolean stopTaskGracefully(String taskId) { +// ManagedTask task = runningTasks.get(taskId); +// if (task != null) { +// return task.stopGracefully(); +// } +// return false; +// } +// +// /** +// * 强制停止任务 +// * +// * @param taskId 任务ID +// * @return true表示停止成功，false表示任务不存在 +// */ +// public boolean stopTaskForcibly(String taskId) { +// ManagedTask task = runningTasks.remove(taskId); +// if (task != null) { +// return task.stopForcibly(); +// } +// return false; +// } +// +// /** +// * 检查任务是否正在运行 +// * +// * @param taskId 任务ID +// * @return true表示正在运行 +// */ +// public boolean isTaskRunning(String taskId) { +// ManagedTask task = runningTasks.get(taskId); +// return task != null && !task.isStopped(); +// } +// +// /** +// * 获取正在运行的任务数量 +// * +// * @return 运行中任务数 +// */ +// public int getRunningTaskCount() { +// return runningTasks.size(); +// } +// +// /** +// * 关闭线程池（等待所有任务完成） +// */ +// public void shutdown() { +// executor.shutdown(); +// } +// +// /** +// * 立即关闭线程池（尝试停止所有任务） +// */ +// public void shutdownNow() { +// executor.shutdownNow(); +// runningTasks.clear(); +// } +// +// /** +// * 获取线程池状态信息 +// * +// * @return 状态信息字符串 +// */ +// public String getPoolStatus() { +// return String.format( +// "[%s] PoolStatus: Active=%d, Completed=%d, Task=%d, Queue=%d/%d", +// name, +// executor.getActiveCount(), +// executor.getCompletedTaskCount(), +// executor.getTaskCount(), +// executor.getQueue().size(), +// executor.getQueue().remainingCapacity() +// ); +// } +// +// /** +// * 被管理的任务包装类 +// */ +// private class ManagedTask implements Runnable { +// private final String taskId; +// private final Runnable task; +// private final AtomicBoolean running = new AtomicBoolean(true); +// private final AtomicBoolean stopped = new AtomicBoolean(false); +// private Thread currentThread; +// +// public ManagedTask(String taskId, Runnable task) { +// this.taskId = taskId; +// this.task = task; +// } +// +// @Override +// public void run() { +// currentThread = Thread.currentThread(); +// try { +// // 执行前检查是否已被停止 +// if (running.get()) { +// task.run(); +// } +// } finally { +// // 任务完成后从运行列表中移除 +// runningTasks.remove(taskId); +// stopped.set(true); +// } +// } +// +// /** +// * 正常停止任务 +// * +// * @return 是否成功停止 +// */ +// public boolean stopGracefully() { +// if (running.compareAndSet(true, false)) { +// return true; +// } +// return false; +// } +// +// /** +// * 强制停止任务 +// * +// * @return 是否成功停止 +// */ +// public boolean stopForcibly() { +// if (stopped.get()) { +// return false; +// } +// +// if (running.compareAndSet(true, false)) { +// if (currentThread != null) { +// // 暴力停止线程 +// // currentThread.stop(); +// try { +// /** +// * Thread.interrupt只支持终止线程的阻塞状态(wait、join、sleep)， +// * 在阻塞出抛出InterruptedException异常,但是并不会终止运行的线程本身； +// * 所以需要注意，此处彻底销毁本线程，需要通过共享变量方式； +// */ +// currentThread.interrupt(); +// currentThread.join(); +// } catch (InterruptedException e) { +// currentThread.interrupt(); +// } catch (Exception e) { +// // ignore +// // currentThread.stop(); +// } +// } +// return true; +// } +// return false; +// } +// +// /** +// * 检查任务是否已停止 +// * +// * @return true表示已停止 +// */ +// public boolean isStopped() { +// return stopped.get(); +// } +// } +//} diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/SerialPipelineNodeHandler.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/SerialPipelineNodeHandler.java new file mode 100644 index 00000000..6b0c9119 --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/SerialPipelineNodeHandler.java @@ -0,0 +1,129 @@ +//package cn.odboy.system.framework.flow.core.handler; +// +//import cn.hutool.core.thread.ThreadUtil; +//import cn.odboy.exception.BadRequestException; +//import com.alibaba.fastjson2.JSON; +//import lombok.extern.slf4j.Slf4j; +// +///** +// * 串行流水线节点处理器 +// * +// * @author odboy +// */ +//@Slf4j +//public abstract class SerialPipelineNodeHandler { +// +// /** +// * 预处理 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract void preProcess(String pipelineId, I inputModel); +// +// /** +// * 预处理异常 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// * @param e 异常信息 +// */ +// protected abstract void preProcessException(String pipelineId, I inputModel, Exception e); +// +// /** +// * 处理业务 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract T process(String pipelineId, I inputModel); +// +// /** +// * 处理业务异常 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// * @param e 异常信息 +// */ +// protected abstract void processException(String pipelineId, I inputModel, Exception e); +// +// /** +// * 业务后置处理 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract void postProcess(String pipelineId, I inputModel, T processResult); +// +// /** +// * 业务后置处理异常 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract void postProcessException(String pipelineId, I inputModel, T processResult, Exception e); +// +// /** +// * 当前节点是否被锁住（卡点功能），返回false解锁 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract boolean isLocked(String pipelineId, I inputModel); +// +// /** +// * 当进程被中断时 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// */ +// protected abstract void onProcessInterrupted(String pipelineId, I inputModel); +// +// /** +// * 业务处理 +// * +// * @param pipelineId 流水线id +// * @param inputModel 输入参数 +// * @return T +// */ +// public T doProcess(String pipelineId, I inputModel) throws BadRequestException { +// try { +// if (Thread.currentThread().isInterrupted()) { +// onProcessInterrupted(pipelineId, inputModel); +// throw new InterruptedException("业务被中断"); +// } +// preProcess(pipelineId, inputModel); +// log.info("preProcess,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); +// } catch (Exception e) { +// preProcessException(pipelineId, inputModel, e); +// log.error("preProcessException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); +// throw new BadRequestException(e.getMessage()); +// } +// if (Thread.currentThread().isInterrupted()) { +// throw new BadRequestException("业务被中断"); +// } +// while (isLocked(pipelineId, inputModel)) { +// ThreadUtil.safeSleep(2000); +// } +// try { +// if (Thread.currentThread().isInterrupted()) { +// throw new BadRequestException("业务被中断"); +// } +// T processResult = process(pipelineId, inputModel); +// log.info("process,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); +// try { +// postProcess(pipelineId, inputModel, processResult); +// log.info("postProcess,pipelineId={},inputModel={},processResult={}", pipelineId, JSON.toJSONString(inputModel), JSON.toJSONString(processResult)); +// return processResult; +// } catch (Exception e) { +// postProcessException(pipelineId, inputModel, processResult, e); +// log.error("postProcessException,pipelineId={},inputModel={},processResult={}", pipelineId, JSON.toJSONString(inputModel), JSON.toJSONString(processResult)); +// throw new BadRequestException(e.getMessage()); +// } +// } catch (Exception e) { +// processException(pipelineId, inputModel, e); +// log.error("processException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); +// throw new BadRequestException(e.getMessage()); +// } +// } +//} diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java new file mode 100644 index 00000000..ceb06028 --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java @@ -0,0 +1,44 @@ +//package cn.odboy.system.framework.flow.core.handler.impl; +// +//import cn.odboy.system.framework.flow.core.handler.SerialPipelineNodeHandler; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Service; +// +//@Slf4j +//@Service("pipeline:create_release_branch") +//public class PipelineAppCreateReleaseBranchHandlerServiceImpl extends SerialPipelineNodeHandler { +// @Override +// public void preProcess(String pipelineId, Object inputModel) { +// } +// +// @Override +// public void preProcessException(String pipelineId, Object inputModel, Exception e) { +// } +// +// @Override +// public Object process(String pipelineId, Object inputModel) { +// return "Hello World"; +// } +// +// @Override +// public void processException(String pipelineId, Object inputModel, Exception e) { +// } +// +// @Override +// public void postProcess(String pipelineId, Object inputModel, Object processResult) { +// } +// +// @Override +// public void postProcessException(String pipelineId, Object inputModel, Object processResult, Exception e) { +// } +// +// @Override +// public boolean isLocked(String pipelineId, Object inputModel) { +// return false; +// } +// +// @Override +// protected void onProcessInterrupted(String pipelineId, Object inputModel) { +// log.error("pipeline is stopping"); +// } +//} diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/model/PipelineNodeVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/model/PipelineNodeVo.java new file mode 100644 index 00000000..7f7d9dd5 --- /dev/null +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/flow/model/PipelineNodeVo.java @@ -0,0 +1,68 @@ +//package cn.odboy.system.framework.flow.model; +// +//import cn.odboy.base.CsSerializeObject; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +// +//import java.util.List; +// +//@Data +//@EqualsAndHashCode(callSuper = false) +//public class PipelineNodeVo extends CsSerializeObject { +// /** +// * 业务节点名称 +// */ +// private String name; +// /** +// * 是否可以点击 +// */ +// private Boolean click = false; +// /** +// * 功能按钮列表，与click互斥 +// */ +// private List buttonList; +// /** +// * 业务编码(createReleaseBranch、mergeCode) +// */ +// private String bizCode; +// /** +// * 业务节点开始时间 +// */ +// private Long startTimeMillis; +// /** +// * 业务节点耗时 +// */ +// private Long durationMillis; +// /** +// * 业务节点执行状态(success 成功, error 失败, running 运行中) +// */ +// private String executeStatus; +// /** +// * 业务节点结果描述(执行成功) +// */ +// private String resultDesc; +// +// /** +// * 流水线节点功能按钮 +// */ +// @Data +// @EqualsAndHashCode(callSuper = false) +// public static class PipelineNodeOperationButton extends CsSerializeObject { +// /** +// * 请求方式(get、post) +// */ +// private String method; +// /** +// * 请求路径(/api/doCheck?id=1&bizCode=) +// */ +// private String requestUrl; +// /** +// * 按钮名称(通过、打回) +// */ +// private String text; +// /** +// * 按钮类型(execute 请求url、link 跳转三方) +// */ +// private String type; +// } +//} diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/CsHealthCheckController.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/CsHealthCheckController.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/CsHealthCheckController.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/CsHealthCheckController.java index cdc2e23c..d021326a 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/CsHealthCheckController.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/CsHealthCheckController.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.monitor.controller; +package cn.odboy.framework.monitor.controller; import cn.odboy.annotation.AnonymousGetMapping; -import cn.odboy.monitor.service.CsHealthCheckPointService; +import cn.odboy.framework.monitor.service.CsHealthCheckPointService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/CsHealthCheckPointService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/CsHealthCheckPointService.java similarity index 84% rename from cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/CsHealthCheckPointService.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/CsHealthCheckPointService.java index 8acacd5d..14ade719 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/CsHealthCheckPointService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/CsHealthCheckPointService.java @@ -1,4 +1,4 @@ -package cn.odboy.monitor.service; +package cn.odboy.framework.monitor.service; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQTypeEnum.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQTypeEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQTypeEnum.java index 58046549..670d27c4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQTypeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQTypeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; /** * 动态查询 枚举 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQuery.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQuery.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java index 0d925fa5..7a68e241 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/CsMpQuery.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/DataTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/DataTypeEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java index 5b553bc5..75175ae5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/DataTypeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpCustomP6SpyLogger.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpCustomP6SpyLogger.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java index 579ad603..bf8d8491 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpCustomP6SpyLogger.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; import cn.hutool.core.util.StrUtil; import com.p6spy.engine.spy.appender.MessageFormattingStrategy; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpInsertBatchSqlInjector.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpInsertBatchSqlInjector.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java index aa5c0f85..f90654ab 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpInsertBatchSqlInjector.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.core.injector.AbstractMethod; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java index 42a36d91..c92524b6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java index 667ac5e2..ab373831 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.framework.mybatisplus.config; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpAnyQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpAnyQUtil.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpAnyQUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpAnyQUtil.java index e9009405..bf66e2ea 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpAnyQUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpAnyQUtil.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.mybatisplus.core; +package cn.odboy.framework.mybatisplus.core; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpCmdGenUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpCmdGenUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java index aa4b2751..87eac1aa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpCmdGenUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.core.framework.mybatisplus.core; +package cn.odboy.framework.mybatisplus.core; +import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.*; @@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import com.baomidou.mybatisplus.generator.keywords.MySqlKeyWordsHandler; import lombok.Data; +import org.apache.ibatis.annotations.Mapper; import java.sql.Types; import java.util.Collections; @@ -144,6 +146,7 @@ public class CsMpCmdGenUtil { } private Consumer getPackageConfigConsumer() { + String mapperPath = FileUtil.getTmpDirPath() + "CodeGen/resources/mapper"; return packageConfigBuilder -> packageConfigBuilder .parent(this.parentPackageName == null ? "cn.codegen" : this.parentPackageName) .moduleName(this.parentPackageModuleName == null ? "moduleName" : this.parentPackageModuleName) @@ -152,13 +155,14 @@ public class CsMpCmdGenUtil { .mapper("mapper") .serviceImpl("service.impl") .controller("rest") - .pathInfo(Collections.singletonMap(OutputFile.xml, (System.getProperty("os.name").toLowerCase().contains("win") ? "C:\\CodeGen\\resources\\mapper" : "/tmp/CodeGen/resources/mapper"))); + .pathInfo(Collections.singletonMap(OutputFile.xml, mapperPath)); } private static Consumer getGlobalConfigConsumer() { + String outputDir = FileUtil.getTmpDirPath() + "CodeGen"; return globalConfigBuilder -> globalConfigBuilder .enableSwagger() - .outputDir((System.getProperty("os.name").toLowerCase().contains("win") ? "C:\\CodeGen" : "/tmp/CodeGen")) + .outputDir(outputDir) .author("codegen") .commentDate("yyyy-MM-dd") .dateType(DateType.TIME_PACK); @@ -167,6 +171,7 @@ public class CsMpCmdGenUtil { private static Consumer getStrategyConfigConsumer() { return strategyConfigBuilder -> strategyConfigBuilder .mapperBuilder() + .mapperAnnotation(Mapper.class) .formatMapperFileName("%sMapper") .formatXmlFileName("%sMapper"); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpQUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java index dc4099e1..23c8c5e0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/CsMpQUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java @@ -1,11 +1,11 @@ -package cn.odboy.core.framework.mybatisplus.core; +package cn.odboy.framework.mybatisplus.core; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsBaseUserTimeTb; -import cn.odboy.core.framework.mybatisplus.config.CsMpQuery; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.mybatisplus.config.CsMpQuery; +import cn.odboy.framework.exception.BadRequestException; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java index 905a2490..4f59a075 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.core.framework.mybatisplus.core.interfaces; +package cn.odboy.framework.mybatisplus.core.interfaces; import cn.odboy.base.CsResultVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpMapper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java similarity index 99% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpMapper.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java index 6a4117d0..877b4ea1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpMapper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.core.framework.mybatisplus.core.interfaces; +package cn.odboy.framework.mybatisplus.core.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java index ec6670c0..3aceca2c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.core.framework.mybatisplus.core.interfaces; +package cn.odboy.framework.mybatisplus.core.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.framework.mybatisplus.core.CsMpQUtil; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.mybatisplus.core.CsMpQUtil; +import cn.odboy.framework.exception.BadRequestException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.enums.SqlMethod; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/AppProperties.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/AppProperties.java index 5d9b57a9..2d5059eb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/AppProperties.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.properties; +package cn.odboy.framework.properties; -import cn.odboy.core.framework.properties.model.*; +import cn.odboy.framework.properties.model.*; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ContentRsaEncodeSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ContentRsaEncodeSettingModel.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ContentRsaEncodeSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ContentRsaEncodeSettingModel.java index c70a2c2f..fd29032e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ContentRsaEncodeSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ContentRsaEncodeSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; import lombok.Getter; import lombok.Setter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/JwtAuthSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/JwtAuthSettingModel.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/JwtAuthSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/JwtAuthSettingModel.java index 9c26ebe4..ffa5da43 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/JwtAuthSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/JwtAuthSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; import lombok.Getter; import lombok.Setter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/SwaggerApiDocSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/SwaggerApiDocSettingModel.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/SwaggerApiDocSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/SwaggerApiDocSettingModel.java index 373aa198..5c4840cb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/SwaggerApiDocSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/SwaggerApiDocSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; import lombok.Getter; import lombok.Setter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ThreadPoolSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ThreadPoolSettingModel.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ThreadPoolSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ThreadPoolSettingModel.java index 597185cf..c709120a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/ThreadPoolSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/ThreadPoolSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; import lombok.Getter; import lombok.Setter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java index 75255316..c734c181 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java @@ -1,7 +1,7 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; -import cn.odboy.core.constant.CaptchaCodeEnum; -import cn.odboy.exception.BadRequestException; +import cn.odboy.constant.CaptchaCodeEnum; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.StringUtil; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginSettingModel.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginSettingModel.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginSettingModel.java index a66dfdb7..f0527685 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.properties.model; +package cn.odboy.framework.properties.model; import lombok.Getter; import lombok.Setter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java index 611a3bdf..a2979daa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.quartz.config; +package cn.odboy.framework.quartz.config; import lombok.extern.slf4j.Slf4j; import org.quartz.spi.TriggerFiredBundle; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzRunnable.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzRunnable.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java index 7399af07..c36488f4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzRunnable.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.quartz.core; +package cn.odboy.framework.quartz.core; -import cn.odboy.context.SpringBeanHolder; +import cn.odboy.framework.context.SpringBeanHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.util.ReflectionUtils; @@ -17,7 +17,7 @@ public class QuartzRunnable implements Callable { private final Method method; private final String params; - protected QuartzRunnable(String beanName, String methodName, String params) throws NoSuchMethodException, SecurityException { + public QuartzRunnable(String beanName, String methodName, String params) throws NoSuchMethodException, SecurityException { this.target = SpringBeanHolder.getBean(beanName); this.params = params; if (StringUtils.isNotBlank(params)) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java similarity index 95% rename from cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java index 426c9a09..9ecc0981 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java @@ -1,4 +1,4 @@ -package cn.odboy.redis; +package cn.odboy.framework.redis; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONFactory; @@ -41,13 +41,11 @@ public class RedisConfiguration extends CachingConfigurerSupport { */ private static final String[] WHITELIST_STR = { "org.springframework", - "cn.odboy.core.dal.dataobject.job", - "cn.odboy.core.dal.dataobject.system", - "cn.odboy.core.dal.dataobject.tools", - "cn.odboy.core.dal.model", - "cn.odboy.core.framework.flow.dto", - "cn.odboy.core.service.system.dto", - "cn.odboy.core.service.tools.dto", + "cn.odboy.system.dal.dataobject", + "cn.odboy.system.dal.model", + "cn.odboy.pipeline.dal.dataobject", + "cn.odboy.pipeline.dal.model", + "cn.odboy.devops.framework.pipeline.model", }; /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java index 192dfb50..41e201b0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisHelper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java @@ -1,4 +1,4 @@ -package cn.odboy.redis; +package cn.odboy.framework.redis; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedissonConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedissonConfiguration.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java index 006b8c17..399b4fe3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedissonConfiguration.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java @@ -1,4 +1,4 @@ -package cn.odboy.redis; +package cn.odboy.framework.redis; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/threadpool/AsyncExecutor.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/threadpool/AsyncExecutor.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java index 9c88fb07..3a1360cb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/threadpool/AsyncExecutor.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java @@ -1,7 +1,7 @@ -package cn.odboy.core.framework.threadpool; +package cn.odboy.framework.server.config; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.framework.properties.model.ThreadPoolSettingModel; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.properties.model.ThreadPoolSettingModel; import com.alibaba.ttl.TtlRunnable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @EnableAsync @Configuration -public class AsyncExecutor implements AsyncConfigurer { +public class AsyncTheadPoolConfig implements AsyncConfigurer { @Autowired private AppProperties properties; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/config/MultipartConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/MultipartConfig.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/config/MultipartConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/MultipartConfig.java index 6fbc5f8a..17f73409 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/config/MultipartConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/MultipartConfig.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.server.config; +package cn.odboy.framework.server.config; -import cn.odboy.core.framework.server.core.FileUploadPathHelper; +import cn.odboy.framework.server.core.FileUploadPathHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringArraysToListDateConverter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringArraysToListDateConverter.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java index bdc7a033..5bd21ab9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringArraysToListDateConverter.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.server.converters; +package cn.odboy.framework.server.converters; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringToDateConverter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringToDateConverter.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java index 8b9fff40..abe73334 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/converters/DateStringToDateConverter.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.server.converters; +package cn.odboy.framework.server.converters; import cn.hutool.core.util.StrUtil; import org.springframework.core.convert.converter.Converter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/ConfigurerAdapter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/ConfigurerAdapter.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java index 3243db09..7c43fdda 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/ConfigurerAdapter.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java @@ -1,8 +1,8 @@ -package cn.odboy.core.framework.server.core; +package cn.odboy.framework.server.core; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.framework.server.converters.DateStringArraysToListDateConverter; -import cn.odboy.core.framework.server.converters.DateStringToDateConverter; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.server.converters.DateStringArraysToListDateConverter; +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; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/FileUploadPathHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/FileUploadPathHelper.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/FileUploadPathHelper.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/FileUploadPathHelper.java index aa760f83..26586d76 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/core/FileUploadPathHelper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/FileUploadPathHelper.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.server.core; +package cn.odboy.framework.server.core; import cn.odboy.constant.SystemConst; import org.springframework.beans.factory.annotation.Value; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/CsWebSocketServerFactory.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/CsWebSocketFactory.java similarity index 86% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/CsWebSocketServerFactory.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/CsWebSocketFactory.java index a33f0040..9adfc45b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/CsWebSocketServerFactory.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/CsWebSocketFactory.java @@ -1,4 +1,4 @@ -package cn.odboy.websocket.config; +package cn.odboy.framework.websocket.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * @date 2024-06-07 */ @Component -public class CsWebSocketServerFactory implements WebServerFactoryCustomizer { +public class CsWebSocketFactory implements WebServerFactoryCustomizer { @Override public void customize(UndertowServletWebServerFactory factory) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/WebSocketConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketConfig.java similarity index 89% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/WebSocketConfig.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketConfig.java index 069f0c28..9a562633 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/config/WebSocketConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.websocket.config; +package cn.odboy.framework.websocket.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/constant/CsWebSocketBizTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/constant/CsWebSocketBizTypeEnum.java similarity index 81% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/constant/CsWebSocketBizTypeEnum.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/constant/CsWebSocketBizTypeEnum.java index a0a1e67b..dfa6002e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/constant/CsWebSocketBizTypeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/constant/CsWebSocketBizTypeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.websocket.constant; +package cn.odboy.framework.websocket.constant; public enum CsWebSocketBizTypeEnum { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketClientManager.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketClientManager.java similarity index 95% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketClientManager.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketClientManager.java index c047ef9b..097ff43b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketClientManager.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketClientManager.java @@ -1,4 +1,4 @@ -package cn.odboy.websocket.context; +package cn.odboy.framework.websocket.context; import java.util.Collection; import java.util.Map; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketMessage.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketMessage.java similarity index 71% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketMessage.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketMessage.java index e9db700b..6cb95b0b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/CsWebSocketMessage.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWebSocketMessage.java @@ -1,6 +1,6 @@ -package cn.odboy.websocket.context; +package cn.odboy.framework.websocket.context; -import cn.odboy.websocket.constant.CsWebSocketBizTypeEnum; +import cn.odboy.framework.websocket.constant.CsWebSocketBizTypeEnum; import lombok.Data; @Data diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/WebSocketServer.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/WebSocketServer.java index 4f098dc4..1de75b13 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/WebSocketServer.java @@ -1,4 +1,4 @@ -package cn.odboy.websocket.context; +package cn.odboy.framework.websocket.context; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; @@ -93,7 +93,7 @@ public class WebSocketServer { } else { CsWebSocketClientManager.getClientBySid(sid).innerSendMessage(message); } - } catch (IOException ignored) { + } catch (Exception ignored) { } } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/AnonTagUtil.java similarity index 77% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/AnonTagUtil.java index ba5c18f3..b08cbcd0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/AnonTagUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/AnonTagUtil.java @@ -2,9 +2,11 @@ package cn.odboy.util; import cn.odboy.annotation.AnonymousAccess; import cn.odboy.constant.RequestMethodEnum; +import lombok.experimental.UtilityClass; import org.springframework.context.ApplicationContext; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; @@ -13,7 +15,8 @@ import java.util.*; /** * 匿名标记工具 */ -public final class AnonTagUtil { +@UtilityClass +public class AnonTagUtil { /** * 获取匿名标记的URL @@ -35,28 +38,29 @@ public final class AnonTagUtil { for (Map.Entry infoEntry : handlerMethodMap.entrySet()) { HandlerMethod handlerMethod = infoEntry.getValue(); AnonymousAccess anonymousAccess = handlerMethod.getMethodAnnotation(AnonymousAccess.class); - if (null != anonymousAccess) { + if (null != anonymousAccess && infoEntry.getKey() != null) { List requestMethods = new ArrayList<>(infoEntry.getKey().getMethodsCondition().getMethods()); RequestMethodEnum request = RequestMethodEnum.find(requestMethods.isEmpty() ? RequestMethodEnum.ALL.getType() : requestMethods.get(0).name()); - if (infoEntry.getKey().getPatternsCondition() != null) { + PatternsRequestCondition patternsCondition = infoEntry.getKey().getPatternsCondition(); + if (patternsCondition != null) { switch (Objects.requireNonNull(request)) { case GET: - get.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + get.addAll(patternsCondition.getPatterns()); break; case POST: - post.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + post.addAll(patternsCondition.getPatterns()); break; case PUT: - put.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + put.addAll(patternsCondition.getPatterns()); break; case PATCH: - patch.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + patch.addAll(patternsCondition.getPatterns()); break; case DELETE: - delete.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + delete.addAll(patternsCondition.getPatterns()); break; default: - all.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); + all.addAll(patternsCondition.getPatterns()); break; } } @@ -80,8 +84,8 @@ public final class AnonTagUtil { public static Set getAllAnonymousUrl(final ApplicationContext applicationContext) { Set allUrl = new HashSet<>(); Map> anonymousUrls = getAnonymousUrl(applicationContext); - for (String key : anonymousUrls.keySet()) { - allUrl.addAll(anonymousUrls.get(key)); + for (Map.Entry> entry : anonymousUrls.entrySet()) { + allUrl.addAll(anonymousUrls.get(entry.getKey())); } return allUrl; } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/BigDecimalUtil.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/BigDecimalUtil.java index 67cfcc8c..49822c0c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BigDecimalUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/BigDecimalUtil.java @@ -1,11 +1,14 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; + import java.math.BigDecimal; import java.math.RoundingMode; /** * 计算类 */ +@UtilityClass public final class BigDecimalUtil { /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/BrowserUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/BrowserUtil.java index e6834987..002dfabe 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/BrowserUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/BrowserUtil.java @@ -2,6 +2,7 @@ package cn.odboy.util; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; +import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest; @@ -12,6 +13,7 @@ import java.net.UnknownHostException; * 浏览器 相关 */ @Slf4j +@UtilityClass public final class BrowserUtil { private static final String UNKNOWN = "unknown"; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/ClassUtil.java similarity index 89% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/ClassUtil.java index 04bde0f6..47bd01a3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ClassUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/ClassUtil.java @@ -1,5 +1,7 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; + import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; @@ -7,6 +9,7 @@ import java.util.List; /** * 类 相关 */ +@UtilityClass public final class ClassUtil { @SuppressWarnings({"unchecked", "all"}) public static List getAllFields(Class clazz, List fields) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CloseUtil.java similarity index 91% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CloseUtil.java index 8c1462a3..77713aa8 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CloseUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CloseUtil.java @@ -1,10 +1,13 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; + import java.io.Closeable; /** * 用于关闭各种连接，缺啥补啥 */ +@UtilityClass public final class CloseUtil { public static void close(Closeable closeable) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsBase64SecretUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBase64SecretUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsBase64SecretUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBase64SecretUtil.java index a2c996df..7653c467 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsBase64SecretUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBase64SecretUtil.java @@ -17,6 +17,7 @@ package cn.odboy.util; import cn.hutool.core.codec.Base64Encoder; import cn.hutool.core.util.IdUtil; +import lombok.experimental.UtilityClass; import java.nio.charset.StandardCharsets; @@ -26,9 +27,8 @@ import java.nio.charset.StandardCharsets; * @author odboy * @date 2022-11-16 */ +@UtilityClass public final class CsBase64SecretUtil { - private CsBase64SecretUtil() { - } public static String build() { // 128位uuid diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsCollUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsCollUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java index 24efc85b..9f9e0726 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsCollUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java @@ -17,6 +17,7 @@ package cn.odboy.util; import cn.odboy.base.CsSelectOptionItemVo; import com.alibaba.fastjson2.JSON; +import lombok.experimental.UtilityClass; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -32,6 +33,7 @@ import java.util.stream.Collectors; * @author odboy * @date 2022-11-09 */ +@UtilityClass public final class CsCollUtil extends cn.hutool.core.collection.CollUtil { private static Predicate distinctPredicate(Function keyMapper) { Map map = new HashMap<>(3); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsDistributedIdUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java similarity index 100% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsDistributedIdUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsJsonUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsJsonUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsJsonUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsJsonUtil.java index ebf64d8e..2adf12e9 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsJsonUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsJsonUtil.java @@ -17,6 +17,7 @@ package cn.odboy.util; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; +import lombok.experimental.UtilityClass; import java.util.List; import java.util.Map; @@ -27,6 +28,7 @@ import java.util.Map; * @author odboy * @date 2024-10-01 */ +@UtilityClass public final class CsJsonUtil { public static Map toMap(String jsonStr, Class kClass, Class vClass) { return JSON.parseObject(jsonStr, new TypeReference>() { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsListUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsListUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java index cb3d4e73..eefb1363 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsListUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java @@ -17,6 +17,7 @@ package cn.odboy.util; import cn.hutool.core.date.DateTime; import cn.odboy.base.CsBaseUserTimeTb; +import lombok.experimental.UtilityClass; import java.util.ArrayList; import java.util.List; @@ -29,6 +30,7 @@ import java.util.stream.Collectors; * @author odboy * @date 2024-10-01 */ +@UtilityClass public final class CsListUtil { /** * 根据对象T的属性去重 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsLogFmtUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsLogFmtUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsLogFmtUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsLogFmtUtil.java index b40bd176..b576de8b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsLogFmtUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsLogFmtUtil.java @@ -15,12 +15,15 @@ */ package cn.odboy.util; +import lombok.experimental.UtilityClass; + /** * 适配 logger 占位符 * * @author odboy * @date 2025-01-13 */ +@UtilityClass public final class CsLogFmtUtil { /** * 替换字符串中的占位符 {} 为传入的参数 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsPageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsPageUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java index e557133e..627a1485 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsPageUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java @@ -4,6 +4,7 @@ import cn.odboy.base.CsResultVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.experimental.UtilityClass; import java.util.ArrayList; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.List; * * @author odboy */ +@UtilityClass public final class CsPageUtil extends cn.hutool.core.util.PageUtil { /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/templatefile/CsResourceTemplateUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsResourceTemplateUtil.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/templatefile/CsResourceTemplateUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsResourceTemplateUtil.java index b11802f2..748c1bd1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/templatefile/CsResourceTemplateUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsResourceTemplateUtil.java @@ -1,4 +1,4 @@ -package cn.odboy.core.framework.templatefile; +package cn.odboy.util; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; @@ -6,6 +6,7 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; +import lombok.experimental.UtilityClass; /** * Resources模版工具 @@ -13,6 +14,7 @@ import cn.hutool.extra.template.TemplateUtil; * @author odboy * @date 2025-06-22 */ +@UtilityClass public class CsResourceTemplateUtil { public static String render(String moduleName, String filename, Dict params) { String path = StrUtil.isBlank(moduleName) ? "template" : "template/" + moduleName; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/CsValidUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java index 889789ca..d2173073 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CsValidUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java @@ -15,6 +15,8 @@ */ package cn.odboy.util; +import lombok.experimental.UtilityClass; + import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; @@ -27,6 +29,7 @@ import java.util.Set; * @author odboy * @date 2025-01-15 */ +@UtilityClass public final class CsValidUtil { private static final Validator VALIDATOR = Validation.buildDefaultValidatorFactory().getValidator(); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/DesEncryptUtil.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/DesEncryptUtil.java index dc5b0ee3..1c90bb75 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/DesEncryptUtil.java @@ -1,5 +1,7 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; + import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; @@ -10,6 +12,7 @@ import java.nio.charset.StandardCharsets; /** * DES加密 */ +@UtilityClass public final class DesEncryptUtil { private static final String STR_PARAM = "Passw0rd"; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java index e795517e..23f6f32f 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java @@ -6,7 +6,8 @@ import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import cn.odboy.constant.FileTypeEnum; import cn.odboy.constant.SystemConst; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; +import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; @@ -32,6 +33,7 @@ import static cn.odboy.constant.SystemConst.*; * File工具类，扩展 hutool 工具包 */ @Slf4j +@UtilityClass public final class FileUtil extends cn.hutool.core.io.FileUtil { /** @@ -65,9 +67,6 @@ public final class FileUtil extends cn.hutool.core.io.FileUtil { */ private static final DecimalFormat DF = new DecimalFormat("0.00"); - public static void main(String[] args) { - } - /** * MultipartFile转File -> ok */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java similarity index 95% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java index 4435330b..09996cb2 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java @@ -1,6 +1,7 @@ package cn.odboy.util; -import cn.odboy.context.SpringBeanHolder; +import cn.odboy.framework.context.SpringBeanHolder; +import lombok.experimental.UtilityClass; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.IpInfo; @@ -11,6 +12,7 @@ import java.util.Enumeration; /** * IP地址 相关 */ +@UtilityClass public final class IpUtil { /** * 注入bean diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java index 1a12604c..d2817cb8 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java @@ -1,5 +1,6 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; import org.apache.commons.codec.binary.Base64; import javax.crypto.Cipher; @@ -13,6 +14,7 @@ import java.security.spec.X509EncodedKeySpec; /** * Rsa 工具类，公钥私钥生成，加解密 */ +@UtilityClass public final class RsaEncryptUtil { private static final String SRC = "123456"; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/StringUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/util/StringUtil.java index 91f6f55e..20a7856b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/StringUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/StringUtil.java @@ -1,5 +1,6 @@ package cn.odboy.util; +import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import java.util.Calendar; @@ -9,6 +10,7 @@ import java.util.Date; * 字符串工具类, 继承org.apache.commons.lang3.StringUtils类 */ @Slf4j +@UtilityClass public final class StringUtil extends org.apache.commons.lang3.StringUtils { private static final char SEPARATOR = '_'; @@ -67,7 +69,7 @@ public final class StringUtil extends org.apache.commons.lang3.StringUtils { * toCapitalizeCamelCase("hello_world") == "HelloWorld" * toUnderScoreCase("helloWorld") = "hello_world" */ - static String toUnderScoreCase(String s) { + public static String toUnderScoreCase(String s) { if (s == null) { return null; } diff --git a/cutejava/cutejava-common/pom.xml b/cutejava/cutejava-module-devops/pom.xml similarity index 64% rename from cutejava/cutejava-common/pom.xml rename to cutejava/cutejava-module-devops/pom.xml index 0a8be00b..faa32951 100644 --- a/cutejava/cutejava-common/pom.xml +++ b/cutejava/cutejava-module-devops/pom.xml @@ -4,18 +4,16 @@ cutejava cn.odboy - 1.4.0 + 1.4.1 4.0.0 - cutejava-common - 公共模块 - + cutejava-module-devops + devops应用模块 - - cn.hutool - hutool-all - ${hutool.version} + cn.odboy + cutejava-framework + 1.4.1 \ No newline at end of file diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java new file mode 100644 index 00000000..4a5f07c3 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java @@ -0,0 +1,23 @@ +package cn.odboy.devops.constant.pipeline; + +/** + * 流水线 常量 + */ +public interface PipelineConst { + /** + * 执行器服务前缀 + */ + String EXECUTOR_PREFIX = "pipeline:executor:"; + /** + * 流水线实例Key + */ + String INSTANCE_ID_KEY = "pipelineInstanceId"; + String INSTANCE_KEY = "pipelineInstance"; + /** + * 流水线实例节点相关Key + */ + String INSTANCE_NODE_INDEX_KEY = "pipelineInstanceNodeIndex"; + String INSTANCE_NODE_CODE_KEY = "pipelineInstanceNodeCode"; + String INSTANCE_NODE_NAME_KEY = "pipelineInstanceNodeName"; + String INSTANCE_NODE_TEMPLATE_ARGS_KEY = "pipelineInstanceNodeTemplateArgs"; +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineNodeBizCodeConst.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineNodeBizCodeConst.java new file mode 100644 index 00000000..98827a4f --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineNodeBizCodeConst.java @@ -0,0 +1,77 @@ +package cn.odboy.devops.constant.pipeline; + +/** + * 流水线节点业务编码 + * + * @author odboy + */ +public interface PipelineNodeBizCodeConst { + /** + * 初始化 + */ + String INIT = PipelineConst.EXECUTOR_PREFIX + "node_init"; + + /** + * 合并代码 + */ + String MERGE_BRANCH = PipelineConst.EXECUTOR_PREFIX + "node_merge_branch"; + + /** + * 镜像扫描 + */ + String IMAGE_SCAN = PipelineConst.EXECUTOR_PREFIX + "node_image_scan"; + + /** + * 部署审批 + */ + String DEPLOY_APPROVE = PipelineConst.EXECUTOR_PREFIX + "node_deploy_approve"; + + /** + * 合并到Master + */ + String MERGE_MASTER = PipelineConst.EXECUTOR_PREFIX + "node_merge_master"; + + interface AppJava { + /** + * 构建 + */ + String BUILD = PipelineConst.EXECUTOR_PREFIX + "node_build_java"; + /** + * 部署 + */ + String DEPLOY = PipelineConst.EXECUTOR_PREFIX + "node_deploy_java"; + } + + interface AppPython { + /** + * 构建 + */ + String BUILD = PipelineConst.EXECUTOR_PREFIX + "node_build_python"; + /** + * 部署 + */ + String DEPLOY = PipelineConst.EXECUTOR_PREFIX + "node_deploy_python"; + } + + interface AppGo { + /** + * 构建 + */ + String BUILD = PipelineConst.EXECUTOR_PREFIX + "node_build_go"; + /** + * 部署 + */ + String DEPLOY = PipelineConst.EXECUTOR_PREFIX + "node_deploy_go"; + } + + interface AppNodeJs { + /** + * 构建 + */ + String BUILD = PipelineConst.EXECUTOR_PREFIX + "node_build_nodejs"; + /** + * 部署 + */ + String DEPLOY = PipelineConst.EXECUTOR_PREFIX + "node_deploy_nodejs"; + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java new file mode 100644 index 00000000..37455cb9 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java @@ -0,0 +1,28 @@ +package cn.odboy.devops.constant.pipeline; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 流水线状态枚举 + */ +@Getter +@AllArgsConstructor +public enum PipelineStatusEnum { + WAIT("wait", "#C0C4CC", "未开始"), + RUNNING("running", "#409EFF", "运行中"), + SUCCESS("success", "#67C23A", "执行成功"), + FAIL("fail", "#F56C6C", "执行失败"); + /** + * 状态码 + */ + private final String code; + /** + * 颜色 + */ + private final String color; + /** + * 描述 + */ + private final String desc; +} \ No newline at end of file diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceNodeDetailTb.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceNodeDetailTb.java new file mode 100644 index 00000000..ca66bba1 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceNodeDetailTb.java @@ -0,0 +1,82 @@ +package cn.odboy.devops.dal.dataobject.pipeline; + +import cn.odboy.base.CsObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; + +/** + *

+ * 流水线实例节点明细 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Getter +@Setter +@TableName("pipeline_instance_node_detail") +@ApiModel(value = "PipelineInstanceNodeDetail对象", description = "流水线实例节点明细") +public class PipelineInstanceNodeDetailTb extends CsObject { + + /** + * 流水线实例id + */ + @ApiModelProperty("流水线实例id") + @TableField("pipeline_instance_id") + private Long pipelineInstanceId; + + /** + * 开始时间 + */ + @ApiModelProperty("开始时间") + @TableField("start_time") + private Date startTime; + + /** + * 结束时间 + */ + @ApiModelProperty("结束时间") + @TableField("finish_time") + private Date finishTime; + + /** + * 节点状态 + */ + @TableField("`status`") + @ApiModelProperty("节点状态") + private String status; + + /** + * 节点索引 + */ + @ApiModelProperty("节点索引") + @TableField("node_index") + private Integer nodeIndex; + + /** + * 节点编码 + */ + @TableField("node_code") + @ApiModelProperty("节点编码") + private String nodeCode; + + /** + * 节点描述 + */ + @ApiModelProperty("节点描述") + @TableField("node_description") + private String nodeDescription; + + /** + * 输入参数 + */ + @TableField("`context`") + @ApiModelProperty("输入参数") + private String context; +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceTb.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceTb.java new file mode 100644 index 00000000..4aac671f --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineInstanceTb.java @@ -0,0 +1,124 @@ +package cn.odboy.devops.dal.dataobject.pipeline; + +import cn.odboy.base.CsObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; + +/** + *

+ * 流水线实例 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Getter +@Setter +@TableName("pipeline_instance") +@ApiModel(value = "PipelineInstance对象", description = "流水线实例") +public class PipelineInstanceTb extends CsObject{ + + /** + * 流水线模板id + */ + @ApiModelProperty("流水线模板id") + @TableField("pipeline_template_id") + private Long pipelineTemplateId; + + /** + * 流水线实例名称 + */ + @ApiModelProperty("流水线实例名称") + @TableField("pipeline_instance_name") + private String pipelineInstanceName; + + /** + * 流水线实例id + */ + @ApiModelProperty("流水线实例id") + @TableField("pipeline_instance_id") + private String pipelineInstanceId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField("create_time") + private Date createTime; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + @TableField("create_by") + private String createBy; + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + @TableField("update_time") + private Date updateTime; + + /** + * 流水线模板类型 + */ + @TableField("`type`") + @ApiModelProperty("流水线模板类型") + private String type; + + /** + * 应用名称 + */ + @TableField("app_name") + @ApiModelProperty("应用名称") + private String appName; + + /** + * 环境编码 + */ + @TableField("env") + @ApiModelProperty("环境编码") + private String env; + + /** + * 流水线实例状态 + */ + @TableField("`status`") + @ApiModelProperty("流水线实例状态") + private String status; + + /** + * 流水线实例当前节点code + */ + @TableField("current_node") + @ApiModelProperty("流水线实例当前节点code") + private String currentNode; + + /** + * 流水线实例当前节点状态 + */ + @ApiModelProperty("流水线实例当前节点状态") + @TableField("current_node_status") + private String currentNodeStatus; + + /** + * 输入参数 + */ + @TableField("`context`") + @ApiModelProperty("输入参数") + private String context; + + /** + * 流水线模板 + */ + @TableField("pipeline_template") + @ApiModelProperty("流水线模板") + private String pipelineTemplate; +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineTemplateTb.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineTemplateTb.java new file mode 100644 index 00000000..685d7d81 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/pipeline/PipelineTemplateTb.java @@ -0,0 +1,82 @@ +package cn.odboy.devops.dal.dataobject.pipeline; + +import cn.odboy.base.CsBaseUserTimeLogicTb; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 流水线模板 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Getter +@Setter +@TableName("pipeline_template") +@ApiModel(value = "PipelineTemplate对象", description = "流水线模板") +public class PipelineTemplateTb extends CsBaseUserTimeLogicTb { + + /** + * id + */ + @ApiModelProperty("id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 流水线类型 + */ + @TableField("`type`") + @ApiModelProperty("流水线类型") + private String type; + + /** + * 语言 + */ + @ApiModelProperty("语言") + @TableField("`language`") + private String language; + + /** + * 环境编码 + */ + @TableField("env") + @ApiModelProperty("环境编码") + private String env; + + /** + * 流水线编码 + */ + @TableField("`code`") + @ApiModelProperty("流水线编码") + private String code; + + /** + * 流水线名称 + */ + @TableField("`name`") + @ApiModelProperty("流水线名称") + private String name; + + /** + * 流水线描述 + */ + @ApiModelProperty("流水线描述") + @TableField("`description`") + private String description; + + /** + * 流水线模板内容 + */ + @TableField("template") + @ApiModelProperty("流水线模板内容") + private String template; +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceMapper.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceMapper.java new file mode 100644 index 00000000..941803a3 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceMapper.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.dal.mysql.pipeline; + +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceTb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 流水线实例 Mapper 接口 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Mapper +public interface PipelineInstanceMapper extends BaseMapper { + +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceNodeDetailMapper.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceNodeDetailMapper.java new file mode 100644 index 00000000..a7280669 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineInstanceNodeDetailMapper.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.dal.mysql.pipeline; + +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceNodeDetailTb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 流水线实例节点明细 Mapper 接口 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Mapper +public interface PipelineInstanceNodeDetailMapper extends BaseMapper { + +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineTemplateMapper.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineTemplateMapper.java new file mode 100644 index 00000000..1a96308b --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/mysql/pipeline/PipelineTemplateMapper.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.dal.mysql.pipeline; + +import cn.odboy.devops.dal.dataobject.pipeline.PipelineTemplateTb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 流水线模板 Mapper 接口 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Mapper +public interface PipelineTemplateMapper extends BaseMapper { + +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobBean.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobBean.java new file mode 100644 index 00000000..98febce7 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobBean.java @@ -0,0 +1,70 @@ +package cn.odboy.devops.framework.pipeline; + +import cn.odboy.devops.constant.pipeline.PipelineConst; +import cn.odboy.framework.context.SpringBeanHolder; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo; +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceTb; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.devops.service.pipeline.PipelineInstanceService; +import cn.odboy.util.CsJsonUtil; +import com.alibaba.fastjson2.JSON; +import lombok.extern.slf4j.Slf4j; +import org.quartz.JobDataMap; +import org.quartz.JobExecutionContext; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.scheduling.quartz.QuartzJobBean; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.Future; + +@Slf4j +public class PipelineJobBean extends QuartzJobBean { + private final ThreadPoolTaskExecutor executor = SpringBeanHolder.getBean("pipelineAsync"); + + @Override + public void executeInternal(JobExecutionContext context) { + JobDataMap mergedJobDataMap = context.getMergedJobDataMap(); + // 实例、节点明细 + PipelineInstanceService pipelineInstanceService = SpringBeanHolder.getBean(PipelineInstanceService.class); + PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService = SpringBeanHolder.getBean(PipelineInstanceNodeDetailService.class); + // 获取流水线实例 + String pipelineInstanceId = mergedJobDataMap.getString(PipelineConst.INSTANCE_ID_KEY); + PipelineInstanceTb pipelineInstance = pipelineInstanceService.getPipelineInstance(pipelineInstanceId); + if (pipelineInstance == null) { + log.info("流水线实例不存在, instanceId={}", pipelineInstanceId); + return; + } + String pipelineTemplate = pipelineInstance.getPipelineTemplate(); + // 流水线节点模板 + List pipelineNodeTemplateVos = JSON.parseArray(pipelineTemplate, PipelineNodeTemplateVo.class); + // 流水线上下文参数 + Map contextArgs = CsJsonUtil.toMap(pipelineInstance.getContext(), String.class, Object.class); + // 放置额外的参数 + contextArgs.put(PipelineConst.INSTANCE_KEY, pipelineInstance); + // 执行节点任务 + for (int i = 0; i < pipelineNodeTemplateVos.size(); i++) { + PipelineNodeTemplateVo pipelineNodeTemplateVo = pipelineNodeTemplateVos.get(i); + String code = pipelineNodeTemplateVo.getCode(); + contextArgs.put(PipelineConst.INSTANCE_NODE_INDEX_KEY, i); + contextArgs.put(PipelineConst.INSTANCE_NODE_CODE_KEY, code); + contextArgs.put(PipelineConst.INSTANCE_NODE_NAME_KEY, pipelineNodeTemplateVo.getName()); + contextArgs.put(PipelineConst.INSTANCE_NODE_TEMPLATE_ARGS_KEY, pipelineNodeTemplateVo.getParameters()); + try { + List allServiceBeanName = SpringBeanHolder.getAllServiceBeanName(); + System.err.println(allServiceBeanName); + PipelineNodeJobRunnable pipelineNodeJobRunnable = new PipelineNodeJobRunnable( + PipelineConst.EXECUTOR_PREFIX + code, + contextArgs, + pipelineInstanceNodeDetailService + ); + Future future = executor.submit(pipelineNodeJobRunnable); + PipelineNodeJobExecuteResult executeResult = (PipelineNodeJobExecuteResult) future.get(); + System.err.println(executeResult); + } catch (Exception e) { + log.error("流水线节点任务执行失败", e); + } + } + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobManage.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobManage.java new file mode 100644 index 00000000..34e0b9cd --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineJobManage.java @@ -0,0 +1,59 @@ +package cn.odboy.devops.framework.pipeline; + +import cn.odboy.devops.constant.pipeline.PipelineConst; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceTb; +import lombok.extern.slf4j.Slf4j; +import org.quartz.*; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Slf4j +@Component +public class PipelineJobManage { + @Resource + private Scheduler scheduler; + + /** + * 启动 job + */ + public void startJob(PipelineInstanceTb pipelineInstance) { + try { + // 构建 JobDetail + JobDetail jobDetail = JobBuilder + .newJob(PipelineJobBean.class) + .withIdentity(pipelineInstance.getPipelineInstanceId()) + .build(); + // 构建Trigger + Trigger cronTrigger = TriggerBuilder.newTrigger() + .withIdentity(pipelineInstance.getPipelineInstanceId()) + .startNow() + .build(); + // 添加流水线实例 + cronTrigger.getJobDataMap().put(PipelineConst.INSTANCE_ID_KEY, pipelineInstance.getPipelineInstanceId()); + try { + scheduler.scheduleJob(jobDetail, cronTrigger); + } catch (ObjectAlreadyExistsException e) { + log.warn("定时任务已存在，跳过加载"); + } + } catch (Exception e) { + log.error("创建定时任务失败", e); + throw new BadRequestException("创建定时任务失败"); + } + } + + /** + * 删除job + */ + public void deleteJob(PipelineInstanceTb pipelineInstance) { + try { + JobKey jobKey = JobKey.jobKey(pipelineInstance.getPipelineInstanceId()); + scheduler.pauseJob(jobKey); + scheduler.deleteJob(jobKey); + } catch (Exception e) { + log.error("删除定时任务失败", e); + throw new BadRequestException("删除定时任务失败"); + } + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobExecutor.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobExecutor.java new file mode 100644 index 00000000..f1a37274 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobExecutor.java @@ -0,0 +1,11 @@ +package cn.odboy.devops.framework.pipeline; + +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; + +import java.util.Map; + +public interface PipelineNodeJobExecutor { + PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException; +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobRunnable.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobRunnable.java new file mode 100644 index 00000000..7247ac83 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/PipelineNodeJobRunnable.java @@ -0,0 +1,29 @@ +package cn.odboy.devops.framework.pipeline; + +import cn.odboy.framework.context.SpringBeanHolder; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.Callable; + +public class PipelineNodeJobRunnable implements Callable { + private final PipelineNodeJobExecutor target; + private final Map params; + private final PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService; + + public PipelineNodeJobRunnable(String beanName, Map params, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) { + this.target = SpringBeanHolder.getBean(beanName); + this.params = params; + this.pipelineInstanceNodeDetailService = pipelineInstanceNodeDetailService; + } + + @Override + @SuppressWarnings({"unchecked", "all"}) + public Object call() throws Exception { + if (this.params == null) { + return this.target.execute(new HashMap<>(1), this.pipelineInstanceNodeDetailService); + } + return this.target.execute(this.params, this.pipelineInstanceNodeDetailService); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java new file mode 100644 index 00000000..13cd832a --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java @@ -0,0 +1,27 @@ +package cn.odboy.devops.framework.pipeline.model; + +import cn.odboy.base.CsObject; +import cn.odboy.devops.constant.pipeline.PipelineStatusEnum; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class PipelineNodeJobExecuteResult extends CsObject { + private PipelineStatusEnum status; + private String message; + + public static PipelineNodeJobExecuteResult success() { + PipelineNodeJobExecuteResult result = new PipelineNodeJobExecuteResult(); + result.setStatus(PipelineStatusEnum.SUCCESS); + result.setMessage(PipelineStatusEnum.SUCCESS.getDesc()); + return result; + } + + public static PipelineNodeJobExecuteResult fail() { + PipelineNodeJobExecuteResult result = new PipelineNodeJobExecuteResult(); + result.setStatus(PipelineStatusEnum.FAIL); + result.setMessage(PipelineStatusEnum.FAIL.getDesc()); + return result; + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateButtonVo.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateButtonVo.java new file mode 100644 index 00000000..16ec7f34 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateButtonVo.java @@ -0,0 +1,39 @@ +package cn.odboy.devops.framework.pipeline.model; + +import cn.odboy.base.CsObject; +import lombok.Getter; +import lombok.Setter; + +/** + * 流水线节点控制按钮 + * + * @author odboy + */ +@Getter +@Setter +public class PipelineNodeTemplateButtonVo extends CsObject { + /** + * 按钮类型（service:调用某个服务 link:带参跳转） + */ + private String type; + /** + * 按钮标题 + */ + private String title; + /** + * 出现的条件，根据node节点的状态判断 + */ + private String condition; + /** + * link: 按钮跳转的url + */ + private String linkUrl; + /** + * link: 是否新窗口打开 + */ + private boolean isBlank = true; + /** + * service: 服务编码 + */ + private String code; +} \ No newline at end of file diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java new file mode 100644 index 00000000..21384d89 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java @@ -0,0 +1,48 @@ +package cn.odboy.devops.framework.pipeline.model; + +import cn.odboy.base.CsObject; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 流水线节点模板 + * + * @author odboy + */ +@Getter +@Setter +public class PipelineNodeTemplateVo extends CsObject { + /** + * 业务编码 + */ + private String code; + /** + * 业务名称 + */ + private String name; + /** + * 是否可点击 + */ + private Boolean click; + /** + * 是否可重试 + */ + private Boolean retry; + /** + * 是否可点击：点击展示详情，详情内容类型 + */ + private String detailType; + /** + * 默认参数 + */ + private Map parameters = new HashMap<>(); + /** + * 流水线节点控制按钮 + */ + private List buttons = new ArrayList<>(); +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java new file mode 100644 index 00000000..d6213c0c --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java @@ -0,0 +1,19 @@ +package cn.odboy.devops.job; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.INIT) +public class PipelineNodeInitJob implements PipelineNodeJobExecutor { + + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildGoJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildGoJob.java new file mode 100644 index 00000000..cdb972f4 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildGoJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppGo.BUILD) +public class PipelineNodeBuildGoJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildJavaJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildJavaJob.java new file mode 100644 index 00000000..fd1daab0 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildJavaJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppJava.BUILD) +public class PipelineNodeBuildJavaJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildPythonJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildPythonJob.java new file mode 100644 index 00000000..0c023e84 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeBuildPythonJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppPython.BUILD) +public class PipelineNodeBuildPythonJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployApproveJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployApproveJob.java new file mode 100644 index 00000000..9e75d632 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployApproveJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.DEPLOY_APPROVE) +public class PipelineNodeDeployApproveJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployGoJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployGoJob.java new file mode 100644 index 00000000..d0fe85dd --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployGoJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppGo.DEPLOY) +public class PipelineNodeDeployGoJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployJavaJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployJavaJob.java new file mode 100644 index 00000000..02761608 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployJavaJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppJava.DEPLOY) +public class PipelineNodeDeployJavaJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployPythonJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployPythonJob.java new file mode 100644 index 00000000..58d38a34 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeDeployPythonJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.AppPython.DEPLOY) +public class PipelineNodeDeployPythonJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeImageScanJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeImageScanJob.java new file mode 100644 index 00000000..f0b25b15 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeImageScanJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.IMAGE_SCAN) +public class PipelineNodeImageScanJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeBranchJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeBranchJob.java new file mode 100644 index 00000000..83cc9085 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeBranchJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.MERGE_BRANCH) +public class PipelineNodeMergeBranchJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeMasterJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeMasterJob.java new file mode 100644 index 00000000..7e6f2302 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/app/PipelineNodeMergeMasterJob.java @@ -0,0 +1,18 @@ +package cn.odboy.devops.job.app; + +import cn.odboy.devops.constant.pipeline.PipelineNodeBizCodeConst; +import cn.odboy.devops.framework.pipeline.PipelineNodeJobExecutor; +import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult; +import cn.odboy.devops.service.pipeline.PipelineInstanceNodeDetailService; +import cn.odboy.framework.exception.BadRequestException; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service(value = PipelineNodeBizCodeConst.MERGE_MASTER) +public class PipelineNodeMergeMasterJob implements PipelineNodeJobExecutor { + @Override + public PipelineNodeJobExecuteResult execute(Map contextArgs, PipelineInstanceNodeDetailService pipelineInstanceNodeDetailService) throws BadRequestException { + return PipelineNodeJobExecuteResult.success(); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceNodeDetailService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceNodeDetailService.java new file mode 100644 index 00000000..22ac41b8 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceNodeDetailService.java @@ -0,0 +1,16 @@ +package cn.odboy.devops.service.pipeline; + +import org.springframework.stereotype.Service; + +/** + *

+ * 流水线实例节点明细 服务实现类 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Service +public class PipelineInstanceNodeDetailService { + +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceService.java new file mode 100644 index 00000000..5c058969 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineInstanceService.java @@ -0,0 +1,30 @@ +package cn.odboy.devops.service.pipeline; + +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceTb; +import cn.odboy.devops.dal.mysql.pipeline.PipelineInstanceMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + *

+ * 流水线实例 服务实现类 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Service +@RequiredArgsConstructor +public class PipelineInstanceService { + private final PipelineInstanceMapper pipelineInstanceMapper; + public PipelineInstanceTb getPipelineInstance(String pipelineInstanceId) { + return pipelineInstanceMapper.selectOne(new LambdaQueryWrapper() + .eq(PipelineInstanceTb::getPipelineInstanceId, pipelineInstanceId) + ); + } + + public void createPipelineInstance(PipelineInstanceTb pipelineInstanceTb) { + pipelineInstanceMapper.insert(pipelineInstanceTb); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineTemplateService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineTemplateService.java new file mode 100644 index 00000000..f97b3c24 --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineTemplateService.java @@ -0,0 +1,24 @@ +package cn.odboy.devops.service.pipeline; + +import cn.odboy.devops.dal.dataobject.pipeline.PipelineTemplateTb; +import cn.odboy.devops.dal.mysql.pipeline.PipelineTemplateMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + *

+ * 流水线模板 服务实现类 + *

+ * + * @author codegen + * @since 2025-06-26 + */ +@Service +@RequiredArgsConstructor +public class PipelineTemplateService { + private final PipelineTemplateMapper pipelineTemplateMapper; + + public PipelineTemplateTb getPipelineTemplateById(Long id) { + return pipelineTemplateMapper.selectById(id); + } +} diff --git a/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceMapper.xml b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceMapper.xml new file mode 100644 index 00000000..2af07cae --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceNodeDetailMapper.xml b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceNodeDetailMapper.xml new file mode 100644 index 00000000..fb1ff03c --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineInstanceNodeDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineTemplateMapper.xml b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineTemplateMapper.xml new file mode 100644 index 00000000..62d529cf --- /dev/null +++ b/cutejava/cutejava-module-devops/src/main/resources/mapper/pipeline/PipelineTemplateMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/cutejava/cutejava-module-system/pom.xml b/cutejava/cutejava-module-system/pom.xml new file mode 100644 index 00000000..b5419fd5 --- /dev/null +++ b/cutejava/cutejava-module-system/pom.xml @@ -0,0 +1,21 @@ + + + + cutejava + cn.odboy + 1.4.1 + + 4.0.0 + + cutejava-module-system + 核心模块 + + + + cn.odboy + cutejava-framework + 1.4.1 + + + diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java index 506a981b..46dbddf2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant; +package cn.odboy.system.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java index 630156f6..b9c0e025 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant; +package cn.odboy.system.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java index 5edb764e..2578cd22 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant; +package cn.odboy.system.constant; public interface TransferProtocolConst { String PREFIX_HTTP = "http://"; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 5f7773d2..5a475dca 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -1,21 +1,21 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousPostMapping; import cn.odboy.constant.SystemConst; -import cn.odboy.core.constant.CaptchaCodeEnum; -import cn.odboy.core.dal.model.SystemUserInfoVo; -import cn.odboy.core.dal.model.SystemUserJwtVo; -import cn.odboy.core.dal.model.SystemUserLoginArgs; -import cn.odboy.core.dal.redis.SystemRedisKey; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.framework.permission.core.handler.TokenProvider; -import cn.odboy.core.framework.permission.core.handler.UserDetailsHandler; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.exception.BadRequestException; -import cn.odboy.redis.RedisHelper; +import cn.odboy.constant.CaptchaCodeEnum; +import cn.odboy.system.dal.model.SystemUserInfoVo; +import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.SystemUserLoginArgs; +import cn.odboy.system.dal.redis.SystemRedisKey; +import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.system.framework.permission.core.handler.TokenProvider; +import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.RsaEncryptUtil; import cn.odboy.util.StringUtil; import com.wf.captcha.base.Captcha; @@ -105,7 +105,7 @@ public class SystemAuthController { } @ApiOperation("获取验证码") - @AnonymousPostMapping(value = "/code") + @AnonymousPostMapping(value = "/captcha/getImage") public ResponseEntity> getCode() { // 获取运算的结果 Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha(); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index 3abc774b..148a166e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -1,8 +1,8 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; -import cn.odboy.core.constant.SystemCaptchaBizEnum; -import cn.odboy.core.dal.model.SystemCheckEmailCaptchaArgs; -import cn.odboy.core.service.SystemEmailService; +import cn.odboy.system.constant.SystemCaptchaBizEnum; +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; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor -@RequestMapping("/api/code") +@RequestMapping("/api/captcha") @Api(tags = "系统：验证码管理") public class SystemCaptchaController { private final SystemEmailService systemEmailService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index ed8b84b3..23085802 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -1,11 +1,11 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.model.CreateSystemDeptArgs; -import cn.odboy.core.dal.model.QuerySystemDeptArgs; -import cn.odboy.core.service.SystemDeptService; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.model.CreateSystemDeptArgs; +import cn.odboy.system.dal.model.QuerySystemDeptArgs; +import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 92e4a4a6..7f13bed5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -1,11 +1,11 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemDictTb; -import cn.odboy.core.dal.model.CreateSystemDictArgs; -import cn.odboy.core.dal.model.QuerySystemDictArgs; -import cn.odboy.core.service.SystemDictService; +import cn.odboy.system.dal.dataobject.SystemDictTb; +import cn.odboy.system.dal.model.CreateSystemDictArgs; +import cn.odboy.system.dal.model.QuerySystemDictArgs; +import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 949fd547..2285e980 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -1,11 +1,11 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemDictDetailTb; -import cn.odboy.core.dal.model.CreateSystemDictDetailArgs; -import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; -import cn.odboy.core.service.SystemDictDetailService; +import cn.odboy.system.dal.dataobject.SystemDictDetailTb; +import cn.odboy.system.dal.model.CreateSystemDictDetailArgs; +import cn.odboy.system.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 39819643..16f3798a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -1,8 +1,8 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; -import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.core.dal.model.SendSystemEmailArgs; -import cn.odboy.core.service.SystemEmailService; +import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; +import cn.odboy.system.dal.model.SendSystemEmailArgs; +import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 34ce2bde..aa338ea3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -1,11 +1,11 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemJobTb; -import cn.odboy.core.dal.model.CreateSystemJobArgs; -import cn.odboy.core.dal.model.QuerySystemJobArgs; -import cn.odboy.core.service.SystemJobService; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.model.CreateSystemJobArgs; +import cn.odboy.system.dal.model.QuerySystemJobArgs; +import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index e90d2a4c..cd84196d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -1,12 +1,12 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; import cn.odboy.constant.FileTypeEnum; -import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; -import cn.odboy.core.service.SystemLocalStorageService; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.system.dal.model.QuerySystemLocalStorageArgs; +import cn.odboy.system.service.SystemLocalStorageService; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index b17935f9..bc4a632b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -1,14 +1,14 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemMenuTb; -import cn.odboy.core.dal.model.QuerySystemMenuArgs; -import cn.odboy.core.dal.model.SystemMenuVo; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.service.SystemMenuService; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.model.QuerySystemMenuArgs; +import cn.odboy.system.dal.model.SystemMenuVo; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.system.service.SystemMenuService; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @Api(tags = "系统：菜单管理") -@RequestMapping("/api/menus") +@RequestMapping("/api/menu") public class SystemMenuController { private final SystemMenuService systemMenuService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index 44092239..63b0abfb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -1,6 +1,6 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; -import cn.odboy.core.service.SystemMonitorService; +import cn.odboy.system.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index d071ce14..07cbc309 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -1,16 +1,15 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.model.SystemUserOnlineVo; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.util.DesEncryptUtil; 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.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQiniuController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQiniuController.java index 1c0d2711..47eb7778 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQiniuController.java @@ -1,12 +1,12 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; -import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; -import cn.odboy.core.dal.model.QuerySystemQiniuArgs; -import cn.odboy.core.service.SystemQiniuConfigService; -import cn.odboy.core.service.SystemQiniuContentService; +import cn.odboy.system.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.system.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.system.dal.model.QuerySystemQiniuArgs; +import cn.odboy.system.service.SystemQiniuConfigService; +import cn.odboy.system.service.SystemQiniuContentService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 5d64e745..6ea59720 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -1,14 +1,14 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; -import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs; -import cn.odboy.core.service.SystemQuartzJobService; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.context.SpringBeanHolder; +import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.system.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.system.dal.model.UpdateSystemQuartzJobArgs; +import cn.odboy.system.service.SystemQuartzJobService; +import cn.odboy.framework.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 86d5760e..0917ad5c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -1,14 +1,14 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.hutool.core.lang.Dict; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.model.CreateSystemRoleArgs; -import cn.odboy.core.dal.model.QuerySystemRoleArgs; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.service.SystemRoleService; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.model.CreateSystemRoleArgs; +import cn.odboy.system.dal.model.QuerySystemRoleArgs; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.system.service.SystemRoleService; +import cn.odboy.framework.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,7 +30,7 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @Api(tags = "系统：角色管理") -@RequestMapping("/api/roles") +@RequestMapping("/api/role") public class SystemRoleController { private final SystemRoleService systemRoleService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 2ab77244..123c3767 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -1,19 +1,19 @@ -package cn.odboy.core.controller; +package cn.odboy.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsResultVo; import cn.odboy.base.CsSelectOptionItemVo; -import cn.odboy.core.constant.SystemCaptchaBizEnum; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.dataobject.SystemUserTb; -import cn.odboy.core.dal.model.QuerySystemUserArgs; -import cn.odboy.core.dal.model.UpdateSystemUserPasswordArgs; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.service.*; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.constant.SystemCaptchaBizEnum; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.model.QuerySystemUserArgs; +import cn.odboy.system.dal.model.UpdateSystemUserPasswordArgs; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.system.service.*; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.RsaEncryptUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; @Api(tags = "系统：用户管理") @RestController -@RequestMapping("/api/users") +@RequestMapping("/api/user") @RequiredArgsConstructor public class SystemUserController { private final PasswordEncoder passwordEncoder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java index e83e0d8a..72279967 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java index 42be079b..1d86d42b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java index bb768ccf..8f1a330c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java similarity index 86% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java index 0467f649..b02855d4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +15,7 @@ import javax.validation.constraints.NotBlank; @Data @TableName("system_email_config") @EqualsAndHashCode(callSuper = false) -public class SystemEmailConfigTb extends CsSerializeObject { +public class SystemEmailConfigTb extends CsObject { @TableId("config_id") private Long id; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java index 8aa849f2..4b76242e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java index 157eddf9..1978089c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java index f19836f6..831312bc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuConfigTb.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuConfigTb.java index 69c17775..aea8415a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuConfigTb.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +15,7 @@ import javax.validation.constraints.NotBlank; @Data @TableName("system_qiniu_config") @EqualsAndHashCode(callSuper = false) -public class SystemQiniuConfigTb extends CsSerializeObject { +public class SystemQiniuConfigTb extends CsObject { @TableId("config_id") private Long id; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuContentTb.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuContentTb.java index 4c2b8c82..d1bbe63c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQiniuContentTb.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.Date; @Data @TableName("system_qiniu_content") @EqualsAndHashCode(callSuper = false) -public class SystemQiniuContentTb extends CsSerializeObject { +public class SystemQiniuContentTb extends CsObject { @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java index 7738c9e8..691a96d7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java index 90170934..d32acfa6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Date; @Data @TableName("system_quartz_log") @EqualsAndHashCode(callSuper = false) -public class SystemQuartzLogTb extends CsSerializeObject { +public class SystemQuartzLogTb extends CsObject { @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java index 767124f0..07219862 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; -import cn.odboy.core.constant.SystemDataScopeEnum; +import cn.odboy.system.constant.SystemDataScopeEnum; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java index 656d8846..b0ca7a49 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject; +package cn.odboy.system.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDeptArgs.java similarity index 76% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDeptArgs.java index 30dc3165..c577beee 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDeptArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) -public class CreateSystemDeptArgs extends CsSerializeObject { +public class CreateSystemDeptArgs extends CsObject { @NotBlank(message = "部门名称必填") private String name; @NotNull(message = "部门排序必填") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictArgs.java similarity index 65% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictArgs.java index 30536932..6bfe5b3a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; @Data @EqualsAndHashCode(callSuper = false) -public class CreateSystemDictArgs extends CsSerializeObject { +public class CreateSystemDictArgs extends CsObject { @NotBlank(message = "字典名称必填") private String name; private String description; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictDetailArgs.java similarity index 71% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictDetailArgs.java index f92a7d8d..5a08a301 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemDictDetailArgs.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.SystemDictTb; +import cn.odboy.base.CsObject; +import cn.odboy.system.dal.dataobject.SystemDictTb; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) -public class CreateSystemDictDetailArgs extends CsSerializeObject { +public class CreateSystemDictDetailArgs extends CsObject { @NotNull(message = "参数dict必填") private SystemDictTb dict; @NotBlank(message = "字典标签必填") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemJobArgs.java similarity index 73% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemJobArgs.java index 172aaf94..01bf068f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemJobArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) -public class CreateSystemJobArgs extends CsSerializeObject { +public class CreateSystemJobArgs extends CsObject { @NotBlank(message = "职位名称必填") private String name; @NotNull(message = "职位排序必填") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemRoleArgs.java similarity index 75% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemRoleArgs.java index dd76f287..4dceb25f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/CreateSystemRoleArgs.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.base.CsObject; +import cn.odboy.system.dal.dataobject.SystemDeptTb; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) -public class CreateSystemRoleArgs extends CsSerializeObject { +public class CreateSystemRoleArgs extends CsObject { @NotBlank(message = "角色名称必填") private String name; @NotNull(message = "角色级别必填") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDeptArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDeptArgs.java index 3858f1cd..ded7190c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDeptArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictArgs.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictArgs.java index 5262aa8b..7daa0b07 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictDetailArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictDetailArgs.java index 1c3dda94..832f489b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemDictDetailArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemJobArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemJobArgs.java index 08f8766b..7c694626 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemLocalStorageArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemLocalStorageArgs.java index bda8269e..b39569ef 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemLocalStorageArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemMenuArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemMenuArgs.java index 3a2af997..8a3f3b17 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemMenuArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQiniuArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQiniuArgs.java index fa6a2233..4f853d68 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQiniuArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQuartzJobArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQuartzJobArgs.java index 169a67f2..4abeae58 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemQuartzJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemRoleArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemRoleArgs.java index 7d6ee70f..5fa4c81b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemRoleArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemUserArgs.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemUserArgs.java index f7bd0380..fff987d2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/QuerySystemUserArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +12,7 @@ import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) -public class QuerySystemUserArgs extends CsSerializeObject { +public class QuerySystemUserArgs extends CsObject { @ApiModelProperty(value = "ID") private Long id; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SendSystemEmailArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SendSystemEmailArgs.java index f7f9d79f..48fe472e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SendSystemEmailArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java similarity index 70% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java index ada5cdb3..7be9dbbd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Getter; import lombok.Setter; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; @Getter @Setter -public class SystemCheckEmailCaptchaArgs extends CsSerializeObject { +public class SystemCheckEmailCaptchaArgs extends CsObject { @NotBlank(message = "邮箱不能为空") private String email; @NotBlank(message = "验证码不能为空") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java similarity index 76% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java index 68abcb2b..eff0169c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class SystemMenuMetaVo extends CsSerializeObject { +public class SystemMenuMetaVo extends CsObject { @ApiModelProperty(value = "菜单标题") private String title; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java similarity index 86% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java index f07ee350..7d1b0ee2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +12,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = false) -public class SystemMenuVo extends CsSerializeObject { +public class SystemMenuVo extends CsObject { @ApiModelProperty(value = "菜单名称") private String name; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java index a6d0bc0a..fb6158d3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java index 28f30ac0..235b5998 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java @@ -1,9 +1,9 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.dataobject.SystemJobTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.base.CsObject; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) -public class SystemSimpleUserVo extends CsSerializeObject { +public class SystemSimpleUserVo extends CsObject { @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "用户角色") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java similarity index 77% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java index 28077194..56f696d9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.stream.Collectors; @Data @EqualsAndHashCode(callSuper = false) -public class SystemUserInfoVo extends CsSerializeObject { +public class SystemUserInfoVo extends CsObject { private SystemSimpleUserVo user; private List dataScopes; private List authorities; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java index d096dfe0..2b96d7bc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.dataobject.SystemUserTb; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java index e1d92617..25d26ed0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java index 0b5e8fef..95d639f8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemQuartzJobArgs.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemQuartzJobArgs.java index 344a0176..ab40fa1e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemQuartzJobArgs.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; -import cn.odboy.base.CsSerializeObject; +import cn.odboy.base.CsObject; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) -public class UpdateSystemQuartzJobArgs extends CsSerializeObject { +public class UpdateSystemQuartzJobArgs extends CsObject { @NotNull private Long id; private String uuid; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemUserPasswordArgs.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemUserPasswordArgs.java index e361c91b..39613a1e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/UpdateSystemUserPasswordArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model; +package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java similarity index 83% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java index 06b054ea..63b63817 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.model.QuerySystemDeptArgs; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.model.QuerySystemDeptArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java similarity index 83% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java index 4c8bb560..7465283a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemDictDetailTb; -import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.system.dal.dataobject.SystemDictDetailTb; +import cn.odboy.system.dal.model.QuerySystemDictDetailArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java index aa0a4705..f20821aa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemDictTb; -import cn.odboy.core.dal.model.QuerySystemDictArgs; +import cn.odboy.system.dal.dataobject.SystemDictTb; +import cn.odboy.system.dal.model.QuerySystemDictArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java similarity index 72% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java index 1b284a40..8be97833 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; +import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java index 44d67be4..4900f4b1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemJobTb; -import cn.odboy.core.dal.model.QuerySystemJobArgs; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.model.QuerySystemJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java index 16c28efd..364fdad9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; +import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.system.dal.model.QuerySystemLocalStorageArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java index 22e1a0e9..ba14daa0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemMenuTb; -import cn.odboy.core.dal.model.QuerySystemMenuArgs; +import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.model.QuerySystemMenuArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuConfigMapper.java similarity index 72% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuConfigMapper.java index eab3982b..a1abc85b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.system.dal.dataobject.SystemQiniuConfigTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuContentMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuContentMapper.java index 51022f1b..ab3fd3ad 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQiniuContentMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; -import cn.odboy.core.dal.model.QuerySystemQiniuArgs; +import cn.odboy.system.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.system.dal.model.QuerySystemQiniuArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java index 2b05b72b..a3365cb0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.system.dal.model.QuerySystemQuartzJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java index 31a222ba..144b4e5d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.system.dal.model.QuerySystemQuartzJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java index efdb8d11..7b23d25e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemDeptTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java index bc997e9c..2ebca19c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.model.QuerySystemRoleArgs; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.model.QuerySystemRoleArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java index 524c83f1..315fdeb7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java index 5a5831cb..71a6c49c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.dataobject.SystemJobTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java index 5af4c8ae..bfda0056 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemUserTb; -import cn.odboy.core.dal.model.QuerySystemUserArgs; +import cn.odboy.system.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.model.QuerySystemUserArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java similarity index 79% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java index 892f036f..b0d32db1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql; +package cn.odboy.system.dal.mysql; -import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java index 96b60edf..f7c63ae8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.redis; +package cn.odboy.system.dal.redis; /** * 关于缓存的Key集合 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index eb858825..60002139 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -1,8 +1,8 @@ -package cn.odboy.core.dal.redis; +package cn.odboy.system.dal.redis; import cn.hutool.core.util.RandomUtil; -import cn.odboy.core.dal.model.SystemUserJwtVo; -import cn.odboy.redis.RedisHelper; +import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 8693ede3..79cfd7bd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -1,11 +1,11 @@ -package cn.odboy.core.dal.redis; +package cn.odboy.system.dal.redis; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.model.SystemUserJwtVo; -import cn.odboy.core.dal.model.SystemUserOnlineVo; -import cn.odboy.core.framework.permission.core.handler.TokenProvider; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.redis.RedisHelper; +import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.framework.permission.core.handler.TokenProvider; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.*; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpMetaObjectHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/mybatisplus/MpMetaObjectHandler.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpMetaObjectHandler.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/mybatisplus/MpMetaObjectHandler.java index 69bb260f..217e3244 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MpMetaObjectHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/mybatisplus/MpMetaObjectHandler.java @@ -1,7 +1,7 @@ -package cn.odboy.core.framework.mybatisplus.config; +package cn.odboy.system.framework.mybatisplus; import cn.hutool.core.date.DateTime; -import cn.odboy.core.framework.permission.core.SecurityHelper; +import cn.odboy.system.framework.permission.core.SecurityHelper; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/AuthorityConfig.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/AuthorityConfig.java index e71b88b9..52172a51 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/AuthorityConfig.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.permission.config; +package cn.odboy.system.framework.permission.config; -import cn.odboy.core.framework.permission.core.SecurityHelper; +import cn.odboy.system.framework.permission.core.SecurityHelper; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java index 61ef5d4c..85a5a8d6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java @@ -1,10 +1,10 @@ -package cn.odboy.core.framework.permission.config; +package cn.odboy.system.framework.permission.config; import cn.odboy.constant.RequestMethodEnum; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; -import cn.odboy.core.framework.permission.core.handler.JwtAccessDeniedHandler; -import cn.odboy.core.framework.permission.core.handler.JwtAuthenticationEntryPoint; -import cn.odboy.core.framework.permission.core.handler.TokenProvider; +import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; +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.AnonTagUtil; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationContext; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java similarity index 77% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java index a2805026..6368081c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/TokenConfigurer.java @@ -1,8 +1,8 @@ -package cn.odboy.core.framework.permission.config; +package cn.odboy.system.framework.permission.config; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; -import cn.odboy.core.framework.permission.core.handler.TokenFilter; -import cn.odboy.core.framework.permission.core.handler.TokenProvider; +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; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/SecurityHelper.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/SecurityHelper.java index 965f9c4f..735335e2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/SecurityHelper.java @@ -1,11 +1,11 @@ -package cn.odboy.core.framework.permission.core; +package cn.odboy.system.framework.permission.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.constant.SystemDataScopeEnum; +import cn.odboy.framework.context.SpringBeanHolder; +import cn.odboy.system.constant.SystemDataScopeEnum; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAccessDeniedHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAccessDeniedHandler.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java index c8d832a3..9118b4ec 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAccessDeniedHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.permission.core.handler; +package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.exception.handler.ApiError; +import cn.odboy.framework.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.HttpStatus; import org.springframework.security.access.AccessDeniedException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAuthenticationEntryPoint.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAuthenticationEntryPoint.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java index 162eeb43..ee149010 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/JwtAuthenticationEntryPoint.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java @@ -1,6 +1,6 @@ -package cn.odboy.core.framework.permission.core.handler; +package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.exception.handler.ApiError; +import cn.odboy.framework.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java index d7d95c4f..6feaab00 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java @@ -1,9 +1,9 @@ -package cn.odboy.core.framework.permission.core.handler; +package cn.odboy.system.framework.permission.core.handler; import cn.hutool.core.util.StrUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.core.dal.model.SystemUserOnlineVo; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java index e25b6052..6024d70b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java @@ -1,13 +1,13 @@ -package cn.odboy.core.framework.permission.core.handler; +package cn.odboy.system.framework.permission.core.handler; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.core.dal.model.SystemUserJwtVo; -import cn.odboy.core.dal.redis.SystemRedisKey; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.redis.RedisHelper; +import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.redis.SystemRedisKey; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.redis.RedisHelper; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java similarity index 77% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index f7103cf8..972465dd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -1,13 +1,13 @@ -package cn.odboy.core.framework.permission.core.handler; +package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.core.dal.dataobject.SystemUserTb; -import cn.odboy.core.dal.model.SystemRoleCodeVo; -import cn.odboy.core.dal.model.SystemUserJwtVo; -import cn.odboy.core.dal.redis.SystemUserInfoDAO; -import cn.odboy.core.service.SystemDataService; -import cn.odboy.core.service.SystemRoleService; -import cn.odboy.core.service.SystemUserService; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.model.SystemRoleCodeVo; +import cn.odboy.system.dal.model.SystemUserJwtVo; +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 cn.odboy.framework.exception.BadRequestException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index 976479af..2cdbb5ea 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -1,18 +1,19 @@ -package cn.odboy.core.framework.quartz.core; +package cn.odboy.system.framework.quartz; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.core.dal.model.SendSystemEmailArgs; -import cn.odboy.core.dal.mysql.SystemQuartzLogMapper; -import cn.odboy.core.service.SystemEmailService; -import cn.odboy.core.service.SystemQuartzJobService; -import cn.odboy.redis.RedisHelper; +import cn.odboy.framework.context.SpringBeanHolder; +import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.system.dal.model.SendSystemEmailArgs; +import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; +import cn.odboy.system.service.SystemEmailService; +import cn.odboy.system.service.SystemQuartzJobService; +import cn.odboy.framework.quartz.core.QuartzRunnable; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.quartz.JobExecutionContext; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java similarity index 84% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java index 218b185f..f182bcaa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/InitialActiveJobApplicationRunner.java @@ -1,7 +1,7 @@ -package cn.odboy.core.framework.quartz.core; +package cn.odboy.system.framework.quartz; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.core.dal.mysql.SystemQuartzJobMapper; +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.boot.ApplicationArguments; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java index cc99280a..0d20e90c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java @@ -1,7 +1,7 @@ -package cn.odboy.core.framework.quartz.core; +package cn.odboy.system.framework.quartz; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java index 353999e1..9b557170 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java @@ -1,4 +1,4 @@ -package cn.odboy.core.job; +package cn.odboy.system.job; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index 3e8d3787..6ccd1049 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -1,10 +1,10 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; -import cn.odboy.core.constant.SystemDataScopeEnum; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.dataobject.SystemUserTb; +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.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 891c0568..48c2cb7c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -1,19 +1,19 @@ -package cn.odboy.core.service; +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.hutool.core.util.ObjectUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.constant.SystemDataScopeEnum; -import cn.odboy.core.dal.dataobject.SystemDeptTb; -import cn.odboy.core.dal.model.CreateSystemDeptArgs; -import cn.odboy.core.dal.model.QuerySystemDeptArgs; -import cn.odboy.core.dal.mysql.SystemDeptMapper; -import cn.odboy.core.dal.mysql.SystemRoleMapper; -import cn.odboy.core.dal.mysql.SystemUserMapper; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.constant.SystemDataScopeEnum; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.model.CreateSystemDeptArgs; +import cn.odboy.system.dal.model.QuerySystemDeptArgs; +import cn.odboy.system.dal.mysql.SystemDeptMapper; +import cn.odboy.system.dal.mysql.SystemRoleMapper; +import cn.odboy.system.dal.mysql.SystemUserMapper; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index a917acff..6a3ea36d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -1,11 +1,11 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemDictDetailTb; -import cn.odboy.core.dal.model.CreateSystemDictDetailArgs; -import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; -import cn.odboy.core.dal.mysql.SystemDictDetailMapper; +import cn.odboy.system.dal.dataobject.SystemDictDetailTb; +import cn.odboy.system.dal.model.CreateSystemDictDetailArgs; +import cn.odboy.system.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index c41bc29f..6fbf0ef5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -1,15 +1,15 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemDictDetailTb; -import cn.odboy.core.dal.dataobject.SystemDictTb; -import cn.odboy.core.dal.model.CreateSystemDictArgs; -import cn.odboy.core.dal.model.QuerySystemDictArgs; -import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; -import cn.odboy.core.dal.mysql.SystemDictDetailMapper; -import cn.odboy.core.dal.mysql.SystemDictMapper; +import cn.odboy.system.dal.dataobject.SystemDictDetailTb; +import cn.odboy.system.dal.dataobject.SystemDictTb; +import cn.odboy.system.dal.model.CreateSystemDictArgs; +import cn.odboy.system.dal.model.QuerySystemDictArgs; +import cn.odboy.system.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.system.dal.mysql.SystemDictDetailMapper; +import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index 2ef2cfdd..ac477dae 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -1,16 +1,16 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import cn.odboy.core.constant.SystemCaptchaBizEnum; -import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.core.dal.model.SendSystemEmailArgs; -import cn.odboy.core.dal.mysql.SystemEmailConfigMapper; -import cn.odboy.core.framework.templatefile.CsResourceTemplateUtil; -import cn.odboy.exception.BadRequestException; -import cn.odboy.redis.RedisHelper; +import cn.odboy.system.constant.SystemCaptchaBizEnum; +import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; +import cn.odboy.system.dal.model.SendSystemEmailArgs; +import cn.odboy.system.dal.mysql.SystemEmailConfigMapper; +import cn.odboy.util.CsResourceTemplateUtil; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.DesEncryptUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 4272d591..b2a53d33 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -1,13 +1,13 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemJobTb; -import cn.odboy.core.dal.model.CreateSystemJobArgs; -import cn.odboy.core.dal.model.QuerySystemJobArgs; -import cn.odboy.core.dal.mysql.SystemJobMapper; -import cn.odboy.core.dal.mysql.SystemUserMapper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.model.CreateSystemJobArgs; +import cn.odboy.system.dal.model.QuerySystemJobArgs; +import cn.odboy.system.dal.mysql.SystemJobMapper; +import cn.odboy.system.dal.mysql.SystemUserMapper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 7098f578..ac5c30be 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -1,15 +1,15 @@ -package cn.odboy.core.service; +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.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; -import cn.odboy.core.dal.mysql.SystemLocalStorageMapper; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.framework.server.core.FileUploadPathHelper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.system.dal.model.QuerySystemLocalStorageArgs; +import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.server.core.FileUploadPathHelper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 43e893ba..5abcd6e1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -1,17 +1,17 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.odboy.core.constant.TransferProtocolConst; -import cn.odboy.core.dal.dataobject.SystemMenuTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.model.QuerySystemMenuArgs; -import cn.odboy.core.dal.model.SystemMenuMetaVo; -import cn.odboy.core.dal.model.SystemMenuVo; -import cn.odboy.core.dal.mysql.SystemMenuMapper; -import cn.odboy.core.dal.mysql.SystemRoleMenuMapper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.constant.TransferProtocolConst; +import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.model.QuerySystemMenuArgs; +import cn.odboy.system.dal.model.SystemMenuMetaVo; +import cn.odboy.system.dal.model.SystemMenuVo; +import cn.odboy.system.dal.mysql.SystemMenuMapper; +import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java similarity index 99% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java index 0c00826c..1a3025cb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java @@ -1,4 +1,4 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.date.BetweenFormatter.Level; import cn.hutool.core.date.DateUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuConfigService.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuConfigService.java index b116499e..ab048958 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuConfigService.java @@ -1,9 +1,9 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; -import cn.odboy.core.constant.TransferProtocolConst; -import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; -import cn.odboy.core.dal.mysql.SystemQiniuConfigMapper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.constant.TransferProtocolConst; +import cn.odboy.system.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.system.dal.mysql.SystemQiniuConfigMapper; +import cn.odboy.framework.exception.BadRequestException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuContentService.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuContentService.java index dc0fb09d..e7c008e3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQiniuContentService.java @@ -1,12 +1,12 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; -import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; -import cn.odboy.core.dal.model.QuerySystemQiniuArgs; -import cn.odboy.core.dal.mysql.SystemQiniuContentMapper; -import cn.odboy.core.util.QiniuUtil; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.system.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.system.dal.model.QuerySystemQiniuArgs; +import cn.odboy.system.dal.mysql.SystemQiniuContentMapper; +import cn.odboy.system.util.QiniuUtil; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import com.alibaba.fastjson2.JSON; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 7c965483..8c8c97e3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -1,18 +1,18 @@ -package cn.odboy.core.service; +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.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; -import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs; -import cn.odboy.core.dal.mysql.SystemQuartzJobMapper; -import cn.odboy.core.dal.mysql.SystemQuartzLogMapper; -import cn.odboy.core.framework.quartz.core.QuartzManage; -import cn.odboy.exception.BadRequestException; -import cn.odboy.redis.RedisHelper; +import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.system.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.system.dal.model.UpdateSystemQuartzJobArgs; +import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; +import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; +import cn.odboy.system.framework.quartz.QuartzManage; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.framework.redis.RedisHelper; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 746d48e0..5444a7fb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -1,20 +1,20 @@ -package cn.odboy.core.service; +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.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemMenuTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.dataobject.SystemUserTb; -import cn.odboy.core.dal.model.CreateSystemRoleArgs; -import cn.odboy.core.dal.model.QuerySystemRoleArgs; -import cn.odboy.core.dal.model.SystemRoleCodeVo; -import cn.odboy.core.dal.mysql.SystemRoleDeptMapper; -import cn.odboy.core.dal.mysql.SystemRoleMapper; -import cn.odboy.core.dal.mysql.SystemRoleMenuMapper; -import cn.odboy.core.dal.mysql.SystemUserMapper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.model.CreateSystemRoleArgs; +import cn.odboy.system.dal.model.QuerySystemRoleArgs; +import cn.odboy.system.dal.model.SystemRoleCodeVo; +import cn.odboy.system.dal.mysql.SystemRoleDeptMapper; +import cn.odboy.system.dal.mysql.SystemRoleMapper; +import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; +import cn.odboy.system.dal.mysql.SystemUserMapper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index be81e1ca..bc312a99 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -1,20 +1,20 @@ -package cn.odboy.core.service; +package cn.odboy.system.service; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.SystemJobTb; -import cn.odboy.core.dal.dataobject.SystemRoleTb; -import cn.odboy.core.dal.dataobject.SystemUserTb; -import cn.odboy.core.dal.model.QuerySystemUserArgs; -import cn.odboy.core.dal.mysql.SystemUserJobMapper; -import cn.odboy.core.dal.mysql.SystemUserMapper; -import cn.odboy.core.dal.mysql.SystemUserRoleMapper; -import cn.odboy.core.dal.redis.SystemUserInfoDAO; -import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; -import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.framework.server.core.FileUploadPathHelper; -import cn.odboy.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.dataobject.SystemUserTb; +import cn.odboy.system.dal.model.QuerySystemUserArgs; +import cn.odboy.system.dal.mysql.SystemUserJobMapper; +import cn.odboy.system.dal.mysql.SystemUserMapper; +import cn.odboy.system.dal.mysql.SystemUserRoleMapper; +import cn.odboy.system.dal.redis.SystemUserInfoDAO; +import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.framework.permission.core.SecurityHelper; +import cn.odboy.framework.properties.AppProperties; +import cn.odboy.framework.server.core.FileUploadPathHelper; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/QiniuUtil.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/QiniuUtil.java index 795105b6..08d7956c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/QiniuUtil.java @@ -1,4 +1,4 @@ -package cn.odboy.core.util; +package cn.odboy.system.util; import cn.odboy.util.FileUtil; import com.qiniu.storage.Region; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java index d2876755..a42ee179 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java @@ -1,7 +1,7 @@ -package cn.odboy.core.util; +package cn.odboy.system.util; -import cn.odboy.core.framework.mybatisplus.config.DataTypeEnum; -import cn.odboy.exception.BadRequestException; +import cn.odboy.framework.mybatisplus.config.DataTypeEnum; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CloseUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.google.common.collect.Lists; diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDeptMapper.xml similarity index 93% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemDeptMapper.xml index 04ac84cd..50704ee3 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDeptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -85,7 +85,7 @@ from system_dept where pid is null - SELECT d.dept_id AS id, d.NAME, d.pid, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml similarity index 87% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml index f7c75908..c920c767 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictMapper.xml similarity index 78% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictMapper.xml index fba9bd43..5f99a547 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemDictMapper.xml @@ -1,7 +1,7 @@ - - SELECT * from system_dict d diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemJobMapper.xml similarity index 77% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemJobMapper.xml index 421fb951..304c590d 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemJobMapper.xml @@ -1,12 +1,12 @@ - - select id from system_job where name = #{name} - select * from system_job diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemLocalStorageMapper.xml similarity index 83% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemLocalStorageMapper.xml index ef65a622..885ff06e 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemLocalStorageMapper.xml @@ -1,7 +1,7 @@ - - select * from system_local_storage diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemMenuMapper.xml similarity index 92% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemMenuMapper.xml index 5e5bbd8d..5163f944 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemMenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -101,12 +101,12 @@ WHERE pid = #{pid} ORDER BY menu_sort - SELECT menu_id id FROM system_menu WHERE title = #{title} - SELECT menu_id id FROM system_menu WHERE name = #{name} diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQiniuContentMapper.xml similarity index 72% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemQiniuContentMapper.xml index 4b9af19a..4933252c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQiniuContentMapper.xml @@ -1,13 +1,13 @@ - - SELECT * FROM system_qiniu_content WHERE name = #{name} - SELECT * FROM system_qiniu_content diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzJobMapper.xml similarity index 72% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzJobMapper.xml index 8e96339b..d00d40cf 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzJobMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM system_quartz_job @@ -15,7 +15,7 @@ ORDER BY id DESC - SELECT * FROM system_quartz_job WHERE is_pause = 0 diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzLogMapper.xml similarity index 81% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzLogMapper.xml index 05ff3f52..c8f2585d 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemQuartzLogMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM system_quartz_log diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleDeptMapper.xml similarity index 90% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleDeptMapper.xml index 00d97b46..e934d5a6 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleDeptMapper.xml @@ -1,6 +1,6 @@ - + insert into system_roles_depts (role_id, dept_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml index 325efe6c..de0a83eb 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,17 +11,17 @@ - + - + - select role_id as id, name, level from system_role order by level @@ -73,7 +73,7 @@ - select role_id as id from system_role where name = #{name} @@ -133,7 +133,7 @@ #{deptId} - SELECT role.role_id as id FROM system_role role, system_roles_menus rm diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml similarity index 93% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml index 75324848..cb4a5baf 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -1,6 +1,6 @@ - + insert into system_roles_menus (role_id, menu_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserJobMapper.xml similarity index 90% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserJobMapper.xml index 6ea7af2c..34e9a028 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserJobMapper.xml @@ -1,6 +1,6 @@ - + insert into system_users_jobs (user_id, job_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml index da041d0c..6ab11ef3 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,15 +19,15 @@ - + - + - + @@ -135,12 +135,12 @@ left join system_dept d on u.dept_id = d.dept_id where u.username = #{username} - select user_id as id, username from system_user where email = #{email} - select user_id as id, username from system_user where phone = #{phone} @@ -156,7 +156,7 @@ set email = #{email} where username = #{username} - SELECT u.user_id as id, u.username FROM system_user u, system_users_roles r @@ -164,7 +164,7 @@ AND r.role_id = #{roleId} group by u.user_id - SELECT u.* FROM system_user u, system_users_roles r, @@ -174,7 +174,7 @@ AND d.dept_id = #{deptId} group by u.user_id - SELECT u.user_id as id, u.username FROM system_user u, system_users_roles ur, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml similarity index 90% rename from cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml rename to cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml index 900f3012..49d524b5 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml @@ -1,6 +1,6 @@ - + insert into system_users_roles (user_id, role_id) values diff --git a/cutejava/cutejava-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl b/cutejava/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl similarity index 100% rename from cutejava/cutejava-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl rename to cutejava/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl diff --git a/cutejava/cutejava-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl b/cutejava/cutejava-module-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl similarity index 100% rename from cutejava/cutejava-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl rename to cutejava/cutejava-module-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl diff --git a/cutejava/cutejava-starter/pom.xml b/cutejava/cutejava-starter/pom.xml index 4b14f19b..97abb852 100644 --- a/cutejava/cutejava-starter/pom.xml +++ b/cutejava/cutejava-starter/pom.xml @@ -4,7 +4,7 @@ cutejava cn.odboy - 1.4.0 + 1.4.1 4.0.0 @@ -14,8 +14,13 @@ cn.odboy - cutejava-system - 1.4.0 + cutejava-module-system + 1.4.1 + + + cn.odboy + cutejava-module-devops + 1.4.1 diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java index e611ecd9..fa769b94 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java @@ -1,17 +1,12 @@ package cn.odboy; -import cn.odboy.annotation.AnonymousGetMapping; -import cn.odboy.context.CsBootApplication; +import cn.odboy.framework.context.CsBootApplication; import io.swagger.annotations.Api; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.bind.annotation.RestController; import java.net.UnknownHostException; -@Slf4j -@RestController @Api(hidden = true) @SpringBootApplication public class AppRun extends CsBootApplication { @@ -20,14 +15,4 @@ public class AppRun extends CsBootApplication { SpringApplication springApplication = new SpringApplication(AppRun.class); inited(springApplication.run(args)); } - - /** - * 访问首页提示 - * - * @return / - */ - @AnonymousGetMapping("/") - public String index() { - return "Backend service started successfully"; - } } diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java index f3fe4cc2..944b7e15 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java @@ -1,7 +1,7 @@ package cn.odboy; -import cn.odboy.core.framework.mybatisplus.core.CsMpCmdGenUtil; +import cn.odboy.framework.mybatisplus.core.CsMpCmdGenUtil; import java.util.List; @@ -11,18 +11,27 @@ import java.util.List; * @date 2024-04-27 */ public class GenCode { + private static final String ADDR = "localhost"; + private static final Integer PORT = 3306; + private static final String DATABASE_NAME = "cutejava"; + private static final String DATABASE_USER = "root"; + private static final String DATABASE_PWD = "root123456"; + private static final String URL = String.format("jdbc:mysql://%s:%s/%s", ADDR, PORT, DATABASE_NAME); + public static void main(String[] args) { CsMpCmdGenUtil generator = new CsMpCmdGenUtil(); - generator.setDatabaseUrl(String.format("jdbc:mysql://%s:%s/%s", "localhost", 3306, "cutejava20250321")); + generator.setDatabaseUrl(URL); generator.setDriverClassName("com.mysql.cj.jdbc.Driver"); - generator.setDatabaseUsername("root"); - generator.setDatabasePassword("123456"); - genCareer(generator); + generator.setDatabaseUsername(DATABASE_USER); + generator.setDatabasePassword(DATABASE_PWD); + genPipeline(generator); } - private static void genCareer(CsMpCmdGenUtil generator) { - generator.gen("tool_", List.of( -// "tool_qiniu_content", + private static void genPipeline(CsMpCmdGenUtil generator) { + generator.gen("", List.of( + "pipeline_template", + "pipeline_instance", + "pipeline_instance_node_detail" )); } } diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java similarity index 69% rename from cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java rename to cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java index 5719305b..95b6cafe 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java @@ -1,13 +1,13 @@ -package cn.odboy.monitor; +package cn.odboy; -import cn.odboy.core.service.SystemDictService; -import cn.odboy.monitor.service.CsHealthCheckPointService; +import cn.odboy.system.service.SystemDictService; +import cn.odboy.framework.monitor.service.CsHealthCheckPointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @Component -public class HealthCheckPointerImpl implements CsHealthCheckPointService { +public class HealthCheckPointer implements CsHealthCheckPointService { @Autowired private SystemDictService systemDictService; diff --git a/cutejava/cutejava-starter/src/main/resources/banner.txt b/cutejava/cutejava-starter/src/main/resources/banner.txt index cee7a60c..b6fb25a2 100644 --- a/cutejava/cutejava-starter/src/main/resources/banner.txt +++ b/cutejava/cutejava-starter/src/main/resources/banner.txt @@ -5,4 +5,4 @@ | |___ | |_| | | | | |___ | |_| | / / | | | |/ / / / | | \_____| \_____/ |_| |_____| \_____/ /_/ |_| |___/ /_/ |_| -Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.4.0) \ No newline at end of file +Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.4.1) \ No newline at end of file diff --git a/cutejava/cutejava-starter/src/main/resources/spy.properties b/cutejava/cutejava-starter/src/main/resources/spy.properties index 702b9b07..784f0677 100644 --- a/cutejava/cutejava-starter/src/main/resources/spy.properties +++ b/cutejava/cutejava-starter/src/main/resources/spy.properties @@ -1,7 +1,7 @@ # 应用的拦截模块 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory # 自定义日志打印 -logMessageFormat=cn.odboy.core.framework.mybatisplus.config.MpCustomP6SpyLogger +logMessageFormat=cn.odboy.framework.mybatisplus.config.MpCustomP6SpyLogger # 日志输出到控制台 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger # 日期格式 diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/SystemApplicationTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java similarity index 93% rename from cutejava/cutejava-starter/src/test/java/cn/odboy/util/SystemApplicationTests.java rename to cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java index 40aa6ae8..15063d19 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/SystemApplicationTests.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java @@ -1,4 +1,4 @@ -package cn.odboy.util; +package cn.odboy; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java new file mode 100644 index 00000000..29e9a67a --- /dev/null +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java @@ -0,0 +1,72 @@ +package cn.odboy.pipeline; + +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; +import cn.odboy.devops.constant.pipeline.PipelineStatusEnum; +import cn.odboy.devops.dal.dataobject.pipeline.PipelineInstanceTb; +import cn.odboy.devops.dal.dataobject.pipeline.PipelineTemplateTb; +import cn.odboy.devops.framework.pipeline.PipelineJobManage; +import cn.odboy.devops.service.pipeline.PipelineInstanceService; +import cn.odboy.devops.service.pipeline.PipelineTemplateService; +import com.alibaba.fastjson2.JSON; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 流水线正式测试 + * + * @author odboy + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class PipelineReleaseTests { + @Autowired + private PipelineJobManage pipelineJobManage; + @Autowired + private PipelineTemplateService pipelineTemplateService; + @Autowired + private PipelineInstanceService pipelineInstanceService; + + /** + * 默认模板由人工维护，百分百不会空
+ * 介意又不想配置的自行面壁 + */ + @Test + public void contextLoads() { + // 输入参数 + Date nowTime = new Date(); + String createBy = "admin"; + String appName = "test"; + String envCode = "daily"; + Map context = new HashMap<>(); + context.put("createBy", createBy); + context.put("appName", appName); + context.put("envCode", envCode); + // 获取模板 + PipelineTemplateTb pipelineTemplateTb = pipelineTemplateService.getPipelineTemplateById(1L); + // 创建流水线实例 + PipelineInstanceTb pipelineInstanceTb = new PipelineInstanceTb(); + pipelineInstanceTb.setPipelineTemplateId(pipelineTemplateTb.getId()); + pipelineInstanceTb.setPipelineInstanceName("流水线测试"); + pipelineInstanceTb.setPipelineInstanceId(IdUtil.nanoId()); + pipelineInstanceTb.setCreateTime(nowTime); + pipelineInstanceTb.setCreateBy(createBy); + pipelineInstanceTb.setUpdateTime(nowTime); + pipelineInstanceTb.setType(pipelineTemplateTb.getType()); + pipelineInstanceTb.setAppName(appName); + pipelineInstanceTb.setEnv(envCode); + pipelineInstanceTb.setStatus(PipelineStatusEnum.WAIT.getCode()); + pipelineInstanceTb.setCurrentNode(null); + pipelineInstanceTb.setCurrentNodeStatus(null); + pipelineInstanceTb.setContext(JSON.toJSONString(context)); + pipelineInstanceTb.setPipelineTemplate(pipelineTemplateTb.getTemplate()); + pipelineInstanceService.createPipelineInstance(pipelineInstanceTb); + pipelineJobManage.startJob(pipelineInstanceTb); + ThreadUtil.safeSleep(1000 * 60 * 60 * 24); + } +} + diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineTests.java new file mode 100644 index 00000000..6f8499d1 --- /dev/null +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineTests.java @@ -0,0 +1,247 @@ +//package cn.odboy.util.pipeline; +// +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.thread.ThreadUtil; +//import cn.hutool.core.util.IdUtil; +//import cn.hutool.core.util.RandomUtil; +//import cn.odboy.base.CsObject; +//import lombok.AllArgsConstructor; +//import lombok.Getter; +//import lombok.Setter; +//import lombok.SneakyThrows; +//import org.quartz.*; +//import org.quartz.impl.StdSchedulerFactory; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +//public class PipelineTests { +// @Getter +// @Setter +// public static class PipelineNodeVo extends CsObject { +// /** +// * Service Code +// */ +// private String code; +// /** +// * 节点名称 +// */ +// private String name; +// /** +// * 节点明细（执行成功，失败之类的） +// */ +// private String desc; +// /** +// * 节点状态（wait:未开始 running:运行中 success:执行成功 fail:执行失败） +// */ +// private StatusEnum status; +// /** +// * 是否支持点击查看详情 +// */ +// private boolean click = false; +// /** +// * 明细详情（click=true时，判断并做出渲染方式；比如构建的时候需要查看 gitlab的构建日志，这里可以为 gitlab） +// */ +// private String detailType; +// /** +// * 开始时间 +// */ +// private long startTimeMillis; +// /** +// * 持续时间 +// */ +// private long durationMillis; +// /** +// * 是否属于检查点：需要流程审批 或 人工手动确认 +// */ +// private boolean checkPoint = false; +// /** +// * 扩展按钮 +// */ +// private List buttonList; +// +// @Getter +// public static class ButtonVo extends CsObject { +// /** +// * 按钮类型（get:带参get请求 link:带参跳转） +// */ +// private String type; +// /** +// * 按钮标题 +// */ +// private String title; +// /** +// * link类型:路由地址和参数 +// */ +// private String linkUrl; +// /** +// * link类型:是否新窗口打开 +// */ +// private boolean linkBlank = true; +// } +// +// @Getter +// @AllArgsConstructor +// public enum StatusEnum { +// WAIT("wait", "#C0C4CC", "未开始"), +// RUNNING("running", "#409EFF", "运行中"), +// SUCCESS("success", "#67C23A", "执行成功"), +// FAIL("fail", "#F56C6C", "执行失败"); +// private final String code; +// private final String color; +// private final String desc; +// } +// } +// +// public static class ImmediateJob implements Job, InterruptableJob { +// private volatile boolean isStop = false; +// +// @Override +// public void execute(JobExecutionContext context) throws JobExecutionException { +// List nodeOperationList = new ArrayList<>(); +// nodeOperationList.add(new Object()); +// nodeOperationList.add(new Object()); +// int startIndex = 0; +// int endIndex = nodeOperationList.size(); +// while (!isStop) { +// try { +// System.err.println("====== 任务节点 执行中 ======"); +// Object nodeOperation = nodeOperationList.get(startIndex); +// if (startIndex % 2 == 0) { +// int i = 1 / 0; +// } +// ThreadUtil.safeSleep(RandomUtil.randomInt(1, 5) * 1000L); +// System.err.println("====== 任务节点 执行成功 更新执行节点子操作状态 ======"); +// startIndex++; +// if (startIndex >= endIndex) { +// break; +// } +// } catch (Exception e) { +// System.err.println("====== 任务节点 执行失败 更新执行节点子操作状态 ======"); +// ThreadUtil.safeSleep(RandomUtil.randomInt(1, 5) * 1000L); +// } +// } +// if (isStop) { +// System.err.println("====== 任务节点强制结束 ======"); +// } +// } +// +// @Override +// public void interrupt() throws UnableToInterruptJobException { +// this.isStop = true; +// } +// } +// +// @SneakyThrows +// public static void main(String[] args) { +// Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler(); +// scheduler.start(); +// +// List pipelineNodes = new ArrayList<>(); +// for (int i = 0; i < 8; i++) { +// PipelineNodeVo pipelineNode = new PipelineNodeVo(); +// pipelineNode.setCode("ServiceCode" + i); +// pipelineNode.setName("初始化" + i); +// pipelineNode.setDesc(PipelineNodeVo.StatusEnum.WAIT.getDesc()); +// pipelineNode.setStatus(PipelineNodeVo.StatusEnum.WAIT); +// pipelineNode.setClick(true); +// pipelineNode.setDetailType(null); +// pipelineNode.setStartTimeMillis(DateTime.now().getTime()); +// pipelineNode.setDurationMillis(0); +// pipelineNode.setCheckPoint(false); +// pipelineNode.setButtonList(null); +// pipelineNodes.add(pipelineNode); +// } +// +// +// String groupName = "cutejava"; +// // 顺序执行任务 +// for (PipelineNodeVo pipelineNode : pipelineNodes) { +// String instanceId = IdUtil.getSnowflakeNextIdStr(); +// +// // 参数 +// Map jobParams = new HashMap<>(); +// jobParams.put("instanceId", instanceId); +// +// // 描述任务 +// String jobName = String.format("job-%s-%s", pipelineNode.getCode(), instanceId); +// String triggerName = String.format("trigger-%s-%s", pipelineNode.getCode(), instanceId); +// JobKey jobKey = JobKey.jobKey(jobName, groupName); +// TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, groupName); +// JobDetail jobDetail = JobBuilder.newJob(ImmediateJob.class) +// .withIdentity(jobKey) +// .usingJobData(new JobDataMap(jobParams)) +// .build(); +// // 触发器：如何执行 +// Trigger trigger = TriggerBuilder.newTrigger() +// .withIdentity(triggerKey) +// .startNow() +// .build(); +// // 调度任务 +// scheduler.scheduleJob(jobDetail, trigger); +// // 持续监听任务状态 +// while (true) { +//// JobDataMap jobDataMap = scheduler.getJobDetail(jobKey).getJobDataMap(); +// PipelineNodeVo pipelineNodeVo = getPipelineNodeInfoByArgs(instanceId, jobName, triggerName); +// if (pipelineNodeVo == null) { +// ThreadUtil.safeSleep(2000); +// System.err.println("====== 节点记录未生成，正在重试 ======"); +// continue; +// } +// boolean isForceStop = false; +// if (isForceStop) { +// // 停止任务 +// System.err.println("====== 停止任务 start ======"); +// scheduler.pauseJob(jobKey); +// scheduler.deleteJob(jobKey); +// scheduler.interrupt(jobKey); +// System.err.println("====== 停止任务 finish ======"); +// break; +// } +// +// if (pipelineNodeVo.isCheckPoint()) { +// // 查询库，判断检查点是否成功（异步回调） +// System.err.println("====== 获取检查点状态 ======"); +// boolean checkPointStatus = getCheckPointStatusByInstanceId(instanceId); +// if (checkPointStatus) { +// pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.SUCCESS); +// pipelineNodeVo.setDesc("检查点通过"); +// System.err.println("====== 检查点通过 ======"); +// } +// } else { +// if (PipelineNodeVo.StatusEnum.SUCCESS.equals(pipelineNodeVo.getStatus())) { +// pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.SUCCESS); +// pipelineNodeVo.setDesc(PipelineNodeVo.StatusEnum.SUCCESS.getDesc()); +// System.err.println("====== 节点执行成功 ======"); +// } else if (PipelineNodeVo.StatusEnum.FAIL.equals(pipelineNodeVo.getStatus())) { +// pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.FAIL); +// pipelineNodeVo.setDesc(PipelineNodeVo.StatusEnum.FAIL.getDesc()); +// System.err.println("====== 节点执行失败 ======"); +// } +// } +// pipelineNodeVo.setDurationMillis(DateTime.now().getTime() - pipelineNodeVo.getStartTimeMillis()); +// updateNodeInfo(pipelineNodeVo); +// System.err.println("====== 更新节点执行时间间隔 ======"); +// ThreadUtil.safeSleep(2000); +// } +// } +// } +// +// private static PipelineNodeVo getPipelineNodeInfoByArgs(String instanceId, String jobName, String triggerName) { +// return null; +// } +// +// private static void updateNodeInfo(PipelineNodeVo nodeInfo) { +// // 更新节点信息 +// } +// +// private static boolean getCheckPointStatusByInstanceId(String instanceId) { +// ThreadUtil.safeSleep(2000); +// return true; +// } +//} +// diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java deleted file mode 100644 index 71ae98c8..00000000 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.odboy.util; - -import cn.odboy.core.framework.flow.core.PipelineManager; -import cn.odboy.core.framework.flow.core.PipelineProcessManager; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class PipelineTests { - @Autowired - private PipelineManager pipelineManager; - @Autowired - private PipelineProcessManager pipelineProcessManager; - - @Test - public void testPipelineManager() { - pipelineManager.test(); - } - - @Test - public void testPipelineProcessManager() { - pipelineProcessManager.test(); - } -} - diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java index 3746cb84..b2e2c023 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java @@ -1,5 +1,6 @@ package cn.odboy.util; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; @@ -39,6 +40,6 @@ public class StringUtilTest { @Test public void testGetIP() { - assertEquals("127.0.0.1", BrowserUtil.getIp(new MockHttpServletRequest())); + Assertions.assertEquals("127.0.0.1", BrowserUtil.getIp(new MockHttpServletRequest())); } } diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/pipeline/PipelineTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/pipeline/PipelineTests.java deleted file mode 100644 index 2e1fdb64..00000000 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/pipeline/PipelineTests.java +++ /dev/null @@ -1,247 +0,0 @@ -package cn.odboy.util.pipeline; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.RandomUtil; -import cn.odboy.base.CsSerializeObject; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; -import lombok.SneakyThrows; -import org.quartz.*; -import org.quartz.impl.StdSchedulerFactory; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class PipelineTests { - @Getter - @Setter - public static class PipelineNodeVo extends CsSerializeObject { - /** - * Service Code - */ - private String code; - /** - * 节点名称 - */ - private String name; - /** - * 节点明细（执行成功，失败之类的） - */ - private String desc; - /** - * 节点状态（wait:未开始 running:运行中 success:执行成功 fail:执行失败） - */ - private StatusEnum status; - /** - * 是否支持点击查看详情 - */ - private boolean click = false; - /** - * 明细详情（click=true时，判断并做出渲染方式；比如构建的时候需要查看 gitlab的构建日志，这里可以为 gitlab） - */ - private String detailType; - /** - * 开始时间 - */ - private long startTimeMillis; - /** - * 持续时间 - */ - private long durationMillis; - /** - * 是否属于检查点：需要流程审批 或 人工手动确认 - */ - private boolean checkPoint = false; - /** - * 扩展按钮 - */ - private List buttonList; - - @Getter - public static class ButtonVo extends CsSerializeObject { - /** - * 按钮类型（get:带参get请求 link:带参跳转） - */ - private String type; - /** - * 按钮标题 - */ - private String title; - /** - * link类型:路由地址和参数 - */ - private String linkUrl; - /** - * link类型:是否新窗口打开 - */ - private boolean linkBlank = true; - } - - @Getter - @AllArgsConstructor - public enum StatusEnum { - WAIT("wait", "#C0C4CC", "未开始"), - RUNNING("running", "#409EFF", "运行中"), - SUCCESS("success", "#67C23A", "执行成功"), - FAIL("fail", "#F56C6C", "执行失败"); - private final String code; - private final String color; - private final String desc; - } - } - - public static class ImmediateJob implements Job, InterruptableJob { - private volatile boolean isStop = false; - - @Override - public void execute(JobExecutionContext context) throws JobExecutionException { - List nodeOperationList = new ArrayList<>(); - nodeOperationList.add(new Object()); - nodeOperationList.add(new Object()); - int startIndex = 0; - int endIndex = nodeOperationList.size(); - while (!isStop) { - try { - System.err.println("====== 任务节点 执行中 ======"); - Object nodeOperation = nodeOperationList.get(startIndex); - if (startIndex % 2 == 0) { - int i = 1 / 0; - } - ThreadUtil.safeSleep(RandomUtil.randomInt(1, 5) * 1000L); - System.err.println("====== 任务节点 执行成功 更新执行节点子操作状态 ======"); - startIndex++; - if (startIndex >= endIndex) { - break; - } - } catch (Exception e) { - System.err.println("====== 任务节点 执行失败 更新执行节点子操作状态 ======"); - ThreadUtil.safeSleep(RandomUtil.randomInt(1, 5) * 1000L); - } - } - if (isStop) { - System.err.println("====== 任务节点强制结束 ======"); - } - } - - @Override - public void interrupt() throws UnableToInterruptJobException { - this.isStop = true; - } - } - - @SneakyThrows - public static void main(String[] args) { - Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler(); - scheduler.start(); - - List pipelineNodes = new ArrayList<>(); - for (int i = 0; i < 8; i++) { - PipelineNodeVo pipelineNode = new PipelineNodeVo(); - pipelineNode.setCode("ServiceCode" + i); - pipelineNode.setName("初始化" + i); - pipelineNode.setDesc(PipelineNodeVo.StatusEnum.WAIT.getDesc()); - pipelineNode.setStatus(PipelineNodeVo.StatusEnum.WAIT); - pipelineNode.setClick(true); - pipelineNode.setDetailType(null); - pipelineNode.setStartTimeMillis(DateTime.now().getTime()); - pipelineNode.setDurationMillis(0); - pipelineNode.setCheckPoint(false); - pipelineNode.setButtonList(null); - pipelineNodes.add(pipelineNode); - } - - - String groupName = "cutejava"; - // 顺序执行任务 - for (PipelineNodeVo pipelineNode : pipelineNodes) { - String instanceId = IdUtil.getSnowflakeNextIdStr(); - - // 参数 - Map jobParams = new HashMap<>(); - jobParams.put("instanceId", instanceId); - - // 描述任务 - String jobName = String.format("job-%s-%s", pipelineNode.getCode(), instanceId); - String triggerName = String.format("trigger-%s-%s", pipelineNode.getCode(), instanceId); - JobKey jobKey = JobKey.jobKey(jobName, groupName); - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, groupName); - JobDetail jobDetail = JobBuilder.newJob(ImmediateJob.class) - .withIdentity(jobKey) - .usingJobData(new JobDataMap(jobParams)) - .build(); - // 触发器：如何执行 - Trigger trigger = TriggerBuilder.newTrigger() - .withIdentity(triggerKey) - .startNow() - .build(); - // 调度任务 - scheduler.scheduleJob(jobDetail, trigger); - // 持续监听任务状态 - while (true) { -// JobDataMap jobDataMap = scheduler.getJobDetail(jobKey).getJobDataMap(); - PipelineNodeVo pipelineNodeVo = getPipelineNodeInfoByArgs(instanceId, jobName, triggerName); - if (pipelineNodeVo == null) { - ThreadUtil.safeSleep(2000); - System.err.println("====== 节点记录未生成，正在重试 ======"); - continue; - } - boolean isForceStop = false; - if (isForceStop) { - // 停止任务 - System.err.println("====== 停止任务 start ======"); - scheduler.pauseJob(jobKey); - scheduler.deleteJob(jobKey); - scheduler.interrupt(jobKey); - System.err.println("====== 停止任务 finish ======"); - break; - } - - if (pipelineNodeVo.isCheckPoint()) { - // 查询库，判断检查点是否成功（异步回调） - System.err.println("====== 获取检查点状态 ======"); - boolean checkPointStatus = getCheckPointStatusByInstanceId(instanceId); - if (checkPointStatus) { - pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.SUCCESS); - pipelineNodeVo.setDesc("检查点通过"); - System.err.println("====== 检查点通过 ======"); - } - } else { - if (PipelineNodeVo.StatusEnum.SUCCESS.equals(pipelineNodeVo.getStatus())) { - pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.SUCCESS); - pipelineNodeVo.setDesc(PipelineNodeVo.StatusEnum.SUCCESS.getDesc()); - System.err.println("====== 节点执行成功 ======"); - } else if (PipelineNodeVo.StatusEnum.FAIL.equals(pipelineNodeVo.getStatus())) { - pipelineNodeVo.setStatus(PipelineNodeVo.StatusEnum.FAIL); - pipelineNodeVo.setDesc(PipelineNodeVo.StatusEnum.FAIL.getDesc()); - System.err.println("====== 节点执行失败 ======"); - } - } - pipelineNodeVo.setDurationMillis(DateTime.now().getTime() - pipelineNodeVo.getStartTimeMillis()); - updateNodeInfo(pipelineNodeVo); - System.err.println("====== 更新节点执行时间间隔 ======"); - ThreadUtil.safeSleep(2000); - } - } - } - - private static PipelineNodeVo getPipelineNodeInfoByArgs(String instanceId, String jobName, String triggerName) { - return null; - } - - private static void updateNodeInfo(PipelineNodeVo nodeInfo) { - // 更新节点信息 - } - - private static boolean getCheckPointStatusByInstanceId(String instanceId) { - ThreadUtil.safeSleep(2000); - return true; - } -} - diff --git a/cutejava/cutejava-system/pom.xml b/cutejava/cutejava-system/pom.xml deleted file mode 100644 index 657860c3..00000000 --- a/cutejava/cutejava-system/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - cutejava - cn.odboy - 1.4.0 - - 4.0.0 - - cutejava-system - 核心模块 - - - 0.11.5 - - 5.8.0 - 1.4.7 - 7.9.3 - - - - - cn.odboy - cutejava-common - 1.4.0 - - - - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - - - - - ch.ethz.ganymed - ganymed-ssh2 - build210 - - - com.jcraft - jsch - 0.1.55 - - - - - com.github.oshi - oshi-core - 6.6.5 - - - - - javax.mail - mail - ${mail.version} - - - - - com.qiniu - qiniu-java-sdk - ${qiniu.version} - - - - - org.springframework.boot - spring-boot-starter-quartz - - - org.quartz-scheduler - quartz - - - - - org.quartz-scheduler - quartz - 2.5.0 - - - com.mchange - c3p0 - 0.10.1 - - - diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineManager.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineManager.java deleted file mode 100644 index 907b8ab6..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineManager.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.odboy.core.framework.flow.core; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; -import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.framework.flow.core.handler.SerialPipelineNodeHandler; -import cn.odboy.core.framework.flow.model.PipelineNodeVo; -import cn.odboy.exception.BadRequestException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - -/** - * 流水线管理工具 - * - * @author odboy - */ -@Slf4j -@Component -public class PipelineManager { - private static final PipelineTaskPool pipelineTaskPool = new PipelineTaskPool("DefaultPipelineTaskPool"); - - public void test() { - String pipelineId = IdUtil.objectId(); - List pipelineNodeVos = initialize(); - execute(pipelineId, pipelineNodeVos); - - ThreadUtil.safeSleep(5000); - pipelineTaskPool.stopTaskForcibly(pipelineId); - ThreadUtil.safeSleep(1000000); - } - - public void execute(String pipelineId, List pipelineNodeVos) { - pipelineTaskPool.submitTask(pipelineId, () -> { - for (PipelineNodeVo pipelineNodeVo : pipelineNodeVos) { - executePipeline(pipelineId, pipelineNodeVo); - // 要么成功，要么失败 - boolean interrupted = Thread.currentThread().isInterrupted(); - while (!interrupted && "running".equals(pipelineNodeVo.getExecuteStatus())) { - log.info("流水线执行中..."); - ThreadUtil.safeSleep(2000); - } - if (interrupted) { - log.info("流水线被中断..."); - return; - } - } - }); - } - - private void executePipeline(String pipelineId, PipelineNodeVo pipelineNodeVo) { - String pipelineServiceName = String.format("pipeline:%s", pipelineNodeVo.getBizCode()); - SerialPipelineNodeHandler pipelineNodeHandler = SpringBeanHolder.getBean(pipelineServiceName); - try { - Object o = pipelineNodeHandler.doProcess(pipelineId, pipelineNodeVo); - log.info("运行结果, {}", o); - } catch (BadRequestException e) { - log.error("运行流水线异常", e); - if (pipelineTaskPool.isTaskRunning(pipelineId)) { - pipelineTaskPool.stopTaskForcibly(pipelineId); - } - } catch (Exception e) { - log.error("其他异常", e); - if (pipelineTaskPool.isTaskRunning(pipelineId)) { - pipelineTaskPool.stopTaskForcibly(pipelineId); - } - } - } - - public List initialize() { - List pipelineNodeVos = new ArrayList<>(); - PipelineNodeVo createReleaseBranchNodeVo = new PipelineNodeVo(); - createReleaseBranchNodeVo.setName("初始化"); - createReleaseBranchNodeVo.setClick(true); - createReleaseBranchNodeVo.setButtonList(null); - createReleaseBranchNodeVo.setBizCode("create_release_branch"); - createReleaseBranchNodeVo.setStartTimeMillis(DateTime.now().getTime()); - createReleaseBranchNodeVo.setDurationMillis(0L); - createReleaseBranchNodeVo.setExecuteStatus("running"); - createReleaseBranchNodeVo.setResultDesc(null); - pipelineNodeVos.add(createReleaseBranchNodeVo); - - PipelineNodeVo createReleaseBranchNodeVo1 = new PipelineNodeVo(); - createReleaseBranchNodeVo1.setName("代码构建"); - createReleaseBranchNodeVo1.setClick(true); - createReleaseBranchNodeVo1.setButtonList(null); - createReleaseBranchNodeVo1.setBizCode("build_code"); - createReleaseBranchNodeVo1.setStartTimeMillis(DateTime.now().getTime()); - createReleaseBranchNodeVo1.setDurationMillis(0L); - createReleaseBranchNodeVo1.setExecuteStatus("running"); - createReleaseBranchNodeVo1.setResultDesc(null); - pipelineNodeVos.add(createReleaseBranchNodeVo1); - - return pipelineNodeVos; - } -} \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineProcessManager.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineProcessManager.java deleted file mode 100644 index 386cdfa8..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineProcessManager.java +++ /dev/null @@ -1,212 +0,0 @@ -package cn.odboy.core.framework.flow.core; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; -import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.framework.flow.core.handler.SerialPipelineNodeHandler; -import cn.odboy.core.framework.flow.model.PipelineNodeVo; -import cn.odboy.exception.BadRequestException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * 流水线进程管理工具 - * - * @author odboy - */ -@Slf4j -@Component -public class PipelineProcessManager { - // 使用ConcurrentHashMap保证线程安全 - private final Map runningTasks = new ConcurrentHashMap<>(); - // 使用AtomicBoolean作为停止标志，保证原子性操作 - private final Map stopFlags = new ConcurrentHashMap<>(); - // 常量定义 - private static final String PIPELINE_THREAD_PREFIX = "pipeline-"; - private static final String PIPELINE_SERVICE_PREFIX = "pipeline:"; - private static final String RUNNING_STATUS = "running"; - private static final long DEFAULT_SLEEP_MS = 2000L; - - /** - * 测试方法 - */ - public void test() { - String pipelineId = IdUtil.objectId(); - List pipelineNodes = initialize(); - execute(pipelineId, pipelineNodes); - - ThreadUtil.safeSleep(5000); - stopForcibly(pipelineId); - ThreadUtil.safeSleep(1000000); - } - - /** - * 执行流水线 - * - * @param pipelineId 流水线ID - * @param pipelineNodes 流水线节点列表 - */ - public void execute(String pipelineId, List pipelineNodes) { - if (runningTasks.containsKey(pipelineId)) { - log.warn("Pipeline [{}] is already running", pipelineId); - return; - } - - stopFlags.put(pipelineId, new AtomicBoolean(false)); - - Thread pipelineThread = new Thread(() -> processPipeline(pipelineId, pipelineNodes)); - pipelineThread.setDaemon(true); - pipelineThread.setName(PIPELINE_THREAD_PREFIX + pipelineId); - - runningTasks.put(pipelineId, pipelineThread); - pipelineThread.start(); - } - - /** - * 处理流水线任务 - */ - private void processPipeline(String pipelineId, List pipelineNodes) { - try { - for (PipelineNodeVo node : pipelineNodes) { - if (shouldStop(pipelineId)) { - log.info("Pipeline [{}] was interrupted", pipelineId); - return; - } - - executePipelineNode(pipelineId, node); - - while (!shouldStop(pipelineId) && RUNNING_STATUS.equals(node.getExecuteStatus())) { - log.debug("Pipeline [{}] is running...", pipelineId); - sleepInterruptibly(DEFAULT_SLEEP_MS, pipelineId); - } - - if (shouldStop(pipelineId)) { - log.info("Pipeline [{}] was interrupted", pipelineId); - return; - } - } - } catch (Exception e) { - log.error("流水线异常", e); - } finally { - cleanup(pipelineId); - } - } - - /** - * 检查是否应该停止 - */ - private boolean shouldStop(String pipelineId) { - return Optional.ofNullable(stopFlags.get(pipelineId)) - .map(AtomicBoolean::get) - .orElse(true); - } - - /** - * 可中断的睡眠 - */ - private void sleepInterruptibly(long millis, String pipelineId) { - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - log.info("Pipeline [{}] sleep interrupted", pipelineId); - Thread.currentThread().interrupt(); - } - } - - /** - * 清理资源 - */ - private void cleanup(String pipelineId) { - runningTasks.remove(pipelineId); - stopFlags.remove(pipelineId); - log.info("Pipeline [{}] resources cleaned up", pipelineId); - } - - /** - * 检查流水线是否在运行 - */ - public boolean isRunning(String pipelineId) { - return Optional.ofNullable(runningTasks.get(pipelineId)) - .map(Thread::isAlive) - .orElse(false); - } - - /** - * 执行单个流水线节点 - */ - private void executePipelineNode(String pipelineId, PipelineNodeVo node) { - String serviceName = PIPELINE_SERVICE_PREFIX + node.getBizCode(); - SerialPipelineNodeHandler handler = SpringBeanHolder.getBean(serviceName); - try { - Object result = handler.doProcess(pipelineId, node); - log.info("Pipeline [{}] node [{}] executed, result: {}", pipelineId, node.getName(), result); - } catch (BadRequestException e) { - handlePipelineError(pipelineId, "Business error in pipeline", e); - } catch (Exception e) { - handlePipelineError(pipelineId, "Unexpected error in pipeline", e); - } - } - - /** - * 处理流水线错误 - */ - private void handlePipelineError(String pipelineId, String message, Exception e) { - log.error(message, e); - if (isRunning(pipelineId)) { - stopForcibly(pipelineId); - } - } - - /** - * 强制停止流水线 - */ - public void stopForcibly(String pipelineId) { - Optional.ofNullable(stopFlags.get(pipelineId)) - .ifPresent(flag -> flag.set(true)); - - Optional.ofNullable(runningTasks.get(pipelineId)) - .ifPresent(thread -> { - try { - thread.interrupt(); - } catch (SecurityException e) { - log.error("Failed to interrupt pipeline [{}]", pipelineId, e); - } - }); - } - - /** - * 初始化测试流水线节点 - */ - public List initialize() { - List nodes = new ArrayList<>(); - - nodes.add(createNode("初始化", "create_release_branch")); - nodes.add(createNode("代码构建", "build_code")); - - return nodes; - } - - /** - * 创建流水线节点 - */ - private PipelineNodeVo createNode(String name, String bizCode) { - PipelineNodeVo node = new PipelineNodeVo(); - node.setName(name); - node.setClick(true); - node.setButtonList(null); - node.setBizCode(bizCode); - node.setStartTimeMillis(DateTime.now().getTime()); - node.setDurationMillis(0L); - node.setExecuteStatus(RUNNING_STATUS); - node.setResultDesc(null); - return node; - } -} \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineTaskPool.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineTaskPool.java deleted file mode 100644 index 66798979..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/PipelineTaskPool.java +++ /dev/null @@ -1,245 +0,0 @@ -package cn.odboy.core.framework.flow.core; - -import java.util.Map; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * 流水线任务池 - * - * @author odboy - */ -public class PipelineTaskPool { - // 默认线程池参数 - private static final int DEFAULT_CORE_POOL_SIZE = 5; - private static final int DEFAULT_MAX_POOL_SIZE = 10; - private static final long DEFAULT_KEEP_ALIVE_TIME = 60L; - private static final TimeUnit DEFAULT_TIME_UNIT = TimeUnit.SECONDS; - private static final int DEFAULT_QUEUE_CAPACITY = 100; - - // 线程池实例 - private final ThreadPoolExecutor executor; - // 存储正在运行的任务 - private final Map runningTasks = new ConcurrentHashMap<>(); - // 线程池管理器名称 - private final String name; - - /** - * 使用默认参数创建线程池管理器 - */ - public PipelineTaskPool(String name) { - this(name, DEFAULT_CORE_POOL_SIZE, DEFAULT_MAX_POOL_SIZE, - DEFAULT_KEEP_ALIVE_TIME, DEFAULT_TIME_UNIT, - new LinkedBlockingQueue<>(DEFAULT_QUEUE_CAPACITY)); - } - - /** - * 自定义参数创建线程池管理器 - */ - public PipelineTaskPool(String name, int corePoolSize, int maxPoolSize, - long keepAliveTime, TimeUnit unit, - BlockingQueue workQueue) { - this.name = name; - this.executor = new ThreadPoolExecutor( - corePoolSize, - maxPoolSize, - keepAliveTime, - unit, - workQueue, - new ThreadFactory() { - private final AtomicInteger threadNumber = new AtomicInteger(1); - - @Override - public Thread newThread(Runnable r) { - return new Thread(r, name + "-thread-" + threadNumber.getAndIncrement()); - } - }, - new ThreadPoolExecutor.AbortPolicy() - ); - } - - /** - * 提交任务并管理 - * - * @param taskId 任务ID - * @param task 任务逻辑 - * @return true表示提交成功，false表示任务已存在 - */ - public boolean submitTask(String taskId, Runnable task) { - if (runningTasks.containsKey(taskId)) { - return false; - } - - ManagedTask managedTask = new ManagedTask(taskId, task); - runningTasks.put(taskId, managedTask); - executor.execute(managedTask); - return true; - } - - /** - * 正常停止任务 - * - * @param taskId 任务ID - * @return true表示停止成功，false表示任务不存在或已停止 - */ - public boolean stopTaskGracefully(String taskId) { - ManagedTask task = runningTasks.get(taskId); - if (task != null) { - return task.stopGracefully(); - } - return false; - } - - /** - * 强制停止任务 - * - * @param taskId 任务ID - * @return true表示停止成功，false表示任务不存在 - */ - public boolean stopTaskForcibly(String taskId) { - ManagedTask task = runningTasks.remove(taskId); - if (task != null) { - return task.stopForcibly(); - } - return false; - } - - /** - * 检查任务是否正在运行 - * - * @param taskId 任务ID - * @return true表示正在运行 - */ - public boolean isTaskRunning(String taskId) { - ManagedTask task = runningTasks.get(taskId); - return task != null && !task.isStopped(); - } - - /** - * 获取正在运行的任务数量 - * - * @return 运行中任务数 - */ - public int getRunningTaskCount() { - return runningTasks.size(); - } - - /** - * 关闭线程池（等待所有任务完成） - */ - public void shutdown() { - executor.shutdown(); - } - - /** - * 立即关闭线程池（尝试停止所有任务） - */ - public void shutdownNow() { - executor.shutdownNow(); - runningTasks.clear(); - } - - /** - * 获取线程池状态信息 - * - * @return 状态信息字符串 - */ - public String getPoolStatus() { - return String.format( - "[%s] PoolStatus: Active=%d, Completed=%d, Task=%d, Queue=%d/%d", - name, - executor.getActiveCount(), - executor.getCompletedTaskCount(), - executor.getTaskCount(), - executor.getQueue().size(), - executor.getQueue().remainingCapacity() - ); - } - - /** - * 被管理的任务包装类 - */ - private class ManagedTask implements Runnable { - private final String taskId; - private final Runnable task; - private final AtomicBoolean running = new AtomicBoolean(true); - private final AtomicBoolean stopped = new AtomicBoolean(false); - private Thread currentThread; - - public ManagedTask(String taskId, Runnable task) { - this.taskId = taskId; - this.task = task; - } - - @Override - public void run() { - currentThread = Thread.currentThread(); - try { - // 执行前检查是否已被停止 - if (running.get()) { - task.run(); - } - } finally { - // 任务完成后从运行列表中移除 - runningTasks.remove(taskId); - stopped.set(true); - } - } - - /** - * 正常停止任务 - * - * @return 是否成功停止 - */ - public boolean stopGracefully() { - if (running.compareAndSet(true, false)) { - return true; - } - return false; - } - - /** - * 强制停止任务 - * - * @return 是否成功停止 - */ - public boolean stopForcibly() { - if (stopped.get()) { - return false; - } - - if (running.compareAndSet(true, false)) { - if (currentThread != null) { - // 暴力停止线程 - // currentThread.stop(); - try { - /** - * Thread.interrupt只支持终止线程的阻塞状态(wait、join、sleep)， - * 在阻塞出抛出InterruptedException异常,但是并不会终止运行的线程本身； - * 所以需要注意，此处彻底销毁本线程，需要通过共享变量方式； - */ - currentThread.interrupt(); - currentThread.join(); - } catch (InterruptedException e) { - currentThread.interrupt(); - } catch (Exception e) { - // ignore - // currentThread.stop(); - } - } - return true; - } - return false; - } - - /** - * 检查任务是否已停止 - * - * @return true表示已停止 - */ - public boolean isStopped() { - return stopped.get(); - } - } -} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/SerialPipelineNodeHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/SerialPipelineNodeHandler.java deleted file mode 100644 index 0acc308e..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/SerialPipelineNodeHandler.java +++ /dev/null @@ -1,129 +0,0 @@ -package cn.odboy.core.framework.flow.core.handler; - -import cn.hutool.core.thread.ThreadUtil; -import cn.odboy.exception.BadRequestException; -import com.alibaba.fastjson2.JSON; -import lombok.extern.slf4j.Slf4j; - -/** - * 串行流水线节点处理器 - * - * @author odboy - */ -@Slf4j -public abstract class SerialPipelineNodeHandler { - - /** - * 预处理 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract void preProcess(String pipelineId, I inputModel); - - /** - * 预处理异常 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - * @param e 异常信息 - */ - protected abstract void preProcessException(String pipelineId, I inputModel, Exception e); - - /** - * 处理业务 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract T process(String pipelineId, I inputModel); - - /** - * 处理业务异常 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - * @param e 异常信息 - */ - protected abstract void processException(String pipelineId, I inputModel, Exception e); - - /** - * 业务后置处理 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract void postProcess(String pipelineId, I inputModel, T processResult); - - /** - * 业务后置处理异常 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract void postProcessException(String pipelineId, I inputModel, T processResult, Exception e); - - /** - * 当前节点是否被锁住（卡点功能），返回false解锁 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract boolean isLocked(String pipelineId, I inputModel); - - /** - * 当进程被中断时 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - */ - protected abstract void onProcessInterrupted(String pipelineId, I inputModel); - - /** - * 业务处理 - * - * @param pipelineId 流水线id - * @param inputModel 输入参数 - * @return T - */ - public T doProcess(String pipelineId, I inputModel) throws BadRequestException { - try { - if (Thread.currentThread().isInterrupted()) { - onProcessInterrupted(pipelineId, inputModel); - throw new InterruptedException("业务被中断"); - } - preProcess(pipelineId, inputModel); - log.info("preProcess,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); - } catch (Exception e) { - preProcessException(pipelineId, inputModel, e); - log.error("preProcessException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); - throw new BadRequestException(e.getMessage()); - } - if (Thread.currentThread().isInterrupted()) { - throw new BadRequestException("业务被中断"); - } - while (isLocked(pipelineId, inputModel)) { - ThreadUtil.safeSleep(2000); - } - try { - if (Thread.currentThread().isInterrupted()) { - throw new BadRequestException("业务被中断"); - } - T processResult = process(pipelineId, inputModel); - log.info("process,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); - try { - postProcess(pipelineId, inputModel, processResult); - log.info("postProcess,pipelineId={},inputModel={},processResult={}", pipelineId, JSON.toJSONString(inputModel), JSON.toJSONString(processResult)); - return processResult; - } catch (Exception e) { - postProcessException(pipelineId, inputModel, processResult, e); - log.error("postProcessException,pipelineId={},inputModel={},processResult={}", pipelineId, JSON.toJSONString(inputModel), JSON.toJSONString(processResult)); - throw new BadRequestException(e.getMessage()); - } - } catch (Exception e) { - processException(pipelineId, inputModel, e); - log.error("processException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); - throw new BadRequestException(e.getMessage()); - } - } -} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java deleted file mode 100644 index 7c7b21d5..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/core/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.odboy.core.framework.flow.core.handler.impl; - -import cn.odboy.core.framework.flow.core.handler.SerialPipelineNodeHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service("pipeline:create_release_branch") -public class PipelineAppCreateReleaseBranchHandlerServiceImpl extends SerialPipelineNodeHandler { - @Override - public void preProcess(String pipelineId, Object inputModel) { - } - - @Override - public void preProcessException(String pipelineId, Object inputModel, Exception e) { - } - - @Override - public Object process(String pipelineId, Object inputModel) { - return "Hello World"; - } - - @Override - public void processException(String pipelineId, Object inputModel, Exception e) { - } - - @Override - public void postProcess(String pipelineId, Object inputModel, Object processResult) { - } - - @Override - public void postProcessException(String pipelineId, Object inputModel, Object processResult, Exception e) { - } - - @Override - public boolean isLocked(String pipelineId, Object inputModel) { - return false; - } - - @Override - protected void onProcessInterrupted(String pipelineId, Object inputModel) { - log.error("pipeline is stopping"); - } -} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/model/PipelineNodeVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/model/PipelineNodeVo.java deleted file mode 100644 index d4517ead..00000000 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/model/PipelineNodeVo.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.odboy.core.framework.flow.model; - -import cn.odboy.base.CsSerializeObject; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = false) -public class PipelineNodeVo extends CsSerializeObject { - /** - * 业务节点名称 - */ - private String name; - /** - * 是否可以点击 - */ - private Boolean click = false; - /** - * 功能按钮列表，与click互斥 - */ - private List buttonList; - /** - * 业务编码(createReleaseBranch、mergeCode) - */ - private String bizCode; - /** - * 业务节点开始时间 - */ - private Long startTimeMillis; - /** - * 业务节点耗时 - */ - private Long durationMillis; - /** - * 业务节点执行状态(success 成功, error 失败, running 运行中) - */ - private String executeStatus; - /** - * 业务节点结果描述(执行成功) - */ - private String resultDesc; - - /** - * 流水线节点功能按钮 - */ - @Data - @EqualsAndHashCode(callSuper = false) - public static class PipelineNodeOperationButton extends CsSerializeObject { - /** - * 请求方式(get、post) - */ - private String method; - /** - * 请求路径(/api/doCheck?id=1&bizCode=) - */ - private String requestUrl; - /** - * 按钮名称(通过、打回) - */ - private String text; - /** - * 按钮类型(execute 请求url、link 跳转三方) - */ - private String type; - } -} diff --git a/cutejava/pom.xml b/cutejava/pom.xml index 75f00d7b..0e7e79f8 100644 --- a/cutejava/pom.xml +++ b/cutejava/pom.xml @@ -5,11 +5,12 @@ cn.odboy cutejava pom - 1.4.0 + 1.4.1 - cutejava-common - cutejava-system + cutejava-framework + cutejava-module-system + cutejava-module-devops cutejava-starter @@ -32,6 +33,11 @@ 2.11.1 3.5.12 5.8.38 + 0.11.5 + + 5.8.0 + 1.4.7 + 7.9.3 @@ -273,6 +279,85 @@ org.springframework.boot spring-boot-starter-aop + + + + cn.hutool + hutool-all + ${hutool.version} + + + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + + + + + ch.ethz.ganymed + ganymed-ssh2 + build210 + + + com.jcraft + jsch + 0.1.55 + + + + + com.github.oshi + oshi-core + 6.6.5 + + + + + javax.mail + mail + ${mail.version} + + + + + com.qiniu + qiniu-java-sdk + ${qiniu.version} + + + + + org.springframework.boot + spring-boot-starter-quartz + + + org.quartz-scheduler + quartz + + + + + org.quartz-scheduler + quartz + 2.5.0 + + + com.mchange + c3p0 + 0.10.1 + diff --git a/doc/cutejava.sql b/doc/cutejava.sql index fe5e928c..385e2448 100644 --- a/doc/cutejava.sql +++ b/doc/cutejava.sql @@ -11,12 +11,165 @@ Target Server Version : 80025 (8.0.25) File Encoding : 65001 - Date: 25/06/2025 18:40:08 + Date: 27/06/2025 00:47:59 */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for demo_logic_table +-- ---------------------------- +DROP TABLE IF EXISTS `demo_logic_table`; +CREATE TABLE `demo_logic_table` ( + `id` bigint NOT NULL COMMENT 'id', + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '修改人', + `update_time` datetime NOT NULL COMMENT '修改时间', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '数据有效性', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- ---------------------------- +-- Records of demo_logic_table +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for demo_table +-- ---------------------------- +DROP TABLE IF EXISTS `demo_table`; +CREATE TABLE `demo_table` ( + `id` bigint NOT NULL COMMENT 'id', + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '修改人', + `update_time` datetime NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- ---------------------------- +-- Records of demo_table +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for demo_time_table +-- ---------------------------- +DROP TABLE IF EXISTS `demo_time_table`; +CREATE TABLE `demo_time_table` ( + `id` bigint NOT NULL COMMENT 'id', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- ---------------------------- +-- Records of demo_time_table +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for pipeline_instance +-- ---------------------------- +DROP TABLE IF EXISTS `pipeline_instance`; +CREATE TABLE `pipeline_instance` ( + `pipeline_template_id` bigint NOT NULL COMMENT '流水线模板id', + `pipeline_instance_name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线实例名称', + `pipeline_instance_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线实例id', + `create_time` datetime NOT NULL COMMENT '创建时间', + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人', + `update_time` datetime NOT NULL COMMENT '更新时间', + `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线模板类型', + `app_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '应用名称', + `env` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '环境编码', + `status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线实例状态', + `current_node` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '流水线实例当前节点code', + `current_node_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '流水线实例当前节点状态', + `context` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '输入参数', + `pipeline_template` text NOT NULL COMMENT '流水线模板', + UNIQUE KEY `udx_pipeline_instance_id` (`pipeline_instance_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='流水线实例'; + +-- ---------------------------- +-- Records of pipeline_instance +-- ---------------------------- +BEGIN; +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', '8omvZEM792bbH8GaFVgLF', '2025-06-27 00:05:12', 'admin', '2025-06-27 00:05:12', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'DWEVcCB0b1A43LjP2SCcV', '2025-06-26 23:47:57', 'admin', '2025-06-26 23:47:57', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'gl4EJWZCikyKuLeW0Gzrq', '2025-06-27 00:13:37', 'admin', '2025-06-27 00:13:37', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'gnZ3oYi_bfVkL0Me6QKwh', '2025-06-26 23:53:07', 'admin', '2025-06-26 23:53:07', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'gqmbUcLG7hgKE40EYkCZz', '2025-06-26 23:55:32', 'admin', '2025-06-26 23:55:32', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'HbIwazuQj6s24Ero08rIw', '2025-06-26 23:57:53', 'admin', '2025-06-26 23:57:53', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'jRq5unyzWhbSSwj6noGrk', '2025-06-26 23:32:04', 'admin', '2025-06-26 23:32:04', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'Kum4R4e_hby0P7DXtV3RV', '2025-06-27 00:03:47', 'admin', '2025-06-27 00:03:47', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'l35eX80-zuYS1h6OfLtIp', '2025-06-26 23:54:28', 'admin', '2025-06-26 23:54:28', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'nN_xqed_XmfENYFk5mrji', '2025-06-27 00:08:25', 'admin', '2025-06-27 00:08:25', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'OZEBc8wLvbGLk6ZtrWx4c', '2025-06-26 23:29:54', 'admin', '2025-06-26 23:29:54', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'piC4lv7Xw7AaAluvqDzUw', '2025-06-26 23:37:44', 'admin', '2025-06-26 23:37:44', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'qBOPGj9lCnWsxdGmvLaiu', '2025-06-27 00:16:59', 'admin', '2025-06-27 00:16:59', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'r9x4rGQskuOXckyKX7exz', '2025-06-27 00:45:08', 'admin', '2025-06-27 00:45:08', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'sGgYbHzvBOBl_bAZ-rigz', '2025-06-26 23:25:54', 'admin', '2025-06-26 23:25:54', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'SMamFqVOtkfbFuBz-rFjd', '2025-06-26 23:28:48', 'admin', '2025-06-26 23:28:48', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'U8lhSSIBvHZYxikX2J9vM', '2025-06-26 23:41:47', 'admin', '2025-06-26 23:41:47', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'XWh1Cfh2Ipe0_KCmicWd2', '2025-06-26 23:28:11', 'admin', '2025-06-26 23:28:11', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'YrrVkKiLVHAFf9WWKkAwm', '2025-06-27 00:00:39', 'admin', '2025-06-27 00:00:39', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +INSERT INTO `pipeline_instance` (`pipeline_template_id`, `pipeline_instance_name`, `pipeline_instance_id`, `create_time`, `create_by`, `update_time`, `type`, `app_name`, `env`, `status`, `current_node`, `current_node_status`, `context`, `pipeline_template`) VALUES (1, '流水线测试', 'ZPHF6zTcCfZIwoG23aKu5', '2025-06-26 23:44:32', 'admin', '2025-06-26 23:44:32', 'app_backend', 'test', 'daily', 'wait', '', '', '{\"createBy\":\"admin\",\"envCode\":\"daily\",\"appName\":\"test\"}', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +COMMIT; + +-- ---------------------------- +-- Table structure for pipeline_instance_node_detail +-- ---------------------------- +DROP TABLE IF EXISTS `pipeline_instance_node_detail`; +CREATE TABLE `pipeline_instance_node_detail` ( + `pipeline_instance_id` bigint NOT NULL COMMENT '流水线实例id', + `start_time` datetime NOT NULL COMMENT '开始时间', + `finish_time` datetime NOT NULL COMMENT '结束时间', + `status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '节点状态', + `node_index` int NOT NULL COMMENT '节点索引', + `node_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '节点编码', + `node_description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '节点描述', + `context` varchar(255) NOT NULL COMMENT '输入参数' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='流水线实例节点明细'; + +-- ---------------------------- +-- Records of pipeline_instance_node_detail +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for pipeline_template +-- ---------------------------- +DROP TABLE IF EXISTS `pipeline_template`; +CREATE TABLE `pipeline_template` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '修改人', + `update_time` datetime NOT NULL COMMENT '修改时间', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '数据有效性', + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线类型', + `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '语言', + `env` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '环境编码', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线编码', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线名称', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线描述', + `template` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流水线模板内容', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='流水线模板'; + +-- ---------------------------- +-- Records of pipeline_template +-- ---------------------------- +BEGIN; +INSERT INTO `pipeline_template` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `available`, `type`, `language`, `env`, `code`, `name`, `description`, `template`) VALUES (1, 'admin', '2025-06-19 18:50:18', 'admin', '2025-06-19 18:50:26', 1, 'app_backend', 'java', 'daily', 'dailyBackendJavaApp', '日常环境流水线', '日常环境流水线（JAVA）', '[{\n \"code\": \"node_init\",\n \"name\": \"初始化\",\n \"click\": \"false\",\n \"retry\": \"false\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_merge_branch\",\n \"name\": \"合并代码\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": []\n },\n {\n \"code\": \"node_build_java\",\n \"name\": \"构建\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"gitlab\",\n \"parameters\": {\n \"pipeline\": \"backend-pipeline\",\n \"jdkVersion\": \"jdk11\"\n }\n },\n {\n \"code\": \"node_deploy_java\",\n \"name\": \"部署\",\n \"click\": \"true\",\n \"retry\": \"true\",\n \"detailType\": \"\",\n \"parameters\": {},\n \"buttons\": [{\n \"type\": \"link\",\n \"title\": \"查看部署详情\",\n \"condition\": \"success|fail\",\n \"isBlank\": \"true\"\n }]\n }\n]'); +COMMIT; + -- ---------------------------- -- Table structure for qrtz_blob_triggers -- ---------------------------- @@ -433,13 +586,12 @@ CREATE TABLE `system_local_storage` ( `create_time` datetime DEFAULT NULL COMMENT '创建日期', `update_time` datetime DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='本地存储'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='本地存储'; -- ---------------------------- -- Records of system_local_storage -- ---------------------------- BEGIN; -INSERT INTO `system_local_storage` (`id`, `real_name`, `name`, `suffix`, `path`, `type`, `size`, `date_group`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (22, '15796374-20250625063744622.jpeg', '15796374', 'jpeg', '/Users/odboy/cutejava/file/20250625/15796374-20250625063744622.jpeg', 'image', '37.76 KB', '20250625', 'admin', 'admin', '2025-06-25 18:37:45', '2025-06-25 18:37:45'); COMMIT; -- ----------------------------