From 46f3642aed1e819b0aef72ede71d6466ac4d2075 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Wed, 30 Jul 2025 21:12:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(module):=20=E9=87=8D=E6=9E=84=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=80=E9=94=AE=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.MD                                     |   1 +
 .../{devops => pipeline}/pipelineInstance.js  |   0
 .../{devops => pipeline}/pipelineTemplate.js  |   0
 cutejava-front/src/temp                       |   0
 .../componentsDemo/CutePipelineNodeDemo.vue   |   4 +-
 .../annotation/AnonymousDeleteMapping.java    |  25 +-
 .../odboy/annotation/AnonymousGetMapping.java |  24 +-
 .../annotation/AnonymousPatchMapping.java     |  25 +-
 .../annotation/AnonymousPostMapping.java      |  25 +-
 .../odboy/annotation/AnonymousPutMapping.java |  25 +-
 .../cn/odboy/base/CsBaseCreateTimeTb.java     |  34 +
 .../main/java/cn/odboy/base/CsBaseTimeTb.java |  38 ++
 .../cn/odboy/base/CsBaseUpdateTimeTb.java     |  34 +
 .../cn/odboy/base/CsBaseUserTimeLogicTb.java  |  25 -
 .../java/cn/odboy/base/CsBaseUserTimeTb.java  |   1 -
 .../{CsResultVo.java => CsPageResultVo.java}  |  14 +-
 .../java/cn/odboy/constant/FileTypeEnum.java  |   6 +-
 .../framework/context/BootApplication.java    |   7 +-
 .../framework/context/CsRequestHolder.java    |   2 +-
 .../framework/context/CsScriptHelper.java     |   2 +-
 .../framework/context/CsSpringBeanHolder.java |   9 +-
 .../cn/odboy/framework/doc/SwaggerConfig.java |  36 +-
 .../framework/exception/handler/ApiError.java |   1 -
 .../handler/GlobalExceptionHandler.java       |   2 +-
 .../controller/HealthCheckController.java     |  14 +-
 .../config/MpCustomP6SpyLogger.java           |  10 +-
 .../config/RemoveDruidAdConfig.java           |  10 +-
 .../mybatisplus/core/CsMpCmdGenUtil.java      | 111 ++--
 .../framework/mybatisplus/core/CsMpQUtil.java |   4 +-
 .../core/interfaces/CsMpEasyService.java      |  10 +-
 .../core/interfaces/CsMpMapper.java           |  12 +-
 .../core/interfaces/CsMpServiceImpl.java      |  18 +-
 .../model/UserLoginCaptchaSettingModel.java   |   2 +-
 .../framework/redis/RedisConfiguration.java   |  25 +-
 .../cn/odboy/framework/redis/RedisHelper.java |   7 +-
 .../redis/RedissonConfiguration.java          |   8 +-
 .../server/config/AsyncTheadPoolConfig.java   |   3 +-
 .../DateStringArraysToListDateConverter.java  |  16 +-
 .../server/core/ConfigurerAdapter.java        |  26 +-
 .../framework/websocket/config/WsConfig.java  |   1 -
 .../framework/websocket/config/WsFactory.java |   3 +-
 .../websocket/context/CsWsClientManager.java  |   6 +-
 .../websocket/context/CsWsServer.java         |   7 +-
 .../java/cn/odboy/util/CsAnonTagUtil.java     |   2 +-
 .../java/cn/odboy/util/CsBigDecimalUtil.java  |   6 +-
 .../main/java/cn/odboy/util/CsCollUtil.java   |  17 +-
 .../java/cn/odboy/util/CsDesEncryptUtil.java  |   2 +-
 .../cn/odboy/util/CsDistributedIdUtil.java    |   9 +-
 .../main/java/cn/odboy/util/CsFileUtil.java   |  23 +-
 .../src/main/java/cn/odboy/util/CsIPUtil.java |   1 -
 .../main/java/cn/odboy/util/CsListUtil.java   |  11 +-
 .../main/java/cn/odboy/util/CsPageUtil.java   |  22 +-
 .../java/cn/odboy/util/CsRsaEncryptUtil.java  |   5 +-
 .../main/java/cn/odboy/util/CsStringUtil.java |  15 +-
 .../main/java/cn/odboy/util/CsValidUtil.java  |   6 +-
 cutejava/cutejava-module-pipeline/pom.xml     |   2 +-
 .../dataobject/PipelineInstanceNodeTb.java    |   2 +-
 .../dal/model/StartPipelineResultVo.java      |   1 -
 .../devops/dal/redis/PipelineInstanceDAO.java |   2 +-
 .../mongoplus/MongoPlusMetaObjectHandler.java |  34 +-
 .../AbstractPipelineNodeJobService.java       |   5 +-
 .../pipeline/constant}/PipelineConst.java     |  24 +-
 .../constant}/PipelineStatusEnum.java         |   6 +-
 .../pipeline/constant}/PipelineTypeEnum.java  |   8 +-
 .../pipeline/core/PipelineJobBean.java        |  18 +-
 .../pipeline/core/PipelineJobManage.java      |   5 +-
 .../pipeline/core/PipelineNodeJobBean.java    |  15 +-
 .../pipeline/core/PipelineNodeJobManage.java  |  15 +-
 .../log/PipelineNodeStepLogAspect.java        |  15 +-
 .../model/PipelineNodeJobExecuteResult.java   |   2 +-
 .../model/PipelineNodeTemplateVo.java         |   4 +-
 .../PipelineInstanceNodeDetailService.java    |   2 +-
 .../core/PipelineInstanceNodeService.java     |   2 +-
 ...PipelineInstanceNodeDetailServiceImpl.java |  28 +-
 .../impl/PipelineInstanceNodeServiceImpl.java |  26 +-
 .../impl/PipelineInstanceServiceImpl.java     |   4 +-
 .../PipelineNodeApkSignAndroidService.java    |   6 +-
 .../PipelineNodeApproveCPlusService.java      |   6 +-
 .../PipelineNodeApproveDeployService.java     |   6 +-
 ...PipelineNodeApproveTestAndroidService.java |   6 +-
 .../PipelineNodeBuildAndroidService.java      |   6 +-
 .../PipelineNodeBuildCPlusService.java        |   6 +-
 .../pipeline/PipelineNodeBuildIOSService.java |   6 +-
 .../PipelineNodeBuildJavaService.java         |   6 +-
 .../PipelineNodeBuildNodeService.java         |   6 +-
 .../pipeline/PipelineNodeBuildNpmService.java |   6 +-
 .../PipelineNodeBuildPythonService.java       |   6 +-
 .../pipeline/PipelineNodeBuildService.java    |   6 +-
 ...ipelineNodeCheckFlutterVersionService.java |   6 +-
 .../PipelineNodeDeployApiService.java         |   6 +-
 .../PipelineNodeDeployJavaService.java        |   6 +-
 .../PipelineNodeDeployNodeService.java        |   6 +-
 .../PipelineNodeDeployPythonService.java      |   6 +-
 .../PipelineNodeHttpGetPluginService.java     |   6 +-
 .../PipelineNodeHttpPostPluginService.java    |   6 +-
 .../PipelineNodeImageScanService.java         |   6 +-
 .../pipeline/PipelineNodeInitService.java     |   6 +-
 .../PipelineNodeMergeBranchService.java       |   6 +-
 .../PipelineNodeMergeConfirmService.java      |   6 +-
 .../PipelineNodeMergeMasterService.java       |   6 +-
 ...ipelineNodeReinforceAndroidApkService.java |   6 +-
 .../PipelineNodeUploadAndroidApkService.java  |   6 +-
 .../node/PipelineNodeBuildJavaBiz.java        |  12 +-
 .../pipeline/node/PipelineNodeDemoBiz.java    |   6 +-
 .../node/PipelineNodeDeployJavaBiz.java       |   9 +-
 .../pipeline/node/PipelineNodeInitBiz.java    |  12 +-
 .../node/PipelineNodeMergeBranchBiz.java      |  10 +-
 .../controller/SystemAuthController.java      |   2 +-
 .../controller/SystemDeptController.java      |   7 +-
 .../controller/SystemDictController.java      |   4 +-
 .../SystemDictDetailController.java           |   6 +-
 .../controller/SystemJobController.java       |   7 +-
 .../SystemLocalStorageController.java         |   4 +-
 .../controller/SystemMenuController.java      |   7 +-
 .../controller/SystemOnlineController.java    |   5 +-
 .../SystemOssStorageController.java           | 332 +++++-----
 .../controller/SystemQuartzJobController.java |   7 +-
 .../controller/SystemRoleController.java      |   8 +-
 .../controller/SystemUserController.java      |  19 +-
 .../system/dal/dataobject/SystemDeptTb.java   |   6 +-
 .../system/dal/dataobject/SystemDictTb.java   |   1 -
 .../system/dal/dataobject/SystemJobTb.java    |   3 +-
 .../system/dal/dataobject/SystemMenuTb.java   |   2 +-
 .../dal/dataobject/SystemQuartzJobTb.java     |   1 -
 .../system/dal/dataobject/SystemRoleTb.java   |   2 +-
 .../system/dal/dataobject/SystemUserTb.java   |   5 +-
 .../system/dal/model/SystemQueryJobArgs.java  |   1 -
 .../system/dal/model/SystemQueryMenuArgs.java |   1 -
 .../dal/model/SystemQueryQuartzJobArgs.java   |   1 -
 .../system/dal/model/SystemQueryRoleArgs.java |   1 -
 .../dal/model/SystemQueryStorageArgs.java     |   1 -
 .../dal/mysql/SystemDictDetailMapper.java     |   1 -
 .../system/dal/mysql/SystemDictMapper.java    |   1 -
 .../dal/mysql/SystemEmailConfigMapper.java    |   1 -
 .../system/dal/mysql/SystemMenuMapper.java    |   1 -
 .../dal/mysql/SystemQuartzLogMapper.java      |   1 -
 .../dal/mysql/SystemRoleMenuMapper.java       |   1 -
 .../system/dal/redis/SystemUserInfoDAO.java   |   3 +-
 .../dal/redis/SystemUserOnlineInfoDAO.java    |   4 +-
 .../config/SpringSecurityConfig.java          |  91 +--
 .../permission/core/CsSecurityHelper.java     |   5 +-
 .../permission/core/handler/TokenFilter.java  |   2 +-
 .../core/handler/TokenProvider.java           |  28 +-
 .../framework/quartz/ExecutionJobBean.java    |   2 +-
 .../system/framework/quartz/QuartzManage.java |  22 +-
 .../storage/local/MultipartConfig.java        |   1 -
 .../storage/minio/MinioRepository.java        |  27 +-
 .../system/service/SystemDeptService.java     |   7 +-
 .../service/SystemDictDetailService.java      |   4 +-
 .../system/service/SystemDictService.java     |   4 +-
 .../system/service/SystemEmailService.java    |  14 +-
 .../system/service/SystemJobService.java      |   5 +-
 .../service/SystemLocalStorageService.java    |   6 +-
 .../system/service/SystemMenuService.java     |   7 +-
 .../system/service/SystemMonitorService.java  |   6 +-
 .../service/SystemOssStorageService.java      |   4 +-
 .../service/SystemQuartzJobService.java       |   6 +-
 .../system/service/SystemRoleService.java     |  16 +-
 .../system/service/SystemUserService.java     |   4 +-
 .../impl/SystemOssStorageServiceImpl.java     |   4 +-
 .../java/cn/odboy/system/util/SqlUtil.java    |   3 +-
 .../src/main/java/cn/odboy/GenCode.java       |  13 +-
 .../src/main/resources/application-dev.yml    |   2 +-
 .../java/cn/odboy/util/CsFileUtilTest.java    |   2 +-
 ...oller命名规范.md => Controller命名规范.md} |   0
 cutejava/docs/IDEA换行调整.jpg                | Bin 0 -> 69216 bytes
 cutejava/docs/Service方法中使用this.txt       | 131 ++++
 .../codestyle/alibaba/eclipse-codestyle.xml   | 603 ++++++++++++++++++
 .../docs/codestyle/default/idea-codestyle.xml |   7 +
 .../docs/codestyle/project/P3C_CodeStyle.xml  | 380 +++++++++++
 cutejava/docs/codestyle/readme.md             |   4 +
 cutejava/docs/{warning.md => 注意事项.md}     |   0
 172 files changed, 1991 insertions(+), 1042 deletions(-)
 rename cutejava-front/src/api/{devops => pipeline}/pipelineInstance.js (100%)
 rename cutejava-front/src/api/{devops => pipeline}/pipelineTemplate.js (100%)
 delete mode 100644 cutejava-front/src/temp
 create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseCreateTimeTb.java
 create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseTimeTb.java
 create mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUpdateTimeTb.java
 rename cutejava/cutejava-framework/src/main/java/cn/odboy/base/{CsResultVo.java => CsPageResultVo.java} (68%)
 rename cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/{constant/pipeline => framework/pipeline/constant}/PipelineConst.java (66%)
 rename cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/{constant/pipeline => framework/pipeline/constant}/PipelineStatusEnum.java (83%)
 rename cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/{constant/pipeline => framework/pipeline/constant}/PipelineTypeEnum.java (83%)
 rename cutejava/docs/{controller命名规范.md => Controller命名规范.md} (100%)
 create mode 100644 cutejava/docs/IDEA换行调整.jpg
 create mode 100644 cutejava/docs/Service方法中使用this.txt
 create mode 100644 cutejava/docs/codestyle/alibaba/eclipse-codestyle.xml
 create mode 100644 cutejava/docs/codestyle/default/idea-codestyle.xml
 create mode 100644 cutejava/docs/codestyle/project/P3C_CodeStyle.xml
 create mode 100644 cutejava/docs/codestyle/readme.md
 rename cutejava/docs/{warning.md => 注意事项.md} (100%)

diff --git a/README.MD b/README.MD
index 25a91fad..5dcacd33 100644
--- a/README.MD
+++ b/README.MD
@@ -36,6 +36,7 @@ https://github.com/odboy-tianjun/cutejava
 - 对一些常用地前端组件封装：表格数据请求、数据字典等
 - 前后端统一异常拦截处理，统一输出异常，避免繁琐的判断
 - 支持在线用户管理与服务器性能监控，支持限制单用户登录
+- 支持一键复制菜单项，避免菜单繁琐配置
 
 #### 系统功能
 
diff --git a/cutejava-front/src/api/devops/pipelineInstance.js b/cutejava-front/src/api/pipeline/pipelineInstance.js
similarity index 100%
rename from cutejava-front/src/api/devops/pipelineInstance.js
rename to cutejava-front/src/api/pipeline/pipelineInstance.js
diff --git a/cutejava-front/src/api/devops/pipelineTemplate.js b/cutejava-front/src/api/pipeline/pipelineTemplate.js
similarity index 100%
rename from cutejava-front/src/api/devops/pipelineTemplate.js
rename to cutejava-front/src/api/pipeline/pipelineTemplate.js
diff --git a/cutejava-front/src/temp b/cutejava-front/src/temp
deleted file mode 100644
index e69de29b..00000000
diff --git a/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
index 12d9469a..4f5e95cf 100644
--- a/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
@@ -68,14 +68,14 @@
 <script>
 
 import CutePipelineNode from '@/views/components/dev/CutePipelineNode'
-import { getPipelineTemplate } from '@/api/devops/pipelineTemplate'
+import { getPipelineTemplate } from '@/api/pipeline/pipelineTemplate'
 import {
   queryLastPipelineDetailWs,
   restartPipeline,
   retryPipeline,
   startPipeline,
   stopPipeline
-} from '@/api/devops/pipelineInstance'
+} from '@/api/pipeline/pipelineInstance'
 import { CountArraysObjectByPropKey } from '@/utils/CsUtil'
 import CsMessage from '@/utils/elementui/CsMessage'
 import CsWsClient from '@/utils/CsWsClient'
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java
index afb37529..041daa15 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousDeleteMapping.java
@@ -22,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import java.lang.annotation.*;
 
 /**
- * Annotation for mapping HTTP {@code DELETE} requests onto specific handler
- * methods.
- * 支持匿名访问  DeleteMapping
+ * Annotation for mapping HTTP {@code DELETE} requests onto specific handler methods. 支持匿名访问  DeleteMapping
  *
  * @see AnonymousGetMapping
  * @see AnonymousPostMapping
@@ -42,43 +40,36 @@ public @interface AnonymousDeleteMapping {
     /**
      * Alias for {@link RequestMapping#name}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String name() default "";
+    @AliasFor(annotation = RequestMapping.class) String name() default "";
 
     /**
      * Alias for {@link RequestMapping#value}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] value() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] value() default {};
 
     /**
      * Alias for {@link RequestMapping#path}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] path() default {};
 
     /**
      * Alias for {@link RequestMapping#params}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] params() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] params() default {};
 
     /**
      * Alias for {@link RequestMapping#headers}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] headers() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] headers() default {};
 
     /**
      * Alias for {@link RequestMapping#consumes}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] consumes() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] consumes() default {};
 
     /**
      * Alias for {@link RequestMapping#produces}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] produces() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] produces() default {};
 
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java
index 144f4678..1d1b51b0 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousGetMapping.java
@@ -22,8 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import java.lang.annotation.*;
 
 /**
- * Annotation for mapping HTTP {@code GET} requests onto specific handler
- * methods.
+ * Annotation for mapping HTTP {@code GET} requests onto specific handler methods.
  * <p>
  * 支持匿名访问   GetMapping
  *
@@ -39,45 +38,38 @@ public @interface AnonymousGetMapping {
     /**
      * Alias for {@link RequestMapping#name}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String name() default "";
+    @AliasFor(annotation = RequestMapping.class) String name() default "";
 
     /**
      * Alias for {@link RequestMapping#value}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] value() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] value() default {};
 
     /**
      * Alias for {@link RequestMapping#path}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] path() default {};
 
     /**
      * Alias for {@link RequestMapping#params}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] params() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] params() default {};
 
     /**
      * Alias for {@link RequestMapping#headers}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] headers() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] headers() default {};
 
     /**
      * Alias for {@link RequestMapping#consumes}.
      *
      * @since 4.3.5
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] consumes() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] consumes() default {};
 
     /**
      * Alias for {@link RequestMapping#produces}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] produces() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] produces() default {};
 
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java
index a46822dc..23a58ea0 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPatchMapping.java
@@ -22,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import java.lang.annotation.*;
 
 /**
- * Annotation for mapping HTTP {@code PATCH} requests onto specific handler
- * methods.
- * 支持匿名访问    PatchMapping
+ * Annotation for mapping HTTP {@code PATCH} requests onto specific handler methods. 支持匿名访问    PatchMapping
  *
  * @see AnonymousGetMapping
  * @see AnonymousPostMapping
@@ -42,43 +40,36 @@ public @interface AnonymousPatchMapping {
     /**
      * Alias for {@link RequestMapping#name}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String name() default "";
+    @AliasFor(annotation = RequestMapping.class) String name() default "";
 
     /**
      * Alias for {@link RequestMapping#value}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] value() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] value() default {};
 
     /**
      * Alias for {@link RequestMapping#path}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] path() default {};
 
     /**
      * Alias for {@link RequestMapping#params}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] params() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] params() default {};
 
     /**
      * Alias for {@link RequestMapping#headers}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] headers() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] headers() default {};
 
     /**
      * Alias for {@link RequestMapping#consumes}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] consumes() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] consumes() default {};
 
     /**
      * Alias for {@link RequestMapping#produces}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] produces() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] produces() default {};
 
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java
index 32546625..c3090f53 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPostMapping.java
@@ -22,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import java.lang.annotation.*;
 
 /**
- * Annotation for mapping HTTP {@code POST} requests onto specific handler
- * methods.
- * 支持匿名访问 PostMapping
+ * Annotation for mapping HTTP {@code POST} requests onto specific handler methods. 支持匿名访问 PostMapping
  *
  * @see AnonymousGetMapping
  * @see AnonymousPostMapping
@@ -42,43 +40,36 @@ public @interface AnonymousPostMapping {
     /**
      * Alias for {@link RequestMapping#name}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String name() default "";
+    @AliasFor(annotation = RequestMapping.class) String name() default "";
 
     /**
      * Alias for {@link RequestMapping#value}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] value() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] value() default {};
 
     /**
      * Alias for {@link RequestMapping#path}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] path() default {};
 
     /**
      * Alias for {@link RequestMapping#params}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] params() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] params() default {};
 
     /**
      * Alias for {@link RequestMapping#headers}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] headers() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] headers() default {};
 
     /**
      * Alias for {@link RequestMapping#consumes}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] consumes() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] consumes() default {};
 
     /**
      * Alias for {@link RequestMapping#produces}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] produces() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] produces() default {};
 
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java
index ba21a2f9..a4165183 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/annotation/AnonymousPutMapping.java
@@ -22,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import java.lang.annotation.*;
 
 /**
- * Annotation for mapping HTTP {@code PUT} requests onto specific handler
- * methods.
- * 支持匿名访问  PutMapping
+ * Annotation for mapping HTTP {@code PUT} requests onto specific handler methods. 支持匿名访问  PutMapping
  *
  * @see AnonymousGetMapping
  * @see AnonymousPostMapping
@@ -42,43 +40,36 @@ public @interface AnonymousPutMapping {
     /**
      * Alias for {@link RequestMapping#name}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String name() default "";
+    @AliasFor(annotation = RequestMapping.class) String name() default "";
 
     /**
      * Alias for {@link RequestMapping#value}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] value() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] value() default {};
 
     /**
      * Alias for {@link RequestMapping#path}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] path() default {};
 
     /**
      * Alias for {@link RequestMapping#params}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] params() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] params() default {};
 
     /**
      * Alias for {@link RequestMapping#headers}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] headers() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] headers() default {};
 
     /**
      * Alias for {@link RequestMapping#consumes}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] consumes() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] consumes() default {};
 
     /**
      * Alias for {@link RequestMapping#produces}.
      */
-    @AliasFor(annotation = RequestMapping.class)
-    String[] produces() default {};
+    @AliasFor(annotation = RequestMapping.class) String[] produces() default {};
 
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseCreateTimeTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseCreateTimeTb.java
new file mode 100644
index 00000000..86c29d44
--- /dev/null
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseCreateTimeTb.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2021-2025 Odboy
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package cn.odboy.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+public class CsBaseCreateTimeTb extends CsObject {
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
+    private Date createTime;
+}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseTimeTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseTimeTb.java
new file mode 100644
index 00000000..4cc8f340
--- /dev/null
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseTimeTb.java
@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2021-2025 Odboy
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package cn.odboy.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+public class CsBaseTimeTb extends CsObject {
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
+    private Date updateTime;
+}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUpdateTimeTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUpdateTimeTb.java
new file mode 100644
index 00000000..f3fab884
--- /dev/null
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUpdateTimeTb.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2021-2025 Odboy
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package cn.odboy.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+public class CsBaseUpdateTimeTb extends CsObject {
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
+    private Date updateTime;
+}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java
index 0e8c4911..ef01cf84 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeLogicTb.java
@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.LastModifiedBy;
 
