Merge pull request #28 from dromara/dev

Dev
🐳 修改镜像权限.
2024-06-19 12:11:39 +08:00 · 2024-06-19 11:53:06 +08:00 · 2024-06-19 11:29:09 +08:00 · 2024-06-19 11:07:03 +08:00 · 2024-06-19 10:48:00 +08:00 · 2024-06-18 11:53:58 +08:00
344 changed files with 4627 additions and 2063 deletions
--- a/README.md
+++ b/README.md
@@ -13,27 +13,27 @@
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor/releases">
+       href="https://github.com/dromara/orion-visor/releases">
      <img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
+       href="https://gitee.com/dromara/orion-visor/stargazers">
+      <img src="https://gitee.com/dromara/orion-visor/badge/star.svg?theme=dark" alt="star" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://gitee.com/lijiahangmax/orion-visor/members">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
+       href="https://gitee.com/dromara/orion-visor/members">
+      <img src="https://gitee.com/dromara/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
+       href="https://github.com/dromara/orion-visor">
      <img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
+       href="https://github.com/dromara/orion-visor">
      <img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
    </a>
 </p>
@@ -51,31 +51,32 @@

 ## 演示环境

-演示地址: http://101.43.254.243:1081/   
-演示账号: admin/admin
-
-⭐ 体验后可以点一下 `star` 这对我很重要!  
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
-[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
+* 🔗 演示地址: http://101.43.254.243:1081/
+* 🔏 演示账号: admin/admin
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)
+* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
+* 📛 演示环境请不要随便删除数据!
+* 📧 如果演示环境不可用请联系我!

 ## 快速开始

 ```bash
 # clone
-git clone https://github.com/lijiahangmax/orion-visor
+git clone https://github.com/dromara/orion-visor
 cd orion-visor
 # 启动
 docker compose up -d
+# 等待后端服务启动后 (2min±) 访问 http://localhost:1081/
 ```

 ## 项目文档

