Merge pull request #55 from dromara/dev

Dev
:replace: 修改 demo 地址.
2024-09-02 13:11:36 +08:00 · 2024-09-02 13:06:17 +08:00 · 2024-09-02 12:37:11 +08:00 · 2024-09-02 11:51:30 +08:00 · 2024-08-29 23:34:28 +08:00 · 2024-08-29 23:33:46 +08:00
627 changed files with 9352 additions and 7936 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
@@ -13,27 +13,27 @@
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor/releases">
+       href="https://github.com/dromara/orion-visor/releases">
      <img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
+       href="https://gitee.com/dromara/orion-visor/stargazers">
+      <img src="https://gitee.com/dromara/orion-visor/badge/star.svg?theme=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" />
+       href="https://gitee.com/dromara/orion-visor/members">
+      <img src="https://gitee.com/dromara/orion-visor/badge/fork.svg?theme=gvp" alt="fork" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
+       href="https://github.com/dromara/orion-visor">
      <img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
    </a>
    <a target="_blank"
       style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
+       href="https://github.com/dromara/orion-visor">
      <img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
    </a>
 </p>
@@ -51,9 +51,9 @@

 ## 演示环境

-* 🔗 演示地址: http://101.43.254.243:1081/
+* 🔗 演示地址: https://dv.orionsec.cn/
 * 🔏 演示账号: admin/admin
-* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/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/lijiahangmax/orion-visor
+git clone --depth=1 https://github.com/dromara/orion-visor
 cd orion-visor
 # 启动
 docker compose up -d
@@ -72,11 +72,11 @@ docker compose up -d

 ## 项目文档

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

 ## 技术栈

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

 ## 免责声明

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

 ## License

-本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。  
+本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。  
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -0,0 +1,79 @@
+version: '3.3'
+services:
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.5
+    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.5
+    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.5
+    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,49 +1,78 @@
 version: '3.3'
 services:
-  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.7
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.5
+    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.7
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    links:
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.5
    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.7
+      - ${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.5
    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.5
    ports:
      - 8081:8080
+    depends_on:
+      mysql:
+        condition: service_healthy
+    links:
+      - mysql
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -1,8 +1,7 @@
 #/bin/bash
 docker compose down
-sh ./pull.sh
 # demo 启动
 if [ "$1" == "demo" ]; then
-    sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml
+    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.5
+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/user-permission/user
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: menu
+    request:
+      api: /orion-visor/api/infra/user-permission/menu
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: haveUnRead
+    request:
+      api: /orion-visor/api/infra/system-message/has-unread
+  - name: queryOperatorLog
+    request:
+      api: /orion-visor/api/infra/mine/query-operator-log
+      method: POST
+  - name: hostList
+    request:
+      api: /orion-visor/api/infra/tag/list?type=HOST
+  - name: queryHost
+    request:
+      api: /orion-visor/api/asset/host/query
+      method: POST
--- a/docker/orion-visor-mysql/Dockerfile
+++ b/docker/orion-visor-mysql/Dockerfile
--- a/docker/orion-visor-mysql/build.sh
+++ b/docker/orion-visor-mysql/build.sh
@@ -1,7 +1,6 @@
 #/bin/bash
-version=2.0.7
+version=2.1.5
 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/orion-visor-mysql/my.cnf
+++ b/docker/orion-visor-mysql/my.cnf
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -0,0 +1,6 @@
+#/bin/bash
+version=2.1.5
+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/orion-visor-redis/Dockerfile
+++ b/docker/orion-visor-redis/Dockerfile
--- a/docker/orion-visor-redis/build.sh
+++ b/docker/orion-visor-redis/build.sh
@@ -1,5 +1,4 @@
 #/bin/bash
-version=2.0.7
+version=2.1.5
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
--- a/docker/orion-visor-redis/redis.conf
+++ b/docker/orion-visor-redis/redis.conf
--- a/docker/orion-visor-service/Dockerfile
+++ b/docker/orion-visor-service/Dockerfile
@@ -8,6 +8,7 @@ RUN \
  sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
  apk update && \
  apk add tzdata && \
+  apk add dmidecode && \
  apk add openjdk8
 # 设置时区
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
--- a/docker/orion-visor-service/build.sh
+++ b/docker/orion-visor-service/build.sh
@@ -1,9 +1,8 @@
 #/bin/bash
-version=2.0.7
+version=2.1.5
 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/orion-visor-service/entrypoint.sh
+++ b/docker/orion-visor-service/entrypoint.sh
--- a/docker/orion-visor-service/nginx.conf
+++ b/docker/orion-visor-service/nginx.conf
@@ -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
@@ -11,14 +11,14 @@
    <name>${project.artifactId}</name>

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

    <properties>
-        <revision>2.0.7</revision>
+        <revision>2.1.5</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/pom.xml
+++ b/orion-visor-framework/orion-visor-framework-common/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

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

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

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

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

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

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

    String CN_ROLE = "角色";

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

    int MD5_LEN = 32;

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

    Integer DEFAULT_SORT = 10;
@@ -33,4 +29,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons

    String SYSTEM_USERNAME = "system";

+    int BATCH_COUNT = 500;
+
 }
