Merge pull request #44 from dromara/dev

Dev
🚨 修复 ts 构建报错.
2024-07-26 11:11:47 +08:00 · 2024-07-26 10:56:36 +08:00 · 2024-07-26 10:25:38 +08:00 · 2024-07-26 10:18:39 +08:00 · 2024-07-25 13:46:48 +08:00 · 2024-07-25 11:16:59 +08:00
637 changed files with 8821 additions and 6808 deletions
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -0,0 +1,21 @@
+name: E2E
+
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{github.workflow}} - ${{github.ref}}
+  cancel-in-progress: true
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: E2E Testing
+        run: |
+          sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+          sudo chmod u+x /usr/local/bin/docker-compose
+          docker compose -f docker-compose-testing.yml up --build testing --exit-code-from testing --remove-orphans
--- a/7
+++ b/7
@@ -0,0 +1,7 @@
+ * 在使用本项目前，请您仔细阅读免责声明，确保您已充分理解其中的内容
+
+ * 本项目采用 APACHE LICENSE 2.0 开源协议，如您需要源码的开发方式，需要遵循以下几点
+
+ 1. 禁止修改或删除 LICENSE 文件。
+ 2. 不可二次开发或参与同类竞品的开发。
+ 3. 本项目可免费商业使用，商业使用请保留项目源码、出处、描述文件和作者声明等。
--- 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)  [gitcode](https://gitcode.com/dromara/orion-visor/overview)
+* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
+* 📛 演示环境请不要随便删除数据!
+* 📧 如果演示环境不可用请联系我!

 ## 快速开始

 ```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-testing.yml
+++ b/docker-compose-testing.yml
@@ -0,0 +1,79 @@
+version: '3.3'
+services:
+  orion-visor-service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1
+    privileged: true
+    ports:
+      - 1081:80
+    environment:
+      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_PORT=3306
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=Data@123456
+      - REDIS_HOST=orion-visor-redis
+      - REDIS_PASSWORD=Data@123456
+      - SECRET_KEY=uQeacXV8b3isvKLK
+      - DEMO_MODE=false
+    volumes:
+      - /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
+    healthcheck:
+      test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
+      interval: 3s
+      timeout: 300s
+      retries: 200
+      start_period: 3s
+    depends_on:
+      orion-visor-mysql:
+        condition: service_healthy
+      orion-visor-redis:
+        condition: service_healthy
+    links:
+      - orion-visor-mysql
+      - orion-visor-redis
+  orion-visor-mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1
+    privileged: true
+    ports:
+      - 3307:3306
+    environment:
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=orion
+      - MYSQL_PASSWORD=Data@123456
+      - MYSQL_ROOT_PASSWORD=Data@123456
+    volumes:
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
+  orion-visor-redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1
+    privileged: true
+    ports:
+      - 6380:6379
+    environment:
+      - REDIS_PASSWORD=Data@123456
+    volumes:
+      - /data/orion-visor-space/docker-volumes/redis/data:/data
+    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
+  testing:
+    build:
+      context: ./docker/e2e
+    environment:
+      SERVER: http://orion-visor-service:80
+    depends_on:
+      orion-visor-service:
+        condition: service_healthy
+    links:
+      - orion-visor-service
--- 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.1.1
+    privileged: true
    ports:
      - 1081:80
    environment:
@@ -15,12 +16,23 @@ services:
      - SECRET_KEY=uQeacXV8b3isvKLK
      - DEMO_MODE=false
    volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
+      - /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
+    healthcheck:
+      test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
+      interval: 3s
+      timeout: 300s
+      retries: 200
+      start_period: 3s
    depends_on:
+      orion-visor-mysql:
+        condition: service_healthy
+      orion-visor-redis:
+        condition: service_healthy
+    links:
      - 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.1.1
    privileged: true
    ports:
      - 3307:3306
@@ -30,19 +42,31 @@ services:
      - MYSQL_PASSWORD=Data@123456
      - MYSQL_ROOT_PASSWORD=Data@123456
    volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
-      - /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
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
  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.1.1
    privileged: true
    ports:
      - 6380:6379
    environment:
      - REDIS_PASSWORD=Data@123456
    volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - /data/orion-visor-space/docker-volumes/redis/data:/data
    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
  orion-visor-adminer:
    image: adminer
    ports:
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -1,8 +1,7 @@
 #/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
 fi
-docker compose up -d
+docker compose up -d --remove-orphans
--- a/docker/e2e/Dockerfile
+++ b/docker/e2e/Dockerfile
@@ -0,0 +1,7 @@
+FROM ghcr.io/linuxsuren/api-testing:v0.0.17
+
+WORKDIR /workspace
+COPY . .
+RUN chmod 777 *
+
+CMD [ "/workspace/entrypoint.sh" ]
--- a/docker/e2e/entrypoint.sh
+++ b/docker/e2e/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+atest run -p testsuite.yaml --report md
--- a/docker/e2e/testsuite.yaml
+++ b/docker/e2e/testsuite.yaml
@@ -0,0 +1,49 @@
+#!api-testing
+# yaml-language-server: $schema=https://linuxsuren.github.io/api-testing/api-testing-schema.json
+name: orion-visor
+api: |
+  {{default "http://orion-visor-service:80" (env "SERVER")}}
+items:
+  - name: login
+    request:
+      api: /orion-visor/api/infra/auth/login
+      method: POST
+      header:
+        Content-type: application/json
+      body: |
+        {"username":"admin","password":"21232f297a57a5a743894a0e4a801fc3"}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+  - name: userPermission
+    request:
+      api: /orion-visor/api/infra/permission/user
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: menu
+    request:
+      api: /orion-visor/api/infra/permission/menu
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: haveUnRead
+    request:
+      api: /orion-visor/api/infra/system-message/has-unread
+  - name: queryOperatorLog
+    request:
+      api: /orion-visor/api/infra/mine/query-operator-log
+      method: POST
+  - name: hostList
+    request:
+      api: /orion-visor/api/infra/tag/list?type=HOST
+  - name: queryHost
+    request:
+      api: /orion-visor/api/asset/host/query
+      method: POST
--- 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.1.1
 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.1.1
 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.1.1
 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.1.1</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.1.1";

-    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
@@ -61,6 +61,10 @@ public interface ErrorMessage {

    String GROUP_ABSENT = "分组不存在";

+    String HOST_TYPE_ERROR = "主机类型错误";
+
+    String HOST_NOT_ENABLED = "主机未启用";
+
    String UNABLE_OPERATE_ADMIN_ROLE = "无法操作管理员账号";

    String UNSUPPORTED_CHARSET = "不支持的编码 [{}]";
@@ -83,8 +87,12 @@ public interface ErrorMessage {

    String UNKNOWN_TYPE = "未知类型";

+    String ERROR_TYPE = "错误的类型";
+
    String FILE_ABSENT = "文件不存在";

+    String FILE_ABSENT_CLEAR = "文件不存在 (可能已被清理)";
+
    String LOG_ABSENT = "日志不存在";

    String TASK_ABSENT = "任务不存在";
@@ -95,6 +103,10 @@ public interface ErrorMessage {

    String FILE_READ_ERROR = "文件读取失败";

+    String FILE_READ_ERROR_CLEAR = "文件读取失败 (可能已被清理)";
+
    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/constant/ExtraFieldConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java
@@ -43,4 +43,6 @@ public interface ExtraFieldConst extends FieldConst {

    String LOG_ID = "logId";

+    String DARK = "dark";
+
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java
@@ -31,6 +31,8 @@ public interface FieldConst {

    String INFO = "info";

+    String EXTRA = "extra";
+
    String REL_ID = "relId";

    String BEFORE = "before";
@@ -59,10 +61,24 @@ public interface FieldConst {

    String TIME = "time";

+    String ISSUE = "issue";
+
+    String EXPIRE = "expire";
+
    String LOCATION = "location";

    String USER_AGENT = "userAgent";

    String ERROR_MESSAGE = "errorMessage";

+    String UUID = "uuid";
+
+    String REDIRECT = "redirect";
+
+    String SCHEMA = "schema";
+
+    String FILTER = "filter";
+
+    String ALL = "all";
+
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java
@@ -1,13 +1,13 @@
 package com.orion.visor.framework.common.constant;

 /**
- * 路径常量
+ * 文件常量
 *
 * @author Jiahang Li
 * @version 1.0.0
 * @since 2024/4/17 10:35
 */
-public interface PathConst {
+public interface FileConst {

    String ERROR_LOG = "error.log";

--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java
@@ -0,0 +1,25 @@
+package com.orion.visor.framework.common.entity;
+
+import lombok.Data;
+
+/**
+ * 自动清理配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/24 15:03
+ */
+@Data
+public class AutoClearConfig {
+
+    /**
+     * 是否开启
+     */
+    private Boolean enabled;
+
+    /**
+     * 保留周期 (天)
+     */
+    private Integer keepPeriod;
+
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java
@@ -0,0 +1,45 @@
+package com.orion.visor.framework.common.enums;
+
+import com.orion.lang.utils.Strings;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 端点定义
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/21 19:15
+ */
+@Getter
+@AllArgsConstructor
+public enum EndpointDefine {
+
+    /**
+     * 上传临时分区
+     */
+    UPLOAD_SWAP("/upload/swap/{}"),
+
+    /**
+     * 批量执行日志
+     */
+    EXEC_LOG("/exec/{}/{}.log"),
+
+    ;
+
+    /**
+     * 端点
+     */
+    private final String endpoint;
+
+    /**
+     * 格式化
+     *
+     * @param params params
+     * @return path
+     */
+    public String format(Object... params) {
+        return Strings.format(this.endpoint, params);
+    }
+
+}
--- 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
@@ -2,8 +2,12 @@ package com.orion.visor.framework.common.utils;

 import com.orion.ext.location.Region;
 import com.orion.ext.location.region.LocationRegions;
+import com.orion.lang.constant.StandardHttpHeader;
+import com.orion.lang.utils.Strings;
 import com.orion.visor.framework.common.constant.Const;
+import com.orion.web.servlet.web.Servlets;

+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;

@@ -21,6 +25,22 @@ public class IpUtils {
    private IpUtils() {
    }

+    /**
+     * 获取请求地址
+     *
+     * @param request request
+     * @return addr
+     */
+    public static String getRemoteAddr(HttpServletRequest request) {
+        // 获取实际地址
+        String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP);
+        if (!Strings.isBlank(realIp)) {
+            return realIp;
+        }
+        // 获取请求地址
+        return Servlets.getRemoteAddr(request);
+    }
+
    /**
     * 获取 ip 位置
     *
@@ -29,7 +49,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 +63,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 +89,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-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java
@@ -41,7 +41,7 @@ public class Requests {
                .map(s -> (ServletRequestAttributes) s)
                .map(ServletRequestAttributes::getRequest)
                .ifPresent(request -> {
-                    String address = Servlets.getRemoteAddr(request);
+                    String address = IpUtils.getRemoteAddr(request);
                    identity.setAddress(address);
                    identity.setLocation(IpUtils.getLocation(address));
                    identity.setUserAgent(Servlets.getUserAgent(request));
--- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -10,7 +10,7 @@
    {
      "name": "orion.async.executor.core-pool-size",
      "type": "java.lang.Integer",
-      "description": "核心线程数量",
+      "description": "核心线程数量.",
      "defaultValue": "8"
    },
    {
--- 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-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- 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/configuration/config/LogPrinterConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java
@@ -1,6 +1,7 @@
 package com.orion.visor.framework.log.configuration.config;

 import com.orion.visor.framework.common.utils.ConfigUtils;
+import com.orion.visor.framework.log.core.enums.LogPrinterMode;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

@@ -17,6 +18,11 @@ import java.util.List;
@ConfigurationProperties("orion.logging.printer")
 public class LogPrinterConfig {

+    /**
+     * 类型
+     */
+    private LogPrinterMode mode;
+
    /**
     * 字段配置
     */
@@ -32,12 +38,31 @@ public class LogPrinterConfig {
     */
    private String expression;

-    public void setField(LogPrinterFieldConfig field) {
-        this.field = field;
-    }
-
    public void setHeaders(List<String> headers) {
        this.headers = ConfigUtils.parseStringList(headers, String::toLowerCase);
    }

+    @Data
+    public static class LogPrinterFieldConfig {
+
+        /**
+         * 忽略的字段
+         */
+        private List<String> ignore;
+
+        /**
+         * 脱敏的字段
+         */
+        private List<String> desensitize;
+
+        public void setIgnore(List<String> ignore) {
+            this.ignore = ConfigUtils.parseStringList(ignore);
+        }
+
+        public void setDesensitize(List<String> desensitize) {
+            this.desensitize = ConfigUtils.parseStringList(desensitize);
+        }
+
+    }
+
 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java
@@ -1,36 +0,0 @@
-package com.orion.visor.framework.log.configuration.config;
-
-import com.orion.visor.framework.common.utils.ConfigUtils;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 日志打印字段配置
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/28 22:36
- */
-@Data
-public class LogPrinterFieldConfig {
-
-    /**
-     * 忽略的字段
-     */
-    private List<String> ignore;
-
-    /**
-     * 脱敏的字段
-     */
-    private List<String> desensitize;
-
-    public void setIgnore(List<String> ignore) {
-        this.ignore = ConfigUtils.parseStringList(ignore);
-    }
-
-    public void setDesensitize(List<String> desensitize) {
-        this.desensitize = ConfigUtils.parseStringList(desensitize);
-    }
-
-}
--- 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
@@ -3,6 +3,7 @@ package com.orion.visor.framework.log.core.interceptor;
 import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Strings;
 import com.orion.lang.utils.time.Dates;
+import com.orion.visor.framework.common.utils.IpUtils;
 import com.orion.visor.framework.common.utils.SwaggerUtils;
 import com.orion.visor.framework.log.configuration.config.LogPrinterConfig;
 import com.orion.web.servlet.web.Servlets;
@@ -60,7 +61,7 @@ public class PrettyLogPrinterInterceptor extends AbstractLogPrinterInterceptor {
        // http
        if (request != null) {
            // remoteAddr
-            requestLog.append("\tremoteAddr: ").append(Servlets.getRemoteAddr(request)).append('\n');
+            requestLog.append("\tremoteAddr: ").append(IpUtils.getRemoteAddr(request)).append('\n');
            // header
            Servlets.getHeaderMap(request).forEach((hk, hv) -> {
                if (headerFilter.test(hk.toLowerCase())) {
@@ -72,9 +73,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
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Strings;
 import com.orion.lang.utils.time.Dates;
+import com.orion.visor.framework.common.utils.IpUtils;
 import com.orion.visor.framework.common.utils.SwaggerUtils;
 import com.orion.visor.framework.log.configuration.config.LogPrinterConfig;
 import com.orion.visor.framework.log.core.enums.LogFieldConst;
@@ -61,7 +62,7 @@ public class RowLogPrinterInterceptor extends AbstractLogPrinterInterceptor impl
        // http
        if (request != null) {
            // remoteAddr
-            fields.put(REMOTE_ADDR, Servlets.getRemoteAddr(request));
+            fields.put(REMOTE_ADDR, IpUtils.getRemoteAddr(request));
            // header
            Map<String, Object> headers = new LinkedHashMap<>();
            Servlets.getHeaderMap(request).forEach((hk, hv) -> {
@@ -73,8 +74,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-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- 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/CodeGenerator.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java
@@ -310,8 +310,6 @@ public class CodeGenerator implements Executable {
                new String[]{"/templates/orion-server-module-entity-request-update.java.vm", "${type}UpdateRequest.java", "entity.request.${bizPackage}"},
                // query request 文件
                new String[]{"/templates/orion-server-module-entity-request-query.java.vm", "${type}QueryRequest.java", "entity.request.${bizPackage}"},
-                // export 文件
-                new String[]{"/templates/orion-server-module-entity-export.java.vm", "${type}Export.java", "entity.export"},
                // convert 文件
                new String[]{"/templates/orion-server-module-convert.java.vm", "${type}Convert.java", "convert"},
                // cache dto 文件
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
@@ -113,7 +113,6 @@ public class CodeGeneratorEngine extends VelocityTemplateEngine {
        apiComment.put("deleteById", "删除" + comment);
        apiComment.put("deleteAll", "根据条件删除" + comment);
        apiComment.put("batchDelete", "批量删除" + comment);
-        apiComment.put("export", "导出" + comment);
        objectMap.put("apiComment", apiComment);
    }

--- 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
@@ -38,14 +38,18 @@ public class CustomFileFilter {
    public List<CustomFile> doFilter() {
        // 生成文件副本
        List<CustomFile> files = originCustomerFile.stream().map(s ->
-                new CustomFile.Builder()
-                        .enableFileOverride()
-                        .templatePath(s.getTemplatePath())
-                        .filePath(s.getFilePath())
-                        .fileName(s.getFileName())
-                        .packageName(s.getPackageName())
-                        .build())
+                        new CustomFile.Builder()
+                                .enableFileOverride()
+                                .templatePath(s.getTemplatePath())
+                                .filePath(s.getFilePath())
+                                .fileName(s.getFileName())
+                                .packageName(s.getPackageName())
+                                .build())
                .collect(Collectors.toList());
+        // 不生成 api http 文件
+        if (!table.isEnableApiHttp()) {
+            files.removeIf(file -> isApiHttpFile(file.getTemplatePath()));
+        }
        // 不生成对外 api 文件
        if (!table.isEnableProviderApi()) {
            files.removeIf(file -> isServerProviderFile(file.getTemplatePath()));
@@ -62,10 +66,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()));
@@ -143,13 +143,13 @@ public class CustomFileFilter {
    }

    /**
-     * 是否为导出文件
+     * 是否为 api http 文件
     *
     * @param templatePath templatePath
     * @return 是否为导出文件
     */
-    public static boolean isExportFile(String templatePath) {
-        return templatePath.contains("orion-server-module-entity-export");
+    public static boolean isApiHttpFile(String templatePath) {
+        return templatePath.contains("orion-server-module-controller.http");
    }

    /**
--- 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
@@ -63,6 +63,16 @@ public class ServerTemplate extends Template {
        return this;
    }

+    /**
+     * 是否生成 api http 文件
+     *
+     * @return this
+     */
+    public ServerTemplate enableApiHttp() {
+        table.enableApiHttp = true;
+        return this;
+    }
+
    /**
     * 是否生成对外 api
     *
@@ -73,16 +83,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
@@ -33,6 +33,11 @@ public class Table {
     */
    protected String bizPackage;

+    /**
+     * 是否生成 api http 文件
+     */
+    protected boolean enableApiHttp;
+
    /**
     * 是否生成对外 api
     */
@@ -43,11 +48,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/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java
@@ -210,14 +210,23 @@ public class DataQuery<T> {
    // -------------------- data grid --------------------

    public DataGrid<T> dataGrid() {
-        return this.dataGrid(Function.identity());
+        return this.dataGrid(this.wrapper, Function.identity());
+    }
+
+    public DataGrid<T> dataGrid(Wrapper<T> countWrapper) {
+        return this.dataGrid(countWrapper, Function.identity());
    }

    public <R> DataGrid<R> dataGrid(Function<T, R> mapper) {
-        Valid.notNull(mapper, "convert function is null");
+        return this.dataGrid(this.wrapper, mapper);
+    }
+
+    public <R> DataGrid<R> dataGrid(Wrapper<T> countWrapper, Function<T, R> mapper) {
        Valid.notNull(page, "page is null");
        Valid.notNull(wrapper, "wrapper is null");
-        Long count = dao.selectCount(wrapper);
+        Valid.notNull(countWrapper, "count wrapper is null");
+        Valid.notNull(mapper, "convert function is null");
+        Long count = dao.selectCount(countWrapper);
        Pager<R> pager = new Pager<>(page);
        pager.setTotal(count.intValue());
        boolean next = pager.hasMoreData();
--- 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
@@ -44,7 +44,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/${package.ModuleName}/${typeHyphen}")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 #if(${superControllerClass})
 public class ${table.controllerName} extends ${superControllerClass} {
 #else
@@ -141,19 +140,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-entity-export.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-export.java.vm
@@ -1,65 +0,0 @@
-package ${currentPackage};
-
-import com.orion.lang.utils.time.Dates;
-import com.orion.office.excel.annotation.ExportField;
-import com.orion.office.excel.annotation.ExportSheet;
-import com.orion.office.excel.annotation.ExportTitle;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-import java.util.*;
-import java.math.*;
-
-/**
- * $!{table.comment} 导出对象
- *
- * @author ${author}
- * @version ${version}
- * @since ${date}
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ExportTitle(title = ${type}Export.TITLE)
-@ExportSheet(name = "$!{table.comment}", filterHeader = true, freezeHeader = true, indexToSort = true)
-@Schema(name = "${type}Export", description = "$!{table.comment}导出对象")
-public class ${type}Export implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public static final String TITLE = "$!{table.comment}导出";
-    #foreach($field in ${table.fields})
-
-    #if("$!field.comment" != "")
-    @Schema(description = "${field.comment}")
-    #end
-    #if("$field.propertyType" == "Date")
-    @ExportField(index = ${foreach.index}, header = "${field.comment}", width = 16, format = Dates.YMD_HMS)
-    #else
-    @ExportField(index = ${foreach.index}, header = "${field.comment}", width = 16)
-    #end
-    private ${field.propertyType} ${field.propertyName};
-    #end
-
-    @ExportField(index = $table.fields.size(), header = "创建时间", width = 16, format = Dates.YMD_HMS)
-    @Schema(description = "创建时间")
-    private Date createTime;
-
-    #set($updateTimeIndex=$table.fields.size() + 1)
-    @Schema(description = "修改时间")
-    @ExportField(index = $updateTimeIndex, header = "修改时间", width = 16, format = Dates.YMD_HMS)
-    private Date updateTime;
-
-    #set($creatorIndex=$table.fields.size() + 2)
-    @Schema(description = "创建人")
-    @ExportField(index = $creatorIndex, header = "创建人", width = 16)
-    private String creator;
-
-    #set($updaterIndex=$table.fields.size() + 3)
-    @Schema(description = "修改人")
-    @ExportField(index = $updaterIndex, header = "修改人", width = 16)
-    private String updater;
-
-}
--- 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-sql-menu.sql.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm
@@ -26,7 +26,3 @@ VALUES
  (@TMP_SUB_ID, '创建$table.comment', '${package.ModuleName}:${typeHyphen}:create', 3, 20, '1', '1', 0),
  (@TMP_SUB_ID, '修改$table.comment', '${package.ModuleName}:${typeHyphen}:update', 3, 30, '1', '1', 0),
  (@TMP_SUB_ID, '删除$table.comment', '${package.ModuleName}:${typeHyphen}:delete', 3, 40, '1', '1', 0);
-  #if(false)
-  (@TMP_SUB_ID, '导出$table.comment', '${package.ModuleName}:${typeHyphen}:export', 3, 50, '1', '1', 0),
-  (@TMP_SUB_ID, '导入$table.comment', '${package.ModuleName}:${typeHyphen}:import', 3, 60, '1', '1', 0);
-  #end
--- 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-card-list.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -3,7 +3,7 @@
             search-input-placeholder="输入搜索值"
             create-card-position="head"
             :loading="loading"
-             :fieldConfig="fieldConfig"
+             :field-config="fieldConfig"
             :list="list"
             :pagination="pagination"
             :card-layout-cols="cardColLayout"
@@ -74,15 +74,16 @@
            <!-- 修改 -->
            <a-doption v-permission="['${package.ModuleName}:${typeHyphen}:update']"
                       @click="emits('openUpdate', record)">
-              <icon-edit />
-              修改
+              <span class="more-doption normal">
+                <icon-edit /> 修改
+              </span>
            </a-doption>
            <!-- 删除 -->
            <a-doption v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
-                       class="span-red"
                       @click="deleteRow(record.id)">
-              <icon-delete />
-              删除
+              <span class="more-doption error">
+                <icon-delete /> 删除
+              </span>
            </a-doption>
          </template>
        </a-dropdown>
@@ -93,15 +94,17 @@
      <!-- 修改 -->
      <a-doption v-permission="['${package.ModuleName}:${typeHyphen}:update']"
                 @click="emits('openUpdate', record)">
-        <icon-edit />
-        修改
+        <span class="more-doption normal">
+          <icon-edit /> 修改
+        </span>
      </a-doption>
      <!-- 删除 -->
      <a-doption v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
                 class="span-red"
                 @click="deleteRow(record.id)">
-        <icon-delete />
-        删除
+        <span class="more-doption error">
+          <icon-delete /> 删除
+        </span>
      </a-doption>
    </template>
  </card-list>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
@@ -1,6 +1,6 @@
 <template>
  <a-modal v-model:visible="visible"
-           body-class="modal-form-large"
+           modal-class="modal-form-large"
           title-align="start"
           :title="title"
           :top="80"
--- 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,19 +79,23 @@
      </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"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      #foreach($field in ${table.fields})
      #if(${dictMap.containsKey(${field.propertyName})})
      <!-- $field.comment -->
--- 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: 68,
    align: 'left',
    fixed: 'left',
  }, #foreach($field in ${table.fields})#if("$!field.propertyName" != "id"){
@@ -15,6 +15,7 @@ const columns = [
    slotName: '${field.propertyName}',
    align: 'left',
    #if(${field.propertyType} == 'String')
+    minWidth: 238,
    ellipsis: true,
    tooltip: true,
    #elseif(${field.propertyType} == 'Date')
--- 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/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-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-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java
@@ -2,9 +2,9 @@ package com.orion.visor.framework.security.configuration;

 import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
 import com.orion.visor.framework.common.crypto.ValueCrypto;
-import com.orion.visor.framework.security.configuration.config.CryptoConfig;
+import com.orion.visor.framework.security.configuration.config.AesCryptoConfig;
 import com.orion.visor.framework.security.core.crypto.PrimaryValueCrypto;
-import com.orion.visor.framework.security.core.crypto.aes.AesCryptoProcessor;
+import com.orion.visor.framework.security.core.crypto.processor.AesCryptoProcessor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -12,8 +12,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;

-import javax.annotation.Resource;
-
 /**
 * 项目加密解密配置
 *
@@ -22,13 +20,10 @@ import javax.annotation.Resource;
 * @since 2023/7/7 23:59
 */
@AutoConfiguration
-@EnableConfigurationProperties(CryptoConfig.class)
+@EnableConfigurationProperties({AesCryptoConfig.class})
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SECURITY_CRYPTO)
 public class OrionCryptoAutoConfiguration {

-    @Resource
-    private CryptoConfig config;
-
    /**
     * @return 默认加密器
     */
@@ -43,8 +38,8 @@ public class OrionCryptoAutoConfiguration {
     */
    @Bean(initMethod = "init")
    @ConditionalOnProperty(value = "orion.crypto.aes.enabled", havingValue = "true")
-    public ValueCrypto aesValueCrypto() {
-        return new AesCryptoProcessor(config.getAes());
+    public ValueCrypto aesValueCrypto(AesCryptoConfig config) {
+        return new AesCryptoProcessor(config);
    }

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java
@@ -1,4 +1,4 @@
-package com.orion.visor.framework.security.core.crypto.aes;
+package com.orion.visor.framework.security.configuration.config;

 import com.orion.lang.utils.crypto.CryptoConst;
 import com.orion.lang.utils.crypto.enums.PaddingMode;
@@ -6,6 +6,7 @@ import com.orion.lang.utils.crypto.enums.WorkingMode;
 import com.orion.visor.framework.security.core.crypto.CryptoConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
 * aes 加密器配置
@@ -16,6 +17,7 @@ import lombok.EqualsAndHashCode;
 */
@Data
@EqualsAndHashCode(callSuper = true)
+@ConfigurationProperties("orion.crypto.aes")
 public class AesCryptoConfig extends CryptoConfig {

    /**
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/CryptoConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/CryptoConfig.java
@@ -1,23 +0,0 @@
-package com.orion.visor.framework.security.configuration.config;
-
-import com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * 加密配置
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/8 0:01
- */
-@Data
-@ConfigurationProperties("orion.crypto")
-public class CryptoConfig {
-
-    /**
-     * aes 加密器配置
-     */
-    private AesCryptoConfig aes;
-
-}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java
@@ -1,4 +1,4 @@
-package com.orion.visor.framework.security.core.crypto.aes;
+package com.orion.visor.framework.security.core.crypto.processor;

 import com.orion.lang.utils.Strings;
 import com.orion.lang.utils.crypto.Keys;
@@ -6,6 +6,7 @@ import com.orion.lang.utils.crypto.enums.CipherAlgorithm;
 import com.orion.lang.utils.crypto.enums.WorkingMode;
 import com.orion.lang.utils.crypto.symmetric.SymmetricBuilder;
 import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto;
+import com.orion.visor.framework.security.configuration.config.AesCryptoConfig;
 import com.orion.visor.framework.security.core.crypto.CryptoProcessor;

 import javax.crypto.SecretKey;
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -5,15 +5,10 @@
      "type": "com.orion.visor.framework.security.configuration.config.SecurityConfig",
      "sourceType": "com.orion.visor.framework.security.configuration.config.SecurityConfig"
    },
-    {
-      "name": "orion.crypto",
-      "type": "com.orion.visor.framework.security.configuration.config.CryptoConfig",
-      "sourceType": "com.orion.visor.framework.security.configuration.config.CryptoConfig"
-    },
    {
      "name": "orion.crypto.aes",
-      "type": "com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig",
-      "sourceType": "com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig"
+      "type": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig",
+      "sourceType": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig"
    }
  ],
  "properties": [
--- 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-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java
@@ -2,7 +2,8 @@ package com.orion.visor.framework.storage.configuration;

 import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
 import com.orion.visor.framework.common.file.FileClient;
-import com.orion.visor.framework.storage.configuration.config.StorageConfig;
+import com.orion.visor.framework.storage.configuration.config.LocalStorageConfig;
+import com.orion.visor.framework.storage.configuration.config.LogsStorageConfig;
 import com.orion.visor.framework.storage.core.client.PrimaryFileClient;
 import com.orion.visor.framework.storage.core.client.local.LocalFileClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -12,8 +13,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;

-import javax.annotation.Resource;
-
 /**
 * 存储配置类
 *
@@ -25,12 +24,9 @@ import javax.annotation.Resource;
 */
@AutoConfiguration
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_STORAGE)
-@EnableConfigurationProperties(StorageConfig.class)
+@EnableConfigurationProperties({LocalStorageConfig.class, LogsStorageConfig.class})
 public class OrionStorageAutoConfiguration {

-    @Resource
-    private StorageConfig config;
-
    /**
     * @return 默认文件客户端
     */
@@ -45,8 +41,8 @@ public class OrionStorageAutoConfiguration {
     */
    @Bean
    @ConditionalOnProperty(value = "orion.storage.local.enabled", havingValue = "true")
-    public FileClient localFileClient() {
-        return new LocalFileClient(config.getLocal());
+    public FileClient localFileClient(LocalStorageConfig config) {
+        return new LocalFileClient(config);
    }

    /**
@@ -54,8 +50,8 @@ public class OrionStorageAutoConfiguration {
     */
    @Bean
    @ConditionalOnProperty(value = "orion.storage.logs.enabled", havingValue = "true")
-    public FileClient logsFileClient() {
-        return new LocalFileClient(config.getLogs());
+    public FileClient logsFileClient(LogsStorageConfig config) {
+        return new LocalFileClient(config);
    }

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java
@@ -2,27 +2,19 @@ package com.orion.visor.framework.storage.configuration.config;

 import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
- * 存储配置
+ * 本地存储配置
 *
 * @author Jiahang Li
 * @version 1.0.0
 * @since 2023/6/30 18:40
 */
@Data
-@ConfigurationProperties(prefix = "orion.storage")
-public class StorageConfig {
-
-    /**
-     * 本地文件客户端 配置
-     */
-    private LocalFileClientConfig local;
-
-    /**
-     * 日志文件客户端 配置
-     */
-    private LocalFileClientConfig logs;
+@EqualsAndHashCode(callSuper = true)
+@ConfigurationProperties(prefix = "orion.storage.local")
+public class LocalStorageConfig extends LocalFileClientConfig {

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java
@@ -0,0 +1,20 @@
+package com.orion.visor.framework.storage.configuration.config;
+
+import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 日志存储配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/30 18:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ConfigurationProperties(prefix = "orion.storage.logs")
+public class LogsStorageConfig extends LocalFileClientConfig {
+
+}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,19 +1,14 @@
 {
  "groups": [
-    {
-      "name": "orion.storage",
-      "type": "com.orion.visor.framework.storage.configuration.config.StorageConfig",
-      "sourceType": "com.orion.visor.framework.storage.configuration.config.StorageConfig"
-    },
    {
      "name": "orion.storage.local",
-      "type": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig",
-      "sourceType": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig"
+      "type": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig",
+      "sourceType": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig"
    },
    {
      "name": "orion.storage.logs",
-      "type": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig",
-      "sourceType": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig"
+      "type": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig",
+      "sourceType": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig"
    }
  ],
  "properties": [
--- 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-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
李佳航	1b2753a2b7	Merge pull request #44 from dromara/dev Dev	2024-07-26 11:11:47 +08:00
lijiahang	29b44b8b77	🚨 修复 ts 构建报错.	2024-07-26 10:56:36 +08:00
lijiahang	7290b1364c	🔖 升级版本.	2024-07-26 10:25:38 +08:00
lijiahang	3851ead8bb	💄 修改滚动条样式.	2024-07-26 10:18:39 +08:00
lijiahang	305312cc26	🐛 修复文件上传列表显示错误.	2024-07-25 13:46:48 +08:00
李佳航	b4217555d2	Merge pull request #43 from dromara/dev Dev	2024-07-25 11:16:59 +08:00
lijiahang	87b8e405f5	🔖 升级版本.	2024-07-25 10:27:49 +08:00
lijiahang	3513196a78	⚡ 修改类型定义.	2024-07-24 15:29:15 +08:00
lijiahang	0240a12321	⬆️ 修改升级sql.	2024-07-24 15:04:29 +08:00
lijiahang	3a8eac4d4a	⚡ 重构终端功能.	2024-07-23 10:47:59 +08:00
lijiahang	4bd2de4ce2	🔨 重构主机模块.	2024-07-22 19:36:02 +08:00
lijiahang	b7608fccb3	🔨 修改主机逻辑.	2024-07-22 18:05:00 +08:00
lijiahang	bb925d354d	📝 修改 md 地址.	2024-07-22 10:37:11 +08:00
lijiahang	3a476d41d2	Merge remote-tracking branch 'origin/main' # Conflicts: # README.md	2024-07-22 10:31:45 +08:00
lijiahang	1927b10bcc	📝 修改 md 地址.	2024-07-22 10:31:05 +08:00
lijiahang	0664eff151	🐛 windows 移动文件失败.	2024-07-22 10:27:21 +08:00
lijiahang	a71456b209	⚡ 去除注解.	2024-07-18 15:39:31 +08:00
lijiahang	48d308b1a8	🐛 批量执行历史显示错误.	2024-07-17 13:38:51 +08:00
lijiahang	f75d097d8a	⚡ 删除 http 文件.	2024-07-17 13:35:04 +08:00
lijiahang	0d46d81c4e	⚡ 优化文件上传逻辑.	2024-07-15 10:15:20 +08:00
lijiahangmax	c20c83245f	🐛 修复 windows 文件备份失败.	2024-07-14 21:24:53 +08:00
lijiahangmax	849e010bc3	Merge remote-tracking branch 'origin/dev' into dev	2024-07-12 00:02:57 +08:00
lijiahangmax	95c299eea4	💄 修改主机编辑样式.	2024-07-12 00:02:45 +08:00
李佳航	ad3edd4ccd	Merge pull request #41 from dromara/dev Dev	2024-07-11 11:08:52 +08:00
lijiahang	81b7b3505e	🚀 修改启动命令.	2024-07-11 10:56:49 +08:00
lijiahang	1522a6f3ad	🔖 升级版本.	2024-07-11 10:28:44 +08:00
lijiahang	04bae45955	⚡ 修改执行参数.	2024-07-10 11:46:07 +08:00
lijiahang	873e910eb1	⚡ 定时任务添加参数.	2024-07-10 10:21:16 +08:00
lijiahang	a7f86bf62a	💄 修改表格样式.	2024-07-09 10:34:39 +08:00
lijiahang	7ba278d210	📝 添加 NOTICE 文件.	2024-07-08 14:45:12 +08:00
lijiahang	e9ac9b9f13	⚡ 修改字典值长度.	2024-07-08 14:44:33 +08:00
lijiahangmax	d34843f90c	✨ 主机终端主题从字典中获取.	2024-07-04 21:53:21 +08:00
lijiahang	374d0bdd9c	Merge remote-tracking branch 'origin/dev' into dev	2024-07-04 10:29:58 +08:00
lijiahang	5d3dc83bab	🐛 修复操作日志分页无效.	2024-07-04 10:29:39 +08:00
lijiahangmax	05d0f75cdc	Merge remote-tracking branch 'origin/dev' into dev	2024-06-30 01:14:58 +08:00
lijiahangmax	711a4a6bab	🐛 修复终端大小适配失效.	2024-06-30 01:14:44 +08:00
李佳航	08895ba170	Merge pull request #37 from LinuxSuRen/fix/e2e 🐛 e2e 配置失效.	2024-06-27 15:27:11 +08:00
rick	c2c8b108ac	fix: the e2e testing failure due to auth error	2024-06-27 07:23:24 +00:00
李佳航	318e9f30b8	Merge pull request #36 from dromara/dev 🚀 修改 e2e 配置.	2024-06-27 14:46:36 +08:00
lijiahang	39a1001510	🚀 修改 e2e 配置.	2024-06-27 14:43:59 +08:00
李佳航	5e7b7ebfa7	Merge pull request #35 from dromara/dev Dev	2024-06-27 13:46:39 +08:00
lijiahang	8d85cdf173	🚀 修改 e2e 配置.	2024-06-27 13:44:39 +08:00
lijiahang	79d95d1997	📝 修改 sql.	2024-06-27 13:31:10 +08:00
李佳航	1eb07d0b24	Merge pull request #34 from dromara/dev Dev	2024-06-27 13:06:49 +08:00
lijiahang	601564b573	🔖 升级版本.	2024-06-27 13:03:25 +08:00
lijiahang	41384fab17	🐛 字典值排序无效.	2024-06-26 10:23:32 +08:00
lijiahang	f0a122d862	⚡ 自动清理配置.	2024-06-25 10:42:32 +08:00
lijiahang	b08d75be62	🔨 更新 spring 配置描述文件.	2024-06-25 10:16:15 +08:00
lijiahangmax	02f5bef6b4	📝 修改命名.	2024-06-24 22:49:17 +08:00
lijiahang	ef10c8b8b6	⚡ 修改前端包结构.	2024-06-24 09:57:33 +08:00
lijiahang	6c4e9cd5c6	🚀 修改 e2e 配置.	2024-06-24 09:54:57 +08:00
lijiahang	8dec40553d	⚡ 优化 terminal 逻辑.	2024-06-21 10:15:33 +08:00
lijiahang	9ae5a6c627	🐛 修复机器码获取失败.	2024-06-20 11:55:00 +08:00
lijiahang	2ec1678f01	🔨 修改 ip 获取逻辑.	2024-06-20 11:53:39 +08:00
李佳航	f9e436e885	Merge pull request #30 from LinuxSuRen/e2e 🚀 add e2e testing base on docker compose.	2024-06-20 11:28:46 +08:00
rick	2a49e7670d	fix the health check command	2024-06-20 02:56:16 +00:00
Rick	95d8988f11	Update e2e.yaml	2024-06-20 10:25:23 +08:00
Rick	e04a972df5	Update Dockerfile	2024-06-20 10:24:58 +08:00
rick	1ca9311625	fix the password in e2e	2024-06-20 01:52:10 +00:00
rick	630a1fd3cd	test: add e2e testing base on docker compose	2024-06-20 01:29:43 +00:00
李佳航	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