-import java.lang.reflect.Field;
 import java.util.Date;
 
 /**
@@ -55,27 +53,4 @@ public class CsBaseUserTimeLogicTb extends CsObject {
     @TableLogic
     @TableField("available")
     private Integer available;
-
-    /* 分组校验 */
-    public @interface Create {
-    }
-
-    /* 分组校验 */
-    public @interface Update {
-    }
-
-    @Override
-    public String toString() {
-        ToStringBuilder builder = new ToStringBuilder(this);
-        Field[] fields = this.getClass().getDeclaredFields();
-        try {
-            for (Field f : fields) {
-                f.setAccessible(true);
-                builder.append(f.getName(), f.get(this)).append("\n");
-            }
-        } catch (Exception e) {
-            builder.append("toString builder encounter an error");
-        }
-        return builder.toString();
-    }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java
index af2e4844..fbb7837a 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsBaseUserTimeTb.java
@@ -28,7 +28,6 @@ import org.springframework.data.annotation.LastModifiedBy;
 import java.lang.reflect.Field;
 import java.util.Date;
 
-
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = false)
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java
similarity index 68%
rename from cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java
rename to cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java
index 9e2005ca..3162c3cc 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsResultVo.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/CsPageResultVo.java
@@ -15,6 +15,7 @@
  */
 package cn.odboy.base;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,14 +31,21 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class CsResultVo<T> extends CsObject {
+public class CsPageResultVo<T> extends CsObject {
     private T content;
     private long totalElements;
 
-    public static <T> CsResultVo<List<T>> emptyListData() {
-        CsResultVo<List<T>> result = new CsResultVo<>();
+    public static <T> CsPageResultVo<List<T>> emptyListData() {
+        CsPageResultVo<List<T>> result = new CsPageResultVo<>();
         result.setTotalElements(0);
         result.setContent(new ArrayList<>());
         return result;
     }
+
+    public static <T> CsPageResultVo<List<T>> listData(IPage<T> page) {
+        CsPageResultVo<List<T>> result = new CsPageResultVo<>();
+        result.setTotalElements(page.getTotal());
+        result.setContent(page.getRecords());
+        return result;
+    }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java
index fea2b725..1d5f8ddb 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/constant/FileTypeEnum.java
@@ -22,11 +22,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FileTypeEnum {
     /* 文件类型 */
-    IMAGE("image", "图片"),
-    DOC("doc", "文档"),
-    VOICE("voice", "音频"),
-    VIDEO("video", "视频"),
-    OTHER("other", "其他");
+    IMAGE("image", "图片"), DOC("doc", "文档"), VOICE("voice", "音频"), VIDEO("video", "视频"), OTHER("other", "其他");
 
     private final String code;
     private final String description;
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java
index b9628177..6ad014b6 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java
@@ -43,11 +43,6 @@ public class BootApplication {
         String port = env.getProperty("server.port");
         String path = StrUtil.isEmpty(env.getProperty("config.servlet.context-path")) ? "" : env.getProperty("config.servlet.context-path");
         log.info(
-                "\n----------------------------------------------------------\n\t"
-                        + "Application is running! Access URLs:\n\t"
-                        + "Local: \t\thttp://localhost:" + port + path + "/\n\t"
-                        + "External: \thttp://" + ip + ":" + port + path + "/\n\t"
-                        + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n"
-                        + "----------------------------------------------------------");
+            "\n----------------------------------------------------------\n\t" + "Application is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/\n\t" + "External: \thttp://" + ip + ":" + port + path + "/\n\t" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "----------------------------------------------------------");
     }
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsRequestHolder.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsRequestHolder.java
index e54c18b8..ef0d6de6 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsRequestHolder.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsRequestHolder.java
@@ -12,6 +12,6 @@ import java.util.Objects;
 public class CsRequestHolder {
 
     public static HttpServletRequest getHttpServletRequest() {
-        return ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        return ((ServletRequestAttributes)Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
     }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java
index 3e8860a0..d35b5b6b 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsScriptHelper.java
@@ -86,7 +86,7 @@ public class CsScriptHelper {
             // 执行脚本
             engine.eval(script);
             // 由ScriptEngines实现的接口, 其方法允许调用以前已执行的脚本中的过程。
-            Invocable inv = (Invocable) engine;
+            Invocable inv = (Invocable)engine;
             // 调用全局函数, 并传入参数
             return inv.invokeFunction(functionName, args);
         } catch (ScriptException e) {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsSpringBeanHolder.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsSpringBeanHolder.java
index b8b2b200..e97de286 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsSpringBeanHolder.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/CsSpringBeanHolder.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-
 @Slf4j
 @SuppressWarnings({"unchecked", "all"})
 public class CsSpringBeanHolder implements ApplicationContextAware, DisposableBean {
@@ -37,8 +36,7 @@ public class CsSpringBeanHolder implements ApplicationContextAware, DisposableBe
     private static boolean addCallback = true;
 
     /**
-     * 针对 某些初始化方法, 在SpringContextHolder 未初始化时 提交回调方法。
-     * 在SpringContextHolder 初始化后, 进行回调使用
+     * 针对 某些初始化方法, 在SpringContextHolder 未初始化时 提交回调方法。 在SpringContextHolder 初始化后, 进行回调使用
      *
      * @param callBack 回调函数
      */
@@ -56,7 +54,7 @@ public class CsSpringBeanHolder implements ApplicationContextAware, DisposableBe
      */
     public static <T> T getBean(String name) {
         assertContextInjected();
-        return (T) applicationContext.getBean(name);
+        return (T)applicationContext.getBean(name);
     }
 
     /**
@@ -110,7 +108,8 @@ public class CsSpringBeanHolder implements ApplicationContextAware, DisposableBe
      */
     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.");
         }
     }
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
index 172860e0..175fc515 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
@@ -58,25 +58,14 @@ public class SwaggerConfig {
 
     @Bean
     public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .enable(properties.getSwagger().getEnabled())
-                .pathMapping("/")
-                .apiInfo(apiInfo())
-                .select()
-                .paths(PathSelectors.regex("^(?!/error).*"))
-                .paths(PathSelectors.any())
-                .build()
-                //添加登陆认证
-                .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts());
+        return new Docket(DocumentationType.SWAGGER_2).enable(properties.getSwagger().getEnabled()).pathMapping("/").apiInfo(apiInfo()).select()
+            .paths(PathSelectors.regex("^(?!/error).*")).paths(PathSelectors.any()).build()
+            //添加登陆认证
+            .securitySchemes(securitySchemes()).securityContexts(securityContexts());
     }
 
     private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .description("一个简单且易上手的 Spring boot 后台管理框架")
-                .title("CuteJava 接口文档")
-                .version("1.4.1")
-                .build();
+        return new ApiInfoBuilder().description("一个简单且易上手的 Spring boot 后台管理框架").title("CuteJava 接口文档").version("1.4.1").build();
     }
 
     private List<SecurityScheme> securitySchemes() {
@@ -98,12 +87,9 @@ public class SwaggerConfig {
         Set<String> urls = CsAnonTagUtil.getAllAnonymousUrl(applicationContext);
         urls = urls.stream().filter(url -> !"/".equals(url)).collect(Collectors.toSet());
         String regExp = "^(?!" + apiPath + String.join("|" + apiPath, urls) + ").*$";
-        return SecurityContext.builder()
-                .securityReferences(defaultAuth())
-                .operationSelector(o -> o.requestMappingPattern()
-                        // 排除不需要认证的接口
-                        .matches(regExp))
-                .build();
+        return SecurityContext.builder().securityReferences(defaultAuth()).operationSelector(o -> o.requestMappingPattern()
+            // 排除不需要认证的接口
+            .matches(regExp)).build();
     }
 
     private List<SecurityReference> defaultAuth() {
@@ -134,9 +120,7 @@ public class SwaggerConfig {
             }
 
             private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
-                List<T> filteredMappings = mappings.stream()
-                        .filter(mapping -> mapping.getPatternParser() == null)
-                        .collect(Collectors.toList());
+                List<T> filteredMappings = mappings.stream().filter(mapping -> mapping.getPatternParser() == null).collect(Collectors.toList());
                 mappings.clear();
                 mappings.addAll(filteredMappings);
             }
@@ -146,7 +130,7 @@ public class SwaggerConfig {
                 if (field != null) {
                     field.setAccessible(true);
                     try {
-                        return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+                        return (List<RequestMappingInfoHandlerMapping>)field.get(bean);
                     } catch (IllegalAccessException e) {
                         throw new IllegalStateException("Failed to access handlerMappings field", e);
                     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java
index 3f42cd53..0c6479af 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java
@@ -17,7 +17,6 @@ package cn.odboy.framework.exception.handler;
 
 import lombok.Data;
 
-
 @Data
 public final class ApiError {
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java
index ea84a50e..cc4caadb 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java
@@ -72,7 +72,7 @@ public class GlobalExceptionHandler {
         ObjectError objectError = e.getBindingResult().getAllErrors().get(0);
         String message = objectError.getDefaultMessage();
         if (objectError instanceof FieldError) {
-            message = ((FieldError) objectError).getField() + ": " + message;
+            message = ((FieldError)objectError).getField() + ": " + message;
         }
         return buildResponseEntity(ApiError.error(message));
     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java
index a5c077ca..66c40ab0 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/controller/HealthCheckController.java
@@ -51,11 +51,11 @@ public class HealthCheckController {
         return healthCheckPointService.doLiveness();
     }
 
-//    /**
-//     * 访问首页提示
-//     */
-//    @AnonymousGetMapping("/")
-//    public String index() {
-//        return "success";
-//    }
+    //    /**
+    //     * 访问首页提示
+    //     */
+    //    @AnonymousGetMapping("/")
+    //    public String index() {
+    //        return "success";
+    //    }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java
index e3058285..87914710 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java
@@ -60,13 +60,7 @@ public class MpCustomP6SpyLogger implements MessageFormattingStrategy {
             sql = sql.replaceAll("\\s+", " ").trim();
         }
         // 格式化并加上颜色
-        return String.format(
-                "CuteJava - %s%s%s %s[%s] %sREVIEW_SQL [Interval: %dms]%s -> %s;",
-                RED, now, RESET,
-                GREEN, Thread.currentThread().getName(),
-                BLUE,
-                elapsed, RESET,
-                sql
-        );
+        return String.format("CuteJava - %s%s%s %s[%s] %sREVIEW_SQL [Interval: %dms]%s -> %s;", RED, now, RESET, GREEN, Thread.currentThread().getName(), BLUE,
+            elapsed, RESET, sql);
     }
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
index 6008339e..069e2e18 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
@@ -34,13 +34,11 @@ import java.io.IOException;
 @SuppressWarnings({"unchecked", "all"})
 @ConditionalOnWebApplication
 @AutoConfigureAfter(DruidDataSourceAutoConfigure.class)
-@ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled",
-        havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true", matchIfMissing = true)
 public class RemoveDruidAdConfig {
 
     /**
-     * 方法名: removeDruidAdFilterRegistrationBean
-     * 方法描述 除去页面底部的广告
+     * 方法名: removeDruidAdFilterRegistrationBean 方法描述 除去页面底部的广告
      *
      * @param properties com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties
      * @return org.springframework.boot.web.servlet.FilterRegistrationBean
@@ -64,8 +62,8 @@ public class RemoveDruidAdConfig {
 
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-                HttpServletRequest httpRequest = (HttpServletRequest) request;
-                HttpServletResponse httpResponse = (HttpServletResponse) response;
+                HttpServletRequest httpRequest = (HttpServletRequest)request;
+                HttpServletResponse httpResponse = (HttpServletResponse)response;
                 if (httpRequest.getRequestURI().endsWith("js/common.js")) {
                     // 获取common.js
                     String text = Utils.readFromResource(filePath);
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java
index 164152c6..cbc954be 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java
@@ -18,7 +18,6 @@ package cn.odboy.framework.mybatisplus.core;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.CsBaseUserTimeTb;
 import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.util.CsFileUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.*;
@@ -74,9 +73,8 @@ public class CsMpCmdGenUtil {
     public void gen(String moduleName, String tablePrefix, List<String> tableNames) {
         this.parentModuleName = moduleName;
         // 1.数据库配置
-        DataSourceConfig.Builder dataSourceConfigBuilder = new DataSourceConfig
-                .Builder(this.databaseUrl, this.databaseUsername, this.databasePassword)
-                .driverClassName(this.driverClassName);
+        DataSourceConfig.Builder dataSourceConfigBuilder =
+            new DataSourceConfig.Builder(this.databaseUrl, this.databaseUsername, this.databasePassword).driverClassName(this.driverClassName);
         dataSourceConfigBuilder.dbQuery(DB_QUERY);
         dataSourceConfigBuilder.keyWordsHandler(new MySqlKeyWordsHandler());
         // 1.1.快速生成器
@@ -103,8 +101,7 @@ public class CsMpCmdGenUtil {
         // 5.策略配置
         // 设置需要生成的表名
         // 设置过滤表前缀
-        fastAutoGenerator.strategyConfig(getStrategyConfigConsumer(tableNames)
-        );
+        fastAutoGenerator.strategyConfig(getStrategyConfigConsumer(tableNames));
         if (tablePrefix != null) {
             // 表前缀, 可多个
             fastAutoGenerator.strategyConfig(strategyConfigBuilder -> strategyConfigBuilder.addTablePrefix(tablePrefix));
@@ -119,10 +116,8 @@ public class CsMpCmdGenUtil {
         // 开启生成@RestController控制器
         fastAutoGenerator.strategyConfig(strategyConfigBuilder -> strategyConfigBuilder.controllerBuilder().enableRestStyle());
         // 如果不需要生成Controller, fastAutoGenerator.templateConfig(templateConfig -> templateConfig.controller(""))。5.3.Service策略配置：格式化service接口和实现类的文件名称, 去掉默认的ServiceName前面的I
-        fastAutoGenerator.strategyConfig(strategyConfigBuilder -> strategyConfigBuilder
-                .serviceBuilder()
-                .formatServiceFileName("%sService")
-                .formatServiceImplFileName("%sServiceImpl"));
+        fastAutoGenerator.strategyConfig(
+            strategyConfigBuilder -> strategyConfigBuilder.serviceBuilder().formatServiceFileName("%sService").formatServiceImplFileName("%sServiceImpl"));
         // 5.4.Mapper策略配置
         // 格式化 mapper文件名,格式化xml实现类文件名称
         fastAutoGenerator.strategyConfig(getStrategyConfigConsumer());
@@ -131,49 +126,36 @@ public class CsMpCmdGenUtil {
     }
 
     private static Consumer<StrategyConfig.Builder> getEntityConfigConsumer() {
-        return strategyConfigBuilder -> strategyConfigBuilder
-                .entityBuilder()
-                .enableLombok()
-                // 如果不需要生成注解, 去掉.enableTableFieldAnnotation()
-                .enableTableFieldAnnotation()
-                .enableFileOverride()
-                .naming(NamingStrategy.underline_to_camel)
-                .columnNaming(NamingStrategy.underline_to_camel)
-                .idType(IdType.AUTO);
+        return strategyConfigBuilder -> strategyConfigBuilder.entityBuilder().enableLombok()
+            // 如果不需要生成注解, 去掉.enableTableFieldAnnotation()
+            .enableTableFieldAnnotation().enableFileOverride().naming(NamingStrategy.underline_to_camel).columnNaming(NamingStrategy.underline_to_camel)
+            .idType(IdType.AUTO);
     }
 
     private static Consumer<StrategyConfig.Builder> getStrategyConfigConsumer(List<String> tableNames) {
-        return strategyConfigBuilder -> strategyConfigBuilder
-                .enableCapitalMode()
-                .enableSkipView()
-                .disableSqlFilter()
-                .addInclude(tableNames)
-                // 实体类生成策略
-                .entityBuilder()
-                .superClass(CsBaseUserTimeTb.class)
-                .addIgnoreColumns("create_time", "update_time", "create_by", "update_by")
-                // 开启生成实体时生成字段注解。
-                // 会在实体类的属性前，添加[@TableField("nickname")]
-                .enableTableFieldAnnotation()
-                .disableSerialVersionUID()
-                // 阶段2：Mapper策略配置
-                .mapperBuilder()
-                // 开启 @Mapper 注解。
-                // 会在mapper接口上添加注解[@Mapper]
-//                .enableMapperAnnotation()
-                // 启用 BaseResultMap 生成。
-                // 会在mapper.xml文件生成[通用查询映射结果]配置。
-//                .enableBaseResultMap()
-                // 启用 BaseColumnList。
-                // 会在mapper.xml文件生成[通用查询结果列 ]配置
-//                .enableBaseColumnList()
-                // 阶段4：Controller策略配置
-                .controllerBuilder()
-                // 会在控制类中加[@RestController]注解。
-                .enableRestStyle()
-                // 开启驼峰转连字符
-                .enableHyphenStyle()
-                .build();
+        return strategyConfigBuilder -> strategyConfigBuilder.enableCapitalMode().enableSkipView().disableSqlFilter().addInclude(tableNames)
+            // 实体类生成策略
+            .entityBuilder().superClass(CsBaseUserTimeTb.class).addIgnoreColumns("create_time", "update_time", "create_by", "update_by")
+            // 开启生成实体时生成字段注解。
+            // 会在实体类的属性前，添加[@TableField("nickname")]
+            .enableTableFieldAnnotation().disableSerialVersionUID()
+            // 阶段2：Mapper策略配置
+            .mapperBuilder()
+            // 开启 @Mapper 注解。
+            // 会在mapper接口上添加注解[@Mapper]
+            //                .enableMapperAnnotation()
+            // 启用 BaseResultMap 生成。
+            // 会在mapper.xml文件生成[通用查询映射结果]配置。
+            //                .enableBaseResultMap()
+            // 启用 BaseColumnList。
+            // 会在mapper.xml文件生成[通用查询结果列 ]配置
+            //                .enableBaseColumnList()
+            // 阶段4：Controller策略配置
+            .controllerBuilder()
+            // 会在控制类中加[@RestController]注解。
+            .enableRestStyle()
+            // 开启驼峰转连字符
+            .enableHyphenStyle().build();
     }
 
     private Consumer<PackageConfig.Builder> getPackageConfigConsumer() {
@@ -181,33 +163,20 @@ public class CsMpCmdGenUtil {
         if (StrUtil.isBlank(this.parentModuleName)) {
             throw new BadRequestException("模块名称必填");
         }
-        return packageConfigBuilder -> packageConfigBuilder
-                .parent(this.parentPackageName)
-                .moduleName(this.parentModuleName)
-                .entity("dal.dataobject")
-                .mapper("dal.mysql")
-                .service("service")
-                .serviceImpl("service.impl")
-                .controller("rest")
-                .pathInfo(Collections.singletonMap(OutputFile.xml, mapperPath));
+        return packageConfigBuilder -> packageConfigBuilder.parent(this.parentPackageName).moduleName(this.parentModuleName).entity("dal.dataobject")
+            .mapper("dal.mysql").service("service").serviceImpl("service.impl").controller("controller")
+            .pathInfo(Collections.singletonMap(OutputFile.xml, mapperPath));
     }
 
     private static Consumer<GlobalConfig.Builder> getGlobalConfigConsumer() {
-        String outputDir = CsFileUtil.getTmpDirPath() + "CodeGen";
-        return globalConfigBuilder -> globalConfigBuilder
-                .enableSwagger()
-                .outputDir(outputDir)
-                .author("codegen")
-                .commentDate("yyyy-MM-dd")
-                .dateType(DateType.TIME_PACK);
+        String outputDir = projectRootPath + "CodeGen";
+        return globalConfigBuilder -> globalConfigBuilder.enableSwagger().outputDir(outputDir).author("codegen").commentDate("yyyy-MM-dd")
+            .dateType(DateType.TIME_PACK);
     }
 
     private static Consumer<StrategyConfig.Builder> getStrategyConfigConsumer() {
-        return strategyConfigBuilder -> strategyConfigBuilder
-                .mapperBuilder()
-                .mapperAnnotation(Mapper.class)
-                .formatMapperFileName("%sMapper")
-                .formatXmlFileName("%sMapper");
+        return strategyConfigBuilder -> strategyConfigBuilder.mapperBuilder().mapperAnnotation(Mapper.class).formatMapperFileName("%sMapper")
+            .formatXmlFileName("%sMapper").entityBuilder().formatFileName("%sTb");
     }
 
     private static Consumer<DataSourceConfig.Builder> getDataSourceConfigConsumer() {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java
index 3e5a1d42..b88d5dfe 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java
@@ -124,7 +124,7 @@ public class CsMpQUtil {
     }
 
     private static <R> void handleInOrNotQuery(boolean b, QueryWrapper<R> queryWrapper, String attributeName, Object fieldVal) {
-        Collection<?> wrapNotInVal = (Collection<?>) fieldVal;
+        Collection<?> wrapNotInVal = (Collection<?>)fieldVal;
         if (CollectionUtil.isNotEmpty(wrapNotInVal)) {
             Optional<?> anyValOptional = wrapNotInVal.stream().findAny();
             if (anyValOptional.isPresent()) {
@@ -150,7 +150,7 @@ public class CsMpQUtil {
 
     private static <R> void handleBetweenQuery(QueryWrapper<R> queryWrapper, Object fieldVal, String finalAttributeName) {
         if (fieldVal instanceof List) {
-            List<Object> between = new ArrayList<>((List<?>) fieldVal);
+            List<Object> between = new ArrayList<>((List<?>)fieldVal);
             int minLength = 2;
             if (CollectionUtil.isNotEmpty(between) && between.size() >= minLength) {
                 queryWrapper.between(finalAttributeName, between.get(0), between.get(1));
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java
index 4f59a075..7c34b592 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
@@ -56,13 +56,13 @@ public interface CsMpEasyService<T> extends IService<T> {
 
     <G> List<G> queryFeatureClazzListByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz);
 
-    CsResultVo<List<T>> queryClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable);
+    CsPageResultVo<List<T>> queryClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable);
 
-    <G> CsResultVo<List<G>> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz);
+    <G> CsPageResultVo<List<G>> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz);
 
-    <G, Q> CsResultVo<List<G>> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz);
+    <G, Q> CsPageResultVo<List<G>> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz);
 
-    <Q> CsResultVo<List<T>> queryClazzPageByArgs(Q criteria, IPage<T> pageable);
+    <Q> CsPageResultVo<List<T>> queryClazzPageByArgs(Q criteria, IPage<T> pageable);
 
     int modifyClazzByArgs(LambdaQueryWrapper<T> wrapper, T entity);
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java
index 877b4ea1..2dc50075 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpMapper.java
@@ -18,7 +18,7 @@ package cn.odboy.framework.mybatisplus.core.interfaces;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.util.CsPageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -136,16 +136,16 @@ public interface CsMpMapper<E> extends BaseMapper<E> {
      * @param clazz    期望的对象类型
      * @return IPage<T>
      */
-    default <T> CsResultVo<List<T>> queryFeatureClazzPage(Pageable pageable, LambdaQueryWrapper<E> wrapper, Class<T> clazz) {
+    default <T> CsPageResultVo<List<T>> queryFeatureClazzPage(Pageable pageable, LambdaQueryWrapper<E> wrapper, Class<T> clazz) {
         int pageNumber = pageable.getPageNumber();
         int pageSize = pageable.getPageSize();
         pageNumber = pageNumber <= 0 ? 1 : pageNumber;
         pageSize = pageSize <= 0 ? 10 : pageSize;
         IPage<E> pageInfo = this.selectPage(new Page<>(pageNumber, pageSize), wrapper);
         if (CollUtil.isEmpty(pageInfo.getRecords())) {
-            return new CsResultVo<>(new ArrayList<>(), pageInfo.getTotal());
+            return new CsPageResultVo<>(new ArrayList<>(), pageInfo.getTotal());
         }
-        return new CsResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+        return new CsPageResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
     }
 
     /**
@@ -156,7 +156,7 @@ public interface CsMpMapper<E> extends BaseMapper<E> {
      * @param clazz    期望的对象类型
      * @return IPage<T>
      */
-    default <T> CsResultVo<List<T>> queryFeatureClazzPage(Pageable pageable, LambdaQueryChainWrapper<E> wrapper, Class<T> clazz) {
+    default <T> CsPageResultVo<List<T>> queryFeatureClazzPage(Pageable pageable, LambdaQueryChainWrapper<E> wrapper, Class<T> clazz) {
         int pageNumber = pageable.getPageNumber();
         int pageSize = pageable.getPageSize();
         pageNumber = pageNumber <= 0 ? 1 : pageNumber;
@@ -165,7 +165,7 @@ public interface CsMpMapper<E> extends BaseMapper<E> {
         if (CollUtil.isEmpty(pageInfo.getRecords())) {
             return CsPageUtil.emptyListData();
         }
-        return new CsResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+        return new CsPageResultVo<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
     }
 
     /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java
index db3f8b3a..2671e332 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java
@@ -17,7 +17,7 @@ package cn.odboy.framework.mybatisplus.core.interfaces;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.mybatisplus.core.CsMpQUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -193,12 +193,12 @@ public class CsMpServiceImpl<M extends CsMpMapper<T>, T> extends ServiceImpl<M,
      * @param wrapper  制造条件
      * @param pageable 分页参数
      */
-    public CsResultVo<List<T>> queryClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable) {
+    public CsPageResultVo<List<T>> queryClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable) {
         if (wrapper == null) {
             wrapper = new LambdaQueryWrapper<>();
         }
         IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-        return new CsResultVo<>(originPageData.getRecords(), originPageData.getTotal());
+        return new CsPageResultVo<>(originPageData.getRecords(), originPageData.getTotal());
     }
 
     /**
@@ -208,24 +208,24 @@ public class CsMpServiceImpl<M extends CsMpMapper<T>, T> extends ServiceImpl<M,
      * @param pageable    分页参数
      * @param targetClazz 目标类型
      */
-    public <G> CsResultVo<List<G>> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz) {
+    public <G> CsPageResultVo<List<G>> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz) {
         if (wrapper == null) {
             wrapper = new LambdaQueryWrapper<>();
         }
         IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-        return new CsResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal());
+        return new CsPageResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal());
     }
 
-    public <G, Q> CsResultVo<List<G>> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz) {
+    public <G, Q> CsPageResultVo<List<G>> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz) {
         QueryWrapper<T> wrapper = CsMpQUtil.build(criteria);
         IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-        return new CsResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal());
+        return new CsPageResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal());
     }
 
-    public <Q> CsResultVo<List<T>> queryClazzPageByArgs(Q criteria, IPage<T> pageable) {
+    public <Q> CsPageResultVo<List<T>> queryClazzPageByArgs(Q criteria, IPage<T> pageable) {
         QueryWrapper<T> wrapper = CsMpQUtil.build(criteria);
         IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-        return new CsResultVo<>(originPageData.getRecords(), originPageData.getTotal());
+        return new CsPageResultVo<>(originPageData.getRecords(), originPageData.getTotal());
     }
 
     /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java
index 1882bbaf..e98b7d0b 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java
@@ -117,7 +117,7 @@ public class UserLoginCaptchaSettingModel extends CsObject {
             int opt = num(3);
 
             // 计算结果
-            int res = new int[]{n1 + n2, n1 - n2, n1 * n2}[opt];
+            int res = new int[] {n1 + n2, n1 - n2, n1 * n2}[opt];
             // 转换为字符运算符
             char optChar = "+-x".charAt(opt);
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
index a8469602..8ba06752 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
@@ -50,28 +50,21 @@ import java.util.Map;
 @AutoConfigureBefore(RedisAutoConfiguration.class)
 public class RedisConfiguration extends CachingConfigurerSupport {
     /**
-     * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）<br/>
-     * 未配置可能导致, 登录失败, 反复登录等问题
+     * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）<br/> 未配置可能导致, 登录失败, 反复登录等问题
      */
-    private static final String[] WHITELIST_STR = {
-            "org.springframework",
-            "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",
-    };
+    private static final String[] WHITELIST_STR =
+        {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model", "cn.odboy.pipeline.dal.dataobject",
+            "cn.odboy.pipeline.dal.model", "cn.odboy.pipeline.framework.pipeline.model"};
 
     /**
-     * 设置 redis 数据默认过期时间，默认2小时
-     * 设置@cacheable 序列化方式
+     * 设置 redis 数据默认过期时间，默认2小时 设置@cacheable 序列化方式
      */
     @Bean
     public RedisCacheConfiguration redisCacheConfiguration() {
         FastJsonRedisSerializer<Object> fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class);
         RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig();
-        configuration = configuration.serializeValuesWith(RedisSerializationContext.
-                SerializationPair.fromSerializer(fastJsonRedisSerializer)).entryTtl(Duration.ofHours(2));
+        configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer))
+            .entryTtl(Duration.ofHours(2));
         return configuration;
     }
 
@@ -103,9 +96,7 @@ public class RedisConfiguration extends CachingConfigurerSupport {
     @Bean
     public RedisCacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
         RedisCacheConfiguration config = redisCacheConfiguration();
-        return RedisCacheManager.builder(redisConnectionFactory)
-                .cacheDefaults(config)
-                .build();
+        return RedisCacheManager.builder(redisConnectionFactory).cacheDefaults(config).build();
     }
 
     /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java
index a6a3a246..51e9645a 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisHelper.java
@@ -202,8 +202,8 @@ public class RedisHelper {
     public void scanDel(String pattern) {
         ScanOptions options = ScanOptions.scanOptions().match(pattern).build();
         try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(
-                (RedisCallback<Cursor<byte[]>>) connection -> (Cursor<byte[]>) new ConvertingCursor<>(
-                        connection.scan(options), redisTemplate.getKeySerializer()::deserialize))) {
+            (RedisCallback<Cursor<byte[]>>)connection -> (Cursor<byte[]>)new ConvertingCursor<>(connection.scan(options),
+                redisTemplate.getKeySerializer()::deserialize))) {
             while (cursor.hasNext()) {
                 redisTemplate.delete(cursor.next());
             }
@@ -256,7 +256,7 @@ public class RedisHelper {
             return null;
         }
         if (value instanceof List<?>) {
-            List<?> list = (List<?>) value;
+            List<?> list = (List<?>)value;
             // 检查每个元素是否为指定类型
             if (list.stream().allMatch(clazz::isInstance)) {
                 return list.stream().map(clazz::cast).collect(Collectors.toList());
@@ -265,7 +265,6 @@ public class RedisHelper {
         return null;
     }
 
-
     /**
      * 普通缓存获取
      *
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java
index 39cd2ad6..200faaca 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java
@@ -55,12 +55,8 @@ public class RedissonConfiguration {
     @Bean
     public RedissonClient redissonClient() {
         Config config = new Config();
-        config.useSingleServer()
-                .setAddress("redis://" + redisHost + ":" + redisPort)
-                .setDatabase(redisDatabase)
-                .setTimeout(timeout)
-                .setConnectionPoolSize(connectionPoolSize)
-                .setConnectionMinimumIdleSize(connectionMinimumIdleSize);
+        config.useSingleServer().setAddress("redis://" + redisHost + ":" + redisPort).setDatabase(redisDatabase).setTimeout(timeout)
+            .setConnectionPoolSize(connectionPoolSize).setConnectionMinimumIdleSize(connectionMinimumIdleSize);
         if (StrUtil.isNotBlank(redisPassword)) {
             config.useSingleServer().setPassword(redisPassword);
         }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java
index 530eee17..8c86dbc9 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java
@@ -48,7 +48,8 @@ public class AsyncTheadPoolConfig implements AsyncConfigurer {
         // 自定义工厂
         ThreadFactory factory = r -> new Thread(r, "default-async-" + new AtomicInteger(1).getAndIncrement());
         // 自定义线程池
-        return new ThreadPoolExecutor(asyncTaskPool.getCorePoolSize(), asyncTaskPool.getMaxPoolSize(), asyncTaskPool.getKeepAliveSeconds(), TimeUnit.SECONDS, new ArrayBlockingQueue<>(asyncTaskPool.getQueueCapacity()), factory, new ThreadPoolExecutor.CallerRunsPolicy());
+        return new ThreadPoolExecutor(asyncTaskPool.getCorePoolSize(), asyncTaskPool.getMaxPoolSize(), asyncTaskPool.getKeepAliveSeconds(), TimeUnit.SECONDS,
+            new ArrayBlockingQueue<>(asyncTaskPool.getQueueCapacity()), factory, new ThreadPoolExecutor.CallerRunsPolicy());
     }
 
     /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java
index b02384b4..4fffb386 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java
@@ -35,14 +35,12 @@ public class DateStringArraysToListDateConverter implements Converter<String[],
         if (source.length == 0) {
             return Collections.emptyList();
         }
-        return Arrays.stream(source)
-                .map(s -> {
-                    try {
-                        return sdf.parse(s);
-                    } catch (ParseException e) {
-                        throw new IllegalArgumentException("Invalid date string: " + s);
-                    }
-                })
-                .collect(Collectors.toList());
+        return Arrays.stream(source).map(s -> {
+            try {
+                return sdf.parse(s);
+            } catch (ParseException e) {
+                throw new IllegalArgumentException("Invalid date string: " + s);
+            }
+        }).collect(Collectors.toList());
     }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java
index f7353548..90985ad9 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/ConfigurerAdapter.java
@@ -88,19 +88,19 @@ public class ConfigurerAdapter implements WebMvcConfigurer {
         config.setDateFormat("yyyy-MM-dd HH:mm:ss");
         // 开启引用检测, 枚举支持
         config.setWriterFeatures(
-                // 是否输出值为null的字段
-                // SerializerFeature.WriteMapNullValue,
-                // 字段如果为null,输出为false,而非null
-//                JSONWriter.Feature.WriteNullBooleanAsFalse,
-                // 字段如果为null,输出为[],而非null
-//                JSONWriter.Feature.WriteNullListAsEmpty,
-                // 字符类型字段如果为null,输出为"",而非null
-//                JSONWriter.Feature.WriteNullStringAsEmpty,
-                // 太具体的数值会直接影响逻辑本身, 所以不要这个
-                // SerializerFeature.WriteNullNumberAsZero,
-                JSONWriter.Feature.WriteEnumUsingToString,
-//                SerializerFeature.DisableCircularReferenceDetect,
-                JSONWriter.Feature.ReferenceDetection);
+            // 是否输出值为null的字段
+            // SerializerFeature.WriteMapNullValue,
+            // 字段如果为null,输出为false,而非null
+            //                JSONWriter.Feature.WriteNullBooleanAsFalse,
+            // 字段如果为null,输出为[],而非null
+            //                JSONWriter.Feature.WriteNullListAsEmpty,
+            // 字符类型字段如果为null,输出为"",而非null
+            //                JSONWriter.Feature.WriteNullStringAsEmpty,
+            // 太具体的数值会直接影响逻辑本身, 所以不要这个
+            // SerializerFeature.WriteNullNumberAsZero,
+            JSONWriter.Feature.WriteEnumUsingToString,
+            //                SerializerFeature.DisableCircularReferenceDetect,
+            JSONWriter.Feature.ReferenceDetection);
         fastJsonConverter.setFastJsonConfig(config);
         fastJsonConverter.setSupportedMediaTypes(supportMediaTypeList);
         fastJsonConverter.setDefaultCharset(StandardCharsets.UTF_8);
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsConfig.java
index cdcf6fb3..c6190be7 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsConfig.java
@@ -19,7 +19,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
-
 @Configuration
 public class WsConfig {
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsFactory.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsFactory.java
index 5a5fcba4..4331a6e1 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsFactory.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WsFactory.java
@@ -22,8 +22,7 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.stereotype.Component;
 
 /**
- * 解决启动io.undertow.websockets.jsr UT026010: Buffer pool was not
- * set on WebSocketDeploymentInfo, the default pool will be used的警告
+ * 解决启动io.undertow.websockets.jsr UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used的警告
  *
  * @date 2024-06-07
  */
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsClientManager.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsClientManager.java
index 37877af8..c81bea9e 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsClientManager.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsClientManager.java
@@ -44,15 +44,15 @@ public class CsWsClientManager {
         CsWsServer wsServer = clientMap.get(sid);
         if (wsServer != null) {
             try {
-//                log.info("关闭session, sid={}", sid);
+                //                log.info("关闭session, sid={}", sid);
                 wsServer.getSession().close();
 
             } catch (Exception e) {
                 // ignore
             }
-//            log.info("停止任务, sid={}", sid);
+            //            log.info("停止任务, sid={}", sid);
             wsServer.stopTask(sid);
-//            log.info("移除客户端, sid={}", sid);
+            //            log.info("移除客户端, sid={}", sid);
             clientMap.remove(sid);
         }
     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
index 3867bf56..bf833891 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-
 @Slf4j
 @Component
 @ServerEndpoint("/websocket/{sid}")
@@ -82,7 +81,7 @@ public class CsWsServer {
 
     @OnError
     public void onError(Session session, Throwable error) {
-//        log.error("WebSocket sid={} 发生错误", this.sid, error);
+        //        log.error("WebSocket sid={} 发生错误", this.sid, error);
         try {
             CsWsClientManager.removeClient(this.sid);
         } catch (Exception e) {
@@ -102,7 +101,7 @@ public class CsWsServer {
      */
     public void sendMessage(CsWsMessage message, @PathParam("sid") String sid) throws IOException {
         String body = JSON.toJSONString(message);
-//        log.info("推送消息到{}, 推送内容:{}", sid, message);
+        //        log.info("推送消息到{}, 推送内容:{}", sid, message);
         try {
             if (sid == null) {
                 sendToAll(body);
@@ -138,7 +137,7 @@ public class CsWsServer {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        CsWsServer that = (CsWsServer) o;
+        CsWsServer that = (CsWsServer)o;
         return Objects.equals(session, that.session) && Objects.equals(sid, that.sid);
     }
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsAnonTagUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsAnonTagUtil.java
index 87f6c8c8..d37aa77a 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsAnonTagUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsAnonTagUtil.java
@@ -25,7 +25,7 @@ public class CsAnonTagUtil {
      * @return /
      */
     public static Map<String, Set<String>> getAnonymousUrl(final ApplicationContext applicationContext) {
-        RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) applicationContext.getBean("requestMappingHandlerMapping");
+        RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping)applicationContext.getBean("requestMappingHandlerMapping");
         Map<RequestMappingInfo, HandlerMethod> handlerMethodMap = requestMappingHandlerMapping.getHandlerMethods();
         Map<String, java.util.Set<String>> anonymousUrls = new HashMap<>(8);
         // 获取匿名标记
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBigDecimalUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBigDecimalUtil.java
index 6618f454..6ccf7c3c 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBigDecimalUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsBigDecimalUtil.java
@@ -19,11 +19,11 @@ public final class CsBigDecimalUtil {
      */
     private static BigDecimal toBigDecimal(Object obj) {
         if (obj instanceof BigDecimal) {
-            return (BigDecimal) obj;
+            return (BigDecimal)obj;
         } else if (obj instanceof Long) {
-            return BigDecimal.valueOf((Long) obj);
+            return BigDecimal.valueOf((Long)obj);
         } else if (obj instanceof Integer) {
-            return BigDecimal.valueOf((Integer) obj);
+            return BigDecimal.valueOf((Integer)obj);
         } else if (obj instanceof Double) {
             return new BigDecimal(String.valueOf(obj));
         } else {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java
index 710d7609..302cc849 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java
@@ -142,7 +142,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
             try {
                 Field field = m.getClass().getDeclaredField(elementName);
                 field.setAccessible(true);
-                that = (BigDecimal) field.get(m);
+                that = (BigDecimal)field.get(m);
             } catch (Exception e) {
                 // 忽略异常
                 that = BigDecimal.ZERO;
@@ -160,10 +160,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
      * @return /
      */
     public static BigDecimal streamBigDecimalMax(List<BigDecimal> data) {
-        return data.stream()
-                .filter(Objects::nonNull)
-                .reduce(BigDecimal::max)
-                .orElse(null);
+        return data.stream().filter(Objects::nonNull).reduce(BigDecimal::max).orElse(null);
     }
 
     /**
@@ -175,10 +172,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
      * @return /
      */
     public static BigDecimal streamBigDecimalMin(List<BigDecimal> data) {
-        return data.stream()
-                .filter(Objects::nonNull)
-                .reduce(BigDecimal::min)
-                .orElse(null);
+        return data.stream().filter(Objects::nonNull).reduce(BigDecimal::min).orElse(null);
     }
 
     /**
@@ -190,10 +184,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
      * @return /
      */
     public static BigDecimal streamBigDecimalAvg(List<BigDecimal> data) {
-        return data.stream()
-                .filter(Objects::nonNull)
-                .reduce(BigDecimal.ZERO, BigDecimal::add)
-                .divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR);
+        return data.stream().filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR);
     }
 
     public static void main(String[] args) {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDesEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDesEncryptUtil.java
index be7afdc3..80faa6ce 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDesEncryptUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDesEncryptUtil.java
@@ -88,7 +88,7 @@ public final class CsDesEncryptUtil {
         byte[] b2 = new byte[b.length / 2];
         for (int n = 0; n < b.length; n += size) {
             String item = new String(b, n, 2);
-            b2[n / 2] = (byte) Integer.parseInt(item, 16);
+            b2[n / 2] = (byte)Integer.parseInt(item, 16);
         }
         return b2;
     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java
index e5f979b7..56983712 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java
@@ -144,17 +144,12 @@ public final class CsDistributedIdUtil {
                 // 序列号溢出，等待下一毫秒
                 currentTimestamp = waitNextMillis(lastTimestampValue);
             }
-            return ((currentTimestamp - START_TIMESTAMP) << timestampLeftShift) |
-                    (dataCenterId << dataCenterIdShift) |
-                    (workerId << workerIdShift) |
-                    seq;
+            return ((currentTimestamp - START_TIMESTAMP) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | seq;
         } else {
             // 时间戳改变，重置序列号
             sequence.set(0L);
             lastTimestamp.set(currentTimestamp);
-            return ((currentTimestamp - START_TIMESTAMP) << timestampLeftShift) |
-                    (dataCenterId << dataCenterIdShift) |
-                    (workerId << workerIdShift);
+            return ((currentTimestamp - START_TIMESTAMP) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift);
         }
     }
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java
index 5cc7b992..253ca844 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java
@@ -54,9 +54,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
     /**
      * 系统临时目录
      * <br>
-     * windows 包含路径分割符, 但Linux 不包含,
-     * 在windows \\==\ 前提下,
-     * 为安全起见 同意拼装 路径分割符,
+     * windows 包含路径分割符, 但Linux 不包含, 在windows \\==\ 前提下, 为安全起见 同意拼装 路径分割符,
      * <pre>
      *       java.io.tmpdir
      *       windows : C:\Users/xxx\AppData\Local\Temp\
@@ -109,13 +107,13 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
         String resultSize;
         if (size / GB >= 1) {
             //如果当前Byte的值大于等于1GB
-            resultSize = DF.format(size / (float) GB) + " GB";
+            resultSize = DF.format(size / (float)GB) + " GB";
         } else if (size / MB >= 1) {
             //如果当前Byte的值大于等于1MB
-            resultSize = DF.format(size / (float) MB) + " MB";
+            resultSize = DF.format(size / (float)MB) + " MB";
         } else if (size / KB >= 1) {
             //如果当前Byte的值大于等于1KB
-            resultSize = DF.format(size / (float) KB) + " KB";
+            resultSize = DF.format(size / (float)KB) + " KB";
         } else {
             resultSize = size + " B";
         }
@@ -190,10 +188,10 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
             Map<String, Object> sanitizedMap = new LinkedHashMap<>();
             map.forEach((key, value) -> {
                 if (value instanceof String) {
-                    String strValue = (String) value;
+                    String strValue = (String)value;
                     // 检查并处理以特殊字符开头的值
-                    if (strValue.startsWith(SYMBOL_EQUAL) || strValue.startsWith(SYMBOL_ADD)
-                            || strValue.startsWith(SYMBOL_SUBTRACT) || strValue.startsWith(SYMBOL_AT)) {
+                    if (strValue.startsWith(SYMBOL_EQUAL) || strValue.startsWith(SYMBOL_ADD) || strValue.startsWith(SYMBOL_SUBTRACT) || strValue.startsWith(
+                        SYMBOL_AT)) {
                         // 添加单引号前缀
                         strValue = "'" + strValue;
                     }
@@ -206,7 +204,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
         }).collect(Collectors.toList());
         // 一次性写出内容, 使用默认样式，强制输出标题
         writer.write(sanitizedList, true);
-        SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
+        SXSSFSheet sheet = (SXSSFSheet)writer.getSheet();
         //上面需要强转SXSSFSheet  不然没有trackAllColumnsForAutoSizing方法
         sheet.trackAllColumnsForAutoSizing();
         //列宽自适应
@@ -278,7 +276,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
      * 获取文件字节数组 -> ok
      */
     private static byte[] getByte(File file) {
-        byte[] b = new byte[(int) file.length()];
+        byte[] b = new byte[(int)file.length()];
         InputStream in = null;
         try {
             in = Files.newInputStream(file.toPath());
@@ -382,8 +380,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
         fileName = fileName.replaceAll("^\\.+/", "");
 
         // 保留文件名中最后一个 "." 字符，过滤掉其他 "."
-        fileName = fileName.replaceAll("^(.*)(\\.[^.]*)$", "$1").replaceAll("\\.", "") +
-                fileName.replaceAll("^(.*)(\\.[^.]*)$", "$2");
+        fileName = fileName.replaceAll("^(.*)(\\.[^.]*)$", "$1").replaceAll("\\.", "") + fileName.replaceAll("^(.*)(\\.[^.]*)$", "$2");
 
         return fileName;
     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsIPUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsIPUtil.java
index 7868d266..ab6207e9 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsIPUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsIPUtil.java
@@ -45,7 +45,6 @@ public final class CsIPUtil {
         return null;
     }
 
-
     /**
      * 获取当前机器的IP
      *
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java
index a171622b..0a1702c1 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java
@@ -39,16 +39,13 @@ public final class CsListUtil {
      * @param classifier 对象T属性表达式, 比如: User::getName
      */
     public static <T, K> List<T> distinctByArgs(List<T> items, Function<? super T, ? extends K> classifier) {
-        return items.stream()
-                .collect(Collectors.groupingBy(classifier))
-                .values().stream()
-                .map(monitorItem -> monitorItem.iterator().next())
-                .collect(Collectors.toList());
+        return items.stream().collect(Collectors.groupingBy(classifier)).values().stream().map(monitorItem -> monitorItem.iterator().next())
+            .collect(Collectors.toList());
     }
 
     /**
-     * list转map, 保留新值 -> Map<String, User> userMap = items.stream().collect(Collectors.toMap(User::getName, user -> user)) <br>
-     * list转map, 保留旧值 -> Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getName, user -> user, (existing, replacement) -> existing));
+     * list转map, 保留新值 -> Map<String, User> userMap = items.stream().collect(Collectors.toMap(User::getName, user -> user)) <br> list转map, 保留旧值 -> Map<String,
+     * User> userMap = users.stream().collect(Collectors.toMap(User::getName, user -> user, (existing, replacement) -> existing));
      */
     public static void main(String[] args) {
         List<CsBaseUserTimeTb> entities = new ArrayList<>();
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java
index 543bc487..69b9eab0 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsPageUtil.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.util;
 
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,36 +52,36 @@ public final class CsPageUtil extends cn.hutool.core.util.PageUtil {
     /**
      * Page 数据处理
      */
-    public static <T> CsResultVo<List<T>> toPage(IPage<T> page) {
-        return new CsResultVo<>(page.getRecords(), page.getTotal());
+    public static <T> CsPageResultVo<List<T>> toPage(IPage<T> page) {
+        return new CsPageResultVo<>(page.getRecords(), page.getTotal());
     }
 
     /**
      * 自定义分页
      */
-    public static <T> CsResultVo<List<T>> toPage(List<T> list) {
-        return new CsResultVo<>(list, list.size());
+    public static <T> CsPageResultVo<List<T>> toPage(List<T> list) {
+        return new CsPageResultVo<>(list, list.size());
     }
 
     /**
      * 返回空数据
      */
-    public static <T> CsResultVo<List<T>> emptyListData() {
-        return new CsResultVo<>(new ArrayList<>(), 0);
+    public static <T> CsPageResultVo<List<T>> emptyListData() {
+        return new CsPageResultVo<>(new ArrayList<>(), 0);
     }
 
     /**
      * 返回空数据
      */
-    public static <T> CsResultVo<T> emptyData() {
-        return new CsResultVo<>(null, 0);
+    public static <T> CsPageResultVo<T> emptyData() {
+        return new CsPageResultVo<>(null, 0);
     }
 
     /**
      * 自定义分页
      */
-    public static <T> CsResultVo<List<T>> toPage(List<T> list, long totalElements) {
-        return new CsResultVo<>(list, totalElements);
+    public static <T> CsPageResultVo<List<T>> toPage(List<T> list, long totalElements) {
+        return new CsPageResultVo<>(list, totalElements);
     }
 
     public static <T> Page<T> getCount(BaseMapper<T> baseMapper) {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsRsaEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsRsaEncryptUtil.java
index 982e3da8..955833eb 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsRsaEncryptUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsRsaEncryptUtil.java
@@ -182,14 +182,13 @@ public final class CsRsaEncryptUtil {
         KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
         keyPairGenerator.initialize(1024);
         KeyPair keyPair = keyPairGenerator.generateKeyPair();
-        RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic();
-        RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate();
+        RSAPublicKey rsaPublicKey = (RSAPublicKey)keyPair.getPublic();
+        RSAPrivateKey rsaPrivateKey = (RSAPrivateKey)keyPair.getPrivate();
         String publicKeyString = Base64.encodeBase64String(rsaPublicKey.getEncoded());
         String privateKeyString = Base64.encodeBase64String(rsaPrivateKey.getEncoded());
         return new RsaKeyPair(publicKeyString, privateKeyString);
     }
 
-
     /**
      * RSA密钥对对象
      */
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsStringUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsStringUtil.java
index d2ca2333..9da2c745 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsStringUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsStringUtil.java
@@ -18,9 +18,7 @@ public final class CsStringUtil extends org.apache.commons.lang3.StringUtils {
     /**
      * 驼峰命名法工具
      *
-     * @return toCamelCase(" hello_world ") == "helloWorld"
-     * toCapitalizeCamelCase("hello_world") == "HelloWorld"
-     * toUnderScoreCase("helloWorld") = "hello_world"
+     * @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
      */
     public static String toCamelCase(String s) {
         if (s == null) {
@@ -50,9 +48,7 @@ public final class CsStringUtil extends org.apache.commons.lang3.StringUtils {
     /**
      * 驼峰命名法工具
      *
-     * @return toCamelCase(" hello_world ") == "helloWorld"
-     * toCapitalizeCamelCase("hello_world") == "HelloWorld"
-     * toUnderScoreCase("helloWorld") = "hello_world"
+     * @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
      */
     public static String toCapitalizeCamelCase(String s) {
         if (s == null) {
@@ -65,9 +61,7 @@ public final class CsStringUtil extends org.apache.commons.lang3.StringUtils {
     /**
      * 驼峰命名法工具
      *
-     * @return toCamelCase(" hello_world ") == "helloWorld"
-     * toCapitalizeCamelCase("hello_world") == "HelloWorld"
-     * toUnderScoreCase("helloWorld") = "hello_world"
+     * @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
      */
     public static String toUnderScoreCase(String s) {
         if (s == null) {
@@ -100,12 +94,11 @@ public final class CsStringUtil extends org.apache.commons.lang3.StringUtils {
         return sb.toString();
     }
 
-
     /**
      * 获得当天是周几
      */
     public static String getWeekDay() {
-//        String[] weekDays = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+        //        String[] weekDays = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
         String[] weekDays = {"星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"};
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java
index adb4bbba..ce65e09c 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java
@@ -44,11 +44,7 @@ public final class CsValidUtil {
     public static <T> void validate(T object) {
         Set<ConstraintViolation<T>> violations = VALIDATOR.validate(object, Default.class);
         if (!violations.isEmpty()) {
-            throw new IllegalArgumentException(violations
-                    .stream()
-                    .map(ConstraintViolation::getMessage)
-                    .collect(Collectors.joining(","))
-            );
+            throw new IllegalArgumentException(violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")));
         }
     }
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-pipeline/pom.xml b/cutejava/cutejava-module-pipeline/pom.xml
index 20950824..31af731e 100644
--- a/cutejava/cutejava-module-pipeline/pom.xml
+++ b/cutejava/cutejava-module-pipeline/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cutejava-module-pipeline</artifactId>
-    <name>devops应用模块</name>
+    <name>pipeline模块</name>
 
     <dependencies>
         <dependency>
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/dataobject/PipelineInstanceNodeTb.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/dataobject/PipelineInstanceNodeTb.java
index abfb6cb4..6c6f808a 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/dataobject/PipelineInstanceNodeTb.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/dataobject/PipelineInstanceNodeTb.java
@@ -16,7 +16,7 @@
 package cn.odboy.devops.dal.dataobject;
 
 import cn.odboy.base.CsObject;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeOperateButtonVo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.anwen.mongo.annotation.ID;
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/model/StartPipelineResultVo.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/model/StartPipelineResultVo.java
index 602b3776..84eb7983 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/model/StartPipelineResultVo.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/model/StartPipelineResultVo.java
@@ -21,7 +21,6 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 
-
 @Getter
 @Setter
 public class StartPipelineResultVo extends CsObject {
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java
index cb274fe5..e7e1c258 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.dal.redis;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.framework.redis.RedisHelper;
 import lombok.RequiredArgsConstructor;
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/mongoplus/MongoPlusMetaObjectHandler.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/mongoplus/MongoPlusMetaObjectHandler.java
index 62f511e6..46d9b8a9 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/mongoplus/MongoPlusMetaObjectHandler.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/mongoplus/MongoPlusMetaObjectHandler.java
@@ -23,23 +23,23 @@ import java.util.Date;
 
 @Component
 public class MongoPlusMetaObjectHandler implements MetaObjectHandler {
-//    @Override
-//    public void insertFill(Map<String, Object> insertFillMap, Document document) {
-//        insertFillMap.keySet().forEach(key -> {
-//            if (key.equals("createTime")){
-//                document.put(key, LocalDateTime.now());
-//            }
-//        });
-//    }
-//
-//    @Override
-//    public void updateFill(Map<String, Object> insertFillMap, Document document) {
-//        insertFillMap.keySet().forEach(key -> {
-//            if (key.equals("createTime")){
-//                document.put(key, LocalDateTime.now());
-//            }
-//        });
-//    }
+    //    @Override
+    //    public void insertFill(Map<String, Object> insertFillMap, Document document) {
+    //        insertFillMap.keySet().forEach(key -> {
+    //            if (key.equals("createTime")){
+    //                document.put(key, LocalDateTime.now());
+    //            }
+    //        });
+    //    }
+    //
+    //    @Override
+    //    public void updateFill(Map<String, Object> insertFillMap, Document document) {
+    //        insertFillMap.keySet().forEach(key -> {
+    //            if (key.equals("createTime")){
+    //                document.put(key, LocalDateTime.now());
+    //            }
+    //        });
+    //    }
 
     @Override
     public void insertFill(AutoFillMetaObject insertAutoFillMetaObject) {
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
index 91e7a86b..b63dbc3b 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.framework.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
 import cn.odboy.devops.service.core.PipelineInstanceNodeService;
@@ -33,7 +33,8 @@ public abstract class AbstractPipelineNodeJobService {
         return pipelineInstanceNodeService.getPipelineInstanceNodeByArgs(instanceId, code);
     }
 
-    public void addPipelineInstanceNodeDetailLog(PipelineInstanceNodeTb pipelineInstanceNode, String stepName, PipelineStatusEnum stepStatus, String stepMsg, Date finishTime) {
+    public void addPipelineInstanceNodeDetailLog(PipelineInstanceNodeTb pipelineInstanceNode, String stepName, PipelineStatusEnum stepStatus, String stepMsg,
+        Date finishTime) {
         if (pipelineInstanceNode != null) {
             pipelineInstanceNodeDetailService.addLog(pipelineInstanceNode.getId(), pipelineInstanceNode.getCode(), stepName, stepStatus, stepMsg, finishTime);
         }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineConst.java
similarity index 66%
rename from cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java
rename to cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineConst.java
index fd36e01c..e1300630 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineConst.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineConst.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package cn.odboy.devops.constant.pipeline;
+package cn.odboy.devops.framework.pipeline.constant;
 
 /**
  * 流水线 常量
@@ -25,17 +25,17 @@ public interface PipelineConst {
     String INSTANCE_PREFIX = "pipeline_instance_";
     String EXECUTOR_PREFIX = "pipeline_executor_";
     //    /**
-//     * 流水线实例Key
-//     */
-//    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";
-//    String INSTANCE_RETRY_NODE_INDEX_KEY = "pipelineInstanceRetryNodeIndex";
+    //     * 流水线实例Key
+    //     */
+    //    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";
+    //    String INSTANCE_RETRY_NODE_INDEX_KEY = "pipelineInstanceRetryNodeIndex";
     // 以下为标准常量
     String INSTANCE = "Instance";
     String INSTANCE_ID = "InstanceId";
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineStatusEnum.java
similarity index 83%
rename from cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java
rename to cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineStatusEnum.java
index 5e1a0948..3debb07e 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineStatusEnum.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package cn.odboy.devops.constant.pipeline;
+package cn.odboy.devops.framework.pipeline.constant;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -24,9 +24,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum PipelineStatusEnum {
-    PENDING("pending", "#C0C4CC", "未开始"),
-    RUNNING("running", "#409EFF", "运行中"),
-    SUCCESS("success", "#67C23A", "执行成功"),
+    PENDING("pending", "#C0C4CC", "未开始"), RUNNING("running", "#409EFF", "运行中"), SUCCESS("success", "#67C23A", "执行成功"),
     FAIL("fail", "#F56C6C", "执行失败");
     /**
      * 状态码
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineTypeEnum.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineTypeEnum.java
similarity index 83%
rename from cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineTypeEnum.java
rename to cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineTypeEnum.java
index e3969e7e..ee371d9d 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/constant/pipeline/PipelineTypeEnum.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/constant/PipelineTypeEnum.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package cn.odboy.devops.constant.pipeline;
+package cn.odboy.devops.framework.pipeline.constant;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -24,11 +24,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum PipelineTypeEnum {
-    BACKEND("backend", "后端"),
-    FRONT("front", "前端"),
-    MOBILE("mobile", "移动端"),
-    ANDROID("pc", "PC端"),
-    UN_SUPPORT("un_support", "不支持的类型");
+    BACKEND("backend", "后端"), FRONT("front", "前端"), MOBILE("mobile", "移动端"), ANDROID("pc", "PC端"), UN_SUPPORT("un_support", "不支持的类型");
     /**
      * 类型编码
      */
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
index 5d9d4659..8dca238a 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
@@ -17,8 +17,8 @@ package cn.odboy.devops.framework.pipeline.core;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.devops.constant.pipeline.PipelineConst;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.dal.mysql.PipelineInstanceMapper;
@@ -54,7 +54,7 @@ public class PipelineJobBean implements InterruptableJob {
 
         // 参数解析
         JobDataMap jobDataMap = jobExecutionContext.getMergedJobDataMap();
-        PipelineInstanceTb pipelineInstanceTb = (PipelineInstanceTb) jobDataMap.get(PipelineConst.INSTANCE);
+        PipelineInstanceTb pipelineInstanceTb = (PipelineInstanceTb)jobDataMap.get(PipelineConst.INSTANCE);
         pipelineInstanceTb.setStatus(PipelineStatusEnum.PENDING.getCode());
         // 获取服务
         PipelineJobManage pipelineJobManage = CsSpringBeanHolder.getBean(PipelineJobManage.class);
@@ -156,7 +156,8 @@ public class PipelineJobBean implements InterruptableJob {
                         }
                         // 检查实例节点状态
                         ThreadUtil.safeSleep(3000);
-                        PipelineInstanceNodeTb runningInstanceNode = pipelineInstanceNodeService.getPipelineInstanceNodeByArgs(instanceId, pipelineNodeTemplateVo.getCode());
+                        PipelineInstanceNodeTb runningInstanceNode =
+                            pipelineInstanceNodeService.getPipelineInstanceNodeByArgs(instanceId, pipelineNodeTemplateVo.getCode());
                         if (PipelineStatusEnum.SUCCESS.getCode().equals(runningInstanceNode.getCurrentNodeStatus())) {
                             pipelineStatusEnum = PipelineStatusEnum.SUCCESS;
                             pipelineInstanceTb.setCurrentNodeStatus(pipelineStatusEnum.getCode());
@@ -236,13 +237,8 @@ public class PipelineJobBean implements InterruptableJob {
                     pipelineInstanceTb.setCurrentNodeStatus(PipelineStatusEnum.FAIL.getCode());
                     // 更新节点状态
                     PipelineInstanceNodeService pipelineInstanceNodeService = CsSpringBeanHolder.getBean(PipelineInstanceNodeService.class);
-                    pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(
-                            this.currentInstanceId,
-                            this.currentNodeCode,
-                            PipelineStatusEnum.FAIL,
-                            "用户主动停止",
-                            new Date()
-                    );
+                    pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(this.currentInstanceId, this.currentNodeCode, PipelineStatusEnum.FAIL,
+                        "用户主动停止", new Date());
                 }
                 pipelineInstanceTb.setStatus(PipelineStatusEnum.FAIL.getCode());
                 // 更新实例状态
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java
index 8088ba51..0c4f8163 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobManage.java
@@ -16,7 +16,7 @@
 package cn.odboy.devops.framework.pipeline.core;
 
 import cn.hutool.core.util.IdUtil;
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.framework.exception.BadRequestException;
 import lombok.extern.slf4j.Slf4j;
@@ -85,8 +85,7 @@ public class PipelineJobManage {
     }
 
     /**
-     * 中断正在执行的任务<br/>
-     * 任务终止需要配合响应中断或停止信号
+     * 中断正在执行的任务<br/> 任务终止需要配合响应中断或停止信号
      */
     public void interruptJob(Long instanceId) throws SchedulerException {
         JobKey jobKey = JobKey.jobKey(String.format(JOB_KEY, instanceId));
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
index e443ff43..fe5da77d 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
@@ -15,8 +15,8 @@
  */
 package cn.odboy.devops.framework.pipeline.core;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
 import cn.odboy.devops.service.core.PipelineInstanceNodeService;
@@ -44,22 +44,25 @@ public class PipelineNodeJobBean implements Job {
 
         JobDataMap jobDataMap = jobExecutionContext.getMergedJobDataMap();
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         String nodeCode = currentNodeTemplate.getCode();
 
         try {
             String serviceName = PipelineConst.EXECUTOR_PREFIX + nodeCode;
             PipelineNodeJobExecutor pipelineNodeJobExecutor = CsSpringBeanHolder.getBean(serviceName);
-            pipelineInstanceNodeService.updatePipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.RUNNING, PipelineStatusEnum.RUNNING.getDesc());
+            pipelineInstanceNodeService.updatePipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.RUNNING,
+                PipelineStatusEnum.RUNNING.getDesc());
             PipelineNodeJobExecuteResult executeResult = pipelineNodeJobExecutor.execute(jobDataMap);
             jobExecutionContext.getMergedJobDataMap().put(PipelineConst.LAST_NODE_RESULT, executeResult);
-            pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.SUCCESS, PipelineStatusEnum.SUCCESS.getDesc(), new Date());
+            pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.SUCCESS, PipelineStatusEnum.SUCCESS.getDesc(),
+                new Date());
         } catch (BadRequestException e) {
             log.error("流水线节点执行异常", e);
             pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.FAIL, e.getMessage(), new Date());
         } catch (Exception e) {
             log.error("流水线节点执行异常", e);
-            pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.FAIL, PipelineStatusEnum.FAIL.getDesc(), new Date());
+            pipelineInstanceNodeService.finishPipelineInstanceNodeByArgs(instanceId, nodeCode, PipelineStatusEnum.FAIL, PipelineStatusEnum.FAIL.getDesc(),
+                new Date());
         }
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java
index 5837315f..9b5cea2f 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobManage.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.framework.pipeline.core;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
 import cn.odboy.framework.exception.BadRequestException;
@@ -49,16 +49,10 @@ public class PipelineNodeJobManage {
             String keyName = String.format(JOB_KEY, instanceId, pipelineNodeTemplate.getCode());
             // 构建 JobDetail
             JobKey jobKey = JobKey.jobKey(keyName);
-            JobDetail jobDetail = JobBuilder
-                    .newJob(PipelineNodeJobBean.class)
-                    .withIdentity(jobKey)
-                    .build();
+            JobDetail jobDetail = JobBuilder.newJob(PipelineNodeJobBean.class).withIdentity(jobKey).build();
             // 构建Trigger
             TriggerKey triggerKey = TriggerKey.triggerKey(keyName);
-            Trigger cronTrigger = TriggerBuilder.newTrigger()
-                    .withIdentity(triggerKey)
-                    .startNow()
-                    .build();
+            Trigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).startNow().build();
             // 任务参数
             JobDataMap jobDataMap = cronTrigger.getJobDataMap();
             jobDataMap.put(PipelineConst.INSTANCE_ID, pipelineInstance.getInstanceId());
@@ -94,8 +88,7 @@ public class PipelineNodeJobManage {
     }
 
     /**
-     * 中断正在执行的任务<br/>
-     * 任务终止需要配合响应中断或停止信号
+     * 中断正在执行的任务<br/> 任务终止需要配合响应中断或停止信号
      */
     public void interruptJob(@NotNull String instanceId, @NotNull String nodeCode) throws SchedulerException {
         JobKey jobKey = JobKey.jobKey(String.format(JOB_KEY, instanceId, nodeCode));
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java
index d581c693..1b811c32 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/log/PipelineNodeStepLogAspect.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.framework.pipeline.log;
 
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.framework.exception.BadRequestException;
@@ -55,20 +55,22 @@ public class PipelineNodeStepLogAspect extends AbstractPipelineNodeJobService {
      */
     @Around("logPointcut()")
     public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        MethodSignature signature = (MethodSignature)joinPoint.getSignature();
         Method method = signature.getMethod();
         PipelineInstanceNodeTb currentNodeInfo = null;
         for (Object arg : joinPoint.getArgs()) {
             if (arg instanceof PipelineInstanceNodeTb) {
-                currentNodeInfo = (PipelineInstanceNodeTb) arg;
+                currentNodeInfo = (PipelineInstanceNodeTb)arg;
                 break;
             }
         }
         PipelineNodeStepLog pipelineNodeStepLog = method.getAnnotation(PipelineNodeStepLog.class);
         try {
-            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.RUNNING, PipelineStatusEnum.RUNNING.getDesc(), null);
+            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.RUNNING, PipelineStatusEnum.RUNNING.getDesc(),
+                null);
             Object result = joinPoint.proceed();
-            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.SUCCESS, PipelineStatusEnum.SUCCESS.getDesc(), new Date());
+            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.SUCCESS, PipelineStatusEnum.SUCCESS.getDesc(),
+                new Date());
             return result;
         } catch (BadRequestException e) {
             log.error("执行失败", e);
@@ -76,7 +78,8 @@ public class PipelineNodeStepLogAspect extends AbstractPipelineNodeJobService {
             throw e;
         } catch (Throwable e) {
             log.error("执行失败", e);
-            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.FAIL, PipelineStatusEnum.FAIL.getDesc(), new Date());
+            addPipelineInstanceNodeDetailLog(currentNodeInfo, pipelineNodeStepLog.value(), PipelineStatusEnum.FAIL, PipelineStatusEnum.FAIL.getDesc(),
+                new Date());
             throw e;
         }
     }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java
index 4f4a1c7e..3c02dd48 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeJobExecuteResult.java
@@ -16,7 +16,7 @@
 package cn.odboy.devops.framework.pipeline.model;
 
 import cn.odboy.base.CsObject;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java
index 13254a02..81c50b90 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/framework/pipeline/model/PipelineNodeTemplateVo.java
@@ -57,9 +57,7 @@ public class PipelineNodeTemplateVo extends CsObject {
      */
     protected String detailType = "";
     /**
-     * 默认参数<br/>
-     * execute: 执行调用
-     * describe: 明细调用
+     * 默认参数<br/> execute: 执行调用 describe: 明细调用
      */
     protected Map<String, Object> parameters = new HashMap<>();
     /**
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
index 1f3d8d23..bbc8131c 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.core;
 
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import com.anwen.mongo.service.IService;
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
index dc44787b..68885986 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.core;
 
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import com.anwen.mongo.service.IService;
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
index 8e84c6a4..c4e1dbc4 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
@@ -16,7 +16,7 @@
 package cn.odboy.devops.service.core.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
@@ -55,28 +55,22 @@ public class PipelineInstanceNodeDetailServiceImpl extends ServiceImpl<PipelineI
 
     @Override
     public PipelineInstanceNodeDetailTb getPipelineInstanceNodeDetailByArgs(Long nodeId, String nodeCode, String stepName) {
-        return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class)
-                .eq(PipelineInstanceNodeDetailTb::getNodeId, nodeId).eq(PipelineInstanceNodeDetailTb::getNodeCode, nodeCode)
-                .eq(PipelineInstanceNodeDetailTb::getStepName, stepName)
-        );
+        return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class).eq(PipelineInstanceNodeDetailTb::getNodeId, nodeId)
+            .eq(PipelineInstanceNodeDetailTb::getNodeCode, nodeCode).eq(PipelineInstanceNodeDetailTb::getStepName, stepName));
     }
 
     @Override
     public void removeByNodeIds(List<Long> nodeIds) {
         if (CollUtil.isNotEmpty(nodeIds)) {
-            remove(new LambdaUpdateChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class)
-                    .in(PipelineInstanceNodeDetailTb::getNodeId, nodeIds)
-            );
+            remove(new LambdaUpdateChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class).in(PipelineInstanceNodeDetailTb::getNodeId, nodeIds));
         }
     }
 
     @Override
     public PipelineInstanceNodeDetailTb getLastPipelineInstanceNodeDetailByArgs(PipelineInstanceNodeTb instanceNode) {
-        List<PipelineInstanceNodeDetailTb> pipelineInstanceNodeDetailList = list(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class)
-                .eq(PipelineInstanceNodeDetailTb::getNodeId, instanceNode.getId())
-                .eq(PipelineInstanceNodeDetailTb::getNodeCode, instanceNode.getCode())
-                .orderByDesc(PipelineInstanceNodeDetailTb::getStartTime)
-        );
+        List<PipelineInstanceNodeDetailTb> pipelineInstanceNodeDetailList = list(
+            new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class).eq(PipelineInstanceNodeDetailTb::getNodeId, instanceNode.getId())
+                .eq(PipelineInstanceNodeDetailTb::getNodeCode, instanceNode.getCode()).orderByDesc(PipelineInstanceNodeDetailTb::getStartTime));
         // 明细为空，返回节点状态
         if (pipelineInstanceNodeDetailList.isEmpty()) {
             PipelineInstanceNodeDetailTb pipelineInstanceNodeDetailTb = new PipelineInstanceNodeDetailTb();
@@ -110,10 +104,8 @@ public class PipelineInstanceNodeDetailServiceImpl extends ServiceImpl<PipelineI
 
     @Override
     public List<PipelineInstanceNodeDetailTb> queryPipelineInstanceNodeDetailByArgs(PipelineInstanceNodeTb instanceNode) {
-        return list(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class)
-                .eq(PipelineInstanceNodeDetailTb::getNodeId, instanceNode.getId())
-                .eq(PipelineInstanceNodeDetailTb::getNodeCode, instanceNode.getCode())
-                .orderByAsc(PipelineInstanceNodeDetailTb::getStartTime)
-        );
+        return list(
+            new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeDetailTb.class).eq(PipelineInstanceNodeDetailTb::getNodeId, instanceNode.getId())
+                .eq(PipelineInstanceNodeDetailTb::getNodeCode, instanceNode.getCode()).orderByAsc(PipelineInstanceNodeDetailTb::getStartTime));
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
index 3b59d5c0..341a8462 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
@@ -16,7 +16,7 @@
 package cn.odboy.devops.service.core.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
@@ -75,10 +75,8 @@ public class PipelineInstanceNodeServiceImpl extends ServiceImpl<PipelineInstanc
     }
 
     public PipelineInstanceNodeTb getPipelineInstanceNodeByArgs(Long instanceId, String code) {
-        return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class)
-                .eq(PipelineInstanceNodeTb::getInstanceId, instanceId)
-                .eq(PipelineInstanceNodeTb::getCode, code)
-        );
+        return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId, instanceId)
+            .eq(PipelineInstanceNodeTb::getCode, code));
     }
 
     @Override
@@ -93,10 +91,9 @@ public class PipelineInstanceNodeServiceImpl extends ServiceImpl<PipelineInstanc
             }
         }
         // 更新节点状态
-        List<PipelineInstanceNodeTb> instanceNodeList = list(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class)
-                .eq(PipelineInstanceNodeTb::getInstanceId, pipelineInstanceTb.getInstanceId())
-                .eq(PipelineInstanceNodeTb::getCode, penddingNodeList)
-        );
+        List<PipelineInstanceNodeTb> instanceNodeList = list(
+            new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId,
+                pipelineInstanceTb.getInstanceId()).eq(PipelineInstanceNodeTb::getCode, penddingNodeList));
         if (CollUtil.isNotEmpty(instanceNodeList)) {
             Date nowTime = new Date();
             for (PipelineInstanceNodeTb pipelineInstanceNodeTb : instanceNodeList) {
@@ -107,20 +104,15 @@ public class PipelineInstanceNodeServiceImpl extends ServiceImpl<PipelineInstanc
             }
             updateBatchByIds(instanceNodeList);
             // 删除节点明细数据
-            List<Long> nodeIds = instanceNodeList.stream()
-                    .map(PipelineInstanceNodeTb::getId)
-                    .distinct()
-                    .collect(Collectors.toList());
+            List<Long> nodeIds = instanceNodeList.stream().map(PipelineInstanceNodeTb::getId).distinct().collect(Collectors.toList());
             pipelineInstanceNodeDetailService.removeByNodeIds(nodeIds);
         }
     }
 
     @Override
     public List<PipelineInstanceNodeTb> queryPipelineInstanceNodeListByInstanceId(Long instanceId) {
-        return list(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class)
-                .eq(PipelineInstanceNodeTb::getInstanceId, instanceId)
-                .orderByAsc(PipelineInstanceNodeTb::getId)
-        );
+        return list(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId, instanceId)
+            .orderByAsc(PipelineInstanceNodeTb::getId));
     }
 
     @Override
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
index 5df20a49..9a487b62 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
@@ -18,8 +18,8 @@ package cn.odboy.devops.service.core.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.devops.constant.pipeline.PipelineConst;
-import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
index 89150354..788728c6 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeApkSignAndroidService extends AbstractPipelineNodeJobSe
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java
index aec73235..90289445 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveCPlusService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeApproveCPlusService extends AbstractPipelineNodeJobServ
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
index c38eeb20..9dcdac10 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeApproveDeployService extends AbstractPipelineNodeJobSer
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java
index e9224332..0ac9d85b 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveTestAndroidService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeApproveTestAndroidService extends AbstractPipelineNodeJ
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
index 6570e24b..f29dc2ea 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildAndroidService extends AbstractPipelineNodeJobServ
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java
index 3c82e1ad..e1dba43c 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildCPlusService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildCPlusService extends AbstractPipelineNodeJobServic
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java
index 46d5ac27..53b33094 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildIOSService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildIOSService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
index e5633f60..aac201ab 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildJavaService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeBuildJavaBiz.buildJavaStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeBuildJavaBiz.startGitlabPipeline(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
index 08e3af3e..934909ef 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildNodeService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
index e53b4167..e72dbfa8 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildNpmService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
index 122ab126..1fc311bb 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildPythonService extends AbstractPipelineNodeJobServi
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
index af1ffcb0..745ac93e 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeBuildService extends AbstractPipelineNodeJobService imp
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java
index b9749219..b813fb75 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeCheckFlutterVersionService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeCheckFlutterVersionService extends AbstractPipelineNode
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
index a918c6d4..9dcd6603 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -47,12 +47,12 @@ public class PipelineNodeDeployApiService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
index 2cc20b5c..13969be1 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineTemplateTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
@@ -50,12 +50,12 @@ public class PipelineNodeDeployJavaService extends AbstractPipelineNodeJobServic
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
         long templateId = jobDataMap.getLong(PipelineConst.TEMPLATE_ID);
         PipelineTemplateTb pipelineTemplate = pipelineTemplateService.getPipelineTemplateById(templateId);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDeployJavaBiz.deployStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDeployJavaBiz.deployJavaByWithContextName(pipelineInstanceNode, contextName, env, templateList, lastNodeResult, pipelineTemplate);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
index a602cd71..4658e524 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeDeployNodeService extends AbstractPipelineNodeJobServic
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java
index 5b1090ad..8b90f67b 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployPythonService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineTemplateTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
@@ -50,12 +50,12 @@ public class PipelineNodeDeployPythonService extends AbstractPipelineNodeJobServ
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
         long templateId = jobDataMap.getLong(PipelineConst.TEMPLATE_ID);
         PipelineTemplateTb pipelineTemplate = pipelineTemplateService.getPipelineTemplateById(templateId);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDeployJavaBiz.deployStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDeployJavaBiz.deployJavaByWithContextName(pipelineInstanceNode, contextName, env, templateList, lastNodeResult, pipelineTemplate);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
index 55d9913e..abe196e0 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeHttpGetPluginService extends AbstractPipelineNodeJobSer
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java
index 6da767bb..3df5ca6a 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeHttpPostPluginService extends AbstractPipelineNodeJobSe
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
index d65f87a8..4be93b33 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeImageScanService extends AbstractPipelineNodeJobService
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
index f75c712e..e94caf3b 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -47,12 +47,12 @@ public class PipelineNodeInitService extends AbstractPipelineNodeJobService impl
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeInitBiz.initStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeInitBiz.createReleaseBranch(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
index 8964a07f..178f5272 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -44,12 +44,12 @@ public class PipelineNodeMergeBranchService extends AbstractPipelineNodeJobServi
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws Exception {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeMergeBranchBiz.mergeBranchStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeMergeBranchBiz.integrationAreaBranchMergeRelease(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
index 3e89b159..e24dc5e2 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeMergeConfirmService extends AbstractPipelineNodeJobServ
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
index 596ea5ac..7b980458 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeMergeMasterService extends AbstractPipelineNodeJobServi
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java
index e09885bb..932aa7cf 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReinforceAndroidApkService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeReinforceAndroidApkService extends AbstractPipelineNode
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java
index 12863d3c..5e12e61b 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeUploadAndroidApkService.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.devops.service.pipeline;
 
-import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
@@ -45,12 +45,12 @@ public class PipelineNodeUploadAndroidApkService extends AbstractPipelineNodeJob
     public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
         // 参数列表
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
-        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo)jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
         String env = jobDataMap.getString(PipelineConst.ENV);
         List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
-        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult)jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
index 9d1b6d24..f004d6ba 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
@@ -30,22 +30,26 @@ import java.util.List;
 public class PipelineNodeBuildJavaBiz {
 
     @PipelineNodeStepLog("构建开始")
-    public void buildJavaStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void buildJavaStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("构建中")
-    public void startGitlabPipeline(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void startGitlabPipeline(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("上传包到OSS")
-    public void uploadPackageToOss(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void uploadPackageToOss(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("构建完成")
-    public void buildJavaFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void buildJavaFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
index 99f80a02..95c12102 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
@@ -30,12 +30,14 @@ import java.util.List;
 public class PipelineNodeDemoBiz {
 
     @PipelineNodeStepLog("开始")
-    public void start(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void start(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("完成")
-    public void finish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void finish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
index 8e9c24f8..b243f05d 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
@@ -30,17 +30,20 @@ import java.util.List;
 @Service
 public class PipelineNodeDeployJavaBiz {
     @PipelineNodeStepLog("部署开始")
-    public void deployStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void deployStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("部署中")
-    public void deployJavaByWithContextName(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult, PipelineTemplateTb templateType) {
+    public void deployJavaByWithContextName(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env,
+        List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult, PipelineTemplateTb templateType) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("部署完成")
-    public void deployFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void deployFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
index fbc10282..7df22986 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
@@ -29,22 +29,26 @@ import java.util.List;
 @Service
 public class PipelineNodeInitBiz {
     @PipelineNodeStepLog("初始化开始")
-    public void initStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void initStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("Master分支合并到Release分支")
-    public void mergeMasterToRelease(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void mergeMasterToRelease(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("新建Release分支")
-    public void createReleaseBranch(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void createReleaseBranch(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("初始化完成")
-    public void initFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void initFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
index adff0e1e..ff163a4d 100644
--- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
+++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
@@ -20,7 +20,6 @@ import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.framework.pipeline.log.PipelineNodeStepLog;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.framework.exception.BadRequestException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -30,17 +29,20 @@ import java.util.List;
 @Service
 public class PipelineNodeMergeBranchBiz {
     @PipelineNodeStepLog("分支合并开始")
-    public void mergeBranchStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void mergeBranchStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("集成区分支合并到release分支")
-    public void integrationAreaBranchMergeRelease(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void integrationAreaBranchMergeRelease(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env,
+        List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("分支合并完成")
-    public void mergeBranchFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+    public void mergeBranchFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList,
+        PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
index 32ff4b1f..32c25edf 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
@@ -99,7 +99,7 @@ public class SystemAuthController {
     @ApiOperation("获取用户信息")
     @PostMapping(value = "/info")
     public ResponseEntity<SystemUserInfoVo> getUserInfo() {
-        SystemUserJwtVo jwtUser = (SystemUserJwtVo) CsSecurityHelper.getCurrentUser();
+        SystemUserJwtVo jwtUser = (SystemUserJwtVo)CsSecurityHelper.getCurrentUser();
         SystemUserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class);
         return ResponseEntity.ok(userInfoVo);
     }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
index 4a4c5b85..96135ebb 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.model.SystemCreateDeptArgs;
 import cn.odboy.system.dal.model.SystemQueryDeptArgs;
@@ -40,7 +40,7 @@ public class SystemDeptController {
     @ApiOperation("查询部门")
     @PostMapping
     @PreAuthorize("@el.check('user:list','dept:list')")
-    public ResponseEntity<CsResultVo<List<SystemDeptTb>>> queryDept(@Validated @RequestBody CsPageArgs<SystemQueryDeptArgs> args) throws Exception {
+    public ResponseEntity<CsPageResultVo<List<SystemDeptTb>>> queryDept(@Validated @RequestBody CsPageArgs<SystemQueryDeptArgs> args) throws Exception {
         SystemQueryDeptArgs criteria = args.getArgs();
         List<SystemDeptTb> depts = systemDeptService.queryAllDept(criteria, true);
         return new ResponseEntity<>(CsPageUtil.toPage(depts), HttpStatus.OK);
@@ -49,7 +49,8 @@ public class SystemDeptController {
     @ApiOperation("查询部门:根据ID获取同级与上级数据")
     @PostMapping("/queryDeptSuperiorTree")
     @PreAuthorize("@el.check('user:list','dept:list')")
-    public ResponseEntity<CsResultVo<Set<SystemDeptTb>>> queryDeptSuperiorTree(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
+    public ResponseEntity<CsPageResultVo<Set<SystemDeptTb>>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
+        @RequestParam(defaultValue = "false") Boolean exclude) {
         Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
         for (Long id : ids) {
             // 同级数据
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
index c511bbab..54aa3307 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
 import cn.odboy.system.dal.model.SystemCreateDictArgs;
 import cn.odboy.system.dal.model.SystemQueryDictArgs;
@@ -45,7 +45,7 @@ public class SystemDictController {
     @ApiOperation("查询字典")
     @PostMapping
     @PreAuthorize("@el.check('dict:list')")
-    public ResponseEntity<CsResultVo<List<SystemDictTb>>> queryDictByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemDictTb>>> queryDictByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictArgs> args) {
         Page<SystemDictTb> page;
         SystemQueryDictArgs criteria = args.getArgs();
         if (args.getSize() != null) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
index 33773ace..354c9adf 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
 import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
 import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
@@ -29,13 +29,13 @@ public class SystemDictDetailController {
 
     @ApiOperation("查询字典详情")
     @PostMapping
-    public ResponseEntity<CsResultVo<List<SystemDictDetailTb>>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemDictDetailTb>>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
         return queryDictDetailByArgs(args);
     }
 
     @ApiOperation("查询字典详情")
     @PostMapping(value = "/queryDictDetailByArgs")
-    public ResponseEntity<CsResultVo<List<SystemDictDetailTb>>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemDictDetailTb>>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
         SystemQueryDictDetailArgs criteria = args.getArgs();
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemDictDetailService.queryDictDetailByArgs(criteria, page), HttpStatus.OK);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
index c4797ff3..6f291f64 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.model.SystemCreateJobArgs;
 import cn.odboy.system.dal.model.SystemQueryJobArgs;
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：岗位管理")
@@ -39,7 +38,7 @@ public class SystemJobController {
     @ApiOperation("查询岗位")
     @PostMapping(value = "/queryAllEnableJob")
     @PreAuthorize("@el.check('job:list','user:list')")
-    public ResponseEntity<CsResultVo<List<SystemJobTb>>> queryJobByArgs(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemJobTb>>> queryJobByArgs(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
         SystemQueryJobArgs criteria = args.getArgs();
         Page<SystemJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemJobService.queryJobByArgs(criteria, page), HttpStatus.OK);
@@ -48,7 +47,7 @@ public class SystemJobController {
     @ApiOperation("查询岗位")
     @PostMapping
     @PreAuthorize("@el.check('job:list','user:list')")
-    public ResponseEntity<CsResultVo<List<SystemJobTb>>> queryJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemJobTb>>> queryJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
         return queryJobByArgs(args);
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
index 7896ebdd..2d6c0354 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.constant.FileTypeEnum;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
@@ -33,7 +33,7 @@ public class SystemLocalStorageController {
     @ApiOperation("查询文件")
     @PostMapping
     @PreAuthorize("@el.check('storage:list')")
-    public ResponseEntity<CsResultVo<List<SystemLocalStorageTb>>> queryLocalStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemLocalStorageTb>>> queryLocalStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
         SystemQueryStorageArgs criteria = args.getArgs();
         Page<SystemLocalStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(localStorageService.queryLocalStorage(criteria, page), HttpStatus.OK);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
index 1004c831..2f83970c 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
@@ -2,7 +2,7 @@ package cn.odboy.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.model.SystemMenuVo;
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：菜单管理")
@@ -68,14 +67,14 @@ public class SystemMenuController {
     @PostMapping
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
-    public ResponseEntity<CsResultVo<List<SystemMenuTb>>> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
+    public ResponseEntity<CsPageResultVo<List<SystemMenuTb>>> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
         return queryAllMenu(args);
     }
 
     @PostMapping(value = "/queryMenuByArgs")
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
-    public ResponseEntity<CsResultVo<List<SystemMenuTb>>> queryAllMenu(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
+    public ResponseEntity<CsPageResultVo<List<SystemMenuTb>>> queryAllMenu(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
         SystemQueryMenuArgs criteria = args.getArgs();
         List<SystemMenuTb> menuList = systemMenuService.queryAllMenu(criteria, true);
         return new ResponseEntity<>(CsPageUtil.toPage(menuList), HttpStatus.OK);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
index eb1986f0..683f681d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.model.SystemUserOnlineVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.util.CsDesEncryptUtil;
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/user/online")
@@ -32,7 +31,7 @@ public class SystemOnlineController {
     @ApiOperation("查询在线用户")
     @PostMapping
     @PreAuthorize("@el.check()")
-    public ResponseEntity<CsResultVo<List<SystemUserOnlineVo>>> queryOnlineUser(@Validated @RequestBody CsPageArgs<SystemUserOnlineVo> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemUserOnlineVo>>> queryOnlineUser(@Validated @RequestBody CsPageArgs<SystemUserOnlineVo> args) {
         IPage<SystemUserOnlineVo> page = new Page<>(args.getPage(), args.getSize());
         return new ResponseEntity<>(systemUserOnlineInfoDAO.queryUserOnlineModelPage(args.getArgs(), page), HttpStatus.OK);
     }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
index 97fa0109..a27d7c59 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
 import cn.odboy.system.dal.model.SystemOssStorageVo;
 import cn.odboy.system.dal.model.SystemQueryStorageArgs;
@@ -33,7 +33,7 @@ public class SystemOssStorageController {
     @ApiOperation("查询文件")
     @PostMapping
     @PreAuthorize("@el.check('storage:list')")
-    public ResponseEntity<CsResultVo<List<SystemOssStorageVo>>> queryOssStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemOssStorageVo>>> queryOssStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
         SystemQueryStorageArgs criteria = args.getArgs();
         Page<SystemOssStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemOssStorageService.queryOssStorage(criteria, page), HttpStatus.OK);
@@ -61,168 +61,168 @@ public class SystemOssStorageController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-//    @ApiOperation(value = "图片/视频预览")
-//    @GetMapping("/preview-file")
-//    public ResponseEntity<Object> previewFile(@RequestParam("fileName") String fileName) {
-//        // 校验文件名是否有效
-//        if (StrUtil.isBlank(fileName)) {
-//            log.warn("文件名为空，无法生成预签名 URL");
-//            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("文件名为空，无法生成预签名 URL");
-//        }
-//
-//        // 确保文件名包含完整的路径（例如：2025/04/28/78bda88f-ff2d-4c4f-9756-397c62c3771f.jpg）
-//        if (!fileName.contains("/")) {
-//            log.warn("请检查文件名是否正确，无法生成预签名 URL");
-//            return null;
-//        }
-//        // 创建返回 map
-//        Map<String, Object> res = new HashMap<>();
-//        // 生成 1 小时有效的预签名 URL
-//        try {
-//            GetPresignedObjectUrlArgs presignedUrlArgs = GetPresignedObjectUrlArgs.builder()
-//                    // 获取 bucket 名称
-//                    .bucket(properties.getOss().getMinio().getBucketName())
-//                    // 使用完整路径
-//                    .object(fileName)
-//                    // 设置方法为 GET（读取文件）
-//                    .method(Method.GET)
-//                    // 设置 URL 过期时间为 1 小时 1*60*60
-//                    .expiry(3600).build();
-//
-//            // 获取预签名 URL
-//            String url = minioClient.getPresignedObjectUrl(presignedUrlArgs);
-//            res.put("data", url);
-//            // 记录生成的 URL
-//            log.info("生成预签名 URL 成功，fileName: {}, url: {}", fileName, url);
-//        } catch (Exception e) {
-//            log.error("生成预签名 URL 失败，fileName: {}", fileName, e);
-//        }
-//        res.put("code", HttpStatus.OK.value());
-//        res.put("msg", "上传成功");
-//        return ResponseEntity.status(HttpStatus.OK).body(res);
-//    }
-//
-//    /**
-//     * 存储桶存在
-//     *
-//     * @param bucketName 存储桶名称
-//     * @return {@link ResponseEntity }<{@link Object }>
-//     */
-//    @ApiOperation(value = "查看存储bucket是否存在")
-//    @GetMapping("/bucketExists")
-//    public ResponseEntity<Object> bucketExists(@RequestParam("bucketName") String bucketName) {
-//        return ResponseEntity.status(HttpStatus.OK).body("查看存储bucket是否存在 bucketName : " + minioRepository.bucketExists(bucketName));
-//    }
-//
-//    /**
-//     * 制作桶
-//     *
-//     * @param bucketName 存储桶名称
-//     * @return {@link ResponseEntity }<{@link Object }>
-//     */
-//    @ApiOperation(value = "创建存储bucket")
-//    @GetMapping("/makeBucket")
-//    public ResponseEntity<Object> makeBucket(String bucketName) {
-//        return ResponseEntity.status(HttpStatus.OK).body("创建存储bucket bucketName : " + minioRepository.makeBucket(bucketName));
-//    }
-//
-//    /**
-//     * 删除存储桶
-//     *
-//     * @param bucketName 存储桶名称
-//     * @return {@link ResponseEntity }<{@link Object }>
-//     */
-//    @ApiOperation(value = "删除存储bucket")
-//    @GetMapping("/removeBucket")
-//    public ResponseEntity<Object> removeBucket(String bucketName) {
-//        return ResponseEntity.status(HttpStatus.OK).body("删除存储bucket bucketName : " + minioRepository.removeBucket(bucketName));
-//    }
-//
-//    /**
-//     * 获取所有存储桶
-//     *
-//     * @return {@link ResponseEntity }<{@link Object }>
-//     */
-//    @ApiOperation(value = "获取全部bucket")
-//    @GetMapping("/queryAllBuckets")
-//    public ResponseEntity<Object> queryAllBuckets() {
-//        List<Bucket> allBuckets = minioRepository.queryAllBuckets();
-//        // 获取名称 allBuckets.forEach(bucket -> log.info(bucket.name()));
-//        List<String> bucketNames = allBuckets.stream().map(Bucket::name).collect(Collectors.toList());
-//        HashMap<String, Object> response = new HashMap<>();
-//        response.put("data", bucketNames);
-//        response.put("code", HttpStatus.OK.value());
-//        response.put("msg", "获取全部bucket成功");
-//        return ResponseEntity.status(HttpStatus.OK).body(response);
-//    }
-//
-//    /**
-//     * 上传
-//     *
-//     * @param file 文件
-//     * @return {@link ResponseEntity }<{@link Object }>
-//     */
-//    @ApiOperation(value = "文件上传返回url")
-//    @PostMapping("/upload")
-//    public ResponseEntity<Object> upload(@RequestParam("file") MultipartFile file) {
-//        if (file.isEmpty()) {
-//            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("文件不能为空");
-//        }
-//        String objectName = minioRepository.upload(file);
-//        if (null != objectName) {
-//            HashMap<String, Object> response = new HashMap<>();
-//            response.put("data", (properties.getOss().getMinio().getEndpoint() + "/" + properties.getOss().getMinio().getBucketName() + "/" + objectName));
-//            response.put("code", HttpStatus.OK.value());
-//            response.put("msg", "上传成功");
-//            return ResponseEntity.status(HttpStatus.OK).body(response);
-//        }
-//        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("文件上传失败");
-//    }
-//
-//    /**
-//     * 文件上传
-//     *
-//     * @param file 文件
-//     * @return 文件在Minio中的路径
-//     */
-//    @ApiOperation(value = "文件上传返回url")
-//    @PostMapping("/upload")
-//    public ResponseEntity<Object> upload(MultipartFile file) {
-//        String originalFilename = file.getOriginalFilename();
-//        if (StrUtil.isBlank(originalFilename)) {
-//            throw new RuntimeException("文件名为空");
-//        }
-//        String fileExtension = FileUtil.getSuffix(originalFilename);
-//        // 使用UUID确保文件名唯一
-//        String fileName = UUID.randomUUID() + fileExtension;
-//        // 使用日期加上文件名，方便分类
-//        String objectName = CsDateUtil.getNowDateTimeMsStr() + "/" + fileName;
-//
-//        log.info("准备上传文件，objectName: {}", objectName);
-//
-//        // 通过更大缓冲区和流优化上传文件
-//        try (InputStream fileInputStream = file.getInputStream()) {
-//            // 上传前记录文件大小和类型
-//            long fileSize = file.getSize();
-//            log.info("上传文件大小：{} 字节, 文件类型：{}", fileSize, file.getContentType());
-//            PutObjectArgs objectArgs = PutObjectArgs.builder()
-//                    .bucket(properties.getOss().getMinio().getBucketName())
-//                    .object(objectName)
-//                    .stream(fileInputStream, fileSize, -1)
-//                    .contentType(file.getContentType())
-//                    .build();
-//            minioClient.putObject(objectArgs);
-//            log.info("文件上传成功，objectName: {}", objectName);
-//            HashMap<String, Object> response = new HashMap<>();
-//            response.put("data", (properties.getOss().getMinio().getEndpoint() + "/" + properties.getOss().getMinio().getBucketName() + "/" + objectName));
-//            response.put("code", HttpStatus.OK.value());
-//            response.put("msg", "上传成功");
-//            return ResponseEntity.status(HttpStatus.OK).body(response);
-//        } catch (IOException e) {
-//            log.error("上传文件失败，objectName: {}", objectName, e);
-//            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("文件上传失败");
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
+    //    @ApiOperation(value = "图片/视频预览")
+    //    @GetMapping("/preview-file")
+    //    public ResponseEntity<Object> previewFile(@RequestParam("fileName") String fileName) {
+    //        // 校验文件名是否有效
+    //        if (StrUtil.isBlank(fileName)) {
+    //            log.warn("文件名为空，无法生成预签名 URL");
+    //            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("文件名为空，无法生成预签名 URL");
+    //        }
+    //
+    //        // 确保文件名包含完整的路径（例如：2025/04/28/78bda88f-ff2d-4c4f-9756-397c62c3771f.jpg）
+    //        if (!fileName.contains("/")) {
+    //            log.warn("请检查文件名是否正确，无法生成预签名 URL");
+    //            return null;
+    //        }
+    //        // 创建返回 map
+    //        Map<String, Object> res = new HashMap<>();
+    //        // 生成 1 小时有效的预签名 URL
+    //        try {
+    //            GetPresignedObjectUrlArgs presignedUrlArgs = GetPresignedObjectUrlArgs.builder()
+    //                    // 获取 bucket 名称
+    //                    .bucket(properties.getOss().getMinio().getBucketName())
+    //                    // 使用完整路径
+    //                    .object(fileName)
+    //                    // 设置方法为 GET（读取文件）
+    //                    .method(Method.GET)
+    //                    // 设置 URL 过期时间为 1 小时 1*60*60
+    //                    .expiry(3600).build();
+    //
+    //            // 获取预签名 URL
+    //            String url = minioClient.getPresignedObjectUrl(presignedUrlArgs);
+    //            res.put("data", url);
+    //            // 记录生成的 URL
+    //            log.info("生成预签名 URL 成功，fileName: {}, url: {}", fileName, url);
+    //        } catch (Exception e) {
+    //            log.error("生成预签名 URL 失败，fileName: {}", fileName, e);
+    //        }
+    //        res.put("code", HttpStatus.OK.value());
+    //        res.put("msg", "上传成功");
+    //        return ResponseEntity.status(HttpStatus.OK).body(res);
+    //    }
+    //
+    //    /**
+    //     * 存储桶存在
+    //     *
+    //     * @param bucketName 存储桶名称
+    //     * @return {@link ResponseEntity }<{@link Object }>
+    //     */
+    //    @ApiOperation(value = "查看存储bucket是否存在")
+    //    @GetMapping("/bucketExists")
+    //    public ResponseEntity<Object> bucketExists(@RequestParam("bucketName") String bucketName) {
+    //        return ResponseEntity.status(HttpStatus.OK).body("查看存储bucket是否存在 bucketName : " + minioRepository.bucketExists(bucketName));
+    //    }
+    //
+    //    /**
+    //     * 制作桶
+    //     *
+    //     * @param bucketName 存储桶名称
+    //     * @return {@link ResponseEntity }<{@link Object }>
+    //     */
+    //    @ApiOperation(value = "创建存储bucket")
+    //    @GetMapping("/makeBucket")
+    //    public ResponseEntity<Object> makeBucket(String bucketName) {
+    //        return ResponseEntity.status(HttpStatus.OK).body("创建存储bucket bucketName : " + minioRepository.makeBucket(bucketName));
+    //    }
+    //
+    //    /**
+    //     * 删除存储桶
+    //     *
+    //     * @param bucketName 存储桶名称
+    //     * @return {@link ResponseEntity }<{@link Object }>
+    //     */
+    //    @ApiOperation(value = "删除存储bucket")
+    //    @GetMapping("/removeBucket")
+    //    public ResponseEntity<Object> removeBucket(String bucketName) {
+    //        return ResponseEntity.status(HttpStatus.OK).body("删除存储bucket bucketName : " + minioRepository.removeBucket(bucketName));
+    //    }
+    //
+    //    /**
+    //     * 获取所有存储桶
+    //     *
+    //     * @return {@link ResponseEntity }<{@link Object }>
+    //     */
+    //    @ApiOperation(value = "获取全部bucket")
+    //    @GetMapping("/queryAllBuckets")
+    //    public ResponseEntity<Object> queryAllBuckets() {
+    //        List<Bucket> allBuckets = minioRepository.queryAllBuckets();
+    //        // 获取名称 allBuckets.forEach(bucket -> log.info(bucket.name()));
+    //        List<String> bucketNames = allBuckets.stream().map(Bucket::name).collect(Collectors.toList());
+    //        HashMap<String, Object> response = new HashMap<>();
+    //        response.put("data", bucketNames);
+    //        response.put("code", HttpStatus.OK.value());
+    //        response.put("msg", "获取全部bucket成功");
+    //        return ResponseEntity.status(HttpStatus.OK).body(response);
+    //    }
+    //
+    //    /**
+    //     * 上传
+    //     *
+    //     * @param file 文件
+    //     * @return {@link ResponseEntity }<{@link Object }>
+    //     */
+    //    @ApiOperation(value = "文件上传返回url")
+    //    @PostMapping("/upload")
+    //    public ResponseEntity<Object> upload(@RequestParam("file") MultipartFile file) {
+    //        if (file.isEmpty()) {
+    //            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("文件不能为空");
+    //        }
+    //        String objectName = minioRepository.upload(file);
+    //        if (null != objectName) {
+    //            HashMap<String, Object> response = new HashMap<>();
+    //            response.put("data", (properties.getOss().getMinio().getEndpoint() + "/" + properties.getOss().getMinio().getBucketName() + "/" + objectName));
+    //            response.put("code", HttpStatus.OK.value());
+    //            response.put("msg", "上传成功");
+    //            return ResponseEntity.status(HttpStatus.OK).body(response);
+    //        }
+    //        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("文件上传失败");
+    //    }
+    //
+    //    /**
+    //     * 文件上传
+    //     *
+    //     * @param file 文件
+    //     * @return 文件在Minio中的路径
+    //     */
+    //    @ApiOperation(value = "文件上传返回url")
+    //    @PostMapping("/upload")
+    //    public ResponseEntity<Object> upload(MultipartFile file) {
+    //        String originalFilename = file.getOriginalFilename();
+    //        if (StrUtil.isBlank(originalFilename)) {
+    //            throw new RuntimeException("文件名为空");
+    //        }
+    //        String fileExtension = FileUtil.getSuffix(originalFilename);
+    //        // 使用UUID确保文件名唯一
+    //        String fileName = UUID.randomUUID() + fileExtension;
+    //        // 使用日期加上文件名，方便分类
+    //        String objectName = CsDateUtil.getNowDateTimeMsStr() + "/" + fileName;
+    //
+    //        log.info("准备上传文件，objectName: {}", objectName);
+    //
+    //        // 通过更大缓冲区和流优化上传文件
+    //        try (InputStream fileInputStream = file.getInputStream()) {
+    //            // 上传前记录文件大小和类型
+    //            long fileSize = file.getSize();
+    //            log.info("上传文件大小：{} 字节, 文件类型：{}", fileSize, file.getContentType());
+    //            PutObjectArgs objectArgs = PutObjectArgs.builder()
+    //                    .bucket(properties.getOss().getMinio().getBucketName())
+    //                    .object(objectName)
+    //                    .stream(fileInputStream, fileSize, -1)
+    //                    .contentType(file.getContentType())
+    //                    .build();
+    //            minioClient.putObject(objectArgs);
+    //            log.info("文件上传成功，objectName: {}", objectName);
+    //            HashMap<String, Object> response = new HashMap<>();
+    //            response.put("data", (properties.getOss().getMinio().getEndpoint() + "/" + properties.getOss().getMinio().getBucketName() + "/" + objectName));
+    //            response.put("code", HttpStatus.OK.value());
+    //            response.put("msg", "上传成功");
+    //            return ResponseEntity.status(HttpStatus.OK).body(response);
+    //        } catch (IOException e) {
+    //            log.error("上传文件失败，objectName: {}", objectName, e);
+    //            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("文件上传失败");
+    //        } catch (Exception e) {
+    //            throw new RuntimeException(e);
+    //        }
+    //    }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
index 55f6c52e..f8e9a4ea 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.context.CsSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -37,7 +36,7 @@ public class SystemQuartzJobController {
     @ApiOperation("查询定时任务")
     @PostMapping
     @PreAuthorize("@el.check('quartzJob:list')")
-    public ResponseEntity<CsResultVo<List<SystemQuartzJobTb>>> queryQuartzJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryQuartzJobArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemQuartzJobTb>>> queryQuartzJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryQuartzJobArgs> args) {
         SystemQueryQuartzJobArgs criteria = args.getArgs();
         Page<SystemQuartzJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemQuartzJobService.queryQuartzJobByArgs(criteria, page), HttpStatus.OK);
@@ -60,7 +59,7 @@ public class SystemQuartzJobController {
     @ApiOperation("查询任务执行日志")
     @PostMapping(value = "/logs")
     @PreAuthorize("@el.check('quartzJob:list')")
-    public ResponseEntity<CsResultVo<List<SystemQuartzLogTb>>> queryQuartzJobLog(SystemQueryQuartzJobArgs criteria) {
+    public ResponseEntity<CsPageResultVo<List<SystemQuartzLogTb>>> queryQuartzJobLog(SystemQueryQuartzJobArgs criteria) {
         Page<SystemQuartzLogTb> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemQuartzJobService.queryQuartzLogByArgs(criteria, page), HttpStatus.OK);
     }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
index b1fc027f..6fbda96c 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
@@ -2,7 +2,7 @@ package cn.odboy.system.controller;
 
 import cn.hutool.core.lang.Dict;
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.model.SystemCreateRoleArgs;
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：角色管理")
@@ -58,7 +57,7 @@ public class SystemRoleController {
     @ApiOperation("查询角色")
     @PostMapping
     @PreAuthorize("@el.check('roles:list')")
-    public ResponseEntity<CsResultVo<List<SystemRoleTb>>> queryRoleByArgs(@Validated @RequestBody CsPageArgs<SystemQueryRoleArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemRoleTb>>> queryRoleByArgs(@Validated @RequestBody CsPageArgs<SystemQueryRoleArgs> args) {
         SystemQueryRoleArgs criteria = args.getArgs();
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(systemRoleService.queryRoleByArgs(criteria, page), HttpStatus.OK);
@@ -118,7 +117,8 @@ public class SystemRoleController {
      * @return /
      */
     private int checkRoleLevels(Integer level) {
-        List<Integer> levels = systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList());
+        List<Integer> levels =
+            systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList());
         int min = Collections.min(levels);
         if (level != null) {
             if (level < min) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
index 6e37b10d..5d996d29 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
@@ -2,7 +2,7 @@ package cn.odboy.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.odboy.base.CsPageArgs;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.base.CsSelectOptionVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
@@ -59,7 +59,7 @@ public class SystemUserController {
     @ApiOperation("查询用户")
     @PostMapping
     @PreAuthorize("@el.check('user:list')")
-    public ResponseEntity<CsResultVo<List<SystemUserTb>>> queryUserByArgs(@Validated @RequestBody CsPageArgs<SystemQueryUserArgs> args) {
+    public ResponseEntity<CsPageResultVo<List<SystemUserTb>>> queryUserByArgs(@Validated @RequestBody CsPageArgs<SystemQueryUserArgs> args) {
         Page<Object> page = new Page<>(args.getPage(), args.getSize());
         SystemQueryUserArgs criteria = args.getArgs();
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
@@ -121,7 +121,8 @@ public class SystemUserController {
     @PreAuthorize("@el.check('user:del')")
     public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
         for (Long id : ids) {
-            Integer currentLevel = Collections.min(systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+            Integer currentLevel = Collections.min(
+                systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
             Integer optLevel = Collections.min(systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
             if (currentLevel > optLevel) {
                 throw new BadRequestException("角色权限不足, 不能删除：" + systemUserService.getUserById(id).getUsername());
@@ -180,7 +181,8 @@ public class SystemUserController {
      * @param resources /
      */
     private void checkLevel(SystemUserTb resources) {
-        Integer currentLevel = Collections.min(systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+        Integer currentLevel = Collections.min(
+            systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
         Integer optLevel = systemRoleService.getDeptLevelByRoles(resources.getRoles());
         if (currentLevel > optLevel) {
             throw new BadRequestException("角色权限不足");
@@ -203,18 +205,13 @@ public class SystemUserController {
             c.or();
             c.like(SystemUserTb::getNickName, criteria.getBlurry());
         });
-        return new ResponseEntity<>(systemUserService.queryUserByBlurry(wrapper, new Page<>(criteria.getPage(), maxPageSize)
-        ).getRecords().stream().map(m -> {
+        return new ResponseEntity<>(systemUserService.queryUserByBlurry(wrapper, new Page<>(criteria.getPage(), maxPageSize)).getRecords().stream().map(m -> {
             Map<String, Object> ext = new HashMap<>(1);
             ext.put("id", m.getId());
             ext.put("deptId", m.getDeptId());
             ext.put("email", m.getEmail());
             ext.put("phone", m.getPhone());
-            return CsSelectOptionVo.builder()
-                    .label(m.getNickName())
-                    .value(m.getUsername())
-                    .ext(ext)
-                    .build();
+            return CsSelectOptionVo.builder().label(m.getNickName()).value(m.getUsername()).ext(ext).build();
         }).collect(Collectors.toList()), HttpStatus.OK);
     }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
index 72279967..64c11353 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
@@ -60,9 +60,8 @@ public class SystemDeptTb extends CsBaseUserTimeTb {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        SystemDeptTb dept = (SystemDeptTb) o;
-        return Objects.equals(id, dept.id) &&
-                Objects.equals(name, dept.name);
+        SystemDeptTb dept = (SystemDeptTb)o;
+        return Objects.equals(id, dept.id) && Objects.equals(name, dept.name);
     }
 
     @Override
@@ -75,7 +74,6 @@ public class SystemDeptTb extends CsBaseUserTimeTb {
         return subCount > 0;
     }
 
-
     @ApiModelProperty(value = "是否为叶子")
     public Boolean getLeaf() {
         return subCount <= 0;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java
index 8f1a330c..2a1c2740 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java
@@ -9,7 +9,6 @@ import lombok.Setter;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-
 @Getter
 @Setter
 @TableName("system_dict")
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
index 4b76242e..f7039d4f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
@@ -12,7 +12,6 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
-
 @Getter
 @Setter
 @TableName("system_job")
@@ -43,7 +42,7 @@ public class SystemJobTb extends CsBaseUserTimeTb {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        SystemJobTb job = (SystemJobTb) o;
+        SystemJobTb job = (SystemJobTb)o;
         return Objects.equals(id, job.id);
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
index 831312bc..12a72a28 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
@@ -81,7 +81,7 @@ public class SystemMenuTb extends CsBaseUserTimeTb {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        SystemMenuTb menu = (SystemMenuTb) o;
+        SystemMenuTb menu = (SystemMenuTb)o;
         return Objects.equals(id, menu.id);
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
index 691a96d7..2a999b1a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
@@ -9,7 +9,6 @@ import lombok.Setter;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-
 @Getter
 @Setter
 @TableName("system_quartz_job")
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
index 07219862..b18d6919 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
@@ -59,7 +59,7 @@ public class SystemRoleTb extends CsBaseUserTimeTb {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        SystemRoleTb role = (SystemRoleTb) o;
+        SystemRoleTb role = (SystemRoleTb)o;
         return Objects.equals(id, role.id);
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
index b0ca7a49..91f95530 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
@@ -89,9 +89,8 @@ public class SystemUserTb extends CsBaseUserTimeTb {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        SystemUserTb user = (SystemUserTb) o;
-        return Objects.equals(id, user.id) &&
-                Objects.equals(username, user.username);
+        SystemUserTb user = (SystemUserTb)o;
+        return Objects.equals(id, user.id) && Objects.equals(username, user.username);
     }
 
     @Override
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
index 843eacd2..60ecf7ac 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
@@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 import java.util.List;
 
-
 @Data
 @NoArgsConstructor
 public class SystemQueryJobArgs {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
index f5aa27bf..74465a54 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-
 @Data
 public class SystemQueryMenuArgs {
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
index 3f2a8e80..43ea513b 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-
 @Data
 public class SystemQueryQuartzJobArgs {
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
index 40d7ba7d..856e88f9 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-
 @Data
 public class SystemQueryRoleArgs {
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
index 8b4ae7ac..70007aeb 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-
 @Data
 public class SystemQueryStorageArgs {
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
index 28bf312d..62a45a9d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
@@ -11,7 +11,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Set;
 
-
 /**
  * 字典明细 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java
index 11f5d27d..9512b333 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java
@@ -10,7 +10,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-
 /**
  * 字典 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java
index 8be97833..d6ba20bc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemEmailConfigMapper.java
@@ -4,7 +4,6 @@ import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
-
 /**
  * 邮件配置 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java
index 5ab3834a..3bc70001 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java
@@ -10,7 +10,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-
 /**
  * 菜单 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java
index 306a3b2b..471f5bfa 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzLogMapper.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-
 /**
  * 定时任务日志 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java
index 315fdeb7..ab5c913a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java
@@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Set;
 
-
 /**
  * 角色菜单关联 Mapper
  *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
index 51b6ab3e..21a404c7 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
@@ -31,8 +31,7 @@ public class SystemUserInfoDAO {
     }
 
     /**
-     * 清理用户缓存信息
-     * 用户信息变更时
+     * 清理用户缓存信息 用户信息变更时
      *
      * @param userName 用户名
      */
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
index 5ab3a3f0..91229b3f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
@@ -1,6 +1,6 @@
 package cn.odboy.system.dal.redis;
 
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.RedisHelper;
 import cn.odboy.system.dal.model.SystemUserJwtVo;
@@ -112,7 +112,7 @@ public class SystemUserOnlineInfoDAO {
      * @return /
      */
 
-    public CsResultVo<List<SystemUserOnlineVo>> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage<SystemUserOnlineVo> pageable) {
+    public CsPageResultVo<List<SystemUserOnlineVo>> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage<SystemUserOnlineVo> pageable) {
         String username = null;
         if (onlineVo != null) {
             username = onlineVo.getUserName();
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
index 7ced427e..a4015ba5 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
@@ -23,7 +23,6 @@ import org.springframework.web.filter.CorsFilter;
 import java.util.Map;
 import java.util.Set;
 
-
 @Configuration
 @RequiredArgsConstructor
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -53,62 +52,40 @@ public class SpringSecurityConfig {
         // 获取匿名标记
         Map<String, Set<String>> anonymousUrls = CsAnonTagUtil.getAnonymousUrl(applicationContext);
         return httpSecurity
-                // 禁用 CSRF
-                .csrf().disable()
-                .addFilter(corsFilter)
-                // 授权异常
-                .exceptionHandling()
-                .authenticationEntryPoint(authenticationErrorHandler)
-                .accessDeniedHandler(jwtAccessDeniedHandler)
-                // 防止iframe 造成跨域
-                .and()
-                .headers()
-                .frameOptions()
-                .disable()
-                // 不创建会话
-                .and()
-                .sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .authorizeRequests()
-                // 静态资源等等
-                .antMatchers(
-                        HttpMethod.GET,
-                        "/*.html",
-                        "/**/*.html",
-                        "/**/*.css",
-                        "/**/*.js",
-                        "/websocket/**"
-                ).permitAll()
-                // swagger 文档
-                .antMatchers("/swagger-ui.html").permitAll()
-                .antMatchers("/swagger-resources/**").permitAll()
-                .antMatchers("/webjars/**").permitAll()
-                .antMatchers("/*/api-docs").permitAll()
-                // 文件
-                .antMatchers("/avatar/**").permitAll()
-                .antMatchers("/file/**").permitAll()
-                // 阿里巴巴 druid
-                .antMatchers("/druid/**").permitAll()
-                // 放行OPTIONS请求
-                .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-                // 自定义匿名访问所有url放行：允许匿名和带Token访问，细腻化到每个 Request 类型
-                // GET
-                .antMatchers(HttpMethod.GET, anonymousUrls.get(RequestMethodEnum.GET.getType()).toArray(new String[0])).permitAll()
-                // POST
-                .antMatchers(HttpMethod.POST, anonymousUrls.get(RequestMethodEnum.POST.getType()).toArray(new String[0])).permitAll()
-                // PUT
-                .antMatchers(HttpMethod.PUT, anonymousUrls.get(RequestMethodEnum.PUT.getType()).toArray(new String[0])).permitAll()
-                // PATCH
-                .antMatchers(HttpMethod.PATCH, anonymousUrls.get(RequestMethodEnum.PATCH.getType()).toArray(new String[0])).permitAll()
-                // DELETE
-                .antMatchers(HttpMethod.DELETE, anonymousUrls.get(RequestMethodEnum.DELETE.getType()).toArray(new String[0])).permitAll()
-                // 所有类型的接口都放行
-                .antMatchers(anonymousUrls.get(RequestMethodEnum.ALL.getType()).toArray(new String[0])).permitAll()
-                // 所有请求都需要认证
-                .anyRequest().authenticated()
-                .and().apply(securityConfigurerAdapter())
-                .and().build();
+            // 禁用 CSRF
+            .csrf().disable().addFilter(corsFilter)
+            // 授权异常
+            .exceptionHandling().authenticationEntryPoint(authenticationErrorHandler).accessDeniedHandler(jwtAccessDeniedHandler)
+            // 防止iframe 造成跨域
+            .and().headers().frameOptions().disable()
+            // 不创建会话
+            .and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().authorizeRequests()
+            // 静态资源等等
+            .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/websocket/**").permitAll()
+            // swagger 文档
+            .antMatchers("/swagger-ui.html").permitAll().antMatchers("/swagger-resources/**").permitAll().antMatchers("/webjars/**").permitAll()
+            .antMatchers("/*/api-docs").permitAll()
+            // 文件
+            .antMatchers("/avatar/**").permitAll().antMatchers("/file/**").permitAll()
+            // 阿里巴巴 druid
+            .antMatchers("/druid/**").permitAll()
+            // 放行OPTIONS请求
+            .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+            // 自定义匿名访问所有url放行：允许匿名和带Token访问，细腻化到每个 Request 类型
+            // GET
+            .antMatchers(HttpMethod.GET, anonymousUrls.get(RequestMethodEnum.GET.getType()).toArray(new String[0])).permitAll()
+            // POST
+            .antMatchers(HttpMethod.POST, anonymousUrls.get(RequestMethodEnum.POST.getType()).toArray(new String[0])).permitAll()
+            // PUT
+            .antMatchers(HttpMethod.PUT, anonymousUrls.get(RequestMethodEnum.PUT.getType()).toArray(new String[0])).permitAll()
+            // PATCH
+            .antMatchers(HttpMethod.PATCH, anonymousUrls.get(RequestMethodEnum.PATCH.getType()).toArray(new String[0])).permitAll()
+            // DELETE
+            .antMatchers(HttpMethod.DELETE, anonymousUrls.get(RequestMethodEnum.DELETE.getType()).toArray(new String[0])).permitAll()
+            // 所有类型的接口都放行
+            .antMatchers(anonymousUrls.get(RequestMethodEnum.ALL.getType()).toArray(new String[0])).permitAll()
+            // 所有请求都需要认证
+            .anyRequest().authenticated().and().apply(securityConfigurerAdapter()).and().build();
     }
 
     private TokenConfigurer securityConfigurerAdapter() {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/CsSecurityHelper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/CsSecurityHelper.java
index 20a3e65f..604d30bc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/CsSecurityHelper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/CsSecurityHelper.java
@@ -44,7 +44,7 @@ public class CsSecurityHelper {
     public static List<Long> getCurrentUserDataScope() {
         UserDetails userDetails = getCurrentUser();
         // 将 Java 对象转换为 JSONObject 对象
-        JSONObject jsonObject = (JSONObject) JSON.toJSON(userDetails);
+        JSONObject jsonObject = (JSONObject)JSON.toJSON(userDetails);
         JSONArray jsonArray = jsonObject.getJSONArray("dataScopes");
         return JSON.parseArray(jsonArray.toJSONString(), Long.class);
     }
@@ -106,8 +106,7 @@ public class CsSecurityHelper {
      * @return /
      */
     public static String getToken() {
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder
-                .getRequestAttributes())).getRequest();
+        HttpServletRequest request = ((ServletRequestAttributes)Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         String bearerToken = request.getHeader(SystemConst.HEADER_NAME);
         if (bearerToken != null && bearerToken.startsWith(SystemConst.TOKEN_PREFIX)) {
             // 去掉令牌前缀
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
index 6feaab00..5f7ed5c4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
@@ -33,7 +33,7 @@ public class TokenFilter extends GenericFilterBean {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException, IOException {
-        HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
+        HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest;
         String token = resolveToken(httpServletRequest);
         // 对于 Token 为空的不需要去查 Redis
         if (StrUtil.isNotBlank(token)) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
index 58cce33d..53d9c568 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -49,14 +48,12 @@ public class TokenProvider implements InitializingBean {
         byte[] keyBytes = Decoders.BASE64.decode(properties.getJwt().getBase64Secret());
         signingKey = Keys.hmacShaKeyFor(keyBytes);
         jwtParser = Jwts.parserBuilder()
-                // 使用预生成的签名密钥
-                .setSigningKey(signingKey)
-                .build();
+            // 使用预生成的签名密钥
+            .setSigningKey(signingKey).build();
     }
 
     /**
-     * 创建Token 设置永不过期，
-     * Token 的时间有效性转到Redis 维护
+     * 创建Token 设置永不过期， Token 的时间有效性转到Redis 维护
      *
      * @param user /
      * @return /
@@ -70,13 +67,12 @@ public class TokenProvider implements InitializingBean {
         claims.put(AUTHORITIES_UUID_KEY, IdUtil.simpleUUID());
         // 直接调用 Jwts.builder() 创建新实例Add commentMore actions
         return Jwts.builder()
-                // 设置自定义 Claims
-                .setClaims(claims)
-                // 设置主题
-                .setSubject(user.getUsername())
-                // 使用预生成的签名密钥和算法签名
-                .signWith(signingKey, SignatureAlgorithm.HS512)
-                .compact();
+            // 设置自定义 Claims
+            .setClaims(claims)
+            // 设置主题
+            .setSubject(user.getUsername())
+            // 使用预生成的签名密钥和算法签名
+            .signWith(signingKey, SignatureAlgorithm.HS512).compact();
     }
 
     /**
@@ -92,9 +88,7 @@ public class TokenProvider implements InitializingBean {
     }
 
     public Claims getClaims(String token) {
-        return jwtParser
-                .parseClaimsJws(token)
-                .getBody();
+        return jwtParser.parseClaimsJws(token).getBody();
     }
 
     /**
@@ -104,7 +98,7 @@ public class TokenProvider implements InitializingBean {
         // 判断是否续期token,计算token的过期时间
         String loginKey = loginKey(token);
         long time = redisHelper.getExpire(loginKey) * 1000;
-        Date expireDate = DateUtil.offset(new Date(), DateField.MILLISECOND, (int) time);
+        Date expireDate = DateUtil.offset(new Date(), DateField.MILLISECOND, (int)time);
         // 判断当前时间与过期时间的时间差
         long differ = expireDate.getTime() - System.currentTimeMillis();
         // 如果在续期检查的范围内，则续期
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
index b39c4616..656be2f5 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
@@ -36,7 +36,7 @@ public class ExecutionJobBean extends QuartzJobBean {
     @Override
     public void executeInternal(JobExecutionContext context) {
         // 获取任务
-        SystemQuartzJobTb quartzJob = (SystemQuartzJobTb) context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
+        SystemQuartzJobTb quartzJob = (SystemQuartzJobTb)context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
         // 获取spring bean
         SystemQuartzLogMapper quartzLogMapper = CsSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
         SystemQuartzJobService systemQuartzJobService = CsSpringBeanHolder.getBean(SystemQuartzJobService.class);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
index 1a19bfc8..88056467 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
@@ -22,20 +22,16 @@ public class QuartzManage {
     public void addJob(SystemQuartzJobTb quartzJob) {
         try {
             // 构建job信息
-            JobDetail jobDetail = JobBuilder.newJob(ExecutionJobBean.class).
-                    withIdentity(JOB_NAME + quartzJob.getId()).build();
+            JobDetail jobDetail = JobBuilder.newJob(ExecutionJobBean.class).withIdentity(JOB_NAME + quartzJob.getId()).build();
 
             // 通过触发器名和cron 表达式创建 Trigger
-            Trigger cronTrigger = TriggerBuilder.newTrigger()
-                    .withIdentity(JOB_NAME + quartzJob.getId())
-                    .startNow()
-                    .withSchedule(CronScheduleBuilder.cronSchedule(quartzJob.getCronExpression()))
-                    .build();
+            Trigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(JOB_NAME + quartzJob.getId()).startNow()
+                .withSchedule(CronScheduleBuilder.cronSchedule(quartzJob.getCronExpression())).build();
 
             cronTrigger.getJobDataMap().put(SystemQuartzJobTb.JOB_KEY, quartzJob);
 
             // 重置启动时间
-            ((CronTriggerImpl) cronTrigger).setStartTime(new Date());
+            ((CronTriggerImpl)cronTrigger).setStartTime(new Date());
 
             // 执行定时任务，如果是持久化的，这里会报错，捕获输出
             try {
@@ -62,16 +58,16 @@ public class QuartzManage {
     public void updateJobCron(SystemQuartzJobTb quartzJob) {
         try {
             TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
-            CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
+            CronTrigger trigger = (CronTrigger)scheduler.getTrigger(triggerKey);
             // 如果不存在则创建一个定时任务
             if (trigger == null) {
                 addJob(quartzJob);
-                trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
+                trigger = (CronTrigger)scheduler.getTrigger(triggerKey);
             }
             CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(quartzJob.getCronExpression());
             trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
             // 重置启动时间
-            ((CronTriggerImpl) trigger).setStartTime(new Date());
+            ((CronTriggerImpl)trigger).setStartTime(new Date());
             trigger.getJobDataMap().put(SystemQuartzJobTb.JOB_KEY, quartzJob);
 
             scheduler.rescheduleJob(triggerKey, trigger);
@@ -110,7 +106,7 @@ public class QuartzManage {
     public void resumeJob(SystemQuartzJobTb quartzJob) {
         try {
             TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
-            CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
+            CronTrigger trigger = (CronTrigger)scheduler.getTrigger(triggerKey);
             // 如果不存在则创建一个定时任务
             if (trigger == null) {
                 addJob(quartzJob);
@@ -131,7 +127,7 @@ public class QuartzManage {
     public void runJobNow(SystemQuartzJobTb quartzJob) {
         try {
             TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
-            CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
+            CronTrigger trigger = (CronTrigger)scheduler.getTrigger(triggerKey);
             // 如果不存在则创建一个定时任务
             if (trigger == null) {
                 addJob(quartzJob);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java
index d3a4992f..c53e229f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java
@@ -14,7 +14,6 @@ import org.springframework.util.unit.DataSize;
 import javax.servlet.MultipartConfigElement;
 import java.io.File;
 
-
 @Slf4j
 @Configuration
 public class MultipartConfig {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java
index 956b8f5a..012f7ee4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java
@@ -1,6 +1,5 @@
 package cn.odboy.system.framework.storage.minio;
 
-
 import cn.hutool.core.io.FastByteArrayOutputStream;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.IORuntimeException;
@@ -147,11 +146,8 @@ public class MinioRepository {
         systemOssStorageTb.setObjectName(objectName);
 
         try (InputStream fileInputStream = CsFileUtil.getInputStream(tempFile)) {
-            PutObjectArgs objectArgs = PutObjectArgs.builder()
-                    .bucket(ossMinioConfig.getBucketName())
-                    .object(objectName)
-                    .stream(fileInputStream, fileSize, -1)
-                    .contentType(contentType)
+            PutObjectArgs objectArgs =
+                PutObjectArgs.builder().bucket(ossMinioConfig.getBucketName()).object(objectName).stream(fileInputStream, fileSize, -1).contentType(contentType)
                     .build();
             minioClient.putObject(objectArgs);
             log.info("文件上传成功，并删除临时文件，文件名：{}", originalFilename);
@@ -168,10 +164,8 @@ public class MinioRepository {
         return null;
     }
 
-
     /**
-     * 优化文件上传
-     * 文件上传：优化版
+     * 优化文件上传 文件上传：优化版
      *
      * @param file
      * @return {@link String }
@@ -192,7 +186,9 @@ public class MinioRepository {
 
         log.info("准备上传文件，原文件名：{}，上传后文件名：{}", originalFilename, fileName);
         try (InputStream fileInputStream = file.getInputStream()) {
-            PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(properties.getOss().getMinio().getBucketName()).object(objectName).stream(fileInputStream, file.getSize(), -1).contentType(file.getContentType()).build();
+            PutObjectArgs objectArgs =
+                PutObjectArgs.builder().bucket(properties.getOss().getMinio().getBucketName()).object(objectName).stream(fileInputStream, file.getSize(), -1)
+                    .contentType(file.getContentType()).build();
             // 使用重试机制进行上传
             uploadWithRetry(objectArgs, 3);
             log.info("文件上传成功，objectName: {}", objectName);
@@ -240,8 +236,7 @@ public class MinioRepository {
     }
 
     /**
-     * 验证文件大小
-     * 限制上传的文件大小
+     * 验证文件大小 限制上传的文件大小
      *
      * @param file 文件
      * @return boolean
@@ -266,10 +261,8 @@ public class MinioRepository {
             return null;
         }
         try {
-            GetPresignedObjectUrlArgs presignedUrlArgs = GetPresignedObjectUrlArgs.builder()
-                    .bucket(properties.getOss().getMinio().getBucketName())
-                    .object(fullFileName)
-                    .method(Method.GET)
+            GetPresignedObjectUrlArgs presignedUrlArgs =
+                GetPresignedObjectUrlArgs.builder().bucket(properties.getOss().getMinio().getBucketName()).object(fullFileName).method(Method.GET)
                     // 设置 URL 过期时间为 7 天, 最大 7 天, 别挣扎了
                     .expiry(3600 * 24 * 7).build();
             String url = minioClient.getPresignedObjectUrl(presignedUrlArgs);
@@ -281,7 +274,6 @@ public class MinioRepository {
         return null;
     }
 
-
     /**
      * 下载文件
      *
@@ -346,7 +338,6 @@ public class MinioRepository {
         }
     }
 
-
     /**
      * 查看文件对象列表
      *
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
index 59dc82f3..da559aae 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
@@ -104,7 +104,6 @@ public class SystemDeptService {
         CsFileUtil.downloadExcel(list, response);
     }
 
-
     /**
      * 更新父节点中子节点数目
      *
@@ -274,7 +273,7 @@ public class SystemDeptService {
      * @return /
      */
 
-    public CsResultVo<Set<SystemDeptTb>> buildDeptTree(List<SystemDeptTb> deptList) {
+    public CsPageResultVo<Set<SystemDeptTb>> buildDeptTree(List<SystemDeptTb> deptList) {
         Set<SystemDeptTb> trees = new LinkedHashSet<>();
         Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
         List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList());
@@ -302,7 +301,7 @@ public class SystemDeptService {
         if (CollectionUtil.isEmpty(trees)) {
             trees = deptSet;
         }
-        CsResultVo<Set<SystemDeptTb>> baseResult = new CsResultVo<>();
+        CsPageResultVo<Set<SystemDeptTb>> baseResult = new CsPageResultVo<>();
         baseResult.setContent(CollectionUtil.isEmpty(trees) ? deptSet : trees);
         baseResult.setTotalElements(deptSet.size());
         return baseResult;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
index 91a21205..b8e9bace 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
 import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
 import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
@@ -64,7 +64,7 @@ public class SystemDictDetailService {
      * @return /
      */
 
-    public CsResultVo<List<SystemDictDetailTb>> queryDictDetailByArgs(SystemQueryDictDetailArgs criteria, Page<Object> page) {
+    public CsPageResultVo<List<SystemDictDetailTb>> queryDictDetailByArgs(SystemQueryDictDetailArgs criteria, Page<Object> page) {
         return CsPageUtil.toPage(systemDictDetailMapper.selectDictDetailByArgs(criteria, page));
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
index 8e26787a..916bdc8f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
@@ -2,7 +2,7 @@ package cn.odboy.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
 import cn.odboy.system.dal.model.SystemCreateDictArgs;
@@ -111,7 +111,7 @@ public class SystemDictService {
      * @return /
      */
 
-    public CsResultVo<List<SystemDictTb>> queryDictByArgs(SystemQueryDictArgs criteria, Page<SystemDictTb> page) {
+    public CsPageResultVo<List<SystemDictTb>> queryDictByArgs(SystemQueryDictArgs criteria, Page<SystemDictTb> page) {
         return CsPageUtil.toPage(systemDictMapper.selectDictByArgs(criteria, page));
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
index 3519873e..5372e77e 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
@@ -56,7 +56,6 @@ public class SystemEmailService {
      * @param sendEmailRequest 邮件发送的内容
      */
 
-
     public void sendEmail(SystemSendEmailArgs sendEmailRequest) {
         SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig();
         if (systemEmailConfigTb.getId() == null) {
@@ -87,14 +86,10 @@ public class SystemEmailService {
         // 发送
         try {
             int size = sendEmailRequest.getTos().size();
-            Mail.create(account)
-                    .setTos(sendEmailRequest.getTos().toArray(new String[size]))
-                    .setTitle(sendEmailRequest.getSubject())
-                    .setContent(content)
-                    .setHtml(true)
-                    // 关闭session
-                    .setUseGlobalSession(false)
-                    .send();
+            Mail.create(account).setTos(sendEmailRequest.getTos().toArray(new String[size])).setTitle(sendEmailRequest.getSubject()).setContent(content)
+                .setHtml(true)
+                // 关闭session
+                .setUseGlobalSession(false).send();
         } catch (Exception e) {
             log.error("邮件发送失败", e);
             throw new BadRequestException("邮件发送失败");
@@ -141,7 +136,6 @@ public class SystemEmailService {
         sendEmail(sendEmailRequest);
     }
 
-
     public SystemEmailConfigTb getLastEmailConfig() {
         SystemEmailConfigTb systemEmailConfigTb = systemEmailConfigMapper.selectById(1L);
         return systemEmailConfigTb == null ? new SystemEmailConfigTb() : systemEmailConfigTb;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
index 377b7a81..d11ea7a0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.model.SystemCreateJobArgs;
@@ -96,8 +96,7 @@ public class SystemJobService {
      * @return
      */
 
-
-    public CsResultVo<List<SystemJobTb>> queryJobByArgs(SystemQueryJobArgs criteria, Page<SystemJobTb> page) {
+    public CsPageResultVo<List<SystemJobTb>> queryJobByArgs(SystemQueryJobArgs criteria, Page<SystemJobTb> page) {
         return CsPageUtil.toPage(systemJobMapper.selectJobByArgs(criteria, page));
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
index 3eea30cb..1785cf0e 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
@@ -3,7 +3,7 @@ package cn.odboy.system.service;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IORuntimeException;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.CsFileLocalUploadHelper;
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-
 @Service
 @RequiredArgsConstructor
 public class SystemLocalStorageService {
@@ -32,7 +31,6 @@ public class SystemLocalStorageService {
     private final CsFileLocalUploadHelper fileUploadPathHelper;
     private final AppProperties properties;
 
-
     /**
      * 上传
      *
@@ -129,7 +127,7 @@ public class SystemLocalStorageService {
      * @param page     分页参数
      * @return /
      */
-    public CsResultVo<List<SystemLocalStorageTb>> queryLocalStorage(SystemQueryStorageArgs criteria, Page<SystemLocalStorageTb> page) {
+    public CsPageResultVo<List<SystemLocalStorageTb>> queryLocalStorage(SystemQueryStorageArgs criteria, Page<SystemLocalStorageTb> page) {
         return CsPageUtil.toPage(systemLocalStorageMapper.selectLocalStorageByArgs(criteria, page));
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
index 8dc631e0..6cd3936b 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
 @Service
 @RequiredArgsConstructor
 public class SystemMenuService {
@@ -55,7 +54,8 @@ public class SystemMenuService {
             resources.setPid(null);
         }
         if (resources.getIFrame()) {
-            if (!(resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
+            if (!(resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || resources.getPath().toLowerCase()
+                .startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
                 throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
             }
         }
@@ -79,7 +79,8 @@ public class SystemMenuService {
         }
         SystemMenuTb menu = systemMenuMapper.selectById(resources.getId());
         if (resources.getIFrame()) {
-            if (!(resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
+            if (!(resources.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || resources.getPath().toLowerCase()
+                .startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
                 throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
             }
         }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java
index 26b2272b..6cf515d0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java
@@ -82,7 +82,7 @@ public class SystemMonitorService {
         diskInfo.put("available", CsFileUtil.getSize(available));
         diskInfo.put("used", CsFileUtil.getSize(used));
         if (total != 0) {
-            diskInfo.put("usageRate", df.format(used / (double) total * 100));
+            diskInfo.put("usageRate", df.format(used / (double)total * 100));
         } else {
             diskInfo.put("usageRate", 0);
         }
@@ -106,7 +106,7 @@ public class SystemMonitorService {
         if (used == 0) {
             swapInfo.put("usageRate", 0);
         } else {
-            swapInfo.put("usageRate", df.format(used / (double) total * 100));
+            swapInfo.put("usageRate", df.format(used / (double)total * 100));
         }
         return swapInfo;
     }
@@ -122,7 +122,7 @@ public class SystemMonitorService {
         memoryInfo.put("total", FormatUtil.formatBytes(memory.getTotal()));
         memoryInfo.put("available", FormatUtil.formatBytes(memory.getAvailable()));
         memoryInfo.put("used", FormatUtil.formatBytes(memory.getTotal() - memory.getAvailable()));
-        memoryInfo.put("usageRate", df.format((memory.getTotal() - memory.getAvailable()) / (double) memory.getTotal() * 100));
+        memoryInfo.put("usageRate", df.format((memory.getTotal() - memory.getAvailable()) / (double)memory.getTotal() * 100));
         return memoryInfo;
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
index b9fc3138..0973efc2 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
@@ -1,6 +1,6 @@
 package cn.odboy.system.service;
 
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
 import cn.odboy.system.dal.model.SystemOssStorageVo;
 import cn.odboy.system.dal.model.SystemQueryStorageArgs;
@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2025-07-15
  */
 public interface SystemOssStorageService extends IService<SystemOssStorageTb> {
-    CsResultVo<List<SystemOssStorageVo>> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page);
+    CsPageResultVo<List<SystemOssStorageVo>> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page);
 
     List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria);
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
index d3202d22..f11d8bb0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
@@ -3,7 +3,7 @@ package cn.odboy.system.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.redis.RedisHelper;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
@@ -212,7 +212,7 @@ public class SystemQuartzJobService {
      * @return /
      */
 
-    public CsResultVo<List<SystemQuartzJobTb>> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzJobTb> page) {
+    public CsPageResultVo<List<SystemQuartzJobTb>> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzJobTb> page) {
         return CsPageUtil.toPage(systemQuartzJobMapper.selectQuartzJobByArgs(criteria, page));
     }
 
@@ -224,7 +224,7 @@ public class SystemQuartzJobService {
      * @return /
      */
 
-    public CsResultVo<List<SystemQuartzLogTb>> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzLogTb> page) {
+    public CsPageResultVo<List<SystemQuartzLogTb>> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzLogTb> page) {
         return CsPageUtil.toPage(systemQuartzLogMapper.selectQuartzLogByArgs(criteria, page));
     }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
index 1d9575fd..1b462f01 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
@@ -3,7 +3,7 @@ package cn.odboy.system.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
@@ -161,14 +161,13 @@ public class SystemRoleService {
      * @return
      */
 
-    public CsResultVo<List<SystemRoleTb>> queryRoleByArgs(SystemQueryRoleArgs criteria, Page<Object> page) {
+    public CsPageResultVo<List<SystemRoleTb>> queryRoleByArgs(SystemQueryRoleArgs criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<SystemRoleTb> roles = systemRoleMapper.selectRoleByArgs(criteria);
         Long total = systemRoleMapper.countRoleByArgs(criteria);
         return CsPageUtil.toPage(roles, total);
     }
 
-
     /**
      * 根据用户ID查询
      *
@@ -210,15 +209,12 @@ public class SystemRoleService {
         // 如果是管理员直接返回
         if (user.getIsAdmin()) {
             permissions.add("admin");
-            return permissions.stream().map(SystemRoleCodeVo::new)
-                    .collect(Collectors.toList());
+            return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
         }
         List<SystemRoleTb> roles = systemRoleMapper.selectRoleByUserId(user.getId());
-        permissions = roles.stream().flatMap(role -> role.getMenus().stream())
-                .map(SystemMenuTb::getPermission)
-                .filter(CsStringUtil::isNotBlank).collect(Collectors.toSet());
-        return permissions.stream().map(SystemRoleCodeVo::new)
-                .collect(Collectors.toList());
+        permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuTb::getPermission).filter(CsStringUtil::isNotBlank)
+            .collect(Collectors.toSet());
+        return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
     }
 
     /**
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
index b442221b..6b7a304d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
@@ -1,7 +1,7 @@
 package cn.odboy.system.service;
 
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.CsFileLocalUploadHelper;
@@ -273,7 +273,7 @@ public class SystemUserService {
      * @return /
      */
 
-    public CsResultVo<List<SystemUserTb>> queryUserByArgs(SystemQueryUserArgs criteria, Page<Object> page) {
+    public CsPageResultVo<List<SystemUserTb>> queryUserByArgs(SystemQueryUserArgs criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<SystemUserTb> users = systemUserMapper.selectUserByArgs(criteria, CsPageUtil.getCount(systemUserMapper)).getRecords();
         Long total = systemUserMapper.countUserByArgs(criteria);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java
index abd78f22..d6a9ebcc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java
@@ -2,7 +2,7 @@ package cn.odboy.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.base.CsResultVo;
+import cn.odboy.base.CsPageResultVo;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.properties.model.StorageOSSModel;
@@ -48,7 +48,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
     private final CsFileLocalUploadHelper fileUploadPathHelper;
 
     @Override
-    public CsResultVo<List<SystemOssStorageVo>> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page) {
+    public CsPageResultVo<List<SystemOssStorageVo>> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page) {
         IPage<SystemOssStorageTb> ossStorageTbs = baseMapper.selectOssStorageByArgs(criteria, page);
         IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
             SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java
index 36c11d39..ed3982e8 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java
@@ -149,8 +149,7 @@ public final class SqlUtil {
     private static List<String> readSqlList(File sqlFile) throws Exception {
         List<String> sqlList = Lists.newArrayList();
         StringBuilder sb = new StringBuilder();
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                Files.newInputStream(sqlFile.toPath()), StandardCharsets.UTF_8))) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(Files.newInputStream(sqlFile.toPath()), StandardCharsets.UTF_8))) {
             String tmp;
             while ((tmp = reader.readLine()) != null) {
                 log.info("line:{}", tmp);
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 1add8bce..e8dab6a0 100644
--- a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java
+++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java
@@ -1,6 +1,5 @@
 package cn.odboy;
 
-
 import cn.odboy.framework.mybatisplus.core.CsMpCmdGenUtil;
 
 import java.util.List;
@@ -22,21 +21,15 @@ public class GenCode {
         generator.setDriverClassName("com.mysql.cj.jdbc.Driver");
         generator.setDatabaseUsername(DATABASE_USER);
         generator.setDatabasePassword(DATABASE_PWD);
-//        genPipeline(generator);
+        //        genPipeline(generator);
         genSystem(generator);
     }
 
     private static void genPipeline(CsMpCmdGenUtil generator) {
-        generator.gen("devops", "", List.of(
-                "pipeline_template",
-                "pipeline_instance",
-                "pipeline_instance_node_detail"
-        ));
+        generator.gen("devops", "", List.of("pipeline_template", "pipeline_instance", "pipeline_instance_node_detail"));
     }
 
     private static void genSystem(CsMpCmdGenUtil generator) {
-        generator.gen("system", "", List.of(
-                "system_oss_storage"
-        ));
+        generator.gen("system", "", List.of("system_oss_storage"));
     }
 }
diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml
index ded2adc3..99c5068f 100644
--- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml
+++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml
@@ -135,7 +135,7 @@ mybatis-plus:
     # 是否开启自动驼峰命名规则（camel case）映射, 即从经典数据库列名 A_COLUMN（下划线命名） 到经典 Java 属性名 aColumn（驼峰命名） 的类似映射
     map-underscore-to-camel-case: true
     # Sql日志
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # 启动时是否检查 MyBatis XML 文件的存在, 默认不检查
   check-config-location: true
   # MyBatis Mapper 所对应的 XML 文件位置
diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/CsFileUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/CsFileUtilTest.java
index 2277ee87..d2f71df0 100644
--- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/CsFileUtilTest.java
+++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/CsFileUtilTest.java
@@ -10,7 +10,7 @@ public class CsFileUtilTest {
 
     @Test
     public void testToFile() {
-        long retval = toFile(new MockMultipartFile("foo", (byte[]) null)).getTotalSpace();
+        long retval = toFile(new MockMultipartFile("foo", (byte[])null)).getTotalSpace();
         assertEquals(500695072768L, retval);
     }
 
diff --git a/cutejava/docs/controller命名规范.md b/cutejava/docs/Controller命名规范.md
similarity index 100%
rename from cutejava/docs/controller命名规范.md
rename to cutejava/docs/Controller命名规范.md
diff --git a/cutejava/docs/IDEA换行调整.jpg b/cutejava/docs/IDEA换行调整.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bb6b19145ef55fc3e98c742b0990177b533ad578
GIT binary patch
literal 69216
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
a3Ur;{o>ec<zq>m4-~RnSU0tJgy8jDwtMK{&

literal 0
HcmV?d00001

diff --git a/cutejava/docs/Service方法中使用this.txt b/cutejava/docs/Service方法中使用this.txt
new file mode 100644
index 00000000..552c9aed
--- /dev/null
+++ b/cutejava/docs/Service方法中使用this.txt
@@ -0,0 +1,131 @@
+# 关于在Spring Service中使用`this`调用方法的问题
+
+确实，在Spring管理的Service类中直接使用`this`调用方法会导致Spring的AOP增强失效，这是一个需要注意的重要问题。
+
+## 问题本质
+
+当你在Spring Service中这样写代码：
+
+```java
+@Service
+public class MyService {
+    
+    public void methodA() {
+        this.methodB();  // 这里使用this调用
+    }
+    
+    @Transactional
+    public void methodB() {
+        // 数据库操作
+    }
+}
+
+@Service
+public class MyService {
+    public void methodA() {
+        methodB();  // 这里隐式使用了this.methodB()
+    }
+
+    @Transactional
+    public void methodB() {
+        // 数据库操作
+    }
+}
+```
+
+`methodB()`上的`@Transactional`注解会失效，因为：
+
+1. Spring的AOP（包括事务管理`@Transactional`、缓存`@Cacheable`等）是通过代理实现的
+2. 使用`this`调用会绕过Spring的代理机制，直接调用原始对象的方法
+3. 只有通过代理调用的方法才会被Spring增强
+
+## 解决方案
+
+### 1. 自我注入（推荐）
+
+```java
+@Service
+public class MyService {
+    
+    @Autowired
+    private MyService self;  // 注入自身代理
+    
+    public void methodA() {
+        self.methodB();  // 通过代理调用
+    }
+    
+    @Transactional
+    public void methodB() {
+        // 数据库操作
+    }
+}
+```
+
+### 2. 通过ApplicationContext获取代理
+
+```java
+@Service
+public class MyService implements ApplicationContextAware {
+    
+    private ApplicationContext context;
+    
+    @Override
+    public void setApplicationContext(ApplicationContext context) {
+        this.context = context;
+    }
+    
+    public void methodA() {
+        context.getBean(MyService.class).methodB();
+    }
+    
+    @Transactional
+    public void methodB() {
+        // 数据库操作
+    }
+}
+```
+
+### 3. 调整方法结构（最佳实践）
+
+```java
+@Service
+public class MyService {
+    
+    private final OtherService otherService;
+    
+    public MyService(OtherService otherService) {
+        this.otherService = otherService;
+    }
+    
+    public void methodA() {
+        // 将需要事务的方法提取到另一个Service
+        otherService.methodB();
+    }
+}
+
+@Service
+public class OtherService {
+    
+    @Transactional
+    public void methodB() {
+        // 数据库操作
+    }
+}
+```
+
+## 为什么会出现这种情况？
+
+Spring的AOP实现原理：
+1. 默认使用JDK动态代理（基于接口）或CGLIB（基于子类）
+2. 代理对象包装了原始对象
+3. 外部调用先经过代理，代理再决定是否应用增强逻辑
+4. `this`引用指向的是原始对象而非代理对象
+
+## 最佳实践建议
+
+1. 尽量避免在Service内部方法间调用需要AOP增强的方法
+2. 如果必须调用，使用自我注入的方式
+3. 考虑将需要事务管理的方法拆分到单独的Service中
+4. 对于复杂的业务逻辑，考虑使用领域驱动设计(DDD)的模式
+
+这种设计是Spring AOP的固有特性，理解这一点对于正确使用Spring的事务管理、缓存、安全等AOP功能非常重要。
diff --git a/cutejava/docs/codestyle/alibaba/eclipse-codestyle.xml b/cutejava/docs/codestyle/alibaba/eclipse-codestyle.xml
new file mode 100644
index 00000000..0faa9575
--- /dev/null
+++ b/cutejava/docs/codestyle/alibaba/eclipse-codestyle.xml
@@ -0,0 +1,603 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+    <profile kind="CodeFormatterProfile" name="P3C-CodeStyle" version="13">
+        <!--可变参数的... Idea没有对应的配置项，强制insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <!--枚举值之间 Idea没有对应的配置项，强制insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=Java:SPACE_BEFORE_COMMA-->
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=Java:SPACE_BEFORE_COMMA
+        由于IDEA只有一个SPACE_BEFORE_COMMA选项，所以统一设置 insert_space_before_comma 为 do not insert
+        -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
+                 value="do not insert"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
+                 value="do not insert"/>
+        <!--insert_space_before_comma end-->
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=Java:SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <!--IDEA只有一个配置项SPACE_AFTER_COMMA，insert_space_after_comma*统一设置成insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <!--insert_space_after_comma end-->
+
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=Java:SPACE_BEFORE_COLON-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=Java:SPACE_AFTER_COLON-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+
+        <!--IDEA不支持配置，默认do not insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <!--这个在Eclipse也没有找到配置的地方-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_semicolon=Java:SPACE_BEFORE_SEMICOLON
+        程序导入的时候强制将SPACE_BEFORE_SEMICOLON设置为false
+        -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+
+        <!--SPACE_AFTER_SEMICOLON=true-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+
+        <!--IDEA不支持配置,do not insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
+                 value="do not insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
+                 value="do not insert"/>
+
+        <!--IDEA不支持，使用默认-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+
+        <!--IDEA不支持配置，使用如下值，两者对应-->
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
+                 value="insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
+                value="do not insert"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
+
+        <!--Java:SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=Java:SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+
+        <!--IDEA使用了对应的配置：Java:SPACE_WITHIN_ARRAY_INITIALIZER_BRACES，但感觉不太好，IDEA默认不插入，Eclipse也使用不插入-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
+                 value="do not insert"/>
+
+        <!--use default insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
+                 value="insert"/>
+
+        <!--use default do not insert -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+
+
+        <!--use default insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
+                 value="insert"/>
+
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=Java:SPACE_BEFORE_SWITCH_LBRACE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=Java:SPACE_BEFORE_CLASS_LBRACE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
+                 value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=Java:SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
+                 value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=Java:SPACE_BEFORE_METHOD_LBRACE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
+                 value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=Java:SPACE_AFTER_QUEST-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=Java:SPACE_BEFORE_QUEST-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=Java:SPACE_BEFORE_ANOTATION_PARAMETER_LIST-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
+                 value="do not insert"/>
+
+        <!--use default do not insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
+                 value="do not insert"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
+                 value="do not insert"/>
+
+
+        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_ASSIGNMENT_OPERATORS，使用insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=Java:SPACE_BEFORE_CATCH_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=Java:SPACE_BEFORE_METHOD_CALL_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
+                 value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=Java:SPACE_BEFORE_TRY_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+
+        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_UNARY_OPERATOR，使用do not insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=Java:SPACE_BEFORE_IF_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=Java:SPACE_BEFORE_WHILE_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=Java:SPACE_AFTER_TYPE_CAST-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=Java:SPACE_BEFORE_METHOD_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
+                 value="do not insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=Java:SPACE_BEFORE_FOR_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=Java:SPACE_BEFORE_SYNCHRONIZED_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+
+        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=Java:SPACE_BEFORE_SWITCH_PARENTHESES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+
+        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_LAMBDA_ARROW，使用insert-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <!--SPACE_WITHIN_EMPTY_ARRAY_INITIALIZER_BRACES-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
+                 value="do not insert"/>
+
+        <!--Idea -> Wrapping And Braces -> Simple classes in one line -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
+        <!--Idea -> Wrapping And Braces -> Simple method in one line -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+        <!--因为Idea不支持配置，所以设置为 Idea默认值-->
+
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+        <!--Idea可以通过Wrap Always实现 TODO-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <!--Idea -> Wrapping And Braces -> Simple block in one line -> do not select -->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+
+        <!--Idea -> Wrapping And Braces -> try statement -> catch.... (Java:CATCH_ON_NEW_LINE)-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
+                 value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=Java:ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
+                 value="do not insert"/>
+        <!--#org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=Java:ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
+                 value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=Java:ELSE_ON_NEW_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=Java:WHILE_ON_NEW_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
+                 value="do not insert"/>
+        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=Java:FINALLY_ON_NEW_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
+                 value="do not insert"/>
+
+        <!--comment start-->
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <!--ENABLE_JAVADOC_FORMATTING-->
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <!--org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <!--IDEA无对应设置，所以关闭对block comment的格式化 -->
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+
+        <!--org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=Java:KEEP_FIRST_COLUMN_COMMENT-->
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <!--org.eclipse.jdt.core.formatter.use_on_off_tags=FORMATTER_TAGS_ENABLED-->
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <!--org.eclipse.jdt.core.formatter.disabling_tag=FORMATTER_OFF_TAG-->
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <!--org.eclipse.jdt.core.formatter.enabling_tag=FORMATTER_ON_TAG-->
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+
+        <!--下面的没有IDEA对应项，在代码里面对IDEA中使用默认值即可,LINE_COMMENT_AT_FIRST_COLUMN BLOCK_COMMENT_AT_FIRST_COLUMN设置为false-->
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
+                 value="false"/>
+
+
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <!--和IDEA保持一致，注释换行-->
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+
+
+        <!--comment end-->
+
+        <!--org.eclipse.jdt.core.formatter.blank_lines_after_imports=Java:BLANK_LINES_AFTER_IMPORTS-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_before_imports=Java:BLANK_LINES_BEFORE_IMPORTS-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_after_package=Java:BLANK_LINES_AFTER_PACKAGE-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=Java:BLANK_LINES_AROUND_CLASS-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=Java:BLANK_LINES_BEFORE_METHOD_BODY-->
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_before_field=Java:BLANK_LINES_AROUND_FIELD-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_before_method=Java:BLANK_LINES_AROUND_METHOD-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.blank_lines_before_package=Java:BLANK_LINES_BEFORE_PACKAGE-->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+
+        <!--下面IDEA没有对应设置，使用对应值即可-->
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+
+        <!--org.eclipse.jdt.core.formatter.indentation.size=Java:IndentOptions:INDENT_SIZE-->
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <!--org.eclipse.jdt.core.formatter.continuation_indentation=Java:IndentOptions:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+        <!--org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <!--org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=Java:IndentOptions:SMART_TABS-->
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <!--org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=Java:INDENT_CASE_FROM_SWITCH-->
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <!--KEEP_INDENTS_ON_EMPTY_LINES-->
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <!--org.eclipse.jdt.core.formatter.tabulation.size=Java:IndentOptions:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <!--Java:IndentOptions:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+
+
+        <!--下面IDEA没有对应设置，使用对应值即可-->
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
+                 value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
+                 value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
+                 value="true"/>
+
+
+        <!--Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+
+        <!--下面没有对应的IDEA设置，Eclipse先使用对应值-->
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="16"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+
+
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
+                 value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="16"/>
+
+        <!--IDEA默认配置在同一行，Eclipse使用对应值即可-->
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration"
+                 value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+
+        <!--Java:BINARY_OPERATION_SIGN_ON_NEXT_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+
+        <!--ASSIGNMENT_WRAP 需要设置为 WRAP_AS_NEEDED  WRAP_AS_NEEDED . Add in jdt.core-3.12，it's not work in previous version -->
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+
+        <!--IDEA无配置项，Eclipse使用对应值即可-->
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+
+        <!--org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=Java:KEEP_CONTROL_STATEMENT_IN_ONE_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <!--org.eclipse.jdt.core.formatter.compact_else_if=Java:SPECIAL_ELSE_IF_TREATMENT-->
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <!--Java:ALIGN_GROUP_FIELD_DECLARATIONS-->
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <!--Java:<Programmatic>-->
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+
+        <!--统一为end_of_lint，IDEA默认一致-->
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
+                 value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+
+
+        <!--        <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+                <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+                <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+                        <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+                                <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+                                        <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+                -->
+        <!--Java:KEEP_SIMPLE_BLOCKS_IN_ONE_LINE-->
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+
+        <!--Java:CLASS_BRACE_STYLE，统一使用end_of_line TODO-->
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+
+        <!--org.eclipse.jdt.core.formatter.lineSplit=RIGHT_MARGIN-->
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+    </profile>
+</profiles>
diff --git a/cutejava/docs/codestyle/default/idea-codestyle.xml b/cutejava/docs/codestyle/default/idea-codestyle.xml
new file mode 100644
index 00000000..c3641913
--- /dev/null
+++ b/cutejava/docs/codestyle/default/idea-codestyle.xml
@@ -0,0 +1,7 @@
+<code_scheme name="Default" version="173">
+  <option name="LINE_SEPARATOR" value="&#10;" />
+  <option name="RIGHT_MARGIN" value="160" />
+  <codeStyleSettings language="JAVA">
+    <option name="WRAP_ON_TYPING" value="1" />
+  </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
diff --git a/cutejava/docs/codestyle/project/P3C_CodeStyle.xml b/cutejava/docs/codestyle/project/P3C_CodeStyle.xml
new file mode 100644
index 00000000..9834cc89
--- /dev/null
+++ b/cutejava/docs/codestyle/project/P3C_CodeStyle.xml
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="utf-8"?>
+<profiles version="21">
+	<profile kind="CodeFormatterProfile" name="P3C-CodeStyle" version="21">
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="18"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="160"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+		<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+	</profile>
+</profiles>
\ No newline at end of file
diff --git a/cutejava/docs/codestyle/readme.md b/cutejava/docs/codestyle/readme.md
new file mode 100644
index 00000000..aa8df2c5
--- /dev/null
+++ b/cutejava/docs/codestyle/readme.md
@@ -0,0 +1,4 @@
+Settings -> Editor -> Code Style -> Java -> Scheme(右侧小齿轮) -> Import Scheme ->
+- alibaba: Eclipse Xml Profile
+- project: Eclipse Xml Profile，当前项目风格
+- default: IDEA Xml Profile，默认的风格
diff --git a/cutejava/docs/warning.md b/cutejava/docs/注意事项.md
similarity index 100%
rename from cutejava/docs/warning.md
rename to cutejava/docs/注意事项.md