--- 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
@@ -1,5 +1,8 @@
 package com.orion.visor.framework.common.constant;

+import com.orion.lang.exception.ApplicationException;
+import com.orion.lang.exception.argument.InvalidArgumentException;
+
 /**
 * 错误信息
 *
@@ -61,6 +64,10 @@ public interface ErrorMessage {

    String GROUP_ABSENT = "分组不存在";

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

    String UNSUPPORTED_CHARSET = "不支持的编码 [{}]";
@@ -83,20 +90,73 @@ public interface ErrorMessage {

    String UNKNOWN_TYPE = "未知类型";

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

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

    String TASK_ABSENT = "任务不存在";

+    String CONNECT_ERROR = "连接失败";
+
+    String AUTH_ERROR = "认证失败";
+
+    String SCRIPT_UPLOAD_ERROR = "脚本上传失败";
+
+    String EXEC_ERROR = "执行失败";
+
    String ILLEGAL_STATUS = "当前状态不支持此操作";

    String CHECK_AUTHORIZED_HOST = "请选择已授权的主机";

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

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

    String CLIENT_ABORT = "手动中断";

+    String UNABLE_DOWNLOAD_FOLDER = "无法下载文件夹";
+
+    /**
+     * 是否为业务异常
+     *
+     * @param ex ex
+     * @return biz exception
+     */
+    static boolean isBizException(Exception ex) {
+        if (ex == null) {
+            return false;
+        }
+        return ex instanceof InvalidArgumentException
+                || ex instanceof IllegalArgumentException
+                || ex instanceof ApplicationException;
+    }
+
+    /**
+     * 获取错误信息
+     *
+     * @param ex         ex
+     * @param defaultMsg defaultMsg
+     * @return message
+     */
+    static String getErrorMessage(Exception ex, String defaultMsg) {
+        if (ex == null) {
+            return null;
+        }
+        String message = ex.getMessage();
+        if (message == null) {
+            return defaultMsg;
+        }
+        // 业务异常
+        if (isBizException(ex)) {
+            return message;
+        }
+        return defaultMsg;
+    }
+
 }
--- 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/DataClearRequest.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/DataClearRequest.java
@@ -0,0 +1,26 @@
+package com.orion.visor.framework.common.entity;
+
+/**
+ * 数据清理请求 定义
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/8/29 11:26
+ */
+public interface DataClearRequest {
+
+    /**
+     * 获取清理数量限制
+     *
+     * @return 清理限制
+     */
+    Integer getLimit();
+
+    /**
+     * 设置清理数量限制
+     *
+     * @param limit limit
+     */
+    void setLimit(Integer limit);
+
+}
--- 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
@@ -1,10 +1,12 @@
 package com.orion.visor.framework.common.entity;

-import com.orion.lang.define.wrapper.IPageRequest;
 import com.orion.visor.framework.common.validator.group.Page;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;

 /**
 * 公共页码请求
@@ -15,14 +17,18 @@ import org.hibernate.validator.constraints.Range;
 */
