Merge pull request #54 from dromara/dev

Dev
🔖 升级版本.
2024-08-22 12:27:58 +08:00 · 2024-08-22 11:45:24 +08:00 · 2024-08-21 13:23:31 +08:00 · 2024-08-21 12:56:07 +08:00 · 2024-08-20 10:20:35 +08:00 · 2024-08-19 09:53:15 +08:00
496 changed files with 6632 additions and 6277 deletions
--- a/.env.example
+++ b/.env.example
@@ -0,0 +1,15 @@
+SERVICE_PORT=1081
+VOLUME_BASE=/data/orion-visor-space/docker-volumes
+
+MYSQL_HOST=mysql
+MYSQL_PORT=3306
+MYSQL_DATABASE=orion_visor
+MYSQL_USER=orion
+MYSQL_PASSWORD=Data@123456
+MYSQL_ROOT_PASSWORD=Data@123456
+
+REDIS_HOST=redis
+REDIS_PASSWORD=Data@123456
+
+SECRET_KEY=uQeacXV8b3isvKLK
+DEMO_MODE=false
--- 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/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ build/

 ### VS Code ###
 .vscode/
+.env
--- a/7
+++ b/7
@@ -0,0 +1,7 @@
+ * 在使用本项目前，请您仔细阅读免责声明，确保您已充分理解其中的内容
+
+ * 本项目采用 APACHE LICENSE 2.0 开源协议，如您需要源码的开发方式，需要遵循以下几点
+
+ 1. 禁止修改或删除 LICENSE 文件。
+ 2. 不可二次开发或参与同类竞品的开发。
+ 3. 本项目可免费商业使用，商业使用请保留项目源码、出处、描述文件和作者声明等。
--- a/README.md
+++ b/README.md
@@ -19,12 +19,12 @@
    <a target="_blank"
       style="text-decoration: none !important;"
       href="https://gitee.com/dromara/orion-visor/stargazers">
-      <img src="https://gitee.com/dromara/orion-visor/badge/star.svg?theme=dark" alt="star" />
+      <img src="https://gitee.com/dromara/orion-visor/badge/star.svg?theme=gvp" alt="star" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
       href="https://gitee.com/dromara/orion-visor/members">
-      <img src="https://gitee.com/dromara/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
+      <img src="https://gitee.com/dromara/orion-visor/badge/fork.svg?theme=gvp" alt="fork" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
@@ -53,7 +53,7 @@

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

 ```bash
 # clone
-git clone https://github.com/dromara/orion-visor
+git clone --depth=1 https://github.com/dromara/orion-visor
 cd orion-visor
 # 启动
 docker compose up -d
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -0,0 +1,79 @@
+version: '3.3'
+services:
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.4
+    privileged: true
+    ports:
+      - 1081:80
+    environment:
+      - MYSQL_HOST=mysql
+      - MYSQL_PORT=3306
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=Data@123456
+      - REDIS_HOST=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:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    links:
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.4
+    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
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.4
+    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://service:80
+    depends_on:
+      service:
+        condition: service_healthy
+    links:
+      - service
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,50 +1,78 @@
 version: '3.3'
 services:
-  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.9
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.4
    privileged: true
    ports:
-      - 1081:80
+      - ${SERVICE_PORT:-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
+      - MYSQL_HOST=${MYSQL_HOST:-mysql}
+      - MYSQL_PORT=${MYSQL_PORT:-3306}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-orion_visor}
+      - MYSQL_USER=${MYSQL_USER:-root}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-Data@123456}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456}
+      - SECRET_KEY=${SECRET_KEY:-uQeacXV8b3isvKLK}
+      - DEMO_MODE=${DEMO_MODE:-false}
    volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
+      - ${VOLUME_BASE:-/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: 15s
+      timeout: 300s
+      retries: 15
+      start_period: 3s
    depends_on:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.9
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    links:
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.4
    privileged: true
    ports:
      - 3307:3306
    environment:
-      - MYSQL_DATABASE=orion_visor
-      - MYSQL_USER=orion
-      - MYSQL_PASSWORD=Data@123456
-      - MYSQL_ROOT_PASSWORD=Data@123456
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-orion_visor}
+      - MYSQL_USER=${MYSQL_USER:-orion}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-Data@123456}
+      - MYSQL_ROOT_PASSWORD=${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
-  orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.9
+      - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/var-lib-mysql:/var/lib/mysql
+      - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - ${VOLUME_BASE:-/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: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.4
    privileged: true
    ports:
      - 6380:6379
    environment:
-      - REDIS_PASSWORD=Data@123456
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456}
    volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/redis/data:/data
    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
-  orion-visor-adminer:
-    image: adminer
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+  adminer:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.4
    ports:
      - 8081:8080
+    depends_on:
+      mysql:
+        condition: service_healthy
+    links:
+      - mysql
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -2,6 +2,6 @@
 docker compose down
 # demo 启动
 if [ "$1" == "demo" ]; then
-    sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml
+    sed -i 's/\${DEMO_MODE:-false}/true/g' docker-compose.yml
 fi
-docker compose up -d
+docker compose up -d --remove-orphans
--- a/docker/adminer/Dockerfile
+++ b/docker/adminer/Dockerfile
@@ -0,0 +1 @@
+FROM adminer:latest
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -0,0 +1,4 @@
+#/bin/bash
+version=2.1.4
+docker build -t orion-visor-adminer:${version} .
+docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
--- 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/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,7 +1,6 @@
 #/bin/bash
-version=2.0.9
+version=2.1.4
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
 docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -0,0 +1,6 @@
+#/bin/bash
+version=2.1.4
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,4 @@
 #/bin/bash
-version=2.0.9
+version=2.1.4
 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/service/build.sh
+++ b/docker/service/build.sh
@@ -1,9 +1,8 @@
 #/bin/bash
-version=2.0.9
+version=2.1.4
 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} .
 rm -rf ./orion-visor-launch.jar
 rm -rf ./dist
 docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
--- a/docker/service/nginx.conf
+++ b/docker/service/nginx.conf
@@ -29,7 +29,7 @@ server {
    location /orion-visor/api {
        proxy_pass    http://localhost:9200/orion-visor/api;
        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP  $remote_addr;
+        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
    }
--- a/docs/README.md
+++ b/docs/README.md
@@ -19,12 +19,12 @@
    <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" />
+      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=gvp" 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" />
+      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=gvp" alt="fork" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
--- a/docs/quickstart/docker-install.md
+++ b/docs/quickstart/docker-install.md
@@ -21,22 +21,35 @@ Dashboard 修改)

 ```shell
 # github