-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
-* [docker安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/docker-install)
-* [普通安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/install)
-* [更新日志](https://lijiahangmax.github.io/orion-visor/#/about/change-log)
-* [操作手册](https://lijiahangmax.github.io/orion-visor/#/operator/asset)
-* [常见问题](https://lijiahangmax.github.io/orion-visor/#/quickstart/faq)
+* [文档地址](https://lijiahangmax.github.io/open-orion/orion-visor/)
+* [安装文档](https://lijiahangmax.github.io/open-orion/orion-visor/quickstart/docker.html)
+* [更新日志](https://lijiahangmax.github.io/open-orion/orion-visor/update/change-log.html)
+* [操作手册](https://lijiahangmax.github.io/open-orion/orion-visor/operator/asset.html)
+* [常见问题](https://lijiahangmax.github.io/open-orion/orion-visor/support/faq.html)

 ## 技术栈

@@ -130,8 +131,8 @@ docker compose up -d

 ## 免责声明

-在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-visor/blob/main/DISCLAIMER.md)
+在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/dromara/orion-visor/blob/main/DISCLAIMER.md)

 ## License

-本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。  
+本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。  
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
 version: '3.3'
 services:
  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.3
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.9
+    privileged: true
    ports:
      - 1081:80
    environment:
@@ -20,7 +21,7 @@ services:
      - orion-visor-mysql
      - orion-visor-redis
  orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.3
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.9
    privileged: true
    ports:
      - 3307:3306
@@ -34,7 +35,7 @@ services:
      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
  orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.3
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.9
    privileged: true
    ports:
      - 6380:6379
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -1,6 +1,5 @@
 #/bin/bash
 docker compose down
-sh ./pull.sh
 # demo 启动
 if [ "$1" == "demo" ]; then
    sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml
--- a/docker/orion-visor-mysql/Dockerfile
+++ b/docker/orion-visor-mysql/Dockerfile
--- a/docker/orion-visor-mysql/build.sh
+++ b/docker/orion-visor-mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.0.3
+version=2.0.9
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
--- a/docker/orion-visor-mysql/my.cnf
+++ b/docker/orion-visor-mysql/my.cnf
--- a/docker/orion-visor-redis/Dockerfile
+++ b/docker/orion-visor-redis/Dockerfile
--- a/docker/orion-visor-redis/build.sh
+++ b/docker/orion-visor-redis/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.0.3
+version=2.0.9
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
--- a/docker/orion-visor-redis/redis.conf
+++ b/docker/orion-visor-redis/redis.conf
--- a/docker/orion-visor-service/Dockerfile
+++ b/docker/orion-visor-service/Dockerfile
@@ -8,6 +8,7 @@ RUN \
  sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
  apk update && \
  apk add tzdata && \
+  apk add dmidecode && \
  apk add openjdk8
 # 设置时区
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
--- a/docker/orion-visor-service/build.sh
+++ b/docker/orion-visor-service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.0.3
+version=2.0.9
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .
--- a/docker/orion-visor-service/entrypoint.sh
+++ b/docker/orion-visor-service/entrypoint.sh
--- a/docker/orion-visor-service/nginx.conf
+++ b/docker/orion-visor-service/nginx.conf
--- a/docs/README.md
+++ b/docs/README.md
@@ -40,6 +40,12 @@

 ------------------------------

+<p><b>⛔⛔此页面已不再维护, 请跳转至 
+<a target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor">这里</a> 
+查看最新文档 ❗</b></p>
+
+------------------------------
+
 **`orion-visor`** 提供一站式服务器运维解决方案。

 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
@@ -70,9 +76,8 @@ docker compose up -d

 ## 项目文档

-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
-* [docker安装](/quickstart/docker-install)
-* [普通安装](/quickstart/install)
+* [文档地址](/)
+* [安装文档](/quickstart/docker-install)
 * [更新日志](/about/change-log)
 * [操作手册](/operator/asset)
 * [常见问题](/quickstart/faq)
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -1,4 +1,4 @@
-# orion-visor <small>2.0.3</small>
+# orion-visor

 > 一款高颜值、现代化的智能运维&轻量堡垒机平台。

--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -11,14 +11,14 @@
    <name>${project.artifactId}</name>

    <description>项目所有依赖</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <properties>
-        <revision>2.0.3</revision>
+        <revision>2.0.9</revision>
        <spring.boot.version>2.7.17</spring.boot.version>
        <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
        <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
-        <orion.kit.revision>1.0.7</orion.kit.revision>
+        <orion.kit.version>1.0.7</orion.kit.version>
        <aspectj.version>1.9.7</aspectj.version>
        <lombok.version>1.18.26</lombok.version>
        <springdoc.version>1.6.15</springdoc.version>
@@ -50,7 +50,7 @@
            <dependency>
                <groupId>io.github.lijiahangmax</groupId>
                <artifactId>orion-all</artifactId>
-                <version>${orion.kit.revision}</version>
+                <version>${orion.kit.version}</version>
                <exclusions>
                    <exclusion>
                        <artifactId>orion-log</artifactId>
--- a/orion-visor-framework/orion-visor-framework-common/pom.xml
+++ b/orion-visor-framework/orion-visor-framework-common/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目公共基准包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java
@@ -0,0 +1,17 @@
+package com.orion.visor.framework.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 保留
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/6 15:26
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Keep {
+
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,14 +14,17 @@ public interface AppConst extends OrionConst {
    /**
     * 同 ${orion.version} 迭代时候需要手动更改
     */
-    String VERSION = "2.0.3";
+    String VERSION = "2.0.9";

-    String ORION_VISOR = "orion-visor";
+    /**
+     * 同 ${spring.application.name}
+     */
+    String APP_NAME = "orion-visor";

-    String GITHUB = "https://github.com/lijiahangmax/orion-visor";
+    String GITHUB = "https://github.com/dromara/orion-visor";

-    String GITEE = "https://gitee.com/lijiahangmax/orion-visor";
+    String GITEE = "https://gitee.com/dromara/orion-visor";

-    String ISSUES = "https://github.com/lijiahangmax/orion-visor/issues";
+    String ISSUES = "https://github.com/dromara/orion-visor/issues";

 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/CnConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/CnConst.java
@@ -13,4 +13,8 @@ public interface CnConst {

    String CN_ROLE = "角色";

+    String CN_UNKNOWN = "未知";
+
+    String CN_INTRANET_IP = "内网IP";
+
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
@@ -17,16 +17,10 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons

    int MD5_LEN = 32;

-    String UNKNOWN = "未知";
-
-    String INTRANET_IP = "内网IP";
-
    Long ROOT_PARENT_ID = 0L;

    Integer DEFAULT_SORT = 10;

-    int LOGIN_HISTORY_COUNT = 30;
-
    Long NONE_ID = -1L;

    Integer DEFAULT_VERSION = 1;
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java
@@ -97,4 +97,6 @@ public interface ErrorMessage {

    String PLEASE_CHECK_HOST_SSH = "请检查主机 {} 是否存在/权限/SSH配置";

+    String CLIENT_ABORT = "手动中断";
+
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java
@@ -14,13 +14,19 @@ import lombok.Getter;
@AllArgsConstructor
 public enum MovePosition {

-    // 拖拽到目标元素上
+    /**
+     * 拖拽到目标元素上
+     */
    TOP(-1),

-    // 拖拽到目标元素中
+    /**
+     * 拖拽到目标元素中
+     */
    IN(0),

-    // 拖拽到目标元素下
+    /**
+     * 拖拽到目标元素下
+     */
    BOTTOM(1),

    ;
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java
@@ -1,9 +1,8 @@
 package com.orion.visor.framework.common.handler.data;

-import com.alibaba.fastjson.JSON;
 import com.orion.spring.SpringHolder;
 import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
+import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy;

 /**
 * 标准数据定义
@@ -12,45 +11,50 @@ import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
 * @version 1.0.0
 * @since 2023/12/21 0:07
 */
+@SuppressWarnings("unchecked")
 public interface GenericsDataDefinition {

-    /**
-     * 获取数据模型类型
-     *
-     * @return class
-     */
-    Class<? extends GenericsDataModel> getModel();
-
    /**
     * 获取数据处理策略
     *
     * @return class
     */
-    Class<? extends MapDataStrategy<? extends GenericsDataModel>> getStrategy();
+    Class<? extends GenericsDataStrategy<? extends GenericsDataModel>> getStrategyClass();

    /**
     * 获取数据模型策略处理器
     *
-     * @param <Model>    Model
-     * @param <Strategy> Strategy
-     * @return StrategyBean
+     * @param <M> Model
+     * @param <S> Strategy
+     * @return Strategy Bean
     */
-    @SuppressWarnings("unchecked")
-    default <Model extends GenericsDataModel, Strategy extends MapDataStrategy<Model>> Strategy getStrategyBean() {
-        return (Strategy) SpringHolder.getBean(this.getStrategy());
+    default <M extends GenericsDataModel, S extends GenericsDataStrategy<M>> S getStrategy() {
+        return (S) SpringHolder.getBean(this.getStrategyClass());
    }

    /**
     * 反序列化对象
     *
-     * @param json    json
-     * @param <Model> Model
+     * @param serialModel serialModel
+     * @param <M>         Model
     * @return object
     */
-    @SuppressWarnings("unchecked")
-    default <Model extends GenericsDataModel> Model parse(String json) {
-        return (Model) JSON.parseObject(json, this.getModel());
+    default <M extends GenericsDataModel> M parse(String serialModel) {
+        return (M) this.getStrategy().parse(serialModel);
    }

+    /**
+     * 转为视图对象
+     *
+     * @param serialModel serialModel
+     * @param <M>         Model
+     * @return viewModel
+     */
+    default <M extends GenericsDataModel> M toView(String serialModel) {
+        GenericsDataStrategy<GenericsDataModel> strategy = this.getStrategy();
+        GenericsDataModel model = strategy.parse(serialModel);
+        strategy.toView(model);
+        return (M) model;
+    }

 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java
@@ -2,6 +2,8 @@ package com.orion.visor.framework.common.handler.data.model;

 import com.alibaba.fastjson.JSON;

+import java.util.Map;
+
 /**
 * 标准数据模型
 *
@@ -20,4 +22,14 @@ public interface GenericsDataModel {
        return JSON.toJSONString(this);
    }

+
+    /**
+     * 转为 map
+     *
+     * @return map
+     */
+    default Map<String, Object> toMap() {
+        return JSON.parseObject(this.serial());
+    }
+
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java
@@ -0,0 +1,65 @@
+package com.orion.visor.framework.common.handler.data.strategy;
+
+import com.alibaba.fastjson.JSON;
+import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
+
+/**
+ * 标准数据处理策略 基类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/11 21:44
+ */
+public abstract class AbstractGenericsDataStrategy<M extends GenericsDataModel> implements GenericsDataStrategy<M> {
+
+    protected final Class<M> modelClass;
+
+    public AbstractGenericsDataStrategy(Class<M> modelClass) {
+        this.modelClass = modelClass;
+    }
+
+    /**
+     * 更新填充
+     *
+     * @param beforeModel 修改前的配置
+     * @param afterModel  修改后的配置
+     */
+    protected void updateFill(M beforeModel, M afterModel) {
+    }
+
+    /**
+     * 预校验参数
+     *
+     * @param model model
+     */
+    protected void preValid(M model) {
+    }
+
+    /**
+     * 校验参数
+     *
+     * @param model model
+     */
+    protected void valid(M model) {
+    }
+
+    @Override
+    public void doValid(M beforeModel, M afterModel) {
+        // 预校验参数
+        this.preValid(afterModel);
+        // 更新填充
+        this.updateFill(beforeModel, afterModel);
+        // 校验参数
+        this.valid(afterModel);
+    }
+
+    @Override
+    public M parse(String serialModel) {
+        return JSON.parseObject(serialModel, modelClass);
+    }
+
+    @Override
+    public void toView(M model) {
+    }
+
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java
@@ -9,60 +9,38 @@ import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
 * @version 1.0.0
 * @since 2023/12/20 22:09
 */
-public interface GenericsDataStrategy<Model extends GenericsDataModel, View> {
+public interface GenericsDataStrategy<M extends GenericsDataModel> {

    /**
     * 获取默认值
     *
     * @return 默认值
     */
-    Model getDefault();
-
-    /**
-     * 更新填充
-     *
-     * @param beforeModel 修改前的配置
-     * @param afterModel  修改后的配置
-     */
-    void updateFill(Model beforeModel, Model afterModel);
-
-    /**
-     * 预校验参数
-     *
-     * @param model model
-     */
-    void preValid(Model model);
-
-    /**
-     * 校验参数
-     *
-     * @param model model
-     */
-    void valid(Model model);
+    M getDefault();

    /**
     * 执行完整验证链
     * <p>
-     * preValid > updateFill > preValid
+     * preValid > updateFill > valid
     *
     * @param beforeModel beforeModel
     * @param afterModel  afterModel
     */
-    default void doValidChain(Model beforeModel, Model afterModel) {
-        // 预校验参数
-        this.preValid(afterModel);
-        // 更新填充
-        this.updateFill(beforeModel, afterModel);
-        // 校验参数
-        this.valid(afterModel);
-    }
+    void doValid(M beforeModel, M afterModel);
+
+    /**
+     * 解析数据
+     *
+     * @param serialModel serialModel
+     * @return model
+     */
+    M parse(String serialModel);

    /**
     * 转为视图配置
     *
     * @param model model
-     * @return 视图配置
     */
-    View toView(String model);
+    void toView(M model);

 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/MapDataStrategy.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/MapDataStrategy.java
@@ -1,22 +0,0 @@
-package com.orion.visor.framework.common.handler.data.strategy;
-
-import com.alibaba.fastjson.JSONObject;
-import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-
-import java.util.Map;
-
-/**
- * map 数据处理策略
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/20 22:11
- */
-public interface MapDataStrategy<Model extends GenericsDataModel> extends GenericsDataStrategy<Model, Map<String, Object>> {
-
-    @Override
-    default Map<String, Object> toView(String model) {
-        return JSONObject.parseObject(model);
-    }
-
-}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java
@@ -29,7 +29,7 @@ public class IpUtils {
     */
    public static String getLocation(String ip) {
        if (ip == null) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        // 查询缓存
        return CACHE.computeIfAbsent(ip, IpUtils::queryLocation);
@@ -43,21 +43,21 @@ public class IpUtils {
     */
    private static String queryLocation(String ip) {
        if (ip == null) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        Region region;
        try {
            region = LocationRegions.getRegion(ip, 3);
        } catch (Exception e) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        if (region != null) {
            String net = region.getNet();
            String province = region.getProvince();
-            if (net.equals(Const.INTRANET_IP)) {
+            if (net.equals(Const.CN_INTRANET_IP)) {
                return net;
            }
-            if (province.equals(Const.UNKNOWN)) {
+            if (province.equals(Const.CN_UNKNOWN)) {
                return province;
            }
            StringBuilder location = new StringBuilder()
@@ -69,7 +69,7 @@ public class IpUtils {
            location.append(" (").append(net).append(')');
            return location.toString();
        }
-        return Const.UNKNOWN;
+        return Const.CN_UNKNOWN;
    }

 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Mixes.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Mixes.java
@@ -0,0 +1,38 @@
+package com.orion.visor.framework.common.utils;
+
+import com.orion.lang.utils.Arrays1;
+import com.orion.lang.utils.crypto.Caesars;
+
+/**
+ * 混淆工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/17 18:27
+ */
+public class Mixes {
+
+    private Mixes() {
+    }
+
+    /**
+     * 混淆
+     * <p>
+     * 此方法不可修改
+     *
+     * @param str str
+     * @return str
+     */
+    public static String obfuscate(String str) {
+        char[] chars = str.toCharArray();
+        Arrays1.reverse(chars);
+        for (int i = 0; i < chars.length; i += 2) {
+            char temp = chars[i];
+            chars[i] = chars[i + 1];
+            chars[i + 1] = temp;
+        }
+        String res = new String(chars);
+        return new Caesars().encrypt(res);
+    }
+
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java
@@ -47,7 +47,7 @@ public class PathUtils {
    public static String getAppPath(boolean isWindows, String username) {
        return getHomePath(isWindows, username)
                + "/" + AppConst.ORION
-                + "/" + AppConst.ORION_VISOR;
+                + "/" + AppConst.APP_NAME;
    }

    /**
--- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 banner 打印包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java
@@ -36,24 +36,47 @@ public class BannerApplicationRunner implements ApplicationRunner {
    @Value("${management.endpoints.web.base-path:''}")
    private String managementEndpoints;

+    @Value("${springdoc.api-docs.enabled}")
+    private Boolean apiDocsEnabled;
+
+    @Value("${spring.datasource.druid.stat-view-servlet.enabled}")
+    private Boolean druidConsoleEnabled;
+
+    @Value("#{'${management.endpoints.web.exposure.include}' != 'shutdown'}")
+    private Boolean springBootActuatorEnabled;
+
+    @Value("${spring.boot.admin.client.enabled}")
+    private Boolean springBootAdminClientEnabled;
+
    @Override
    public void run(ApplicationArguments args) {
-        String line = AnsiAppender.create()
-                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档       ")
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: druid console     ")
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ")
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: admin console     ")
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测    ")
-                .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\"")
-                .toString();
+        AnsiAppender appender = AnsiAppender.create()
+                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor v" + version + " 服务已启动(" + env + ") ::\n");
+        // swagger 地址
+        if (apiDocsEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档       ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n");
+        }
+        // druid 控制台
+        if (druidConsoleEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: druid console     ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n");
+        }
+        // admin actuator 端点
+        if (springBootActuatorEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n");
+        }
+        // admin server 控制台
+        if (springBootAdminClientEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: admin console     ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n");
+        }
+        appender.append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测    ")
+                .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\"");
        Threads.start(() -> {
            Threads.sleep(1000L);
-            System.out.println(line);
+            System.out.println(appender);
        });
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt
@@ -8,4 +8,5 @@ ${AnsiColor.BRIGHT_GREEN}:: Application Name     ${AnsiColor.BLUE}${spring.appli
 ${AnsiColor.BRIGHT_GREEN}:: Application Version  ${AnsiColor.BLUE}${orion.version}
 ${AnsiColor.BRIGHT_GREEN}:: SpringBoot Version   ${AnsiColor.BLUE}${spring-boot.version}
 ${AnsiColor.BRIGHT_GREEN}:: Active Profile       ${AnsiColor.BLUE}${spring.profiles.active}
+${AnsiColor.BRIGHT_GREEN}:: Demo Mode            ${AnsiColor.BLUE}${orion.demo}
 ${AnsiColor.DEFAULT}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目操作日志包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目数据源配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目数据脱敏包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目定时任务配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目日志配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java
@@ -72,9 +72,9 @@ public class PrettyLogPrinterInterceptor extends AbstractLogPrinterInterceptor {
        }
        Method method = invocation.getMethod();
        // 方法签名
-        requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#')
-                .append(method.getName()).append("\n");
-        // 参数
+        // requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#')
+        //         .append(method.getName()).append("\n");
+        // 方法参数
        requestLog.append("\tparameter: ").append(this.requestToString(method, invocation.getArguments()));
        log.info(requestLog.toString());
    }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java
@@ -73,8 +73,8 @@ public class RowLogPrinterInterceptor extends AbstractLogPrinterInterceptor impl
        }
        Method method = invocation.getMethod();
        // 方法签名
-        fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName());
-        // 参数
+        // fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName());
+        // 方法参数
        fields.put(PARAMETER, this.requestToString(method, invocation.getArguments()));
        log.info("api请求-开始 {}", JSON.toJSONString(fields));
        fields.clear();
--- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目监控配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 mybatis 配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java
@@ -62,10 +62,6 @@ public class CustomFileFilter {
        if (!table.isEnableCache()) {
            files.removeIf(file -> isServerCacheFile(file.getTemplatePath()));
        }
-        // 不生成导出文件
-        if (!table.isEnableExport()) {
-            files.removeIf(file -> isExportFile(file.getTemplatePath()));
-        }
        // 不生成操作日志文件
        if (!table.isEnableOperatorLog()) {
            files.removeIf(file -> isOperatorLogFile(file.getTemplatePath()));
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java
@@ -73,16 +73,6 @@ public class ServerTemplate extends Template {
        return this;
    }

-    // /**
-    //  * 生成导出
-    //  *
-    //  * @return this
-    //  */
-    // public ServerTemplate enableExport() {
-    //     table.enableExport = true;
-    //     return this;
-    // }
-
    /**
     * 不生成单元测试
     *
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java
@@ -43,11 +43,6 @@ public class Table {
     */
    protected boolean enableUnitTest;

-    /**
-     * 是否生成导出
-     */
-    protected boolean enableExport;
-
    /**
     * 是否可缓存
     */
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java
@@ -17,6 +17,7 @@ public class VueTemplate extends Template {
    public VueTemplate(Table table, String module, String feature) {
        super(table);
        table.enableVue = true;
+        table.enableRowSelection = true;
        table.module = module;
        table.feature = feature;
    }
@@ -54,12 +55,12 @@ public class VueTemplate extends Template {
    }

    /**
-     * 列表可多选
+     * 关闭列表可多选
     *
     * @return this
     */
-    public VueTemplate enableRowSelection() {
-        table.enableRowSelection = true;
+    public VueTemplate disableRowSelection() {
+        table.enableRowSelection = false;
        return this;
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm
@@ -68,19 +68,5 @@ Authorization: {{token}}
 ${httpComment} ${apiComment.batchDelete}
 DELETE {{baseUrl}}/${package.ModuleName}/${typeHyphen}/batch-delete?idList=1,2,3
 Authorization: {{token}}
-#if($meta.enableExport)
-
-
-${httpComment} ${apiComment.export}
-POST {{baseUrl}}/${package.ModuleName}/${typeHyphen}/export
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  #foreach($field in ${table.fields})
-  "${field.propertyName}": ""#if($foreach.hasNext),#end
-  #end
-}
-#end

 ${httpComment}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm
@@ -141,19 +141,6 @@ public class ${table.controllerName} {
    public Integer batchDelete${type}(@RequestParam("idList") List<Long> idList) {
        return ${typeLower}Service.delete${type}ByIdList(idList);
    }
-    #if($meta.enableExport)
-
-    #if($meta.enableOperatorLog)
-    @OperatorLog(${type}OperatorType.EXPORT)
-    #end
-    @PostMapping("/export")
-    @Operation(summary = "${apiComment.export}")
-    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:export')")
-    public void export${type}(@Validated @RequestBody ${type}QueryRequest request,
-                              HttpServletResponse response) throws IOException {
-        ${typeLower}Service.export${type}(request, response);
-    }
-    #end

 }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-convert.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-convert.java.vm
@@ -28,10 +28,6 @@ public interface ${type}Convert {
    ${type}DO to(${type}QueryRequest request);

    ${type}VO to(${type}DO domain);
-    #if($meta.enableExport)
-
-    ${type}Export toExport(${type}DO domain);
-    #end

    List<${type}VO> to(List<${type}DO> list);

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm
@@ -21,10 +21,6 @@ public class ${type}OperatorType extends InitializingOperatorTypes {
    public static final String UPDATE = "${typeHyphen}:update";

    public static final String DELETE = "${typeHyphen}:delete";
-    #if($meta.enableExport)
-
-    public static final String EXPORT = "${typeHyphen}:export";
-    #end

    @Override
    public OperatorType[] types() {
@@ -32,9 +28,6 @@ public class ${type}OperatorType extends InitializingOperatorTypes {
                new OperatorType(L, CREATE, "创建$!{table.comment}"),
                new OperatorType(M, UPDATE, "更新$!{table.comment}"),
                new OperatorType(H, DELETE, "删除$!{table.comment}"),
-                #if($meta.enableExport)
-                new OperatorType(M, EXPORT, "导出$!{table.comment}"),
-                #end
        };
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
@@ -5,13 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.orion.lang.define.wrapper.DataGrid;
 import com.orion.lang.utils.Strings;
 import com.orion.lang.utils.collect.Lists;
-#if($meta.enableExport)
-import com.orion.office.excel.writer.exporting.ExcelExport;
-#end
 import com.orion.visor.framework.common.constant.ErrorMessage;
-#if($meta.enableExport)
-import com.orion.visor.framework.common.utils.FileNames;
-#end
 import com.orion.visor.framework.common.utils.Valid;
 #if($meta.enableCache)
 import com.orion.visor.framework.redis.core.utils.RedisMaps;
@@ -23,18 +17,11 @@ import ${pkg}.*;
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
-#if($meta.enableExport)
-import com.orion.web.servlet.web.Servlets;
-#end
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
-#if($meta.enableExport)
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-#end
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -54,6 +41,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    private ${type}DAO ${typeLower}DAO;

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Long create${type}(${type}CreateRequest request) {
        log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request));
        // 转换
@@ -72,6 +60,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Integer update${type}ById(${type}UpdateRequest request) {
        Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
        log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request));
@@ -93,6 +82,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) {
        log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
        // 条件
@@ -179,6 +169,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Integer delete${type}ById(Long id) {
        log.info("${type}Service-delete${type}ById id: {}", id);
        // 检查数据是否存在
@@ -195,6 +186,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Integer delete${type}ByIdList(List<Long> idList) {
        log.info("${type}Service-delete${type}ByIdList idList: {}", idList);
        int effect = ${typeLower}DAO.deleteBatchIds(idList);
@@ -207,6 +199,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public Integer delete${type}(${type}QueryRequest request) {
        log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request));
        // 条件
@@ -220,26 +213,6 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
        #end
        return effect;
    }
-    #if($meta.enableExport)
-
-    @Override
-    public void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException {
-        log.info("${type}Service.export${type} request: {}", JSON.toJSONString(request));
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 查询
-        List<${type}Export> rows = ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::toExport);
-        log.info("${type}Service.export${type} size: {}", rows.size());
-        // 导出
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ExcelExport.create(${type}Export.class)
-                .addRows(rows)
-                .write(out)
-                .close();
-        // 传输
-        Servlets.transfer(response, out.toByteArray(), FileNames.exportName(${type}Export.TITLE));
-    }
-    #end

    /**
     * 检查对象是否存在
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm
@@ -115,16 +115,5 @@ public interface ${table.serviceName} {
     * @return effect
     */
    Integer delete${type}(${type}QueryRequest request);
-    #if($meta.enableExport)
-
-    /**
-     * ${apiComment.export}
-     *
-     * @param request  request
-     * @param response response
-     * @throws IOException IOException
-     */
-    void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException;
-    #end

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-dict.sql.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-dict.sql.vm
@@ -14,12 +14,7 @@ VALUES
  (@MODULE_KEY_ID, 'operatorLogModule', '${package.ModuleName}:${typeHyphen}', '$!{table.comment}', '{}', @MODULE_KEY_MAX_SORT + 10, now(), now(), '1', '1', 0),
  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:create', '创建$!{table.comment}', '{}', 10, now(), now(), '1', '1', 0),
  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:update', '更新$!{table.comment}', '{}', 20, now(), now(), '1', '1', 0),
-  #if($meta.enableExport)
-  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:delete', '删除$!{table.comment}', '{}', 30, now(), now(), '1', '1', 0),
-  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:export', '导出$!{table.comment}', '{}', 40, now(), now(), '1', '1', 0);
-  #else
  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:delete', '删除$!{table.comment}', '{}', 30, now(), now(), '1', '1', 0);
-  #end
 #end

 #if($dictMap.entrySet().size() > 0)
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm
@@ -133,12 +133,4 @@ export function batchDelete${vue.featureEntity}(idList: Array<number>) {
    }
  });
 }
-#if($meta.enableExport)

-/**
- * $apiComment.export
- */
-export function export${vue.featureEntity}(request: ${vue.featureEntity}QueryRequest) {
-  return axios.post('/${package.ModuleName}/${typeHyphen}/export', request);
-}
-#end
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -79,12 +79,16 @@
      </div>
    </template>
    <!-- table -->
+    #if($vue.enableRowSelection)
+    <a-table v-model:selected-keys="selectedKeys"
+             row-key="id"
+    #else
    <a-table row-key="id"
+    #end
             ref="tableRef"
             :loading="loading"
             :columns="columns"
             #if($vue.enableRowSelection)
-             v-model:selected-keys="selectedKeys"
             :row-selection="rowSelection"
             #end
             :data="tableRenderData"
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, #foreach($field in ${table.fields})#if("$!field.propertyName" != "id"){
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 redis 配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
@@ -7,6 +7,7 @@ import com.orion.visor.framework.redis.configuration.config.RedissonConfig;
 import com.orion.visor.framework.redis.core.lock.RedisLocker;
 import com.orion.visor.framework.redis.core.utils.RedisUtils;
 import org.redisson.api.RedissonClient;
+import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
@@ -35,6 +37,7 @@ public class OrionRedisAutoConfiguration {
     * @param redisConnectionFactory factory
     * @return RedisTemplate
     */
+    @Primary
    @Bean
    public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
        RedisTemplate<String, String> redisTemplate = new RedisTemplate<>();
@@ -58,6 +61,9 @@ public class OrionRedisAutoConfiguration {
        return config -> {
            config.setThreads(redissonConfig.getThreads());
            config.setNettyThreads(redissonConfig.getNettyThreads());
+            // 单机配置
+            SingleServerConfig single = config.useSingleServer();
+            single.setConnectionMinimumIdleSize(redissonConfig.getMinimumIdleSize());
        };
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java
@@ -24,9 +24,15 @@ public class RedissonConfig {
     */
    private Integer nettyThreads;

+    /**
+     * 最小空闲连接数
+     */
+    private Integer minimumIdleSize;
+
    public RedissonConfig() {
        this.threads = 16;
        this.nettyThreads = 16;
+        this.minimumIdleSize = 16;
    }

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -18,6 +18,12 @@
      "type": "java.lang.Integer",
      "description": "netty 线程数.",
      "defaultValue": "16"
+    },
+    {
+      "name": "spring.redisson.minimum-idle-size",
+      "type": "java.lang.Integer",
+      "description": "最小空闲连接数.",
+      "defaultValue": "16"
    }
  ]
 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 security 配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目存储层配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 swagger 配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java
@@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpHeaders;

 import java.util.HashMap;
@@ -38,10 +37,9 @@ import java.util.Optional;
 * @version 1.0.0
 * @since 2022/6/21 11:22
 */
-@Profile({"dev"})
@ConditionalOnClass({OpenAPI.class})
@EnableConfigurationProperties(SwaggerConfig.class)
-@ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true")
@AutoConfiguration
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SWAGGER)
 public class OrionSwaggerAutoConfiguration {
--- a/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目单元测试包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 web 包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

    <description>项目 websocket 配置包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-framework/pom.xml
+++ b/orion-visor-framework/pom.xml
@@ -13,7 +13,7 @@
    <packaging>pom</packaging>

    <description>项目组件包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <modules>
        <module>orion-visor-framework-common</module>
--- a/orion-visor-launch/pom.xml
+++ b/orion-visor-launch/pom.xml
@@ -13,7 +13,7 @@
    <packaging>jar</packaging>

    <description>后端服务主项目容器 按需引用 orion-visor-module-xxx 依赖</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <!-- spring boot 配置所需依赖 -->
--- a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java
+++ b/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java
@@ -1,7 +1,17 @@
 package com.orion.visor.launch;

+import com.orion.lang.utils.Strings;
+import com.orion.visor.framework.common.constant.Const;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.core.type.AnnotationMetadata;
+
+import java.util.Optional;

 /**
 * application 启动类
@@ -14,7 +24,35 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 public class LaunchApplication {

    public static void main(String[] args) {
-        new SpringApplicationBuilder(LaunchApplication.class).run(args);
+        new SpringApplicationBuilder(LaunchApplication.class)
+                .beanNameGenerator(new CustomBeanNameGenerator())
+                .run(args);
+    }
+
+    /**
+     * 自定义 bean 名称生成器
+     */
+    public static class CustomBeanNameGenerator implements BeanNameGenerator {
+
+        private static final String BEAN_ANNOTATION_CLASS_NAME = "org.springframework.stereotype.Component";
+
+        @Override
+        public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
+            // 兼容注解自定义名称
+            if (definition instanceof AnnotatedBeanDefinition) {
+                AnnotationMetadata metadata = ((AnnotatedBeanDefinition) definition).getMetadata();
+                // 处理自定义 bean 名称
+                return Optional.of(metadata)
+                        .map(s -> s.getAnnotationAttributes(BEAN_ANNOTATION_CLASS_NAME))
+                        .map(s -> s.get(Const.VALUE))
+                        .map(Object::toString)
+                        .filter(Strings::isNotBlank)
+                        .orElseGet(definition::getBeanClassName);
+            } else {
+                // 非注解形式默认使用默认名称
+                return BeanDefinitionReaderUtils.generateBeanName(definition, registry);
+            }
+        }
    }

 }
--- a/orion-visor-launch/src/main/resources/application-dev.yaml
+++ b/orion-visor-launch/src/main/resources/application-dev.yaml
@@ -7,6 +7,8 @@ spring:
      initial-size: 0
      min-idle: 1
      max-active: 5
+      stat-view-servlet:
+        enabled: false
  redis:
    host: 127.0.0.1
    port: 6379
@@ -14,6 +16,20 @@ spring:
  redisson:
    threads: 2
    netty-threads: 2
+    minimum-idle-size: 2
+  boot:
+    admin:
+      client:
+        enabled: false
+      server:
+        enabled: false
+
+management:
+  endpoints:
+    enabled-by-default: false
+    web:
+      exposure:
+        include: shutdown

 mybatis-plus:
  configuration:
--- a/orion-visor-launch/src/main/resources/application-prod.yaml
+++ b/orion-visor-launch/src/main/resources/application-prod.yaml
@@ -10,10 +10,13 @@ spring:
      min-idle: 5
      # 最大连接池数量
      max-active: 20
-      web-stat-filter:
-        enabled: true
+      # 控制台
      stat-view-servlet:
        enabled: true
+        login-username: ${DRUID_USERNAME:admin}
+        login-password: ${DRUID_PASSWORD:admin}
+      web-stat-filter:
+        enabled: true
      filter:
        stat:
          enabled: true
@@ -24,12 +27,23 @@ spring:
  redisson:
    threads: 4
    netty-threads: 4
+    minimum-idle-size: 4
  quartz:
    properties:
      org:
        quartz:
          threadPool:
            threadCount: 10
+  boot:
+    admin:
+      client:
+        enabled: true
+      server:
+        enabled: true
+
+management:
+  endpoints:
+    enabled-by-default: true

 springdoc:
  api-docs:
@@ -39,6 +53,7 @@ springdoc:

 knife4j:
  enable: false
+  production: true

 orion:
  # 是否为演示模式
--- a/orion-visor-launch/src/main/resources/application.yaml
+++ b/orion-visor-launch/src/main/resources/application.yaml
@@ -3,7 +3,7 @@ server:

 spring:
  application:
-    name: orion-visor-launch
+    name: orion-visor
  profiles:
    active: dev
  main:
@@ -19,6 +19,9 @@ spring:
  mvc:
    pathmatch:
      matching-strategy: ANT_PATH_MATCHER
+    async:
+      # 异步请求时间 30min
+      request-timeout: 1800000
  datasource:
    druid:
      driver-class-name: com.mysql.cj.jdbc.Driver
@@ -37,13 +40,14 @@ spring:
      # 最大生存的时间
      max-evictable-idle-time-millis: 900000
      validation-query: SELECT 1
-      web-stat-filter:
-        enabled: true
+      # 控制台
      stat-view-servlet:
        enabled: true
        url-pattern: /druid/*
        login-username:
        login-password:
+      web-stat-filter:
+        enabled: true
      filter:
        stat:
          enabled: true
@@ -85,7 +89,7 @@ spring:
            misfireThreshold: 60000
            clusterCheckinInterval: 5000
            isClustered: true
-          #连接池
+          # 连接池
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 5
@@ -95,12 +99,16 @@ spring:
    admin:
      context-path: /admin
      client:
+        enabled: true
        url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path}
        instance:
          service-host-type: IP
+      server:
+        enabled: true

 management:
  endpoints:
+    enabled-by-default: true
    web:
      base-path: /actuator
      exposure:
@@ -134,7 +142,7 @@ knife4j:

 logging:
  file:
-    path: ${user.home}/orion/logs/orion-visor
+    path: ${user.home}/orion/logs/${spring.application.name}
    name: ${logging.file.path}/app.log
  logback:
    rollingpolicy:
@@ -195,7 +203,7 @@ orion:
  api:
    # 公共 api 前缀
    prefix: /orion-visor/api
-    # 是否开启跨域
+    # 是否允许跨域
    cors: true
  websocket:
    # 公共 websocket 前缀
@@ -212,10 +220,10 @@ orion:
    title: orion-visor 运维平台
    description: 一站式运维服务平台
    version: ${orion.version}
-    url: https://github.com/lijiahangmax/orion-visor
+    url: https://github.com/dromara/orion-visor
    email: ljh1553488six@139.com
    license: Apache-2.0
-    license-url: https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE
+    license-url: https://github.com/dromara/orion-visor/blob/main/LICENSE
    grouped-api:
      infra:
        group: "infra - 基建模块"
@@ -245,14 +253,14 @@ orion:
      timestamp-prefix: false
      date-directory: false
      storage-path: ${user.home}
-      base-path: /orion/orion-visor/storage
+      base-path: /orion/${spring.application.name}/storage
    # 日志文件存储
    logs:
      enabled: true
      timestamp-prefix: false
      date-directory: false
      storage-path: ${user.home}
-      base-path: /orion/orion-visor/logs
+      base-path: /orion/${spring.application.name}/logs
  security:
    password-encoder-length: 4
    # 匿名接口
--- a/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml
+++ b/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml
@@ -13,7 +13,7 @@
    <packaging>jar</packaging>

    <description>项目资产模块</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/infra/api/CommandSnippetApi.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/infra/api/CommandSnippetApi.java
@@ -0,0 +1,22 @@
+package com.orion.visor.module.infra.api;
+
+import java.util.List;
+
+/**
+ * 命令片段 对外服务类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/3 11:07
+ */
+public interface CommandSnippetApi {
+
+    /**
+     * 通过 userId 删除
+     *
+     * @param userIdList userIdList
+     * @return effect
+     */
+    Integer deleteByUserIdList(List<Long> userIdList);
+
+}
--- a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/infra/api/PathBookmarkApi.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/infra/api/PathBookmarkApi.java
@@ -0,0 +1,22 @@
+package com.orion.visor.module.infra.api;
+
+import java.util.List;
+
+/**
+ * 路径标签 对外服务类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/3 11:07
+ */
+public interface PathBookmarkApi {
+
+    /**
+     * 通过 userId 删除
+     *
+     * @param userIdList userIdList
+     * @return effect
+     */
+    Integer deleteByUserIdList(List<Long> userIdList);
+
+}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml
@@ -13,7 +13,7 @@
    <packaging>jar</packaging>

    <description>项目资产模块</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>

    <dependencies>
        <dependency>
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/CommandSnippetApiImpl.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/CommandSnippetApiImpl.java
@@ -0,0 +1,30 @@
+package com.orion.visor.module.asset.api.impl;
+
+import com.orion.visor.module.asset.service.CommandSnippetService;
+import com.orion.visor.module.infra.api.CommandSnippetApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 命令片段 对外服务实现类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/3 11:11
+ */
+@Slf4j
+@Service
+public class CommandSnippetApiImpl implements CommandSnippetApi {
+
+    @Resource
+    private CommandSnippetService commandSnippetService;
+
+    @Override
+    public Integer deleteByUserIdList(List<Long> userIdList) {
+        return commandSnippetService.deleteByUserIdList(userIdList);
+    }
+
+}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/PathBookmarkApiImpl.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/PathBookmarkApiImpl.java
@@ -0,0 +1,30 @@
+package com.orion.visor.module.asset.api.impl;
+
+import com.orion.visor.module.asset.service.PathBookmarkService;
+import com.orion.visor.module.infra.api.PathBookmarkApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 路径标签 对外服务实现类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/3 11:11
+ */
+@Slf4j
+@Service
+public class PathBookmarkApiImpl implements PathBookmarkApi {
+
+    @Resource
+    private PathBookmarkService pathBookmarkService;
+
+    @Override
+    public Integer deleteByUserIdList(List<Long> userIdList) {
+        return pathBookmarkService.deleteByUserIdList(userIdList);
+    }
+
+}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java
@@ -98,6 +98,15 @@ public class ExecJobController {
        return execJobService.deleteExecJobById(id);
    }

+    @OperatorLog(ExecJobOperatorType.DELETE)
+    @DeleteMapping("/batch-delete")
+    @Operation(summary = "批量删除计划任务")
+    @Parameter(name = "idList", description = "idList", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:exec-job:delete')")
+    public Integer batchDeleteExecJob(@RequestParam("idList") List<Long> idList) {
+        return execJobService.deleteExecJobByIdList(idList);
+    }
+
    @OperatorLog(ExecJobOperatorType.TRIGGER)
    @PostMapping("/trigger")
    @Operation(summary = "手动触发计划任务")
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java
@@ -21,6 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
+import java.util.List;

 /**
 * 执行模板 api
@@ -92,5 +93,14 @@ public class ExecTemplateController {
        return execTemplateService.deleteExecTemplateById(id);
    }

+    @OperatorLog(ExecTemplateOperatorType.DELETE)
+    @DeleteMapping("/batch-delete")
+    @Operation(summary = "批量删除执行模板")
+    @Parameter(name = "idList", description = "idList", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:exec-template:delete')")
+    public Integer batchDeleteExecTemplate(@RequestParam("idList") List<Long> idList) {
+        return execTemplateService.deleteExecTemplateByIdList(idList);
+    }
+
 }

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
@@ -96,5 +96,15 @@ public class HostController {
        return hostService.deleteHostById(id);
    }

+    @DemoDisableApi
+    @OperatorLog(HostOperatorType.DELETE)
+    @DeleteMapping("/batch-delete")
+    @Operation(summary = "批量删除主机")
+    @Parameter(name = "idList", description = "idList", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:host:delete')")
+    public Integer batchDeleteHost(@RequestParam("idList") List<Long> idList) {
+        return hostService.deleteHostByIdList(idList);
+    }
+
 }

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java
@@ -97,5 +97,15 @@ public class HostIdentityController {
        return hostIdentityService.deleteHostIdentityById(id);
    }

+    @DemoDisableApi
+    @OperatorLog(HostIdentityOperatorType.DELETE)
+    @DeleteMapping("/batch-delete")
+    @Operation(summary = "批量删除主机身份")
+    @Parameter(name = "idList", description = "idList", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:host-identity:delete')")
+    public Integer batchDeleteHostIdentity(@RequestParam("idList") List<Long> idList) {
+        return hostIdentityService.deleteHostIdentityByIdList(idList);
+    }
+
 }

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java
@@ -96,5 +96,15 @@ public class HostKeyController {
        return hostKeyService.deleteHostKeyById(id);
    }

+    @DemoDisableApi
+    @OperatorLog(HostKeyOperatorType.DELETE)
+    @DeleteMapping("/batch-delete")
+    @Operation(summary = "批量删除主机密钥")
+    @Parameter(name = "idList", description = "idList", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:host-key:delete')")
+    public Integer batchDeleteHostKey(@RequestParam("idList") List<Long> idList) {
+        return hostKeyService.deleteHostKeyByIdList(idList);
+    }
+
 }

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostSftpLogController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostSftpLogController.http
@@ -1,5 +1,5 @@
 ### 分页查询 SFTP 操作日志
-POST {{baseUrl}}/asset/host-sftp-log/query
+POST {{baseUrl}}/asset/host-sftp/query-log
 Content-Type: application/json
 Authorization: {{token}}

@@ -10,8 +10,12 @@ Authorization: {{token}}


 ### 删除 SFTP 操作日志
-DELETE {{baseUrl}}/asset/host-sftp-log/delete?idList=1,2,3
+DELETE {{baseUrl}}/asset/host-sftp/delete-log?idList=1,2,3
 Authorization: {{token}}


+### 下载文件
+GET {{baseUrl}}/asset/host-sftp/download?channelId=123&transferToken=123
+
+
 ###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostSftpLogController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostSftpLogController.java
@@ -5,11 +5,12 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
 import com.orion.visor.framework.common.validator.group.Page;
 import com.orion.visor.framework.log.core.annotation.IgnoreLog;
 import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
+import com.orion.visor.framework.web.core.annotation.IgnoreWrapper;
 import com.orion.visor.framework.web.core.annotation.RestWrapper;
 import com.orion.visor.module.asset.define.operator.HostTerminalOperatorType;
 import com.orion.visor.module.asset.entity.request.host.HostSftpLogQueryRequest;
 import com.orion.visor.module.asset.entity.vo.HostSftpLogVO;
-import com.orion.visor.module.asset.service.HostSftpLogService;
+import com.orion.visor.module.asset.service.HostSftpService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,44 +18,60 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;

 /**
- * SFTP 操作日志服务 api
+ * SFTP 操作服务 api
 *
 * @author Jiahang Li
 * @version 1.0.0
 * @since 2023-12-26 22:09
 */
-@Tag(name = "asset - SFTP 操作日志服务")
+@Tag(name = "asset - SFTP 操作服务")
@Slf4j
@Validated
@RestWrapper
@RestController
-@RequestMapping("/asset/host-sftp-log")
+@RequestMapping("/asset/host-sftp")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostSftpLogController {

    @Resource
-    private HostSftpLogService hostSftpLogService;
+    private HostSftpService hostSftpService;

    @IgnoreLog(IgnoreLogMode.RET)
-    @PostMapping("/query")
+    @PostMapping("/query-log")
    @Operation(summary = "分页查询 SFTP 操作日志")
    @PreAuthorize("@ss.hasAnyPermission('infra:operator-log:query', 'asset:host-sftp-log:management:query')")
    public DataGrid<HostSftpLogVO> getHostSftpLogPage(@Validated(Page.class) @RequestBody HostSftpLogQueryRequest request) {
-        return hostSftpLogService.getHostSftpLogPage(request);
+        return hostSftpService.getHostSftpLogPage(request);
    }

    @OperatorLog(HostTerminalOperatorType.DELETE_SFTP_LOG)
-    @DeleteMapping("/delete")
+    @DeleteMapping("/delete-log")
    @Operation(summary = "删除 SFTP 操作日志")
    @Parameter(name = "idList", description = "idList", required = true)
    @PreAuthorize("@ss.hasAnyPermission('infra:operator-log:delete', 'asset:host-sftp-log:management:delete')")
    public Integer deleteHostSftpLog(@RequestParam("idList") List<Long> idList) {
-        return hostSftpLogService.deleteHostSftpLog(idList);
+        return hostSftpService.deleteHostSftpLog(idList);
+    }
+
+    @PermitAll
+    @IgnoreWrapper
+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/download")
+    @Operation(summary = "下载文件")
+    @Parameter(name = "channelId", description = "channelId", required = true)
+    @Parameter(name = "transferToken", description = "transferToken", required = true)
+    public StreamingResponseBody downloadWithTransferToken(@RequestParam("channelId") String channelId,
+                                                           @RequestParam("transferToken") String transferToken,
+                                                           HttpServletResponse response) {
+        return hostSftpService.downloadWithTransferToken(channelId, transferToken, response);
    }

 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/CommandSnippetDAO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/CommandSnippetDAO.java
@@ -7,6 +7,8 @@ import com.orion.visor.framework.mybatis.core.mapper.IMapper;
 import com.orion.visor.module.asset.entity.domain.CommandSnippetDO;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
 /**
 * 命令片段 Mapper 接口
 *
@@ -42,4 +44,16 @@ public interface CommandSnippetDAO extends IMapper<CommandSnippetDO> {
        return this.delete(wrapper);
    }

+    /**
+     * 通过 userId 删除
+     *
+     * @param userIdList userIdList
+     * @return effect
+     */
+    default int deleteByUserIdList(List<Long> userIdList) {
+        LambdaQueryWrapper<CommandSnippetDO> wrapper = this.lambda()
+                .in(CommandSnippetDO::getUserId, userIdList);
+        return this.delete(wrapper);
+    }
+
 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobHostDAO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobHostDAO.java
@@ -44,6 +44,18 @@ public interface ExecJobHostDAO extends IMapper<ExecJobHostDO> {
        return this.delete(wrapper);
    }

+    /**
+     * 通过 jobId 删除
+     *
+     * @param jobIdList jobIdList
+     * @return effect
+     */
+    default Integer deleteByJobIdList(List<Long> jobIdList) {
+        LambdaQueryWrapper<ExecJobHostDO> wrapper = this.wrapper()
+                .in(ExecJobHostDO::getJobId, jobIdList);
+        return this.delete(wrapper);
+    }
+
    /**
     * 通过 hostId 删除
     *
@@ -56,4 +68,16 @@ public interface ExecJobHostDAO extends IMapper<ExecJobHostDO> {
        return this.delete(wrapper);
    }

+    /**
+     * 通过 hostId 删除
+     *
+     * @param hostIdList hostIdList
+     * @return effect
+     */
+    default Integer deleteByHostIdList(List<Long> hostIdList) {
+        LambdaQueryWrapper<ExecJobHostDO> wrapper = this.wrapper()
+                .in(ExecJobHostDO::getHostId, hostIdList);
+        return this.delete(wrapper);
+    }
+
 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostConfigDAO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostConfigDAO.java
@@ -95,17 +95,17 @@ public interface HostConfigDAO extends IMapper<HostConfigDO> {
    /**
     * 设置 keyId 为 NULL
     *
-     * @param keyId keyId
+     * @param keyIdList keyIdList
     * @return effect
     */
-    int setKeyIdWithNull(@Param("keyId") Long keyId);
+    int setKeyIdWithNull(@Param("keyIdList") List<Long> keyIdList);

    /**
     * 设置 identityId 为 NULL
     *
-     * @param identityId identityId
+     * @param identityIdList identityIdList
     * @return effect
     */
-    int setIdentityIdWithNull(@Param("identityId") Long identityId);
+    int setIdentityIdWithNull(@Param("identityIdList") List<Long> identityIdList);

 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostIdentityDAO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostIdentityDAO.java
@@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.orion.visor.framework.mybatis.core.mapper.IMapper;
 import com.orion.visor.module.asset.entity.domain.HostIdentityDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;

 /**
 * 主机身份 Mapper 接口
@@ -20,13 +21,13 @@ public interface HostIdentityDAO extends IMapper<HostIdentityDO> {
    /**
     * 设置 keyId 为 null
     *
-     * @param keyId keyId
+     * @param keyIdList keyIdList
     * @return effect
     */
-    default int setKeyWithNull(@Param("keyId") Long keyId) {
+    default int setKeyWithNull(List<Long> keyIdList) {
        LambdaUpdateWrapper<HostIdentityDO> updateWrapper = Wrappers.<HostIdentityDO>lambdaUpdate()
                .set(HostIdentityDO::getKeyId, null)
-                .eq(HostIdentityDO::getKeyId, keyId);
+                .in(HostIdentityDO::getKeyId, keyIdList);
        return this.update(null, updateWrapper);
    }

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/PathBookmarkDAO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/PathBookmarkDAO.java
@@ -7,6 +7,8 @@ import com.orion.visor.framework.mybatis.core.mapper.IMapper;
 import com.orion.visor.module.asset.entity.domain.PathBookmarkDO;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
 /**
 * 路径标签 Mapper 接口
 *
@@ -42,4 +44,16 @@ public interface PathBookmarkDAO extends IMapper<PathBookmarkDO> {
        return this.delete(wrapper);
    }

+    /**
+     * 通过 userId 删除
+     *
+     * @param userIdList userIdList
+     * @return effect
+     */
+    default int deleteByUserIdList(List<Long> userIdList) {
+        LambdaQueryWrapper<PathBookmarkDO> wrapper = this.lambda()
+                .in(PathBookmarkDO::getUserId, userIdList);
+        return this.delete(wrapper);
+    }
+
 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConfigTypeEnum.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConfigTypeEnum.java
@@ -3,8 +3,7 @@ package com.orion.visor.module.asset.enums;
 import com.orion.visor.framework.common.enums.EnableStatus;
 import com.orion.visor.framework.common.handler.data.GenericsDataDefinition;
 import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
-import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel;
+import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy;
 import com.orion.visor.module.asset.handler.host.config.strategy.HostSshConfigStrategy;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -24,7 +23,6 @@ public enum HostConfigTypeEnum implements GenericsDataDefinition {
     * SSH 配置
     */
    SSH("ssh",
-            HostSshConfigModel.class,
            HostSshConfigStrategy.class,
            EnableStatus.ENABLED.getValue()),

@@ -32,9 +30,7 @@ public enum HostConfigTypeEnum implements GenericsDataDefinition {

    private final String type;

-    private final Class<? extends GenericsDataModel> model;
-
-    private final Class<? extends MapDataStrategy<? extends GenericsDataModel>> strategy;
+    private final Class<? extends GenericsDataStrategy<? extends GenericsDataModel>> strategyClass;

    private final Integer defaultStatus;

--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraItemEnum.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraItemEnum.java
@@ -2,9 +2,7 @@ package com.orion.visor.module.asset.enums;

 import com.orion.visor.framework.common.handler.data.GenericsDataDefinition;
 import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
-import com.orion.visor.module.asset.handler.host.extra.model.HostLabelExtraModel;
-import com.orion.visor.module.asset.handler.host.extra.model.HostSshExtraModel;
+import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy;
 import com.orion.visor.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy;
 import com.orion.visor.module.asset.handler.host.extra.strategy.HostSshExtraStrategy;
 import lombok.AllArgsConstructor;
@@ -24,20 +22,18 @@ public enum HostExtraItemEnum implements GenericsDataDefinition {
    /**
     * SSH 额外配置
     */
-    SSH("ssh", HostSshExtraModel.class, HostSshExtraStrategy.class),
+    SSH("ssh", HostSshExtraStrategy.class),

    /**
     * 标签额外配置
     */
-    LABEL("label", HostLabelExtraModel.class, HostLabelExtraStrategy.class),
+    LABEL("label", HostLabelExtraStrategy.class),

    ;

    private final String item;

-    private final Class<? extends GenericsDataModel> model;
-
-    private final Class<? extends MapDataStrategy<? extends GenericsDataModel>> strategy;
+    private final Class<? extends GenericsDataStrategy<? extends GenericsDataModel>> strategyClass;

    public static HostExtraItemEnum of(String type) {
        if (type == null) {
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java
@@ -2,7 +2,6 @@ package com.orion.visor.module.asset.handler.host.config.model;

 import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
 import com.orion.visor.framework.common.security.UpdatePasswordAction;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,61 +23,86 @@ import javax.validation.constraints.Size;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "HostSftpConfig", description = "主机 SSH 配置")
 public class HostSshConfigModel implements GenericsDataModel, UpdatePasswordAction {

+    /**
+     * ssh 端口
+     */
    @NotNull
    @Range(min = 1, max = 65535)
-    @Schema(description = "ssh 端口")
    private Integer port;

+    /**
+     * 用户名
+     */
    @Size(max = 128)
-    @Schema(description = "用户名")
    private String username;

+    /**
+     * 认证方式
+     */
    @NotBlank
    @Size(max = 12)
-    @Schema(description = "认证方式")
    private String authType;

+    /**
+     * 系统类型
+     */
    @NotBlank
    @Size(max = 12)
-    @Schema(description = "系统类型")
    private String osType;

-    @Schema(description = "密码")
+    /**
+     * 密码
+     */
    private String password;

-    @Schema(description = "身份id")
+    /**
+     * 身份id
+     */
    private Long identityId;

-    @Schema(description = "密钥id")
+    /**
+     * 密钥id
+     */
    private Long keyId;

+    /**
+     * 连接超时时间
+     */
    @NotNull
    @Range(min = 0, max = 100000)
-    @Schema(description = "连接超时时间")
    private Integer connectTimeout;

+    /**
+     * SSH输出编码
+     */
    @NotBlank
    @Size(max = 12)
-    @Schema(description = "SSH输出编码")
    private String charset;

+    /**
+     * 文件名称编码
+     */
    @NotBlank
    @Size(max = 12)
-    @Schema(description = "文件名称编码")
    private String fileNameCharset;

+    /**
+     * 文件内容编码
+     */
    @NotBlank
    @Size(max = 12)
-    @Schema(description = "文件内容编码")
    private String fileContentCharset;

-    @Schema(description = "是否使用新密码 仅参数")
+    /**
+     * 是否使用新密码 仅参数
+     */
    private Boolean useNewPassword;

-    @Schema(description = "是否已设置密码 仅返回")
+    /**
+     * 是否已设置密码 仅返回
+     */
    private Boolean hasPassword;

 }
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java
@@ -1,13 +1,12 @@
 package com.orion.visor.module.asset.handler.host.config.strategy;

-import com.alibaba.fastjson.JSON;
 import com.orion.lang.utils.Booleans;
 import com.orion.lang.utils.Charsets;
 import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Strings;
 import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.common.constant.ErrorMessage;
-import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
+import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy;
 import com.orion.visor.framework.common.security.PasswordModifier;
 import com.orion.visor.framework.common.utils.Valid;
 import com.orion.visor.module.asset.dao.HostIdentityDAO;
@@ -18,7 +17,6 @@ import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel
 import org.springframework.stereotype.Component;

 import javax.annotation.Resource;
-import java.util.Map;

 /**
 * 主机 SSH 配置策略
@@ -28,7 +26,7 @@ import java.util.Map;
 * @since 2023/9/19 14:26
 */
@Component
-public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel> {
+public class HostSshConfigStrategy extends AbstractGenericsDataStrategy<HostSshConfigModel> {

    @Resource
    private HostKeyDAO hostKeyDAO;
@@ -40,6 +38,10 @@ public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel

    private static final String USERNAME = "root";

+    public HostSshConfigStrategy() {
+        super(HostSshConfigModel.class);
+    }
+
    @Override
    public HostSshConfigModel getDefault() {
        return HostSshConfigModel.builder()
@@ -55,7 +57,7 @@ public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel
    }

    @Override
-    public void preValid(HostSshConfigModel model) {
+    protected void preValid(HostSshConfigModel model) {
        // 验证认证类型
        Valid.valid(HostSshAuthTypeEnum::of, model.getAuthType());
        // 验证系统版本
@@ -77,13 +79,13 @@ public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel
    }

    @Override
-    public void valid(HostSshConfigModel model) {
+    protected void valid(HostSshConfigModel model) {
        // 验证填充后的参数
        Valid.valid(model);
    }

    @Override
-    public void updateFill(HostSshConfigModel beforeModel, HostSshConfigModel afterModel) {
+    protected void updateFill(HostSshConfigModel beforeModel, HostSshConfigModel afterModel) {
        // 加密密码
        this.checkEncryptPassword(beforeModel, afterModel);
        afterModel.setHasPassword(null);
@@ -91,14 +93,12 @@ public class HostSshConfigStrategy implements MapDataStrategy<HostSshConfigModel
    }

    @Override
-    public Map<String, Object> toView(String config) {
-        if (config == null) {
-            return null;
+    public void toView(HostSshConfigModel model) {
+        if (model == null) {
+            return;
        }
-        HostSshConfigModel model = JSON.parseObject(config, HostSshConfigModel.class);
        model.setHasPassword(Strings.isNotBlank(model.getPassword()));
        model.setPassword(null);
-        return JSON.parseObject(JSON.toJSONString(model));
    }

    /**
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java
@@ -1,8 +1,8 @@
 package com.orion.visor.module.asset.handler.host.exec.command;

 import com.orion.visor.module.asset.define.AssetThreadPools;
-import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO;
 import com.orion.visor.module.asset.handler.host.exec.command.handler.ExecTaskHandler;
+import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO;

 /**
 * 批量执行命令执行器
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java
@@ -1,56 +0,0 @@
-package com.orion.visor.module.asset.handler.host.exec.command.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 批量执行启动主机对象
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024/3/11 15:46
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "ExecCommandHostDTO", description = "批量执行启动主机对象")
-public class ExecCommandHostDTO {
-
-    @Schema(description = "hostLogId")
-    private Long hostLogId;
-
-    @Schema(description = "hostId")
-    private Long hostId;
-
-    @Schema(description = "主机名称")
-    private String hostName;
-
-    @Schema(description = "主机地址")
-    private String hostAddress;
-
-    @Schema(description = "日志文件路径")
-    private String logPath;
-
-    @Schema(description = "脚本路径")
-    private String scriptPath;
-
-    @Schema(description = "执行命令")
-    private String command;
-
-    @Schema(description = "主机用户")
-    private String username;
-
-    @Schema(description = "命令编码")
-    private String charset;
-
-    @Schema(description = "文件名称编码")
-    private String fileNameCharset;
-
-    @Schema(description = "文件内容编码")
-    private String fileContentCharset;
-
-}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java
@@ -20,8 +20,8 @@ import com.orion.visor.framework.common.file.FileClient;
 import com.orion.visor.module.asset.dao.ExecHostLogDAO;
 import com.orion.visor.module.asset.entity.domain.ExecHostLogDO;
 import com.orion.visor.module.asset.enums.ExecHostStatusEnum;
-import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO;
-import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO;
+import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO;
+import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO;
 import com.orion.visor.module.asset.handler.host.exec.log.manager.ExecLogManager;
 import com.orion.visor.module.asset.service.HostTerminalService;
 import lombok.Getter;
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java
@@ -9,8 +9,8 @@ import com.orion.lang.utils.time.Dates;
 import com.orion.net.host.ssh.ExitCode;
 import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.module.asset.enums.ExecHostStatusEnum;
-import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO;
-import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO;
+import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO;
+import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO;

 /**
 * 命令执行器 ansi 日志输出
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
李佳航	0f6d84dab2	Merge pull request #28 from dromara/dev Dev	2024-06-19 12:11:39 +08:00
lijiahang	f64eb395a8	🐳 修改镜像权限.	2024-06-19 11:53:06 +08:00
lijiahang	2e69c67de0	🐳 修改镜像权限.	2024-06-19 11:29:09 +08:00
lijiahang	7747b4e52e	🔖 升级版本.	2024-06-19 11:07:03 +08:00
lijiahang	830622aafb	💄 修改样式.	2024-06-19 10:48:00 +08:00
lijiahang	2919950c5b	⬆️ 升级 arco 版本.	2024-06-18 11:53:58 +08:00
lijiahangmax	d56cfbba82	✨ 添加系统设置页面.	2024-06-18 00:35:45 +08:00
lijiahang	cfe1924f11	✨ 获取应用信息.	2024-06-17 19:12:58 +08:00
lijiahang	dfd2ec45f4	🔨 修改 spring 应用名称.	2024-06-17 10:13:23 +08:00
李佳航	19c7e31f53	Merge pull request #24 from dromara/dev Dev	2024-06-12 16:02:47 +08:00
lijiahang	f618aef988	🔖 升级版本.	2024-06-12 15:14:24 +08:00
lijiahang	af97f752f5	📝 修改仓库地址.	2024-06-12 15:13:07 +08:00
lijiahangmax	bfb80afee2	⚡ 优化标准数据模型.	2024-06-12 00:21:25 +08:00
李佳航	72695af0f0	Merge pull request #23 from lijiahangmax/dev 🐛 登录后提示系统异常.	2024-06-11 16:30:55 +08:00
lijiahang	3a5b84eec4	🐛 登录后提示系统异常.	2024-06-11 16:07:38 +08:00
李佳航	387ed53328	Merge pull request #22 from lijiahangmax/dev Dev	2024-06-11 13:20:15 +08:00
lijiahang	c9cbc5fd55	🔖 升级版本.	2024-06-11 12:50:42 +08:00
lijiahang	ae03460a33	⚡ 优化会话关闭处理逻辑.	2024-06-11 12:31:16 +08:00
lijiahang	4b060a864a	⚡ 登录历史参数化.	2024-06-11 12:28:24 +08:00
李佳航	07e8e63ee6	Merge pull request #21 from lijiahangmax/main merge	2024-06-11 11:28:39 +08:00
lijiahang	ab1d4ed97f	🔨 规范化配置.	2024-06-11 11:12:44 +08:00
lijiahang	2bd7dfd5b8	🔨 规范化注释.	2024-06-07 16:05:26 +08:00
lijiahang	c39049e5f5	🔨 规范化包结构.	2024-06-07 15:41:52 +08:00
李佳航	5113aa63bd	Merge pull request #20 from lijiahangmax/dev Dev	2024-06-06 13:00:36 +08:00
lijiahang	518fd8c839	🔖 升级版本.	2024-06-06 12:02:35 +08:00
lijiahang	a046faaa07	🔨 清理后提示.	2024-06-05 10:27:06 +08:00
lijiahangmax	dcf25392ff	⬆️ 升级 stylelint 版本.	2024-06-04 21:49:51 +08:00
lijiahang	7f24948efa	✨ 修改下载文件逻辑.	2024-06-04 20:01:05 +08:00
lijiahang	59d9739f36	⚡ 优化文件下载方式.	2024-06-04 18:34:19 +08:00
lijiahang	26a6d08d96	🔨 修改 redisson 配置.	2024-06-04 11:33:09 +08:00
lijiahang	cd59c51344	⚡ 升级依赖版本.	2024-06-04 10:47:32 +08:00
李佳航	8dec98406d	Merge pull request #19 from lijiahangmax/dev Dev	2024-06-03 13:33:14 +08:00
lijiahang	9386bfc5c1	📝 升级文档.	2024-06-03 13:12:50 +08:00
lijiahang	370272ca43	🔖 升级版本.	2024-06-03 11:53:53 +08:00
lijiahang	5c6758c8e7	⚡ 批量删除前端.	2024-06-03 10:49:05 +08:00
lijiahang	11606e25bb	⚡ 批量删除后端服务.	2024-06-03 10:19:48 +08:00
lijiahang	285f0532d3	🎨 修改代码格式.	2024-05-31 16:32:45 +08:00
lijiahang	7bfa8a73be	💄 修改样式.	2024-05-31 13:36:49 +08:00