@Data
@Schema(description = "公共页码请求")
-public class PageRequest implements IPageRequest {
+public class PageRequest {

-    @Range(min = 1, max = 10000, groups = Page.class)
+    @NotNull(groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    @Max(value = 10000, groups = Page.class)
    @Schema(description = "页码")
-    private int page;
+    private Integer page;

-    @Range(min = 1, max = 100, groups = Page.class)
+    @NotNull(groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    @Max(value = 200, groups = Page.class)
    @Schema(description = "大小")
-    private int limit;
+    private Integer 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/handler/data/GenericsDataDefinition.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java
@@ -1,9 +1,8 @@
 package com.orion.visor.framework.common.handler.data;

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

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

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

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

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

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

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

 import com.alibaba.fastjson.JSON;

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

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

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

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

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

 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/MapDataStrategy.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/MapDataStrategy.java
@@ -1,22 +0,0 @@
-package com.orion.visor.framework.common.handler.data.strategy;
-
-import com.alibaba.fastjson.JSONObject;
-import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-
-import java.util.Map;
-
-/**
- * map 数据处理策略
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/20 22:11
- */
-public interface MapDataStrategy<Model extends GenericsDataModel> extends GenericsDataStrategy<Model, Map<String, Object>> {
-
-    @Override
-    default Map<String, Object> toView(String model) {
-        return JSONObject.parseObject(model);
-    }
-
-}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/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) {
+        // 获取实际地址 X_REAL_IP 在多代理情况下会有问题
+        // String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP);
+        // if (!Strings.isBlank(realIp)) {
+        //     return realIp;
+        // }
+        // 获取请求地址
+        return Servlets.getRemoteAddr(request);
+    }
+
    /**
     * 获取 ip 位置
     *
@@ -29,7 +49,7 @@ public class IpUtils {
     */
    public static String getLocation(String ip) {
        if (ip == null) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        // 查询缓存
        return CACHE.computeIfAbsent(ip, IpUtils::queryLocation);
@@ -43,21 +63,21 @@ public class IpUtils {
     */
    private static String queryLocation(String ip) {
        if (ip == null) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        Region region;
        try {
            region = LocationRegions.getRegion(ip, 3);
        } catch (Exception e) {
-            return Const.UNKNOWN;
+            return Const.CN_UNKNOWN;
        }
        if (region != null) {
            String net = region.getNet();
            String province = region.getProvince();
-            if (net.equals(Const.INTRANET_IP)) {
+            if (net.equals(Const.CN_INTRANET_IP)) {
                return net;
            }
-            if (province.equals(Const.UNKNOWN)) {
+            if (province.equals(Const.CN_UNKNOWN)) {
                return province;
            }
            StringBuilder location = new StringBuilder()
@@ -69,7 +89,7 @@ public class IpUtils {
            location.append(" (").append(net).append(')');
            return location.toString();
        }
-        return Const.UNKNOWN;
+        return Const.CN_UNKNOWN;
    }

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

    /**
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java
@@ -41,7 +41,7 @@ public class Requests {
                .map(s -> (ServletRequestAttributes) s)
                .map(ServletRequestAttributes::getRequest)
                .ifPresent(request -> {
-                    String address = Servlets.getRemoteAddr(request);
+                    String address = IpUtils.getRemoteAddr(request);
                    identity.setAddress(address);
                    identity.setLocation(IpUtils.getLocation(address));
                    identity.setUserAgent(Servlets.getUserAgent(request));
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SqlUtils.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SqlUtils.java
@@ -0,0 +1,38 @@
+package com.orion.visor.framework.common.utils;
+
+import com.orion.visor.framework.common.constant.Const;
+
+/**
+ * sql 工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/8/26 16:03
+ */
+public class SqlUtils {
+
+    private SqlUtils() {
+    }
+
+    /**
+     * limit n
+     *
+     * @param limit limit
+     * @return limit
+     */
+    public static String limit(Number limit) {
+        return Const.LIMIT + Const.SPACE + limit;
+    }
+
+    /**
+     * limit offset limit
+     *
+     * @param offset offset
+     * @param limit  limit
+     * @return limit
+     */
+    public static String limit(Number offset, Number limit) {
+        return Const.LIMIT + Const.SPACE + offset + Const.COMMA + limit;
+    }
+
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java
@@ -9,6 +9,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;

@@ -31,6 +32,10 @@ public class Valid extends com.orion.lang.utils.Valid {
        return notBlank(s, ErrorMessage.PARAM_MISSING);
    }

+    public static <T extends Map<?, ?>> T notEmpty(T map) {
+        return notEmpty(map, ErrorMessage.PARAM_MISSING);
+    }
+
    public static <T extends Collection<?>> T notEmpty(T object) {
        return notEmpty(object, ErrorMessage.PARAM_MISSING);
    }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java
@@ -1,7 +1,5 @@
 package com.orion.visor.framework.common.validator.group;

-import javax.validation.groups.Default;
-
 /**
 * 批量验证分组
 *
@@ -9,5 +7,5 @@ import javax.validation.groups.Default;
 * @version 1.0.0
 * @since 2023/9/1 19:13
 */
-public interface Batch extends Default {
+public interface Batch {
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Clear.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Clear.java
@@ -0,0 +1,11 @@
+package com.orion.visor.framework.common.validator.group;
+
+/**
+ * 清理验证分组
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/1 19:13
+ */
+public interface Clear {
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Export.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Export.java
@@ -0,0 +1,11 @@
+package com.orion.visor.framework.common.validator.group;
+
+/**
+ * 导出验证分组
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/1 19:13
+ */
+public interface Export {
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java
@@ -1,7 +1,5 @@
 package com.orion.visor.framework.common.validator.group;

-import javax.validation.groups.Default;
-
 /**
 * 分页验证分组
 *
@@ -9,5 +7,5 @@ import javax.validation.groups.Default;
 * @version 1.0.0
 * @since 2023/9/1 19:13
 */
-public interface Id extends Default {
+public interface Id {
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Import.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Import.java
@@ -0,0 +1,11 @@
+package com.orion.visor.framework.common.validator.group;
+
+/**
+ * 导出验证分组
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/1 19:13
+ */
+public interface Import {
+}
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java
@@ -1,7 +1,5 @@
 package com.orion.visor.framework.common.validator.group;

-import javax.validation.groups.Default;
-
 /**
 * 分页验证分组
 *
@@ -9,5 +7,5 @@ import javax.validation.groups.Default;
 * @version 1.0.0
 * @since 2023/9/1 19:13
 */
-public interface Page extends Default {
+public interface Page {
 }
--- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -10,7 +10,7 @@
    {
      "name": "orion.async.executor.core-pool-size",
      "type": "java.lang.Integer",
-      "description": "核心线程数量",
+      "description": "核心线程数量.",
      "defaultValue": "8"
    },
    {
--- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java
@@ -51,7 +51,7 @@ public class BannerApplicationRunner implements ApplicationRunner {
    @Override
    public void run(ApplicationArguments args) {
        AnsiAppender appender = AnsiAppender.create()
-                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n");
+                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor v" + version + " 服务已启动(" + env + ") ::\n");
        // swagger 地址
        if (apiDocsEnabled) {
            appender.append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档       ")
--- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

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

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

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

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java
@@ -7,9 +7,6 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-import org.springframework.scheduling.quartz.SpringBeanJobFactory;
-
-import javax.sql.DataSource;

 /**
 * quartz 配置
@@ -22,27 +19,6 @@ import javax.sql.DataSource;
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB_QUARTZ)
 public class OrionQuartzAutoConfiguration {

-    /**
-     * @return 任务工厂
-     */
-    @Bean
-    public SpringBeanJobFactory jobFactory() {
-        return new SpringBeanJobFactory();
-    }
-
-    /**
-     * @param dataSource dataSource
-     * @param jobFactory jobFactory
-     * @return 调度器工厂
-     */
-    @Bean
-    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource, SpringBeanJobFactory jobFactory) {
-        SchedulerFactoryBean factory = new SchedulerFactoryBean();
-        factory.setDataSource(dataSource);
-        factory.setJobFactory(jobFactory);
-        return factory;
-    }
-
    /**
     * @param schedulerFactoryBean 调度器工厂
     * @return 调度器
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java
@@ -1,6 +1,7 @@
 package com.orion.visor.framework.log.configuration.config;

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

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

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

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

+    @Data
+    public static class LogPrinterFieldConfig {
+
+        /**
+         * 忽略的字段
+         */
+        private List<String> ignore;
+
+        /**
+         * 脱敏的字段
+         */
+        private List<String> desensitize;
+
+        public void setIgnore(List<String> ignore) {
+            this.ignore = ConfigUtils.parseStringList(ignore);
+        }
+
+        public void setDesensitize(List<String> desensitize) {
+            this.desensitize = ConfigUtils.parseStringList(desensitize);
+        }
+
+    }
+
 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java
@@ -1,36 +0,0 @@
-package com.orion.visor.framework.log.configuration.config;
-
-import com.orion.visor.framework.common.utils.ConfigUtils;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 日志打印字段配置
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/28 22:36
- */
-@Data
-public class LogPrinterFieldConfig {
-
-    /**
-     * 忽略的字段
-     */
-    private List<String> ignore;
-
-    /**
-     * 脱敏的字段
-     */
-    private List<String> desensitize;
-
-    public void setIgnore(List<String> ignore) {
-        this.ignore = ConfigUtils.parseStringList(ignore);
-    }
-
-    public void setDesensitize(List<String> desensitize) {
-        this.desensitize = ConfigUtils.parseStringList(desensitize);
-    }
-
-}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java
@@ -6,6 +6,9 @@ import java.lang.annotation.*;

 /**
 * 不执行统一日志打印
+ * <p>
+ * 如果设置在方法上，则忽略该方法的日志打印
+ * 如果设置到参数上，则忽略该参数的日志打印
 *
 * @author Jiahang Li
 * @version 1.0.0
--- 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-monitor/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

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

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java
@@ -310,8 +310,6 @@ public class CodeGenerator implements Executable {
                new String[]{"/templates/orion-server-module-entity-request-update.java.vm", "${type}UpdateRequest.java", "entity.request.${bizPackage}"},
                // query request 文件
                new String[]{"/templates/orion-server-module-entity-request-query.java.vm", "${type}QueryRequest.java", "entity.request.${bizPackage}"},
-                // export 文件
-                new String[]{"/templates/orion-server-module-entity-export.java.vm", "${type}Export.java", "entity.export"},
                // convert 文件
                new String[]{"/templates/orion-server-module-convert.java.vm", "${type}Convert.java", "convert"},
                // cache dto 文件
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
@@ -113,7 +113,6 @@ public class CodeGeneratorEngine extends VelocityTemplateEngine {
        apiComment.put("deleteById", "删除" + comment);
        apiComment.put("deleteAll", "根据条件删除" + comment);
        apiComment.put("batchDelete", "批量删除" + comment);
-        apiComment.put("export", "导出" + comment);
        objectMap.put("apiComment", apiComment);
    }

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java
@@ -38,14 +38,18 @@ public class CustomFileFilter {
    public List<CustomFile> doFilter() {
        // 生成文件副本
        List<CustomFile> files = originCustomerFile.stream().map(s ->
-                new CustomFile.Builder()
-                        .enableFileOverride()
-                        .templatePath(s.getTemplatePath())
-                        .filePath(s.getFilePath())
-                        .fileName(s.getFileName())
-                        .packageName(s.getPackageName())
-                        .build())
+                        new CustomFile.Builder()
+                                .enableFileOverride()
+                                .templatePath(s.getTemplatePath())
+                                .filePath(s.getFilePath())
+                                .fileName(s.getFileName())
+                                .packageName(s.getPackageName())
+                                .build())
                .collect(Collectors.toList());
+        // 不生成 api http 文件
+        if (!table.isEnableApiHttp()) {
+            files.removeIf(file -> isApiHttpFile(file.getTemplatePath()));
+        }
        // 不生成对外 api 文件
        if (!table.isEnableProviderApi()) {
            files.removeIf(file -> isServerProviderFile(file.getTemplatePath()));
@@ -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/mapper/IMapper.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
@@ -3,6 +3,7 @@ package com.orion.visor.framework.mybatis.core.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
+import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.mybatis.core.query.Conditions;
 import com.orion.visor.framework.mybatis.core.query.DataQuery;

@@ -61,7 +62,7 @@ public interface IMapper<T> extends BaseMapper<T> {
     * @return 是否成功
     */
    default boolean insertBatch(Collection<T> entities) {
-        return Db.saveBatch(entities);
+        return this.insertBatch(entities, Const.BATCH_COUNT);
    }

    /**
@@ -82,7 +83,7 @@ public interface IMapper<T> extends BaseMapper<T> {
     * @return 是否成功
     */
    default boolean updateBatch(Collection<T> entities) {
-        return Db.updateBatchById(entities);
+        return this.updateBatch(entities, Const.BATCH_COUNT);
    }

    /**
@@ -113,7 +114,7 @@ public interface IMapper<T> extends BaseMapper<T> {
     * @return 是否成功
     */
    default boolean insertOrUpdateBatch(Collection<T> entities) {
-        return Db.saveOrUpdateBatch(entities);
+        return this.insertOrUpdateBatch(entities, Const.BATCH_COUNT);
    }

    /**
--- 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
@@ -16,6 +16,7 @@ import com.orion.lang.utils.collect.Lists;
 import com.orion.lang.utils.reflect.Classes;
 import com.orion.spring.SpringHolder;
 import com.orion.visor.framework.common.constant.Const;
+import com.orion.visor.framework.common.utils.SqlUtils;
 import com.orion.visor.framework.mybatis.core.domain.BaseDO;

 import java.io.Serializable;
@@ -36,7 +37,7 @@ public class DataQuery<T> {

    private final BaseMapper<T> dao;

-    private IPageRequest page;
+    private PageRequest page;

    private Wrapper<T> wrapper;

@@ -73,8 +74,9 @@ public class DataQuery<T> {
        return new DataQuery<>(dao, wrapper);
    }

-    public DataQuery<T> page(IPageRequest page) {
-        this.page = Valid.notNull(page, "page is null");
+    public DataQuery<T> page(com.orion.visor.framework.common.entity.PageRequest page) {
+        com.orion.visor.framework.common.entity.PageRequest pr = Valid.notNull(page, "page is null");
+        this.page = new PageRequest(pr.getPage(), pr.getLimit());
        return this;
    }

@@ -111,11 +113,11 @@ public class DataQuery<T> {
    }

    public DataQuery<T> limit(int limit) {
-        return this.last(Const.LIMIT + Const.SPACE + limit);
+        return this.last(SqlUtils.limit(limit));
    }

    public DataQuery<T> limit(int offset, int limit) {
-        return this.last(Const.LIMIT + Const.SPACE + offset + Const.COMMA + limit);
+        return this.last(SqlUtils.limit(offset, limit));
    }

    public DataQuery<T> only() {
@@ -199,6 +201,18 @@ public class DataQuery<T> {
        return dao.selectCount(wrapper);
    }

+    public Long countMax(Number max) {
+        Long count = dao.selectCount(wrapper);
+        if (max == null) {
+            return count;
+        }
+        long maxValue = max.longValue();
+        if (maxValue <= 0L) {
+            return count;
+        }
+        return Math.min(count, maxValue);
+    }
+
    public boolean absent() {
        return dao.selectCount(wrapper) == 0;
    }
@@ -210,14 +224,23 @@ public class DataQuery<T> {
    // -------------------- data grid --------------------

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

    public <R> DataGrid<R> dataGrid(Function<T, R> mapper) {
-        Valid.notNull(mapper, "convert function is null");
+        return this.dataGrid(this.wrapper, mapper);
+    }
+
+    public <R> DataGrid<R> dataGrid(Wrapper<T> countWrapper, Function<T, R> mapper) {
        Valid.notNull(page, "page is null");
        Valid.notNull(wrapper, "wrapper is null");
-        Long count = dao.selectCount(wrapper);
+        Valid.notNull(countWrapper, "count wrapper is null");
+        Valid.notNull(mapper, "convert function is null");
+        Long count = dao.selectCount(countWrapper);
        Pager<R> pager = new Pager<>(page);
        pager.setTotal(count.intValue());
        boolean next = pager.hasMoreData();
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm
@@ -60,6 +60,18 @@ Authorization: {{token}}
 }


+${httpComment} ${apiComment.queryCount}
+POST {{baseUrl}}/${package.ModuleName}/${typeHyphen}/count
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  #foreach($field in ${table.fields})
+  "${field.propertyName}": ""#if($foreach.hasNext),#end
+  #end
+}
+
+
 ${httpComment} ${apiComment.deleteById}
 DELETE {{baseUrl}}/${package.ModuleName}/${typeHyphen}/delete?id=1
 Authorization: {{token}}
--- 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
@@ -114,6 +113,13 @@ public class ${table.controllerName} {
        return ${typeLower}Service.get${type}Page(request);
    }

+    @PostMapping("/count")
+    @Operation(summary = "${apiComment.queryCount}")
+    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:query')")
+    public Long get${type}Count(@Validated @RequestBody ${type}QueryRequest request) {
+        return ${typeLower}Service.get${type}Count(request);
+    }
+
    #if($meta.enableDemoApi)
    @DemoDisableApi
    #end
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-export.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-export.java.vm
@@ -1,65 +0,0 @@
-package ${currentPackage};
-
-import com.orion.lang.utils.time.Dates;
-import com.orion.office.excel.annotation.ExportField;
-import com.orion.office.excel.annotation.ExportSheet;
-import com.orion.office.excel.annotation.ExportTitle;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-import java.util.*;
-import java.math.*;
-
-/**
- * $!{table.comment} 导出对象
- *
- * @author ${author}
- * @version ${version}
- * @since ${date}
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ExportTitle(title = ${type}Export.TITLE)
-@ExportSheet(name = "$!{table.comment}", filterHeader = true, freezeHeader = true, indexToSort = true)
-@Schema(name = "${type}Export", description = "$!{table.comment}导出对象")
-public class ${type}Export implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public static final String TITLE = "$!{table.comment}导出";
-    #foreach($field in ${table.fields})
-
-    #if("$!field.comment" != "")
-    @Schema(description = "${field.comment}")
-    #end
-    #if("$field.propertyType" == "Date")
-    @ExportField(index = ${foreach.index}, header = "${field.comment}", width = 16, format = Dates.YMD_HMS)
-    #else
-    @ExportField(index = ${foreach.index}, header = "${field.comment}", width = 16)
-    #end
-    private ${field.propertyType} ${field.propertyName};
-    #end
-
-    @ExportField(index = $table.fields.size(), header = "创建时间", width = 16, format = Dates.YMD_HMS)
-    @Schema(description = "创建时间")
-    private Date createTime;
-
-    #set($updateTimeIndex=$table.fields.size() + 1)
-    @Schema(description = "修改时间")
-    @ExportField(index = $updateTimeIndex, header = "修改时间", width = 16, format = Dates.YMD_HMS)
-    private Date updateTime;
-
-    #set($creatorIndex=$table.fields.size() + 2)
-    @Schema(description = "创建人")
-    @ExportField(index = $creatorIndex, header = "创建人", width = 16)
-    private String creator;
-
-    #set($updaterIndex=$table.fields.size() + 3)
-    @Schema(description = "修改人")
-    @ExportField(index = $updaterIndex, header = "修改人", width = 16)
-    private String updater;
-
-}
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
@@ -122,7 +122,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
    @Override
    public List<${type}VO> get${type}List(${type}QueryRequest request) {
        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request)
+                .orderByDesc(${type}DO::getId);
        // 查询
        return ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::to);
    }
@@ -148,24 +149,28 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
                .sorted(Comparator.comparing(${type}VO::getId).reversed())
                .collect(Collectors.toList());
    }
-
    #end
+
+    @Override
+    public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) {
+        // 条件
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request)
+                .orderByDesc(${type}DO::getId);
+        // 查询
+        return ${typeLower}DAO.of()
+                .page(request)
+                .wrapper(wrapper)
+                .dataGrid(${type}Convert.MAPPER::to);
+    }
+
    @Override
    public Long get${type}Count(${type}QueryRequest request) {
        // 条件
        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
        // 查询
-        return ${typeLower}DAO.selectCount(wrapper);
-    }
-
-    @Override
-    public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) {
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 查询
-        return ${typeLower}DAO.of(wrapper)
-                .page(request)
-                .dataGrid(${type}Convert.MAPPER::to);
+        return ${typeLower}DAO.of()
+                .wrapper(wrapper)
+                .countMax(request.getLimit());
    }

    @Override
@@ -235,13 +240,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
        Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
    }

-    /**
-     * 构建查询 wrapper
-     *
-     * @param request request
-     * @return wrapper
-     */
-    private LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) {
+    @Override
+    public LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) {
        String searchValue = request.getSearchValue();
        return ${typeLower}DAO.wrapper()
                #foreach($field in ${table.fields})
@@ -251,8 +251,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
                        #foreach($field in ${table.fields})
                        .eq(${type}DO::get${field.capitalName}, searchValue)#if($foreach.hasNext).or()#end
                        #end
-                )
-                .orderByDesc(${type}DO::getId);
+                );
    }

 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm
@@ -1,5 +1,6 @@
 package ${package.Service};

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.orion.lang.define.wrapper.DataGrid;
 #foreach($pkg in ${customModuleFilePackages})
 import ${pkg}.*;
@@ -116,4 +117,12 @@ public interface ${table.serviceName} {
     */
    Integer delete${type}(${type}QueryRequest request);

+    /**
+     * 构建查询 wrapper
+     *
+     * @param request request
+     * @return wrapper
+     */
+    private LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request);
+
 }
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm
@@ -26,7 +26,3 @@ VALUES
  (@TMP_SUB_ID, '创建$table.comment', '${package.ModuleName}:${typeHyphen}:create', 3, 20, '1', '1', 0),
  (@TMP_SUB_ID, '修改$table.comment', '${package.ModuleName}:${typeHyphen}:update', 3, 30, '1', '1', 0),
  (@TMP_SUB_ID, '删除$table.comment', '${package.ModuleName}:${typeHyphen}:delete', 3, 40, '1', '1', 0);
-  #if(false)
-  (@TMP_SUB_ID, '导出$table.comment', '${package.ModuleName}:${typeHyphen}:export', 3, 50, '1', '1', 0),
-  (@TMP_SUB_ID, '导入$table.comment', '${package.ModuleName}:${typeHyphen}:import', 3, 60, '1', '1', 0);
-  #end
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm
@@ -115,6 +115,13 @@ export function get${vue.featureEntity}Page(request: ${vue.featureEntity}QueryRe
  return axios.post<DataGrid<${vue.featureEntity}QueryResponse>>('/${package.ModuleName}/${typeHyphen}/query', request);
 }

+/**
+ * $apiComment.queryCount
+ */
+export function get${vue.featureEntity}Count(request: ${vue.featureEntity}QueryRequest) {
+  return axios.post<number>('/${package.ModuleName}/${typeHyphen}/count', request);
+}
+
 /**
 * $apiComment.deleteById
 */
--- 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
@@ -1,9 +1,9 @@
 <template>
  <card-list v-model:searchValue="formModel.searchValue"
             search-input-placeholder="输入搜索值"
-             create-card-position="head"
+             :create-card-position="false"
             :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/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/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/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml
@@ -14,7 +14,7 @@
    <packaging>jar</packaging>

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

    <dependencies>
        <dependency>
--- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java
@@ -2,9 +2,9 @@ package com.orion.visor.framework.security.configuration;

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

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

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

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

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

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

    /**
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
李佳航	f73fa14bfd	Merge pull request #55 from dromara/dev Dev	2024-09-02 13:11:36 +08:00
lijiahang	fd88c725d3	:replace: 修改 demo 地址.	2024-09-02 13:06:17 +08:00
lijiahang	3a16f9d9ab	⚡ 优化查询逻辑.	2024-09-02 12:37:11 +08:00
lijiahang	de9b89d805	🔖 升级版本.	2024-09-02 11:51:30 +08:00
lijiahangmax	a05c387ba1	⚡ 修改配置.	2024-08-29 23:34:28 +08:00
lijiahangmax	3cb6e5a2d4	⚡ 修改配置.	2024-08-29 23:33:46 +08:00
lijiahang	104a9a0aa3	🔨 数据清理时添加条数限制.	2024-08-29 18:26:26 +08:00
lijiahangmax	d7b747eac4	⚡ 优化主机删除逻辑.	2024-08-29 00:33:13 +08:00
lijiahangmax	d2949c11f3	Merge remote-tracking branch 'origin/dev' into dev	2024-08-29 00:23:33 +08:00
lijiahangmax	cd05f71173	🐛 修复开始 webgl 终端显示错误.	2024-08-29 00:23:11 +08:00
lijiahang	e0dca73369	📝 修改文档.	2024-08-28 17:14:18 +08:00
lijiahang	b8599a6693	🐛 修复加载缓存时报错.	2024-08-28 10:46:06 +08:00
lijiahang	a0adb415fa	🔨 数据清理时添加条数限制.	2024-08-26 17:10:40 +08:00
lijiahang	6c60756e54	⚡ 禁用 demo api.	2024-08-26 13:57:18 +08:00
lijiahangmax	ee9f51ce7d	🐛 修复 quartz 配置不生效.	2024-08-25 00:50:16 +08:00
lijiahangmax	924b46b41a	⚡ 优化异常信息获取逻辑.	2024-08-24 19:59:45 +08:00
lijiahangmax	1fca5a1912	⚡ 优化数据分组逻辑.	2024-08-23 01:44:05 +08:00
李佳航	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
李佳航	0f6d84dab2	Merge pull request #28 from dromara/dev Dev	2024-06-19 12:11:39 +08:00
lijiahang	f64eb395a8	🐳 修改镜像权限.	2024-06-19 11:53:06 +08:00
lijiahang	2e69c67de0	🐳 修改镜像权限.	2024-06-19 11:29:09 +08:00
lijiahang	7747b4e52e	🔖 升级版本.	2024-06-19 11:07:03 +08:00
lijiahang	830622aafb	💄 修改样式.	2024-06-19 10:48:00 +08:00
lijiahang	2919950c5b	⬆️ 升级 arco 版本.	2024-06-18 11:53:58 +08:00
lijiahangmax	d56cfbba82	✨ 添加系统设置页面.	2024-06-18 00:35:45 +08:00
lijiahang	cfe1924f11	✨ 获取应用信息.	2024-06-17 19:12:58 +08:00
lijiahang	dfd2ec45f4	🔨 修改 spring 应用名称.	2024-06-17 10:13:23 +08:00
李佳航	19c7e31f53	Merge pull request #24 from dromara/dev Dev	2024-06-12 16:02:47 +08:00
lijiahang	f618aef988	🔖 升级版本.	2024-06-12 15:14:24 +08:00
lijiahang	af97f752f5	📝 修改仓库地址.	2024-06-12 15:13:07 +08:00
lijiahangmax	bfb80afee2	⚡ 优化标准数据模型.	2024-06-12 00:21:25 +08:00