-git clone https://github.com/lijiahangmax/orion-visor
+git clone --depth=1 https://github.com/lijiahangmax/orion-visor
 # gitee
-git clone https://gitee.com/lijiahangmax/orion-visor
+git clone --depth=1 https://gitee.com/lijiahangmax/orion-visor
 ```

-### 构建镜像
+### 拉取镜像

 ```
 # 进入仓库目录
 cd orion-visor
-# 修改 docker-compose.yml (建议修改)
-    # MYSQL_USER          mysql 用户名
-    # MYSQL_PASSWORD      mysql 用户密码
-    # MYSQL_ROOT_PASSWORD mysql root 密码
-    # REDIS_PASSWORD      redis 密码
-    # SECRET_KEY          加密密钥
+# 创建名为 .env 的 .env.example 副本
+cp .env.example .env
+# 将其中的值删除以保持默认或将其修改为你喜欢的值
+    # SERVICE_PORT            你希望服务监听的端口
+    # VOLUME_BASE             你希望数据持久化保存的目录, 如果不提前创建将以 docker 进程宿主身份创建(通常是 root)
+
+    # MYSQL_HOST              mysql 服务所在的主机, 如果你没有现有的 MySQL 请保持值为 mysql, 如果你有自部署的请在 docker-compose.yml 中移除 services.mysql 以节约性能
+    # MYSQL_PORT              mysql 监听的端口
+    # MYSQL_DATABASE          mysql 数据库
+    # MYSQL_USER              mysql 用户名
+    # MYSQL_PASSWORD          mysql 用户密码
+    # MYSQL_ROOT_PASSWORD     mysql root 密码
+
+    # REDIS_HOST              redis 服务所在的主机, 如果你没有现有的 Redis 请保持值为 redis, 如果你有自部署的请在 docker-compose.yml 中移除 services.redis 以节约性能
+    # REDIS_PASSWORD          redis 密码
+
+    # SECRET_KEY              加密密钥
+# 拉取远程镜像
+docker compose pull
 ```

 ### 启动
@@ -45,7 +58,7 @@ cd orion-visor
 docker compose up -d
 ```

