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 00000000..bb6b1914
Binary files /dev/null and b/cutejava/docs/IDEA换行调整.jpg differ
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