-### 修改加密方式
+### 修改 MySQL 账户的加密方式

 ```
 访问 adminer: http://localhost:8081
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,11 +14,11 @@
    <url>https://github.com/dromara/orion-visor</url>

    <properties>
-        <revision>2.0.9</revision>
+        <revision>2.1.4</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.version>1.0.7</orion.kit.version>
+        <orion.kit.version>1.0.8</orion.kit.version>
        <aspectj.version>1.9.7</aspectj.version>
        <lombok.version>1.18.26</lombok.version>
        <springdoc.version>1.6.15</springdoc.version>
--- 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,7 +14,7 @@ public interface AppConst extends OrionConst {
    /**
     * 同 ${orion.version} 迭代时候需要手动更改
     */
-    String VERSION = "2.0.9";
+    String VERSION = "2.1.4";

    /**
     * 同 ${spring.application.name}
--- 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,8 +103,12 @@ public interface ErrorMessage {

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

+    String FILE_READ_ERROR_CLEAR = "文件读取失败 (可能已被清理)";
+
    String PLEASE_CHECK_HOST_SSH = "请检查主机 {} 是否存在/权限/SSH配置";

    String CLIENT_ABORT = "手动中断";

+    String UNABLE_DOWNLOAD_FOLDER = "无法下载文件夹";
+
 }
--- 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/entity/PageRequest.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java
@@ -21,7 +21,7 @@ public class PageRequest implements IPageRequest {
    @Schema(description = "页码")
    private int page;

-    @Range(min = 1, max = 100, groups = Page.class)
+    @Range(min = 1, max = 200, groups = Page.class)
    @Schema(description = "大小")
    private int limit;

--- 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/meta/TraceIdHolder.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java
@@ -1,6 +1,8 @@
 package com.orion.visor.framework.common.meta;

 import com.alibaba.ttl.TransmittableThreadLocal;
+import com.orion.lang.id.UUIds;
+import org.slf4j.MDC;

 /**
 * traceId 持有者
@@ -23,16 +25,74 @@ public class TraceIdHolder {
     */
    private static final ThreadLocal<String> HOLDER = new TransmittableThreadLocal<>();

+    /**
+     * 获取 traceId
+     *
+     * @return traceId
+     */
    public static String get() {
        return HOLDER.get();
    }

-    public static void set(String traceId) {
-        HOLDER.set(traceId);
+    /**
+     * 设置 traceId
+     */
+    public static void set() {
+        set(createTraceId());
    }

+    /**
+     * 设置 traceId
+     *
+     * @param traceId traceId
+     */
+    public static void set(String traceId) {
+        // 设置应用上下文
+        HOLDER.set(traceId);
+        // 设置日志上下文
+        setMdc(traceId);
+    }
+
+    /**
+     * 删除 traceId
+     */
    public static void remove() {
+        // 移除应用上下文
        HOLDER.remove();
+        // 移除日志上下文
+        removeMdc();
+    }
+
+    /**
+     * 从应用上下文 设置到日志上下文
+     */
+    public static void setMdc() {
+        setMdc(HOLDER.get());
+    }
+
+    /**
+     * 设置到日志上下文
+     *
+     * @param traceId traceId
+     */
+    public static void setMdc(String traceId) {
+        MDC.put(TRACE_ID_MDC, traceId);
+    }
+
+    /**
+     * 移除日志上下文
+     */
+    public static void removeMdc() {
+        MDC.remove(TRACE_ID_MDC);
+    }
+
+    /**
+     * 创建 traceId
+     *
+     * @return traceId
+     */
+    public static String createTraceId() {
+        return UUIds.random32();
    }

 }
--- 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 位置
     *
--- 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-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-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())) {
--- 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) -> {
--- 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-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()));
@@ -139,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/core/DictParser.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/DictParser.java
@@ -3,6 +3,7 @@ package com.orion.visor.framework.mybatis.core.generator.core;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Strings;
 import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.common.constant.FieldConst;
@@ -47,7 +48,7 @@ public class DictParser {
                    .stream()
                    .filter(s -> variable.equals(s.getName()) || variable.equals(s.getPropertyName()))
                    .findFirst()
-                    .orElseThrow(() -> new RuntimeException("未查询到字典映射字段 " + variable));
+                    .orElseThrow(() -> Exceptions.runtime("未查询到字典映射字段 " + variable));
            // 设置字段名称
            if (meta.getField() == null) {
                meta.setField(Strings.firstUpper(tableField.getPropertyName()));
--- 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
     *
--- 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
     */
--- 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.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
--- 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-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-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"
@@ -68,21 +68,22 @@
    <template #extra="{ record }">
      <a-space>
        <!-- 更多操作 -->
-        <a-dropdown trigger="hover">
+        <a-dropdown trigger="hover" :popup-max-height="false">
          <icon-more class="card-extra-icon" />
          <template #content>
            <!-- 修改 -->
            <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>
@@ -115,7 +118,7 @@

 <script lang="ts" setup>
  import type { ${vue.featureEntity}QueryRequest, ${vue.featureEntity}QueryResponse } from '@/api/${vue.module}/${vue.feature}';
-  import { usePagination, useColLayout } from '@/types/card';
+  import { useCardPagination, useCardColLayout } from '@/hooks/card';
  import { computed, reactive, ref, onMounted } from 'vue';
  import useLoading from '@/hooks/loading';
  import { objectTruthKeyCount, resetObject } from '@/utils';
@@ -133,8 +136,8 @@

  const emits = defineEmits(['openAdd', 'openUpdate']);

-  const cardColLayout = useColLayout();
-  const pagination = usePagination();
+  const cardColLayout = useCardColLayout();
+  const pagination = useCardPagination();
  const { loading, setLoading } = useLoading();
  #if($dictMap.entrySet().size() > 0)
  const { toOptions, getDictValue } = useDictStore();
--- 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
@@ -94,8 +94,8 @@
             :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 -->
@@ -151,9 +151,9 @@
  import {} from '../types/const';
  #end
  #if($vue.enableRowSelection)
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
  #else
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
  #end
  #if($dictMap.entrySet().size() > 0)
  import { useDictStore } from '@/store';
@@ -161,7 +161,7 @@

  const emits = defineEmits(['openAdd', 'openUpdate']);

-  const pagination = usePagination();
+  const pagination = useTablePagination();
  #if($vue.enableRowSelection)
  const rowSelection = useRowSelection();
  #end
--- 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: 100,
+    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/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
--- 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/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java
@@ -98,6 +98,13 @@ public class SecurityUtils {
        return loginUser != null ? loginUser.getTimestamp() : null;
    }

+    /**
+     * 清空用户上下文
+     */
+    public static void clearAuthentication() {
+        SecurityContextHolder.getContext().setAuthentication(null);
+    }
+
    /**
     * 设置当前用户
     *
@@ -107,7 +114,9 @@ public class SecurityUtils {
    public static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
        // 创建 authentication
        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginUser, null, Collections.emptyList());
-        authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        if (request != null) {
+            authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        }
        // 设置上下文
        SecurityContextHolder.getContext().setAuthentication(authentication);
    }
--- 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/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/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-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java
@@ -1,8 +1,6 @@
 package com.orion.visor.framework.web.core.filter;

-import com.orion.lang.id.UUIds;
 import com.orion.visor.framework.common.meta.TraceIdHolder;
-import org.slf4j.MDC;
 import org.springframework.web.filter.OncePerRequestFilter;

 import javax.servlet.FilterChain;
@@ -23,21 +21,17 @@ public class TraceIdFilter extends OncePerRequestFilter {
    @Override
    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
        try {
-            // 获 traceId
-            String traceId = UUIds.random32();
-            // 设置应用上下文
+            // 获取 traceId
+            String traceId = TraceIdHolder.createTraceId();
+            // 设置 traceId 上下文
            TraceIdHolder.set(traceId);
-            // 设置日志上下文
-            MDC.put(TraceIdHolder.TRACE_ID_MDC, traceId);
            // 设置响应头
            response.setHeader(TraceIdHolder.TRACE_ID_HEADER, traceId);
            // 执行请求
            filterChain.doFilter(request, response);
        } finally {
-            // 清理应用上下文
+            // 清空 traceId 上下文
            TraceIdHolder.remove();
-            // 清理日志上下文
-            MDC.clear();
        }
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -10,7 +10,7 @@
    {
      "name": "orion.websocket.prefix",
      "type": "java.lang.String",
-      "description": "公共 websocket 前缀"
+      "description": "公共 websocket 前缀."
    },
    {
      "name": "orion.websocket.binary-buffer-size",
--- a/orion-visor-launch/src/main/resources/application.yaml
+++ b/orion-visor-launch/src/main/resources/application.yaml
@@ -167,6 +167,8 @@ app:
    allow-refresh: true
    # 凭证续签最大次数
    max-refresh-count: 3
+    # 登录失败发送站内信阈值
+    login-failed-send-threshold: 3
    # 登录失败锁定次数
    login-failed-lock-count: 5
    # 登录失败锁定时间 (分)
@@ -189,10 +191,16 @@ app:
  exec-log:
    # 是否拼接 ansi 执行状态日志
    append-ansi: true
-    # 自动清理执行文件
-    auto-clear: true
-    # 保留周期 (天)
-    keep-period: 30
+  # 自动清理配置
+  auto-clear:
+    # 批量执行日志
+    exec-log:
+      enabled: false
+      keep-period: 30
+    # 主机连接日志
+    host-connect-log:
+      enabled: false
+      keep-period: 30

 # orion framework config
 orion:
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/configuration/AssetWebSocketConfiguration.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/configuration/AssetWebSocketConfiguration.java
@@ -5,6 +5,7 @@ import com.orion.visor.module.asset.handler.host.terminal.TerminalMessageDispatc
 import com.orion.visor.module.asset.handler.host.transfer.TransferMessageDispatcher;
 import com.orion.visor.module.asset.interceptor.ExecLogTailInterceptor;
 import com.orion.visor.module.asset.interceptor.TerminalAccessInterceptor;
+import com.orion.visor.module.asset.interceptor.TerminalTransferInterceptor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -28,6 +29,9 @@ public class AssetWebSocketConfiguration implements WebSocketConfigurer {
    @Resource
    private TerminalAccessInterceptor terminalAccessInterceptor;

+    @Resource
+    private TerminalTransferInterceptor terminalTransferInterceptor;
+
    @Resource
    private ExecLogTailInterceptor execLogTailInterceptor;

@@ -42,13 +46,13 @@ public class AssetWebSocketConfiguration implements WebSocketConfigurer {

    @Override
    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        // 终端
+        // 终端会话
        registry.addHandler(terminalMessageDispatcher, prefix + "/host/terminal/{accessToken}")
                .addInterceptors(terminalAccessInterceptor)
                .setAllowedOrigins("*");
        // 文件传输
-        registry.addHandler(transferMessageDispatcher, prefix + "/host/transfer/{accessToken}")
-                .addInterceptors(terminalAccessInterceptor)
+        registry.addHandler(transferMessageDispatcher, prefix + "/host/transfer/{transferToken}")
+                .addInterceptors(terminalTransferInterceptor)
                .setAllowedOrigins("*");
        // 执行日志
        registry.addHandler(execLogTailHandler, prefix + "/exec/log/{token}")
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.http
@@ -1,12 +0,0 @@
-### 查询当前用户已授权的主机
-GET {{baseUrl}}/asset/authorized-data/current-host
-Authorization: {{token}}
-
-### 查询当前用户已授权的主机密钥
-GET {{baseUrl}}/asset/authorized-data/current-host-key
-Authorization: {{token}}
-
-### 查询当前用户已授权的主机身份
-GET {{baseUrl}}/asset/authorized-data/current-host-identity
-Authorization: {{token}}
-
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.http
@@ -1,50 +0,0 @@
-### 主机分组授权
-PUT {{baseUrl}}/asset/data-grant/grant-host-group
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "userId": 10,
-  "idList": [
-    3,
-    5
-  ]
-}
-
-### 获取已授权的主机分组
-GET {{baseUrl}}/asset/data-grant/get-host-group?userId=10
-Authorization: {{token}}
-
-### 主机密钥授权
-PUT {{baseUrl}}/asset/data-grant/grant-host-key
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "userId": 10,
-  "idList": [
-    2,
-    3
-  ]
-}
-
-### 获取已授权的主机密钥
-GET {{baseUrl}}/asset/data-grant/get-host-key?userId=10
-Authorization: {{token}}
-
-### 主机身份授权
-PUT {{baseUrl}}/asset/data-grant/grant-host-identity
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "userId": 10,
-  "idList": [
-    3,
-    5
-  ]
-}
-
-### 获取已授权的主机身份
-GET {{baseUrl}}/asset/data-grant/get-host-identity?userId=10
-Authorization: {{token}}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.http
@@ -1,36 +0,0 @@
-### 创建命令片段
-POST {{baseUrl}}/asset/command-snippet/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "groupId": "",
-  "name": "",
-  "command": ""
-}
-
-
-### 更新命令片段
-PUT {{baseUrl}}/asset/command-snippet/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "groupId": "",
-  "name": "",
-  "command": ""
-}
-
-
-### 查询全部命令片段
-GET {{baseUrl}}/asset/command-snippet/list
-Authorization: {{token}}
-
-
-### 删除命令片段
-DELETE {{baseUrl}}/asset/command-snippet/delete?id=1
-Authorization: {{token}}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.java
@@ -29,7 +29,6 @@ import javax.annotation.Resource;
@RestWrapper
@RestController
@RequestMapping("/asset/command-snippet")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class CommandSnippetController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.http
@@ -1,32 +0,0 @@
-### 创建命令片段分组
-POST {{baseUrl}}/asset/command-snippet-group/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": ""
-}
-
-
-### 更新命令片段分组
-PUT {{baseUrl}}/asset/command-snippet-group/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": ""
-}
-
-
-### 查询全部命令片段分组
-GET {{baseUrl}}/asset/command-snippet-group/list
-Authorization: {{token}}
-
-
-### 删除命令片段分组
-DELETE {{baseUrl}}/asset/command-snippet-group/delete?id=1
-Authorization: {{token}}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.java
@@ -31,7 +31,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/command-snippet-group")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class CommandSnippetGroupController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.http
@@ -1,25 +0,0 @@
-### 批量执行命令
-POST {{baseUrl}}/asset/exec-command/exec
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "description": 1,
-  "timeout": 10,
-  "scriptExec": 0,
-  "command": "echo 这是日志@{{ hostAddress }}\nsleep 1\necho @{{ hostName }}",
-  "parameterSchema": "[]",
-  "hostIdList": [1]
-}
-
-### 批量执行命令
-POST {{baseUrl}}/asset/exec-command/re-exec
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "logId": 1
-}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.java
@@ -33,7 +33,6 @@ import javax.annotation.Resource;
@RestWrapper
@RestController
@RequestMapping("/asset/exec-command")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class ExecCommandController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.http
@@ -1,58 +0,0 @@
-### 查询批量执行日志
-GET {{baseUrl}}/asset/exec-command-log/get?id=1
-Authorization: {{token}}
-
-
-### 分页查询批量执行日志
-POST {{baseUrl}}/asset/exec-command-log/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "userId": "",
-  "username": "",
-  "description": "",
-  "command": "",
-  "status": ""
-}
-
-
-### 删除批量执行日志
-DELETE {{baseUrl}}/asset/exec-command-log/delete?id=1
-Authorization: {{token}}
-
-
-### 批量删除批量执行日志
-DELETE {{baseUrl}}/asset/exec-command-log/batch-delete?idList=1,2,3
-Authorization: {{token}}
-
-
-### 查看执行日志
-POST {{baseUrl}}/asset/exec-command-log/tail
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "execId": 56
-}
-
-
-### 下载批量执行日志文件
-GET {{baseUrl}}/asset/exec-command-log/download?id=83
-Authorization: {{token}}
-
-
-### 中断批量执行命令
-POST {{baseUrl}}/asset/exec-command-log/interrupt
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "logId": 7
-}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java
@@ -43,7 +43,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/exec-command-log")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class ExecCommandLogController {

    private static final String SOURCE = ExecSourceEnum.BATCH.name();
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.http
@@ -1,74 +0,0 @@
-### 创建计划任务
-POST {{baseUrl}}/asset/exec-job/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": "测试 1",
-  "expression": "0 */3 * * * ?",
-  "timeout": 0,
-  "scriptExec": 0,
-  "command": "echo 123",
-  "parameterSchema": "[]",
-  "hostIdList": [
-    1
-  ]
-}
-
-
-### 更新计划任务
-PUT {{baseUrl}}/asset/exec-job/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": 5,
-  "name": "测试 1",
-  "expression": "0 */10 * * * ?",
-  "timeout": 0,
-  "scriptExec": 0,
-  "command": "echo 123",
-  "parameterSchema": "[]",
-  "hostIdList": [
-    1
-  ]
-}
-
-
-### 更新计划任务状态
-PUT {{baseUrl}}/asset/exec-job/update-status
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": 5,
-  "status": 0
-}
-
-
-### 查询计划任务
-GET {{baseUrl}}/asset/exec-job/get?id=1
-Authorization: {{token}}
-
-
-### 分页查询计划任务
-POST {{baseUrl}}/asset/exec-job/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "name": "",
-  "command": "",
-  "status": ""
-}
-
-
-### 删除计划任务
-DELETE {{baseUrl}}/asset/exec-job/delete?id=1
-Authorization: {{token}}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java
@@ -5,6 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
 import com.orion.visor.framework.common.validator.group.Page;
 import com.orion.visor.framework.log.core.annotation.IgnoreLog;
 import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
+import com.orion.visor.framework.web.core.annotation.DemoDisableApi;
 import com.orion.visor.framework.web.core.annotation.RestWrapper;
 import com.orion.visor.module.asset.define.operator.ExecJobOperatorType;
 import com.orion.visor.module.asset.entity.request.exec.*;
@@ -34,12 +35,12 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/exec-job")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class ExecJobController {

    @Resource
    private ExecJobService execJobService;

+    @DemoDisableApi
    @OperatorLog(ExecJobOperatorType.CREATE)
    @PostMapping("/create")
    @Operation(summary = "创建计划任务")
@@ -48,6 +49,7 @@ public class ExecJobController {
        return execJobService.createExecJob(request);
    }

+    @DemoDisableApi
    @OperatorLog(ExecJobOperatorType.UPDATE)
    @PutMapping("/update")
    @Operation(summary = "更新计划任务")
@@ -56,6 +58,7 @@ public class ExecJobController {
        return execJobService.updateExecJobById(request);
    }

+    @DemoDisableApi
    @OperatorLog(ExecJobOperatorType.UPDATE_STATUS)
    @PutMapping("/update-status")
    @Operation(summary = "更新计划任务状态")
@@ -89,6 +92,7 @@ public class ExecJobController {
        return execJobService.getExecJobPage(request);
    }

+    @DemoDisableApi
    @OperatorLog(ExecJobOperatorType.DELETE)
    @DeleteMapping("/delete")
    @Operation(summary = "删除计划任务")
@@ -98,6 +102,7 @@ public class ExecJobController {
        return execJobService.deleteExecJobById(id);
    }

+    @DemoDisableApi
    @OperatorLog(ExecJobOperatorType.DELETE)
    @DeleteMapping("/batch-delete")
    @Operation(summary = "批量删除计划任务")
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.http
@@ -1,57 +0,0 @@
-### 查询计划任务日志
-GET {{baseUrl}}/asset/exec-job-log/get?id=1
-Authorization: {{token}}
-
-
-### 分页查询计划任务日志
-POST {{baseUrl}}/asset/exec-job-log/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "userId": "",
-  "username": "",
-  "description": "",
-  "command": "",
-  "status": ""
-}
-
-
-### 删除计划任务日志
-DELETE {{baseUrl}}/asset/exec-job-log/delete?id=1
-Authorization: {{token}}
-
-
-### 批量删除计划任务日志
-DELETE {{baseUrl}}/asset/exec-job-log/batch-delete?idList=1,2,3
-Authorization: {{token}}
-
-
-### 查看计划任务日志
-POST {{baseUrl}}/asset/exec-job-log/tail
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "execId": 56
-}
-
-
-### 下载计划任务日志文件
-GET {{baseUrl}}/asset/exec-job-log/download?id=83
-Authorization: {{token}}
-
-
-### 中断计划任务命令
-POST {{baseUrl}}/asset/exec-command-log/interrupt
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "logId": 7
-}
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java
@@ -42,7 +42,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/exec-job-log")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class ExecJobLogController {

    private static final String SOURCE = ExecSourceEnum.JOB.name();
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.http
@@ -1,63 +0,0 @@
-### 创建执行模板
-POST {{baseUrl}}/asset/exec-template/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": "",
-  "command": "",
-  "timeout": 0,
-  "scriptExec": 0,
-  "parameterSchema": ""
-}
-
-
-### 更新执行模板
-PUT {{baseUrl}}/asset/exec-template/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": "",
-  "command": "",
-  "timeout": 0,
-  "scriptExec": 0,
-  "parameterSchema": ""
-}
-
-
-### 查询执行模板
-GET {{baseUrl}}/asset/exec-template/get?id=1
-Authorization: {{token}}
-
-
-### 查询全部执行模板
-GET {{baseUrl}}/asset/exec-template/list
-Content-Type: application/json
-Authorization: {{token}}
-
-
-### 分页查询执行模板
-POST {{baseUrl}}/asset/exec-template/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "name": "",
-  "command": "",
-  "timeout": 0,
-  "scriptExec": 0,
-  "parameterSchema": ""
-}
-
-
-### 删除执行模板
-DELETE {{baseUrl}}/asset/exec-template/delete?id=1
-Authorization: {{token}}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java
@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/exec-template")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class ExecTemplateController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.http
@@ -1,31 +0,0 @@
-### 查询主机配置
-GET {{baseUrl}}/asset/host-config/get?hostId=1&type=SSH
-Authorization: {{token}}
-
-### 查询全部主机配置
-GET {{baseUrl}}/asset/host-config/list?hostId=1
-Authorization: {{token}}
-
-### 通过 id 更新主机配置
-PUT {{baseUrl}}/asset/host-config/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "config": "",
-  "version": ""
-}
-
-### 通过 id 更新主机配置状态
-PUT {{baseUrl}}/asset/host-config/update-status
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "status": "",
-  "version": ""
-}
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java
@@ -1,82 +0,0 @@
-package com.orion.visor.module.asset.controller;
-
-import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
-import com.orion.visor.framework.log.core.annotation.IgnoreLog;
-import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
-import com.orion.visor.framework.web.core.annotation.DemoDisableApi;
-import com.orion.visor.framework.web.core.annotation.RestWrapper;
-import com.orion.visor.module.asset.define.operator.HostOperatorType;
-import com.orion.visor.module.asset.entity.request.host.HostConfigUpdateRequest;
-import com.orion.visor.module.asset.entity.request.host.HostConfigUpdateStatusRequest;
-import com.orion.visor.module.asset.entity.vo.HostConfigVO;
-import com.orion.visor.module.asset.service.HostConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 主机配置 api
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023-9-11 14:16
- */
-@Tag(name = "asset - 主机配置服务")
-@Slf4j
-@Validated
-@RestWrapper
-@RestController
-@RequestMapping("/asset/host-config")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
-public class HostConfigController {
-
-    @Resource
-    private HostConfigService hostConfigService;
-
-    @IgnoreLog(IgnoreLogMode.RET)
-    @GetMapping("/get")
-    @Operation(summary = "查询主机配置")
-    @Parameter(name = "hostId", description = "hostId", required = true)
-    @Parameter(name = "type", description = "配置类型", required = true)
-    @PreAuthorize("@ss.hasPermission('asset:host:query')")
-    public HostConfigVO getHostConfig(@RequestParam("hostId") Long hostId,
-                                      @RequestParam(name = "type") String type) {
-        return hostConfigService.getHostConfig(hostId, type);
-    }
-
-    @IgnoreLog(IgnoreLogMode.RET)
-    @GetMapping("/list")
-    @Operation(summary = "查询全部主机配置")
-    @Parameter(name = "hostId", description = "hostId", required = true)
-    @PreAuthorize("@ss.hasPermission('asset:host:query')")
-    public List<HostConfigVO> getHostConfigList(@RequestParam("hostId") Long hostId) {
-        return hostConfigService.getHostConfigList(hostId);
-    }
-
-    @DemoDisableApi
-    @OperatorLog(HostOperatorType.UPDATE_CONFIG)
-    @PutMapping("/update")
-    @Operation(summary = "更新主机配置")
-    @PreAuthorize("@ss.hasPermission('asset:host:update-config')")
-    public Integer updateHostConfig(@Validated @RequestBody HostConfigUpdateRequest request) {
-        return hostConfigService.updateHostConfig(request);
-    }
-
-    @DemoDisableApi
-    @OperatorLog(HostOperatorType.UPDATE_CONFIG_STATUS)
-    @PutMapping("/update-status")
-    @Operation(summary = "更新主机配置状态/动态初始化配置")
-    @PreAuthorize("@ss.hasPermission('asset:host:update-config')")
-    public Integer updateHostConfigStatus(@Validated @RequestBody HostConfigUpdateStatusRequest request) {
-        return hostConfigService.updateHostConfigStatus(request);
-    }
-
-}
-
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.http
@@ -1,31 +0,0 @@
-### 分页查询主机连接日志
-POST {{baseUrl}}/asset/host-connect-log/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "userId": "",
-  "hostId": "",
-  "type": "",
-  "token": "",
-  "status": "",
-  "startTimeRange": [
-    "",
-    ""
-  ]
-}
-
-### 查询用户最近连接的 ssh 主机
-POST {{baseUrl}}/asset/host-connect-log/latest-connect
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "limit": 10,
-  "type": "SSH"
-}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java
@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/host-connect-log")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostConnectLogController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.http
@@ -1,56 +0,0 @@
-### 创建主机
-POST {{baseUrl}}/asset/host/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": "",
-  "code": "",
-  "address": ""
-}
-
-
-### 通过 id 更新主机
-PUT {{baseUrl}}/asset/host/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": "",
-  "code": "",
-  "address": ""
-}
-
-
-### 通过 id 查询主机
-GET {{baseUrl}}/asset/host/get?id=1&extra=true&config=true
-Authorization: {{token}}
-
-
-### 查询主机
-GET {{baseUrl}}/asset/host/list
-Authorization: {{token}}
-
-
-### 分页查询主机
-POST {{baseUrl}}/asset/host/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "name": "",
-  "code": "",
-  "address": ""
-}
-
-
-### 通过 id 删除主机
-DELETE {{baseUrl}}/asset/host/delete?id=1
-Authorization: {{token}}
-
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
@@ -8,9 +8,8 @@ import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
 import com.orion.visor.framework.web.core.annotation.DemoDisableApi;
 import com.orion.visor.framework.web.core.annotation.RestWrapper;
 import com.orion.visor.module.asset.define.operator.HostOperatorType;
-import com.orion.visor.module.asset.entity.request.host.HostCreateRequest;
-import com.orion.visor.module.asset.entity.request.host.HostQueryRequest;
-import com.orion.visor.module.asset.entity.request.host.HostUpdateRequest;
+import com.orion.visor.module.asset.entity.request.host.*;
+import com.orion.visor.module.asset.entity.vo.HostConfigVO;
 import com.orion.visor.module.asset.entity.vo.HostVO;
 import com.orion.visor.module.asset.service.HostService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -37,7 +36,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/host")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostController {

    @Resource
@@ -61,6 +59,24 @@ public class HostController {
        return hostService.updateHostById(request);
    }

+    @DemoDisableApi
+    @OperatorLog(HostOperatorType.UPDATE_STATUS)
+    @PutMapping("/update-status")
+    @Operation(summary = "更新主机状态")
+    @PreAuthorize("@ss.hasPermission('asset:host:update-status')")
+    public Integer updateHostStatus(@Validated @RequestBody HostUpdateStatusRequest request) {
+        return hostService.updateHostStatus(request);
+    }
+
+    @DemoDisableApi
+    @OperatorLog(HostOperatorType.UPDATE_CONFIG)
+    @PutMapping("/update-config")
+    @Operation(summary = "更新主机配置")
+    @PreAuthorize("@ss.hasPermission('asset:host:update-config')")
+    public Integer updateHostConfig(@Validated @RequestBody HostUpdateConfigRequest request) {
+        return hostService.updateHostConfig(request);
+    }
+
    @IgnoreLog(IgnoreLogMode.RET)
    @GetMapping("/get")
    @Operation(summary = "通过 id 查询主机")
@@ -70,12 +86,22 @@ public class HostController {
        return hostService.getHostById(id);
    }

+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/get-config")
+    @Operation(summary = "查询主机配置")
+    @Parameter(name = "id", description = "id", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:host:query')")
+    public HostConfigVO getHostConfig(@RequestParam("id") Long id) {
+        return hostService.getHostConfig(id);
+    }
+
    @IgnoreLog(IgnoreLogMode.RET)
    @GetMapping("/list")
    @Operation(summary = "查询主机")
+    @Parameter(name = "type", description = "type", required = false)
    @PreAuthorize("@ss.hasPermission('asset:host:query')")
-    public List<HostVO> getHostList() {
-        return hostService.getHostListByCache();
+    public List<HostVO> getHostList(@RequestParam(value = "type", required = false) String type) {
+        return hostService.getHostList(type);
    }

    @IgnoreLog(IgnoreLogMode.RET)
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.http
@@ -1,28 +0,0 @@
-### 获取主机拓展信息
-GET {{baseUrl}}/asset/host-extra/get?hostId=1&item=ssh
-Authorization: {{token}}
-
-### 获取多个主机拓展信息
-POST {{baseUrl}}/asset/host-extra/list
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "hostId": 1,
-  "items": [
-    "ssh"
-  ]
-}
-
-### 修改主机拓展信息
-PUT {{baseUrl}}/asset/host-extra/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "hostId": 1,
-  "item": "ssh",
-  "extra": "{\"authType\":\"DEFAULT\"}"
-}
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.java
@@ -29,7 +29,6 @@ import java.util.Map;
@RestWrapper
@RestController
@RequestMapping("/asset/host-extra")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostExtraController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.http
@@ -1,44 +0,0 @@
-### 创建主机分组
-POST {{baseUrl}}/asset/host-group/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "parentId": -1,
-  "name": ""
-}
-
-
-### 查询主机分组
-GET {{baseUrl}}/asset/host-group/tree
-Authorization: {{token}}
-
-
-### 修改名称
-PUT {{baseUrl}}/asset/host-group/rename
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": ""
-}
-
-
-### 移动位置
-PUT {{baseUrl}}/asset/host-group/move
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "targetId": "",
-  "position": ""
-}
-
-
-### 删除主机分组
-DELETE {{baseUrl}}/asset/host-group/delete?id=1
-Authorization: {{token}}
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java
@@ -37,7 +37,6 @@ import java.util.Set;
@RestWrapper
@RestController
@RequestMapping("/asset/host-group")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostGroupController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.http
@@ -1,57 +0,0 @@
-### 创建主机身份
-POST {{baseUrl}}/asset/host-identity/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": "",
-  "username": "",
-  "password": "",
-  "keyId": ""
-}
-
-
-### 通过 id 更新主机身份
-PUT {{baseUrl}}/asset/host-identity/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": "",
-  "username": "",
-  "password": "",
-  "keyId": ""
-}
-
-
-### 通过 id 查询主机身份
-GET {{baseUrl}}/asset/host-identity/get?id=1
-Authorization: {{token}}
-
-
-### 通过 id 批量查询主机身份
-GET {{baseUrl}}/asset/host-identity/list
-Authorization: {{token}}
-
-
-### 分页查询主机身份
-POST {{baseUrl}}/asset/host-identity/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "name": "",
-  "username": "",
-  "password": "",
-  "keyId": ""
-}
-
-
-### 通过 id 删除主机身份
-DELETE {{baseUrl}}/asset/host-identity/delete?id=1
-Authorization: {{token}}
-
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java
@@ -37,7 +37,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/host-identity")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostIdentityController {

    @Resource
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.http
@@ -1,66 +0,0 @@
-### 创建主机密钥
-POST {{baseUrl}}/asset/host-key/create
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "name": "",
-  "publicKey": "",
-  "privateKey": "",
-  "password": ""
-}
-
-
-### 通过 id 更新主机密钥
-PUT {{baseUrl}}/asset/host-key/update
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": "",
-  "publicKey": "",
-  "privateKey": "",
-  "password": ""
-}
-
-
-### 通过 id 查询主机密钥
-GET {{baseUrl}}/asset/host-key/get?id=1
-Authorization: {{token}}
-
-### 查询主机密钥
-POST {{baseUrl}}/asset/host-key/list
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": "",
-  "name": "",
-  "publicKey": "",
-  "privateKey": "",
-  "password": ""
-}
-
-
-### 分页查询主机密钥
-POST {{baseUrl}}/asset/host-key/query
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "page": 1,
-  "limit": 10,
-  "id": "",
-  "name": "",
-  "publicKey": "",
-  "privateKey": "",
-  "password": ""
-}
-
-
-### 通过 id 删除主机密钥
-DELETE {{baseUrl}}/asset/host-key/delete?id=1
-Authorization: {{token}}
-
-###
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java
@@ -37,7 +37,6 @@ import java.util.List;
@RestWrapper
@RestController
@RequestMapping("/asset/host-key")
-@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
 public class HostKeyController {

    @Resource
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
李佳航	120eb1ee69	Merge pull request #54 from dromara/dev Dev	2024-08-22 12:27:58 +08:00
lijiahang	252c538571	🔖 升级版本.	2024-08-22 11:45:24 +08:00
lijiahang	1eec373b7e	⚡ demo 禁用定时任务.	2024-08-21 13:23:31 +08:00
lijiahang	aa9b96a9c1	⚡ 修改表格显示字段.	2024-08-21 12:56:07 +08:00
lijiahang	059fb30aa4	⚡ 优化权限逻辑.	2024-08-20 10:20:35 +08:00
lijiahang	2afaf7ad34	Merge remote-tracking branch 'origin/dev' into dev	2024-08-19 09:53:15 +08:00
lijiahang	076a0956c5	⚡ 修改心跳检测时间.	2024-08-19 09:49:41 +08:00
lijiahangmax	4a91ec47bf	⚡ 添加主题.	2024-08-13 20:56:00 +08:00
lijiahangmax	1066b43b3d	✨ 全屏模式.	2024-08-12 00:07:54 +08:00
lijiahangmax	3f78125c43	Merge remote-tracking branch 'origin/dev' into dev	2024-08-11 23:07:14 +08:00
lijiahangmax	144a44673b	🐛 修复更新菜单后查询条件错误.	2024-08-11 23:06:59 +08:00
李佳航	777f7b3758	Merge pull request #52 from dromara/dev Dev	2024-08-08 10:52:09 +08:00
lijiahang	947fa0fea3	🐳 添加 push 脚本.	2024-08-08 10:17:31 +08:00
lijiahang	7109e89fb4	🔖 升级版本.	2024-08-08 10:14:39 +08:00
lijiahang	70e7b1d544	⚡ 修改终端标签颜色显示.	2024-08-07 10:18:39 +08:00
lijiahangmax	613f86155c	💄 修改终端样式.	2024-08-06 00:01:27 +08:00
lijiahang	8d0b58e48f	⬆️ 升级 orion kit 版本.	2024-08-05 13:49:52 +08:00
lijiahang	8cea9dc977	⚡ 优化终端代码.	2024-08-05 09:11:54 +08:00
lijiahangmax	471acfdf00	⚡ 优化自动聚焦逻辑.	2024-08-04 17:01:44 +08:00
lijiahangmax	8ed42131d0	⚡ 优化命令片段处理逻辑.	2024-08-02 01:52:29 +08:00
lijiahangmax	18c605354a	🔨 修改终端逻辑.	2024-07-31 00:42:02 +08:00
李佳航	8c04411458	Merge pull request #48 from MemoryShadow/dev perf: Use the.env file instead to modify docker-compose.yml	2024-07-30 17:53:31 +08:00
lijiahang	9a8d1d05cd	💄 修改终端样式.	2024-07-30 14:40:15 +08:00
MemoryShadow	1cbaf9c424	docs: Clarify behavior semantics and accelerate deployment efficiency	2024-07-29 07:02:32 +00:00
MemoryShadow	537c2fc108	perf: Use the.env file instead to modify docker-compose.yml	2024-07-29 07:02:21 +00:00
李佳航	122b568cf5	Merge pull request #46 from dromara/dev Dev	2024-07-29 11:39:00 +08:00
lijiahang	8b97c02d15	🐳 修改 docker 配置.	2024-07-29 11:15:44 +08:00
lijiahang	dcfb016ce5	🔖 升级版本.	2024-07-29 10:33:59 +08:00
lijiahang	c842de9e23	⚡ 修改 hook 位置.	2024-07-29 10:25:11 +08:00
李佳航	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