Merge pull request #162 from dromara/dev

Dev

.env.example

@@ -6,7 +6,13 @@ SPRING_PROFILES_ACTIVE=prod
 DEMO_MODE=false
 
 API_CORS=true
+API_IP_HEADERS=X-Forwarded-For,X-Real-IP
+# api 地址 (需要改为宿主机 IP)
+API_HOST=0.0.0.0
+# API_URL=http://127.0.0.1:9200/orion-visor/api
+# api 密钥 (建议修改)
 API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
+# 加密密钥 (建议修改)
 SECRET_KEY=uQeacXV8b3isvKLK
 
 NGINX_SERVICE_HOST=service

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,6 +17,8 @@ body:
           required: true
         - label: 我已搜索 [issue](https://github.com/dromara/orion-visor/issues) 并没有找到相关问题
           required: true
+        - label: 我已 star 了此项目, 否则可能会被自动关闭
+          required: true
   - type: input
     id: version
     attributes:

.github/workflows/e2e.yaml

@@ -1,9 +1,10 @@
 name: E2E
 
 on:
-  pull_request:
-    branches:
-      - main
+  workflow_dispatch:
+#  pull_request:
+#    branches:
+#      - main
 
 concurrency:
   group: ${{github.workflow}} - ${{github.ref}}

README.md

@@ -38,8 +38,8 @@
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://gitcode.com/dromara/orion-visor">
-      <img src="https://gitcode.com/dromara/orion-visor/star/badge.svg" alt="star"/>
+       href="https://atomgit.com/dromara/orion-visor">
+      <img src="https://atomgit.com/dromara/orion-visor/star/2025top.svg" alt="star" />
     </a>
 </p>
 
@@ -60,7 +60,7 @@
 * 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/)
 * 🔏 演示账号: admin/admin
 * ⭐ 体验后可以点一下 `star`
-  这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor)
+  这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [atomgit](https://atomgit.com/dromara/orion-visor)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
 
@@ -70,6 +70,10 @@
 # clone
 git clone --depth=1 https://github.com/dromara/orion-visor
 cd orion-visor
+# 复制配置
+cp .env.example .env
+# 修改配置
+vim .env
 # 启动
 docker compose up -d
 # 等待后端服务启动后 (2min±) 访问 http://localhost:1081/
@@ -171,6 +175,6 @@ QQ群: 755242157
 
 ![GVP](docs/assets/gvp.jpg?time=20250627 "GVP")
 
-## GitCode 最有影响力的开源项目 G-Star
+## AtomGit 最有影响力的开源项目 G-Star
 
 ![GSTAR](docs/assets/gstar.jpg?time=20250627 "GSTAR")

docker-compose-bt.yml

@@ -0,0 +1,169 @@
+# https://github.com/aaPanel/appstore/tree/main/apps/orion_visor
+
+services:
+  orion-ui:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
+    ports:
+      - ${HOST_IP}:${WEB_HTTP_PORT}:80
+    environment:
+      NGINX_SERVICE_HOST: ${NGINX_SERVICE_HOST:-orion-service}
+      NGINX_SERVICE_PORT: ${NGINX_SERVICE_PORT:-9200}
+    restart: unless-stopped
+    depends_on:
+      orion-service:
+        condition: service_healthy
+    networks:
+      - baota_net
+
+  orion-service:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${VERSION}
+    privileged: true
+    ports:
+      - "9200:9200"
+    environment:
+      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-prod}
+      MYSQL_HOST: orion-mysql
+      MYSQL_PORT: ${MYSQL_PORT:-3306}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-orion_visor}
+      MYSQL_USER: ${MYSQL_USER:-orion}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-Data@123456}
+      REDIS_HOST: orion-redis
+      REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
+      REDIS_DATABASE: ${REDIS_DATABASE:-0}
+      REDIS_DATA_VERSION: ${REDIS_DATA_VERSION:-1}
+      INFLUXDB_ENABLED: true
+      INFLUXDB_HOST: orion-influxdb
+      INFLUXDB_PORT: ${INFLUXDB_PORT:-8086}
+      INFLUXDB_ORG: ${INFLUXDB_ORG:-orion-visor}
+      INFLUXDB_BUCKET: ${INFLUXDB_BUCKET:-metrics}
+      INFLUXDB_TOKEN: ${INFLUXDB_TOKEN:-Data@123456}
+      GUACD_HOST: orion-guacd
+      GUACD_PORT: ${GUACD_PORT:-4822}
+      GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive}
+      SECRET_KEY: ${SECRET_KEY:-uQeacXV8b3isvKLK}
+      API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-pmqeHOyZaumHm0Wt}
+      API_IP_HEADERS: ${API_IP_HEADERS:-X-Forwarded-For,X-Real-IP}
+      # 这里需要改为具体的服务地址 (宿主机ip)
+      API_HOST: ${HOST_IP}
+      # 若 API_HOST 不满足, 可以修改这里 http://<ip>:<port>/orion-visor/api
+      API_URL: ${API_URL:-}
+      API_CORS: ${API_CORS:-true}
+      DEMO_MODE: ${DEMO_MODE:-false}
+    volumes:
+      - ${APP_PATH}/service/root-orion:/root/orion
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
+    restart: unless-stopped
+    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-mysql:
+        condition: service_healthy
+      orion-redis:
+        condition: service_healthy
+      orion-influxdb:
+        condition: service_healthy
+    labels:
+      createdBy: "bt_apps"
+    networks:
+      - baota_net
+
+  orion-mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${VERSION}
+    privileged: true
+    environment:
+      - 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:
+      - ${APP_PATH}/mysql/var-lib-mysql:/var/lib/mysql
+      - ${APP_PATH}/mysql/var-lib-mysql-files:/var/lib/mysql-files
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
+      interval: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+    labels:
+      createdBy: "bt_apps"
+    networks:
+      - baota_net
+
+  orion-redis:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${VERSION}
+    privileged: true
+    environment:
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456}
+    volumes:
+      - ${APP_PATH}/redis/data:/data
+    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+    labels:
+      createdBy: "bt_apps"
+    networks:
+      - baota_net
+
+  orion-influxdb:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-influxdb:latest
+    privileged: true
+    ports:
+      - "8086:8086"
+    environment:
+      DOCKER_INFLUXDB_INIT_MODE: setup
+      DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_ADMIN_USERNAME:-admin}
+      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_ADMIN_PASSWORD:-Data@123456}
+      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_TOKEN:-Data@123456}
+      DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG:-orion-visor}
+      DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET:-metrics}
+    volumes:
+      - ${APP_PATH}/influxdb/data:/var/lib/influxdb2
+      - ${APP_PATH}/influxdb/config:/etc/influxdb2
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/8086" ]
+      interval: 15s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
+    networks:
+      - baota_net
+
+  orion-guacd:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest
+    ports:
+      - "4822:4822"
+    environment:
+      GUACD_LOG_LEVEL: info
+      GUACD_LOG_FILE: /var/log/guacd.log
+    volumes:
+      - ${APP_PATH}/guacd/drive:${GUACD_DRIVE_PATH:-/drive}
+      - ${APP_PATH}/guacd/var-logs:/var/log
+      - ${APP_PATH}/guacd/local-guacamole-lib:/usr/local/guacamole/lib
+      - ${APP_PATH}/guacd/local-guacamole-extensions:/usr/local/guacamole/extensions
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "nc", "-vz", "localhost", "4822" ]
+      interval: 15s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
+    networks:
+      - baota_net
+
+networks:
+  baota_net:
+    external: true

docker-compose-testing.yaml

@@ -1,5 +1,3 @@
-version: '3.3'
-
 services:
   service:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
@@ -19,6 +17,10 @@ services:
       DEMO_MODE: false
     volumes:
       - /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     healthcheck:
       test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
       interval: 15s
@@ -87,4 +89,4 @@ services:
 
 networks:
   orion-visor-net:
-    driver: bridge
+    driver: bridge

docker-compose.yaml

@@ -1,6 +1,4 @@
-version: '3.3'
-
-# latest = 2.5.1
+# latest = 2.5.7
 
 # 支持以下源
 # lijiahangmax/*
@@ -32,7 +30,7 @@ services:
       MYSQL_HOST: ${MYSQL_HOST:-mysql}
       MYSQL_PORT: ${MYSQL_PORT:-3306}
       MYSQL_DATABASE: ${MYSQL_DATABASE:-orion_visor}
-      MYSQL_USER: ${MYSQL_USER:-root}
+      MYSQL_USER: ${MYSQL_USER:-orion}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD:-Data@123456}
       REDIS_HOST: ${REDIS_HOST:-redis}
       REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
@@ -49,10 +47,19 @@ services:
       GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive}
       SECRET_KEY: ${SECRET_KEY:-uQeacXV8b3isvKLK}
       API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-pmqeHOyZaumHm0Wt}
+      API_IP_HEADERS: ${API_IP_HEADERS:-X-Forwarded-For,X-Real-IP}
+      # 这里需要改为具体的服务地址 (宿主机ip)
+      API_HOST: ${API_HOST:-0.0.0.0}
+      # 若 API_HOST 不满足, 可以修改这里 http://<ip>:<port>/orion-visor/api
+      API_URL: ${API_URL:-}
       API_CORS: ${API_CORS:-true}
       DEMO_MODE: ${DEMO_MODE:-false}
     volumes:
       - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/service/root-orion:/root/orion
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     restart: unless-stopped
     healthcheck:
       test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
@@ -174,4 +181,4 @@ services:
 
 networks:
   orion-visor-net:
-    driver: bridge
+    driver: bridge

docker-upgrade.sh

@@ -41,7 +41,7 @@ if [ "$DEMO_MODE" = true ]; then
     echo "Starting services for demo mode..."
 
     # 启动指定的服务
-    docker compose up -d --remove-orphans mysql redis ui service guacd adminer
+    docker compose up -d --remove-orphans mysql redis ui service guacd influxdb adminer
     echo "Started services for demo mode..."
 else
     # 启动所有服务

docker/docker-build.sh

@@ -7,7 +7,7 @@ set -e
 source ./project-build.sh "$@"
 
 # 版本号
-version=2.5.1
+version=2.5.7
 # 是否推送镜像
 push_image=false
 # 是否构建 latest
@@ -140,7 +140,7 @@ function modify_dockerfiles() {
     if [ -f "$file" ]; then
       echo "备份并修改: $file"
       cp "$file" "$file$backup_suffix"
-      sed -i 's/--platform=\TARGETPLATFORM//g' "$file"
+      sed -i "s/--platform=\$TARGETPLATFORM//g" "$file"
     else
       echo "文件不存在 -> $file"
     fi
@@ -189,7 +189,7 @@ function push_image_to_registry() {
       # 推送版本
       docker push "${namespace}/${image_name}:${version}"
       # 推送 latest
-      if [ "latest_image" = true ]; then
+      if [ "$latest_image" = true ]; then
         docker push "${namespace}/${image_name}:latest"
       fi
     done

docker/project-build.sh

@@ -4,7 +4,7 @@ set -e
 # DockerContext: orion-visor
 
 # 版本号
-version=2.5.1
+version=2.5.7
 # 是否构建 service
 export build_service=false
 # 是否构建 ui

docker/service/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM openjdk:8-jdk-alpine
+FROM --platform=$TARGETPLATFORM openjdk:8u171-jdk-alpine3.7
 
 USER root
 

orion-visor-common/src/main/java/org/dromara/visor/common/configuration/CommonConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.common.configuration;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.utils.IpUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * 公共配置类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/20 10:34
+ */
+@Slf4j
+@Configuration
+public class CommonConfiguration {
+
+    @Value("${orion.api.ip-headers}")
+    private String[] ipHeaders;
+
+    /**
+     * 设置 IP 请求头
+     */
+    @PostConstruct
+    public void setIpHeader() {
+        IpUtils.setIpHeader(ipHeaders);
+        log.info("IpUtils.setIpHeader {}", String.join(",", ipHeaders));
+    }
+
+}

orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java

@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.5.1";
+    String VERSION = "2.5.7";
 
     /**
      * 同 ${spring.application.name}

orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java

@@ -33,6 +33,8 @@ package org.dromara.visor.common.constant;
  */
 public interface AutoConfigureOrderConst {
 
+    int FRAMEWORK_EXECUTOR = Integer.MIN_VALUE + 1000;
+
     int FRAMEWORK_WEB = Integer.MIN_VALUE + 1100;
 
     int FRAMEWORK_SECURITY = Integer.MIN_VALUE + 1200;
@@ -65,8 +67,6 @@ public interface AutoConfigureOrderConst {
 
     int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2610;
 
-    int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2620;
-
     int FRAMEWORK_BIZ_PUSH = Integer.MIN_VALUE + 2700;
 
     int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 7000;

orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java

@@ -34,116 +34,116 @@ public interface ConfigKeys {
     /**
      * SFTP 文件预览大小
      */
-    String SFTP_PREVIEW_SIZE = "sftp_previewSize";
+    String SFTP_PREVIEW_SIZE = "sftp.preview-size";
 
     /**
      * SFTP 重复文件备份
      */
-    String SFTP_UPLOAD_PRESENT_BACKUP = "sftp_uploadPresentBackup";
+    String SFTP_UPLOAD_PRESENT_BACKUP = "sftp.upload-present-backup";
 
     /**
      * SFTP 备份文件名称
      */
-    String SFTP_UPLOAD_BACKUP_FILE_NAME = "sftp_uploadBackupFileName";
+    String SFTP_UPLOAD_BACKUP_FILE_NAME = "sftp.upload-backup-file-name";
 
     /**
      * 加密公钥
      */
-    String ENCRYPT_PUBLIC_KEY = "encrypt_publicKey";
+    String ENCRYPT_PUBLIC_KEY = "encrypt.public-key";
 
     /**
      * 加密私钥
      */
-    String ENCRYPT_PRIVATE_KEY = "encrypt_privateKey";
+    String ENCRYPT_PRIVATE_KEY = "encrypt.private-key";
 
     /**
      * 日志前端显示行数
      */
-    String LOG_WEB_SCROLL_LINES = "log_webScrollLines";
+    String LOG_WEB_SCROLL_LINES = "log.web-scroll-lines";
 
     /**
      * 日志加载偏移行
      */
-    String LOG_TRACKER_LOAD_LINES = "log_trackerLoadLines";
+    String LOG_TRACKER_LOAD_LINES = "log.tracker-load-lines";
 
     /**
      * 日志加载间隔毫秒
      */
-    String LOG_TRACKER_LOAD_INTERVAL = "log_trackerLoadInterval";
+    String LOG_TRACKER_LOAD_INTERVAL = "log.tracker-load-interval";
 
     /**
      * 是否生成详细的执行日志
      */
-    String LOG_EXEC_DETAIL_LOG = "log_execDetailLog";
+    String LOG_EXEC_DETAIL_ENABLED = "log.exec-detail.enabled";
 
     /**
-     * 凭证有效期分
+     * 凭证有效期 分
      */
-    String LOGIN_LOGIN_SESSION_TIME = "login_loginSessionTime";
+    String LOGIN_LOGIN_SESSION_TIME = "login.login-session-time";
 
     /**
      * 允许多端登录
      */
-    String LOGIN_ALLOW_MULTI_DEVICE = "login_allowMultiDevice";
+    String LOGIN_ALLOW_MULTI_DEVICE = "login.allow-multi-device";
 
     /**
      * 允许凭证续签
      */
-    String LOGIN_ALLOW_REFRESH = "login_allowRefresh";
+    String LOGIN_ALLOW_REFRESH = "login.allow-refresh";
 
     /**
      * 凭证续签最大次数
      */
-    String LOGIN_MAX_REFRESH_COUNT = "login_maxRefreshCount";
+    String LOGIN_MAX_REFRESH_COUNT = "login.max-refresh-count";
 
     /**
      * 凭证续签间隔分
      */
-    String LOGIN_REFRESH_INTERVAL = "login_refreshInterval";
+    String LOGIN_REFRESH_INTERVAL = "login.refresh-interval";
 
     /**
      * 登录失败锁定
      */
-    String LOGIN_LOGIN_FAILED_LOCK = "login_loginFailedLock";
+    String LOGIN_LOGIN_FAILED_LOCK = "login.login-failed-lock";
 
     /**
-     * 登录失败锁定阈值分
+     * 登录失败锁定阈值
      */
-    String LOGIN_LOGIN_FAILED_LOCK_THRESHOLD = "login_loginFailedLockThreshold";
+    String LOGIN_LOGIN_FAILED_LOCK_THRESHOLD = "login.login-failed-lock-threshold";
 
     /**
-     * 登录失败锁定时间分
+     * 登录失败锁定时间 分
      */
-    String LOGIN_LOGIN_FAILED_LOCK_TIME = "login_loginFailedLockTime";
+    String LOGIN_LOGIN_FAILED_LOCK_TIME = "login.login-failed-lock-time";
 
     /**
      * 登录失败发信
      */
-    String LOGIN_LOGIN_FAILED_SEND = "login_loginFailedSend";
+    String LOGIN_LOGIN_FAILED_SEND = "login.login-failed-send";
 
     /**
      * 登录失败发信阈值
      */
-    String LOGIN_LOGIN_FAILED_SEND_THRESHOLD = "login_loginFailedSendThreshold";
+    String LOGIN_LOGIN_FAILED_SEND_THRESHOLD = "login.login-failed-send-threshold";
 
     /**
      * 是否开启自动清理命令记录
      */
-    String AUTO_CLEAR_EXEC_LOG_ENABLED = "autoClear_execLogEnabled";
+    String AUTO_CLEAR_EXEC_LOG_ENABLED = "auto-clear.exec-log.enabled";
 
     /**
      * 自动清理命令记录保留天数
      */
-    String AUTO_CLEAR_EXEC_LOG_KEEP_DAYS = "autoClear_execLogKeepDays";
+    String AUTO_CLEAR_EXEC_LOG_KEEP_DAYS = "auto-clear.exec-log.keep-days";
 
     /**
      * 是否开启自动清理终端连接记录
      */
-    String AUTO_CLEAR_TERMINAL_LOG_ENABLED = "autoClear_terminalLogEnabled";
+    String AUTO_CLEAR_TERMINAL_LOG_ENABLED = "auto-clear.terminal-log.enabled";
 
     /**
      * 自动清理终端连接记录保留天数
      */
-    String AUTO_CLEAR_TERMINAL_LOG_KEEP_DAYS = "autoClear_terminalLogKeepDays";
+    String AUTO_CLEAR_TERMINAL_LOG_KEEP_DAYS = "auto-clear.terminal-log.keep-days";
 
 }

orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java

@@ -55,4 +55,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst,
 
     int BATCH_COUNT = 500;
 
+    String IP_0000 = "0.0.0.0";
+
 }

orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java

@@ -210,6 +210,12 @@ public interface ErrorMessage {
 
     String PLEASE_SELECT_SUFFIX_FILE = "请选择 {} 类型的文件";
 
+    String SPEC_FORMAT_INCORRECT = "规格格式不正确";
+
+    String INFLUXDB_UNSUPPORTED = "InfluxDB 服务未开启";
+
+    String AGENT_KEY_NOT_FOUND = "未通过 agentKey 查询到对应的主机 ({})";
+
     /**
      * 是否为业务异常
      *

orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java

@@ -33,6 +33,20 @@ import java.io.Serializable;
  */
 public interface RequestIdentity extends Serializable {
 
+    /**
+     * 获取请求时间戳
+     *
+     * @return timestamp
+     */
+    Long getTimestamp();
+
+    /**
+     * 设置请求时间戳
+     *
+     * @param timestamp timestamp
+     */
+    void setTimestamp(Long timestamp);
+
     /**
      * 获取请求地址
      *

orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java

@@ -23,7 +23,10 @@
 package org.dromara.visor.common.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 请求留痕模型
@@ -33,9 +36,15 @@ import lombok.Data;
  * @since 2023/12/29 11:57
  */
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Schema(name = "RequestIdentityModel", description = "请求留痕模型")
 public class RequestIdentityModel implements RequestIdentity {
 
+    @Schema(description = "时间戳")
+    private Long timestamp;
+
     @Schema(description = "请求地址")
     private String address;
 

orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.common.handler.data.model;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.util.Map;
 

orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.common.handler.data.strategy;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.dromara.visor.common.handler.data.model.GenericsDataModel;
 
 /**

orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java

@@ -25,7 +25,7 @@ package org.dromara.visor.common.json;
 import cn.orionsec.kit.lang.utils.Desensitizes;
 import cn.orionsec.kit.lang.utils.Objects1;
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.serializer.ValueFilter;
+import com.alibaba.fastjson2.filter.ValueFilter;
 
 import java.util.List;
 
@@ -55,7 +55,7 @@ public class FieldDesensitizeFilter implements ValueFilter {
     }
 
     @Override
-    public Object process(Object object, String name, Object value) {
+    public Object apply(Object object, String name, Object value) {
         if (Lists.isEmpty(desensitizeFields) || !desensitizeFields.contains(name)) {
             return value;
         }

orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java

@@ -23,7 +23,7 @@
 package org.dromara.visor.common.json;
 
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.serializer.PropertyFilter;
+import com.alibaba.fastjson2.filter.PropertyFilter;
 
 import java.util.List;
 

orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/DateConversion.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.common.mapstruct;
+
+import java.util.Date;
+
+/**
+ * date 转换器
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/3/7 17:43
+ */
+public class DateConversion {
+
+    private DateConversion() {
+    }
+
+    /**
+     * Long > Date
+     *
+     * @param timestamp timestamp
+     * @return Date
+     */
+    public static Date longToDate(Long timestamp) {
+        return timestamp != null ? new Date(timestamp) : null;
+    }
+
+    /**
+     * Date > Long
+     *
+     * @param date date
+     * @return Long
+     */
+    public static Long dateToLong(Date date) {
+        return date != null ? date.getTime() : null;
+    }
+
+}

orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/JsonConversion.java

@@ -22,9 +22,9 @@
  */
 package org.dromara.visor.common.mapstruct;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 
 /**
  * json 转换器

orion-visor-common/src/main/java/org/dromara/visor/common/utils/Assert.java

@@ -37,13 +37,13 @@ import java.util.Set;
 import java.util.function.Function;
 
 /**
- * 验证器
+ * 断言
  *
  * @author Jiahang Li
  * @version 1.0.0
  * @since 2023/7/18 11:23
  */
-public class Valid extends cn.orionsec.kit.lang.utils.Valid {
+public class Assert extends cn.orionsec.kit.lang.utils.Assert {
 
     private static final Validator validator = SpringHolder.getBean(Validator.class);
 
@@ -155,8 +155,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid {
      * @param path path
      */
     public static String checkNormalize(String path) {
-        Valid.notBlank(path);
-        Valid.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE);
+        Assert.notBlank(path);
+        Assert.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE);
         return Files1.getPath(path);
     }
 
@@ -168,8 +168,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid {
      * @return file
      */
     public static String checkSuffix(String file, String suffix) {
-        Valid.notBlank(file);
-        Valid.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix);
+        Assert.notBlank(file);
+        Assert.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix);
         return file;
     }
 

orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java

@@ -24,7 +24,7 @@ package org.dromara.visor.common.utils;
 
 import cn.orionsec.kit.ext.location.Region;
 import cn.orionsec.kit.ext.location.region.LocationRegions;
-import cn.orionsec.kit.web.servlet.web.Servlets;
+import cn.orionsec.kit.lang.utils.net.IPs;
 import org.dromara.visor.common.constant.Const;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,6 +40,8 @@ import java.util.Map;
  */
 public class IpUtils {
 
+    private static String[] IP_HEADER = new String[]{"X-Forwarded-For", "X-Real-IP"};
+
     private static final Map<String, String> CACHE = new HashMap<>();
 
     private IpUtils() {
@@ -52,13 +54,17 @@ public class IpUtils {
      * @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);
+        if (request == null) {
+            return null;
+        } else {
+            for (String remoteAddrHeader : IP_HEADER) {
+                String addr = checkIpHeader(request.getHeader(remoteAddrHeader));
+                if (addr != null) {
+                    return addr;
+                }
+            }
+            return checkIpHeader(request.getRemoteAddr());
+        }
     }
 
     /**
@@ -112,4 +118,23 @@ public class IpUtils {
         return Const.CN_UNKNOWN;
     }
 
+    /**
+     * 检查 ip 请求头
+     *
+     * @param headerValue headerValue
+     * @return header
+     */
+    private static String checkIpHeader(String headerValue) {
+        if (headerValue == null) {
+            return null;
+        } else {
+            headerValue = headerValue.split(",")[0];
+            return IPs.checkIp(headerValue);
+        }
+    }
+
+    public static void setIpHeader(String[] ipHeader) {
+        IP_HEADER = ipHeader;
+    }
+
 }

orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java

@@ -64,10 +64,24 @@ public class Requests {
                 .map(ServletRequestAttributes::getRequest)
                 .ifPresent(request -> {
                     String address = IpUtils.getRemoteAddr(request);
+                    identity.setTimestamp(System.currentTimeMillis());
                     identity.setAddress(address);
                     identity.setLocation(IpUtils.getLocation(address));
                     identity.setUserAgent(Servlets.getUserAgent(request));
                 });
     }
 
+    /**
+     * 复制留痕信息
+     *
+     * @param source source
+     * @param target target
+     */
+    public static void copyIdentity(RequestIdentityModel source, RequestIdentityModel target) {
+        target.setTimestamp(source.getTimestamp());
+        target.setAddress(source.getAddress());
+        target.setLocation(source.getLocation());
+        target.setUserAgent(source.getUserAgent());
+    }
+
 }

orion-visor-dependencies/pom.xml

@@ -14,11 +14,11 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.5.1</revision>
+        <revision>2.5.7</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>2.0.3</orion.kit.version>
+        <orion.kit.version>2.0.6</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
@@ -106,6 +106,11 @@
                 <artifactId>orion-visor-spring-boot-starter-job</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>org.dromara.visor</groupId>
+                <artifactId>orion-visor-spring-boot-starter-executor</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-websocket</artifactId>

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java

@@ -22,8 +22,7 @@
  */
 package org.dromara.visor.framework.biz.operator.log.configuration;
 
-import com.alibaba.fastjson.serializer.SerializeFilter;
-import com.alibaba.fastjson.serializer.ValueFilter;
+import com.alibaba.fastjson2.filter.Filter;
 import org.dromara.visor.common.constant.AutoConfigureOrderConst;
 import org.dromara.visor.common.json.FieldDesensitizeFilter;
 import org.dromara.visor.common.json.FieldIgnoreFilter;
@@ -55,7 +54,7 @@ import javax.annotation.Resource;
 public class OrionOperatorLogAutoConfiguration {
 
     @Resource
-    private ValueFilter desensitizeValueFilter;
+    private Filter desensitizeValueFilter;
 
     /**
      * 操作日志委托类
@@ -82,7 +81,7 @@ public class OrionOperatorLogAutoConfiguration {
     public OperatorLogAspect operatorLogAspect(OperatorLogConfig operatorLogConfig,
                                                OperatorLogFrameworkService service) {
         // 参数过滤器
-        SerializeFilter[] serializeFilters = new SerializeFilter[]{
+        Filter[] serializeFilters = new Filter[]{
                 // 忽略字段过滤器
                 new FieldIgnoreFilter(operatorLogConfig.getIgnore()),
                 // 脱敏字段过滤器

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java

@@ -123,8 +123,8 @@ public class OperatorLogModel implements RequestIdentity {
     private Date endTime;
 
     /**
-     * 创建时间
+     * 时间戳
      */
-    private Date createTime;
+    private Long timestamp;
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java

@@ -27,12 +27,12 @@ import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Refs;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializeFilter;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.filter.Filter;
 import org.dromara.visor.common.entity.RequestIdentity;
 import org.dromara.visor.common.enums.BooleanBit;
-import org.dromara.visor.common.trace.TraceIdHolder;
 import org.dromara.visor.common.security.LoginUser;
+import org.dromara.visor.common.trace.TraceIdHolder;
 import org.dromara.visor.common.utils.Requests;
 import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
 import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType;
@@ -54,7 +54,7 @@ import java.util.Optional;
  */
 public class OperatorLogFiller implements Gettable<OperatorLogModel> {
 
-    private static SerializeFilter[] serializeFilters;
+    private static Filter[] serializeFilters;
 
     private static OperatorLogConfig operatorLogConfig;
 
@@ -91,6 +91,7 @@ public class OperatorLogFiller implements Gettable<OperatorLogModel> {
      */
     public OperatorLogFiller fillUsedTime(long start) {
         long end = System.currentTimeMillis();
+        model.setTimestamp(start);
         model.setDuration((int) (end - start));
         model.setStartTime(new Date(start));
         model.setEndTime(new Date(end));
@@ -274,7 +275,7 @@ public class OperatorLogFiller implements Gettable<OperatorLogModel> {
         return model;
     }
 
-    public static void setSerializeFilters(SerializeFilter[] serializeFilters) {
+    public static void setSerializeFilters(Filter[] serializeFilters) {
         if (OperatorLogFiller.serializeFilters != null) {
             // unmodified
             throw Exceptions.state();

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java

@@ -25,9 +25,8 @@ package org.dromara.visor.framework.biz.operator.log.core.utils;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Maps;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializeFilter;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.filter.Filter;
 import org.dromara.visor.common.constant.ExtraFieldConst;
 import org.dromara.visor.common.security.LoginUser;
 
@@ -44,7 +43,7 @@ public class OperatorLogs implements ExtraFieldConst {
 
     private static final String UN_SAVE_FLAG = "__un__save__";
 
-    private static SerializeFilter[] serializeFilters;
+    private static Filter[] serializeFilters;
 
     /**
      * 拓展信息
@@ -98,7 +97,7 @@ public class OperatorLogs implements ExtraFieldConst {
         if (obj == null) {
             return;
         }
-        if (obj instanceof JSONObject || obj instanceof com.alibaba.fastjson2.JSONObject) {
+        if (obj instanceof com.alibaba.fastjson2.JSONObject || obj instanceof com.alibaba.fastjson2.JSONObject) {
             EXTRA_HOLDER.get().putAll(JSON.parseObject(toJsonString(obj)));
         } else if (obj instanceof Map) {
             EXTRA_HOLDER.get().putAll((Map<String, ?>) obj);
@@ -204,7 +203,7 @@ public class OperatorLogs implements ExtraFieldConst {
                 .replaceAll("<br/>", "\n");
     }
 
-    public static void setSerializeFilters(SerializeFilter[] serializeFilters) {
+    public static void setSerializeFilters(Filter[] serializeFilters) {
         if (OperatorLogs.serializeFilters != null) {
             // unmodified
             throw Exceptions.state();

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingRequestBody.java

@@ -23,7 +23,7 @@
 package org.dromara.visor.framework.biz.push.core.entity;
 
 import cn.orionsec.kit.lang.able.IJsonObject;
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingResponseBody.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.framework.biz.push.core.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuRequestBody.java

@@ -23,7 +23,7 @@
 package org.dromara.visor.framework.biz.push.core.entity;
 
 import cn.orionsec.kit.lang.able.IJsonObject;
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComRequestBody.java

@@ -23,7 +23,7 @@
 package org.dromara.visor.framework.biz.push.core.entity;
 
 import cn.orionsec.kit.lang.able.IJsonObject;
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComResponseBody.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.framework.biz.push.core.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/enums/PushChannelEnum.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.framework.biz.push.core.enums;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.dromara.visor.framework.biz.push.core.message.*;

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/listener/PushMessageEventListener.java

@@ -48,8 +48,7 @@ public class PushMessageEventListener implements ApplicationListener<PushMessage
         this.pushServiceMap = pushServiceMap;
     }
 
-    // FIXME
-    @Async("asyncExecutor")
+    @Async("pushExecutor")
     @Override
     public void onApplicationEvent(PushMessageEvent event) {
         try {
@@ -68,4 +67,4 @@ public class PushMessageEventListener implements ApplicationListener<PushMessage
         return (IPushService<T>) pushServiceMap.get(message.getChannel());
     }
 
-}
+}

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java

@@ -24,11 +24,11 @@ package org.dromara.visor.framework.biz.push.core.service;
 
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.entity.PushUser;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.biz.push.core.message.PushMessage;
 
 import java.util.stream.Collectors;
@@ -67,7 +67,7 @@ public abstract class BasePushService<Message extends PushMessage> implements IP
      */
     protected void validateMessage(Message message) {
         // 验证消息
-        Valid.valid(message);
+        Assert.valid(message);
     }
 
     /**

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java

@@ -25,13 +25,13 @@ package org.dromara.visor.framework.biz.push.core.service;
 import cn.orionsec.kit.http.ok.OkRequests;
 import cn.orionsec.kit.http.ok.OkResponse;
 import cn.orionsec.kit.lang.constant.StandardContentType;
+import cn.orionsec.kit.lang.utils.Assert;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
-import cn.orionsec.kit.lang.utils.Valid;
 import cn.orionsec.kit.lang.utils.codec.Base64s;
 import cn.orionsec.kit.lang.utils.crypto.Signatures;
 import cn.orionsec.kit.lang.utils.math.Hex;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
@@ -108,7 +108,7 @@ public class DingPushService extends BasePushService<DingPushMessage> {
         OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
         DingResponseBody responseBody = JSON.parseObject(response.getBodyString(), DingResponseBody.class);
         // 验证发送结果
-        Valid.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
+        Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java

@@ -27,12 +27,12 @@ import cn.orionsec.kit.http.ok.OkResponse;
 import cn.orionsec.kit.lang.constant.Const;
 import cn.orionsec.kit.lang.constant.StandardContentType;
 import cn.orionsec.kit.lang.utils.Strings;
-import cn.orionsec.kit.lang.utils.Valid;
 import cn.orionsec.kit.lang.utils.codec.Base64s;
 import cn.orionsec.kit.lang.utils.crypto.Signatures;
 import cn.orionsec.kit.lang.utils.crypto.enums.SecretKeySpecMode;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
 import org.dromara.visor.framework.biz.push.core.entity.FeiShuRequestBody;
 import org.dromara.visor.framework.biz.push.core.entity.FeiShuResponseBody;
@@ -112,7 +112,7 @@ public class FeiShuPushService extends BasePushService<FeiShuPushMessage> {
         OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
         FeiShuResponseBody responseBody = JSON.parseObject(response.getBodyString(), FeiShuResponseBody.class);
         // 验证发送结果
-        Valid.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg());
+        Assert.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg());
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java

@@ -25,9 +25,9 @@ package org.dromara.visor.framework.biz.push.core.service;
 import cn.orionsec.kit.http.ok.OkRequests;
 import cn.orionsec.kit.http.ok.OkResponse;
 import cn.orionsec.kit.lang.constant.StandardContentType;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
 import org.dromara.visor.framework.biz.push.core.entity.WeComRequestBody;
 import org.dromara.visor.framework.biz.push.core.entity.WeComResponseBody;
@@ -79,7 +79,7 @@ public class WeComPushService extends BasePushService<WeComPushMessage> {
         OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
         WeComResponseBody responseBody = JSON.parseObject(response.getBodyString(), WeComResponseBody.class);
         // 验证发送结果
-        Valid.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
+        Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java

@@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Maps;
 import cn.orionsec.kit.lang.utils.reflect.Annotations;
 import cn.orionsec.kit.lang.utils.reflect.Fields;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ValueFilter;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.filter.ValueFilter;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.framework.desensitize.core.annotation.Desensitize;
 import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject;
@@ -53,7 +53,7 @@ public class DesensitizeValueFilter implements ValueFilter {
     private static final Map<String, Map<String, Desensitize>> DESENSITIZE_FIELDS = new HashMap<>();
 
     @Override
-    public Object process(Object object, String name, Object value) {
+    public Object apply(Object object, String name, Object value) {
         if (object == null || value == null) {
             return value;
         }

orion-visor-framework/orion-visor-spring-boot-starter-executor/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara.visor</groupId>
+        <artifactId>orion-visor-framework</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>orion-visor-spring-boot-starter-executor</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>jar</packaging>
+
+    <description>项目线程池配置包</description>
+    <url>https://github.com/dromara/orion-visor</url>
+
+    <dependencies>
+        <!-- common -->
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/configuration/OrionExecutorAutoConfiguration.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.executor.configuration;
+
+import org.dromara.visor.common.constant.AutoConfigureOrderConst;
+import org.dromara.visor.framework.executor.configuration.config.ExecutorsConfig;
+import org.dromara.visor.framework.executor.core.context.ExecutorContext;
+import org.dromara.visor.framework.executor.core.utils.ExecutorUtils;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.Map;
+
+/**
+ * 项目线程池配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/16 14:34
+ */
+@EnableAsync
+@AutoConfiguration
+@EnableConfigurationProperties({ExecutorsConfig.class})
+@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_EXECUTOR)
+public class OrionExecutorAutoConfiguration {
+
+    /**
+     * 创建线程池上下文
+     *
+     * @param executorsConfig executorsConfig
+     * @param beanFactory     beanFactory
+     * @return 线程池上下文
+     */
+    @Bean
+    public ExecutorContext executorContext(ExecutorsConfig executorsConfig,
+                                           ConfigurableBeanFactory beanFactory) {
+        // 创建上下文
+        ExecutorContext context = new ExecutorContext(executorsConfig, beanFactory);
+        Map<String, ThreadPoolTaskExecutor> executorMap = context.init();
+        // 获取线程池列表
+        ExecutorUtils.setExecutors(executorMap);
+        return context;
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/configuration/config/ExecutorConfig.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.executor.configuration.config;
+
+import cn.orionsec.kit.lang.define.thread.RejectPolicy;
+import cn.orionsec.kit.lang.utils.Systems;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 线程池配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/16 10:51
+ */
+@Data
+@Builder
+@AllArgsConstructor
+public class ExecutorConfig {
+
+    /**
+     * 是否启用
+     */
+    private boolean enabled;
+
+    /**
+     * 是否使用 MDC
+     */
+    private boolean mdc;
+
+    /**
+     * 核心线程数
+     */
+    private int corePoolSize;
+
+    /**
+     * 最大线程数
+     */
+    private int maxPoolSize;
+
+    /**
+     * 队列容量
+     */
+    private int queueCapacity;
+
+    /**
+     * 空闲线程存活时间
+     */
+    private int keepAliveSeconds;
+
+    /**
+     * 是否允许核心线程超时
+     */
+    private boolean allowCoreTimeout;
+
+    /**
+     * 是否使用同步队列
+     */
+    private boolean synchronousQueue;
+
+    /**
+     * 线程名称前缀
+     */
+    private String threadNamePrefix;
+
+    /**
+     * 拒绝策略
+     */
+    private RejectPolicy rejectPolicy;
+
+    public ExecutorConfig() {
+        this.enabled = true;
+        this.corePoolSize = Systems.PROCESS_NUM;
+        this.maxPoolSize = Systems.PROCESS_NUM;
+        this.queueCapacity = 100;
+        this.keepAliveSeconds = 300;
+        this.rejectPolicy = RejectPolicy.CALLER_RUNS;
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/configuration/config/ExecutorsConfig.java

@@ -20,47 +20,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dromara.visor.framework.job.configuration.config;
+package org.dromara.visor.framework.executor.configuration.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import java.util.Map;
+
 /**
- * 线程池配置类
+ * 线程池配置
  *
  * @author Jiahang Li
  * @version 1.0.0
- * @since 2023/7/10 15:49
+ * @since 2025/9/16 16:21
  */
 @Data
-@ConfigurationProperties(prefix = "orion.async.executor")
-public class AsyncExecutorConfig {
+@ConfigurationProperties(prefix = "app")
+public class ExecutorsConfig {
 
     /**
-     * 核心线程数量
+     * 线程池配置
      */
-    private int corePoolSize;
-
-    /**
-     * 最大线程数量
-     */
-    private int maxPoolSize;
-
-    /**
-     * 队列容量
-     */
-    private int queueCapacity;
-
-    /**
-     * 活跃时间
-     */
-    private int keepAliveSeconds;
-
-    public AsyncExecutorConfig() {
-        this.corePoolSize = 8;
-        this.maxPoolSize = 16;
-        this.queueCapacity = 200;
-        this.keepAliveSeconds = 300;
-    }
+    private Map<String, ExecutorConfig> executors;
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/context/ExecutorContext.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.executor.core.context;
+
+import cn.orionsec.kit.lang.define.thread.RejectPolicy;
+import cn.orionsec.kit.lang.utils.Strings;
+import com.alibaba.fastjson2.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.thread.ThreadPoolMdcTaskExecutor;
+import org.dromara.visor.framework.executor.configuration.config.ExecutorConfig;
+import org.dromara.visor.framework.executor.configuration.config.ExecutorsConfig;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 执行器上下文
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/16 16:28
+ */
+@Slf4j
+public class ExecutorContext {
+
+    private final ExecutorsConfig executorsConfig;
+
+    private final ConfigurableBeanFactory beanFactory;
+
+    public ExecutorContext(ExecutorsConfig executorsConfig, ConfigurableBeanFactory beanFactory) {
+        this.executorsConfig = executorsConfig;
+        this.beanFactory = beanFactory;
+    }
+
+    /**
+     * 初始化
+     *
+     * @return executorMap
+     */
+    public Map<String, ThreadPoolTaskExecutor> init() {
+        log.info("--------- Executors init start --------- ");
+        Map<String, ThreadPoolTaskExecutor> executorMap = new HashMap<>();
+        executorsConfig.getExecutors().forEach((beanName, config) -> {
+            String executorName = Strings.leftPad(beanName, 30);
+            // 是否启用
+            if (!config.isEnabled()) {
+                log.info("Executor [{}] is disabled.", executorName);
+                return;
+            }
+            // 创建线程池
+            ThreadPoolTaskExecutor executor = this.createTaskExecutor(config);
+            // 注册到容器中
+            beanFactory.registerSingleton(beanName, executor);
+            executorMap.put(beanName, executor);
+            log.info("Executor [{}] init success. {}", executorName, JSON.toJSONString(config));
+        });
+        log.info("--------- Executors init end --------- ");
+        return executorMap;
+    }
+
+    /**
+     * 创建线程池
+     *
+     * @param config config
+     */
+    private ThreadPoolTaskExecutor createTaskExecutor(ExecutorConfig config) {
+        // 创建线程池
+        ThreadPoolTaskExecutor executor;
+        if (config.isMdc()) {
+            executor = new ThreadPoolMdcTaskExecutor();
+        } else {
+            executor = new ThreadPoolTaskExecutor();
+        }
+        // 同步队列
+        if (config.isSynchronousQueue()) {
+            config.setCorePoolSize(0);
+            config.setMaxPoolSize(Integer.MAX_VALUE);
+            config.setQueueCapacity(0);
+            config.setRejectPolicy(RejectPolicy.ABORT);
+        }
+        // 设置参数
+        executor.setCorePoolSize(config.getCorePoolSize());
+        executor.setMaxPoolSize(config.getMaxPoolSize());
+        executor.setQueueCapacity(config.getQueueCapacity());
+        executor.setThreadNamePrefix(config.getThreadNamePrefix());
+        executor.setKeepAliveSeconds(config.getKeepAliveSeconds());
+        executor.setAllowCoreThreadTimeOut(config.isAllowCoreTimeout());
+        executor.setRejectedExecutionHandler(config.getRejectPolicy().getHandler());
+        // 设置等待所有任务执行结束再关闭线程池
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.setAwaitTerminationSeconds(60);
+        // 初始化
+        executor.initialize();
+        return executor;
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/utils/ExecutorUtils.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.executor.core.utils;
+
+import cn.orionsec.kit.lang.able.Executable;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.collect.Maps;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.Map;
+
+/**
+ * 线程池工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/16 16:34
+ */
+public class ExecutorUtils {
+
+    private static Map<String, ThreadPoolTaskExecutor> executorMap;
+
+    private ExecutorUtils() {
+    }
+
+    /**
+     * 获取线程池
+     *
+     * @param name name
+     * @return executor
+     */
+    public static ThreadPoolTaskExecutor getExecutor(String name) {
+        return executorMap.get(name);
+    }
+
+    /**
+     * 执行
+     *
+     * @param name     name
+     * @param runnable runnable
+     */
+    public static void execute(String name, Runnable runnable) {
+        getExecutor(name).execute(runnable);
+    }
+
+    /**
+     * 执行
+     *
+     * @param name       name
+     * @param executable executable
+     */
+    public static void execute(String name, Executable executable) {
+        getExecutor(name).execute(executable::exec);
+    }
+
+    public static void setExecutors(Map<String, ThreadPoolTaskExecutor> executorMap) {
+        if (ExecutorUtils.executorMap != null) {
+            // unmodified
+            throw Exceptions.state();
+        }
+        ExecutorUtils.executorMap = Maps.unmodified(executorMap);
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,77 @@
+{
+  "groups": [
+    {
+      "name": "orion.executors.*",
+      "type": "org.dromara.visor.framework.executor.configuration.config.ExecutorConfig",
+      "sourceType": "org.dromara.visor.framework.executor.configuration.config.ExecutorConfig",
+      "description": "线程池配置项."
+    }
+  ],
+  "properties": [
+    {
+      "name": "orion.executors",
+      "type": "java.util.Map<java.lang.String,org.dromara.visor.framework.executor.configuration.config.ExecutorConfig>",
+      "description": "线程池配置.",
+      "defaultValue": "{}"
+    },
+    {
+      "name": "orion.executors.*.enabled",
+      "type": "java.lang.Boolean",
+      "description": "是否启用.",
+      "defaultValue": false
+    },
+    {
+      "name": "orion.executors.*.corePoolSize",
+      "type": "java.lang.Integer",
+      "description": "核心线程数.",
+      "defaultValue": "CPU_NUM"
+    },
+    {
+      "name": "orion.executors.*.maxPoolSize",
+      "type": "java.lang.Integer",
+      "description": "最大线程数.",
+      "defaultValue": "CPU_NUM"
+    },
+    {
+      "name": "orion.executors.*.queueCapacity",
+      "type": "java.lang.Integer",
+      "description": "任务队列容量.",
+      "defaultValue": 100
+    },
+    {
+      "name": "orion.executors.*.keepAliveSeconds",
+      "type": "java.lang.Integer",
+      "description": "空闲线程存活时间.",
+      "defaultValue": 60
+    },
+    {
+      "name": "orion.executors.*.allowCoreTimeout",
+      "type": "java.lang.Boolean",
+      "description": "是否允许核心线程超时回收.",
+      "defaultValue": false
+    },
+    {
+      "name": "orion.executors.*.synchronousQueue",
+      "type": "java.lang.Boolean",
+      "description": "是否启用同步队列模式.",
+      "defaultValue": false
+    },
+    {
+      "name": "orion.executors.*.mdc",
+      "type": "java.lang.Boolean",
+      "description": "是否启用 MDC 上下文传递.",
+      "defaultValue": false
+    },
+    {
+      "name": "orion.executors.*.threadNamePrefix",
+      "type": "java.lang.String",
+      "description": "线程名称前缀."
+    },
+    {
+      "name": "orion.executors.*.rejectPolicy",
+      "type": "cn.orionsec.kit.lang.define.thread.RejectPolicy",
+      "description": "拒绝策略.",
+      "defaultValue": "CALLER_RUNS"
+    }
+  ]
+}

orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.dromara.visor.framework.executor.configuration.OrionExecutorAutoConfiguration

orion-visor-framework/orion-visor-spring-boot-starter-influxdb/src/main/java/org/dromara/visor/framework/influxdb/core/query/FluxQueryBuilder.java

@@ -24,6 +24,7 @@ package org.dromara.visor.framework.influxdb.core.query;
 
 import cn.orionsec.kit.lang.utils.collect.Collections;
 import cn.orionsec.kit.lang.utils.collect.Lists;
+import cn.orionsec.kit.lang.utils.collect.Maps;
 import org.dromara.visor.common.constant.Const;
 
 import java.time.Instant;
@@ -194,7 +195,7 @@ public class FluxQueryBuilder {
         if (values.size() == 1) {
             return this.tag(key, Collections.first(values));
         }
-        //
+        // 使用 or 拼接
         Collection<String> conditions = values.stream()
                 .map(value -> String.format("r[\"%s\"] == \"%s\"", key, value))
                 .collect(Collectors.toList());
@@ -204,33 +205,18 @@ public class FluxQueryBuilder {
     }
 
     /**
-     * 过滤多个 tag
-     * tag 使用 and
-     * value 使用 or
+     * 过滤 tag
      *
      * @param tags tags
      * @return this
      */
     public FluxQueryBuilder tags(Map<String, ? extends Collection<String>> tags) {
-        for (Map.Entry<String, ? extends Collection<String>> entry : tags.entrySet()) {
-            String key = entry.getKey();
-            Collection<String> values = entry.getValue();
-            if (Collections.isEmpty(values)) {
-                continue;
-            }
-            if (values.size() == 1) {
-                // 单值直接用等号
-                String singleValue = values.iterator().next();
-                this.appendFilter(String.format("r[\"%s\"] == \"%s\"", key, singleValue));
-            } else {
-                // 多值用 OR
-                Collection<String> conditions = values.stream()
-                        .map(v -> String.format("r[\"%s\"] == \"%s\"", key, v))
-                        .collect(Collectors.toList());
-                this.appendFilter("(" + String.join(" or ", conditions) + ")");
-            }
+        if (Maps.isEmpty(tags)) {
+            return this;
+        }
+        for (Map.Entry<String, ? extends Collection<String>> entry : tags.entrySet()) {
+            this.tag(entry.getKey(), entry.getValue());
         }
-        this.closeFilter();
         return this;
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-influxdb/src/main/java/org/dromara/visor/framework/influxdb/core/utils/InfluxdbUtils.java

@@ -30,7 +30,9 @@ import com.influxdb.client.write.Point;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
 import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.entity.chart.TimeChartSeries;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.influxdb.core.query.FluxQueryBuilder;
 
 import java.time.Instant;
@@ -66,6 +68,7 @@ public class InfluxdbUtils {
      * @param points points
      */
     public static void writePoints(List<Point> points) {
+        Assert.notNull(client, ErrorMessage.INFLUXDB_UNSUPPORTED);
         try (WriteApi api = client.makeWriteApi()) {
             // 写入指标
             api.writePoints(points);
@@ -79,6 +82,7 @@ public class InfluxdbUtils {
      * @return points
      */
     public static List<FluxTable> queryTable(String query) {
+        Assert.notNull(client, ErrorMessage.INFLUXDB_UNSUPPORTED);
         return client.getQueryApi().query(query);
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2023 - present Dromara, All rights reserved.
- *
- *   https://visor.dromara.org
- *   https://visor.dromara.org.cn
- *   https://visor.orionsec.cn
- *
- * Members:
- *   Jiahang Li - ljh1553488six@139.com - author
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.dromara.visor.framework.job.configuration;
-
-import org.dromara.visor.common.constant.AutoConfigureOrderConst;
-import org.dromara.visor.common.constant.Const;
-import org.dromara.visor.common.thread.ThreadPoolMdcTaskExecutor;
-import org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * async 异步任务
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/20 10:34
- */
-@EnableAsync
-@AutoConfiguration
-@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB_ASYNC)
-@EnableConfigurationProperties(AsyncExecutorConfig.class)
-public class OrionAsyncAutoConfiguration {
-
-    /**
-     * {@code @Async("asyncExecutor")}
-     *
-     * @return 支持 MDC 的异步线程池
-     */
-    @Bean(name = "asyncExecutor")
-    public TaskExecutor asyncExecutor(AsyncExecutorConfig config) {
-        ThreadPoolMdcTaskExecutor executor = new ThreadPoolMdcTaskExecutor();
-        executor.setCorePoolSize(config.getCorePoolSize());
-        executor.setMaxPoolSize(config.getMaxPoolSize());
-        executor.setQueueCapacity(config.getQueueCapacity());
-        executor.setKeepAliveSeconds(config.getKeepAliveSeconds());
-        executor.setAllowCoreThreadTimeOut(true);
-        executor.setThreadNamePrefix("async-task-");
-        // 设置等待所有任务执行结束再关闭线程池
-        executor.setWaitForTasksToCompleteOnShutdown(true);
-        // 以确保应用最后能够被关闭
-        executor.setAwaitTerminationSeconds(60);
-        // 调用者调用拒绝策略
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        executor.initialize();
-        return executor;
-    }
-
-    /**
-     * {@code @Async("metricsExecutor")}
-     *
-     * @return 指标线程池
-     */
-    @Bean(name = "metricsExecutor")
-    public TaskExecutor metricsExecutor() {
-        ThreadPoolMdcTaskExecutor executor = new ThreadPoolMdcTaskExecutor();
-        executor.setCorePoolSize(4);
-        executor.setMaxPoolSize(8);
-        executor.setQueueCapacity(1000);
-        executor.setKeepAliveSeconds(Const.MS_S_60);
-        executor.setAllowCoreThreadTimeOut(true);
-        executor.setThreadNamePrefix("metrics-task-");
-        executor.setWaitForTasksToCompleteOnShutdown(true);
-        executor.setAwaitTerminationSeconds(60);
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        executor.initialize();
-        return executor;
-    }
-
-}

orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java

@@ -25,6 +25,8 @@ package org.dromara.visor.framework.job.configuration;
 import org.dromara.visor.common.constant.AutoConfigureOrderConst;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.task.TaskSchedulingProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -40,17 +42,18 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 @EnableScheduling
 @AutoConfiguration
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB)
+@EnableConfigurationProperties(TaskSchedulingProperties.class)
 public class OrionSchedulerAutoConfiguration {
 
     /**
      * @return 任务调度器
      */
     @Bean
-    public TaskScheduler taskScheduler() {
+    public TaskScheduler taskScheduler(TaskSchedulingProperties properties) {
         ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
-        scheduler.setPoolSize(4);
         scheduler.setRemoveOnCancelPolicy(true);
-        scheduler.setThreadNamePrefix("scheduling-task-");
+        scheduler.setPoolSize(properties.getPool().getSize());
+        scheduler.setThreadNamePrefix(properties.getThreadNamePrefix());
         return scheduler;
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,35 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "orion.async.executor",
-      "type": "org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig",
-      "sourceType": "org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig"
-    }
-  ],
-  "properties": [
-    {
-      "name": "orion.async.executor.core-pool-size",
-      "type": "java.lang.Integer",
-      "description": "核心线程数量.",
-      "defaultValue": "8"
-    },
-    {
-      "name": "orion.async.executor.max-pool-size",
-      "type": "java.lang.Integer",
-      "description": "最大线程数量.",
-      "defaultValue": "16"
-    },
-    {
-      "name": "orion.async.executor.queue-capacity",
-      "type": "java.lang.Integer",
-      "description": "队列容量.",
-      "defaultValue": "200"
-    },
-    {
-      "name": "orion.async.executor.keep-alive-seconds",
-      "type": "java.lang.Integer",
-      "description": "活跃时间.",
-      "defaultValue": "300"
-    }
-  ]
-}

orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,2 @@
 org.dromara.visor.framework.job.configuration.OrionSchedulerAutoConfiguration
 org.dromara.visor.framework.job.configuration.OrionQuartzAutoConfiguration
-org.dromara.visor.framework.job.configuration.OrionAsyncAutoConfiguration

orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java

@@ -25,10 +25,10 @@ package org.dromara.visor.framework.log.core.interceptor;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Maps;
 import cn.orionsec.kit.lang.utils.reflect.Classes;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.serializer.SerializeFilter;
-import com.alibaba.fastjson.serializer.ValueFilter;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.filter.Filter;
+import com.alibaba.fastjson2.filter.ValueFilter;
 import org.aopalliance.intercept.MethodInvocation;
 import org.dromara.visor.common.json.FieldDesensitizeFilter;
 import org.dromara.visor.common.json.FieldIgnoreFilter;
@@ -65,7 +65,7 @@ public abstract class AbstractLogPrinterInterceptor implements LogPrinterInterce
     /**
      * 字段过滤器
      */
-    protected SerializeFilter[] serializeFilters;
+    protected Filter[] serializeFilters;
 
     /**
      * 脱敏配置
@@ -91,7 +91,7 @@ public abstract class AbstractLogPrinterInterceptor implements LogPrinterInterce
     @Override
     public void init() {
         // 参数过滤器
-        this.serializeFilters = new SerializeFilter[]{
+        this.serializeFilters = new Filter[]{
                 // 忽略字段过滤器
                 new FieldIgnoreFilter(config.getField().getIgnore()),
                 // 脱敏字段过滤器

orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.time.Dates;
 import cn.orionsec.kit.web.servlet.web.Servlets;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.aopalliance.intercept.MethodInvocation;
 import org.dromara.visor.common.utils.IpUtils;

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java

@@ -38,7 +38,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.mybatis.core.domain.BaseDO;
 import org.dromara.visor.framework.mybatis.core.generator.template.Table;
 import org.dromara.visor.framework.mybatis.core.mapper.IMapper;
@@ -101,7 +101,7 @@ public class CodeGenerator implements Executable {
      */
     @Override
     public void exec() {
-        Valid.notEmpty(tables, "请先配置需要生成的表");
+        Assert.notEmpty(tables, "请先配置需要生成的表");
 
         // 创建引擎
         VelocityTemplateEngine engine = this.getEngine(tables);

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java

@@ -24,7 +24,7 @@ package org.dromara.visor.framework.mybatis.core.generator.core;
 
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import org.dromara.visor.common.constant.Const;

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java

@@ -25,7 +25,7 @@ package org.dromara.visor.framework.mybatis.core.query;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 
 import java.util.Collection;
 
@@ -81,7 +81,7 @@ public class Conditions {
      * @return wrapper
      */
     public static <T, E> LambdaQueryWrapper<T> eq(SFunction<T, E> mapping, E e) {
-        Valid.notNull(e, ErrorMessage.INVALID_PARAM);
+        Assert.notNull(e, ErrorMessage.INVALID_PARAM);
         return new LambdaQueryWrapper<T>().eq(mapping, e);
     }
 
@@ -95,7 +95,7 @@ public class Conditions {
      * @return wrapper
      */
     public static <T, E> LambdaQueryWrapper<T> in(SFunction<T, E> mapping, Collection<E> es) {
-        Valid.notEmpty(es, ErrorMessage.INVALID_PARAM);
+        Assert.notEmpty(es, ErrorMessage.INVALID_PARAM);
         return new LambdaQueryWrapper<T>().in(mapping, es);
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java

@@ -27,7 +27,6 @@ import cn.orionsec.kit.lang.define.wrapper.PageRequest;
 import cn.orionsec.kit.lang.define.wrapper.Pager;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Objects1;
-import cn.orionsec.kit.lang.utils.Valid;
 import cn.orionsec.kit.lang.utils.collect.Lists;
 import cn.orionsec.kit.lang.utils.reflect.Classes;
 import cn.orionsec.kit.spring.SpringHolder;
@@ -42,6 +41,7 @@ import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.entity.IOrderRequest;
 import org.dromara.visor.common.entity.IPageRequest;
 import org.dromara.visor.common.enums.BooleanBit;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.SqlUtils;
 import org.dromara.visor.framework.mybatis.core.domain.BaseDO;
 
@@ -85,23 +85,23 @@ public class DataQuery<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T extends BaseDO> DataQuery<T> create(Class<T> entityClass) {
-        TableInfo table = Valid.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class");
+        TableInfo table = Assert.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class");
         Class<BaseMapper<T>> mapperClass = (Class<BaseMapper<T>>) Classes.loadClass(table.getCurrentNamespace());
         return new DataQuery<T>(SpringHolder.getBean(mapperClass));
     }
 
     public static <T> DataQuery<T> of(BaseMapper<T> dao) {
-        Valid.notNull(dao, "dao is null");
+        Assert.notNull(dao, "dao is null");
         return new DataQuery<>(dao);
     }
 
     public static <T> DataQuery<T> of(BaseMapper<T> dao, Wrapper<T> wrapper) {
-        Valid.notNull(dao, "dao is null");
+        Assert.notNull(dao, "dao is null");
         return new DataQuery<>(dao, wrapper);
     }
 
     public DataQuery<T> page(IPageRequest request) {
-        Valid.notNull(request, "page is null");
+        Assert.notNull(request, "page is null");
         this.page = new PageRequest(request.getPage(), request.getLimit());
         return this;
     }
@@ -112,7 +112,7 @@ public class DataQuery<T> {
     }
 
     public DataQuery<T> wrapper(Wrapper<T> wrapper) {
-        this.wrapper = Valid.notNull(wrapper, "wrapper is null");
+        this.wrapper = Assert.notNull(wrapper, "wrapper is null");
         return this;
     }
 
@@ -177,18 +177,18 @@ public class DataQuery<T> {
     // -------------------- id --------------------
 
     public T get(Serializable id) {
-        Valid.notNull(id, "id is null");
+        Assert.notNull(id, "id is null");
         return dao.selectById(id);
     }
 
     public <R> R get(Serializable id, Function<T, R> mapper) {
-        Valid.notNull(id, "id is null");
-        Valid.notNull(mapper, "convert function is null");
+        Assert.notNull(id, "id is null");
+        Assert.notNull(mapper, "convert function is null");
         return Objects1.map(dao.selectById(id), mapper);
     }
 
     public Optional<T> optional(Serializable id) {
-        Valid.notNull(id, "id is null");
+        Assert.notNull(id, "id is null");
         return Optional.ofNullable(dao.selectById(id));
     }
 
@@ -213,7 +213,7 @@ public class DataQuery<T> {
     }
 
     public <R> R get(Function<T, R> mapper) {
-        Valid.notNull(mapper, "convert function is null");
+        Assert.notNull(mapper, "convert function is null");
         return Objects1.map(dao.selectOne(wrapper), mapper);
     }
 
@@ -228,7 +228,7 @@ public class DataQuery<T> {
     }
 
     public <R> List<R> list(Function<T, R> mapper) {
-        Valid.notNull(mapper, "convert function is null");
+        Assert.notNull(mapper, "convert function is null");
         return Lists.map(dao.selectList(wrapper), mapper);
     }
 
@@ -277,10 +277,10 @@ public class DataQuery<T> {
     }
 
     public <R> DataGrid<R> dataGrid(Wrapper<T> countWrapper, Function<T, R> mapper) {
-        Valid.notNull(page, "page is null");
-        Valid.notNull(wrapper, "wrapper is null");
-        Valid.notNull(countWrapper, "count wrapper is null");
-        Valid.notNull(mapper, "convert function is null");
+        Assert.notNull(page, "page is null");
+        Assert.notNull(wrapper, "wrapper is null");
+        Assert.notNull(countWrapper, "count wrapper is null");
+        Assert.notNull(mapper, "convert function is null");
         Long count = dao.selectCount(countWrapper);
         Pager<R> pager = new Pager<>(page);
         pager.setTotal(count.intValue());

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java

@@ -22,8 +22,8 @@
  */
 package org.dromara.visor.framework.mybatis.core.type;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java

@@ -22,8 +22,8 @@
  */
 package org.dromara.visor.framework.mybatis.core.type;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm

@@ -25,18 +25,19 @@ package ${package.ServiceImpl};
 import cn.orionsec.kit.lang.define.wrapper.DataGrid;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
-#if($meta.enableCache)
-import org.dromara.visor.framework.redis.core.utils.RedisMaps;
-import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers;
-#end
-#foreach($pkg in ${customModuleFilePackages})
-import ${pkg}.*;
-#end
+import org.dromara.visor.common.utils.Assert;
+    #if($meta.enableCache)
+    import org.dromara.visor.framework.redis.core.utils.RedisMaps;
+    import org.dromara.visor.framework.redis.core.utils.RedisUtils;
+    import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers;
+    #end
+    #foreach($pkg in ${customModuleFilePackages})
+    import ${pkg}.*;
+    #end
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
@@ -59,222 +60,222 @@ import java.util.stream.Collectors;
 @Service
 public class ${table.serviceImplName} implements ${table.serviceName} {
 
-    @Resource
-    private ${type}DAO ${typeLower}DAO;
+        @Resource
+        private ${type}DAO ${typeLower}DAO;
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Long create${type}(${type}CreateRequest request) {
-        log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request));
-        // 转换
-        ${type}DO record = ${type}Convert.MAPPER.to(request);
-        // 查询数据是否冲突
-        this.check${type}Present(record);
-        // 插入
-        int effect = ${typeLower}DAO.insert(record);
-        Long id = record.getId();
-        log.info("${type}Service-create${type} id: {}, effect: {}", id, effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
-        #end
-        return id;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer update${type}ById(${type}UpdateRequest request) {
-        Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
-        log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request));
-        // 查询
-        ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
-        // 转换
-        ${type}DO updateRecord = ${type}Convert.MAPPER.to(request);
-        // 查询数据是否冲突
-        this.check${type}Present(updateRecord);
-        // 更新
-        int effect = ${typeLower}DAO.updateById(updateRecord);
-        log.info("${type}Service-update${type}ById effect: {}", effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
-        #end
-        return effect;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) {
-        log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query);
-        // 转换
-        ${type}DO updateRecord = ${type}Convert.MAPPER.to(update);
-        // 更新
-        int effect = ${typeLower}DAO.update(updateRecord, wrapper);
-        log.info("${type}Service.update${type} effect: {}", effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
-        #end
-        return effect;
-    }
-
-    @Override
-    public ${type}VO get${type}ById(Long id) {
-        // 查询
-        ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
-        // 转换
-        return ${type}Convert.MAPPER.to(record);
-    }
-
-    @Override
-    public List<${type}VO> get${type}ByIdList(List<Long> idList) {
-        // 查询
-        List<${type}DO> records = ${typeLower}DAO.selectBatchIds(idList);
-        if (records.isEmpty()) {
-            return Lists.empty();
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Long create${type}(${type}CreateRequest request) {
+            log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request));
+            // 转换
+                ${type}DO record = ${type}Convert.MAPPER.to(request);
+            // 查询数据是否冲突
+            this.check${type}Present(record);
+            // 插入
+            int effect = ${typeLower}DAO.insert(record);
+            Long id = record.getId();
+            log.info("${type}Service-create${type} id: {}, effect: {}", id, effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
+            #end
+            return id;
         }
-        // 转换
-        return ${type}Convert.MAPPER.to(records);
-    }
 
-    @Override
-    public List<${type}VO> get${type}List(${type}QueryRequest request) {
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 查询
-        return ${typeLower}DAO.of(wrapper)
-                .order(request, ${type}DO::getId)
-                .list(${type}Convert.MAPPER::to);
-    }
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Integer update${type}ById(${type}UpdateRequest request) {
+            Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
+            log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request));
+            // 查询
+                ${type}DO record = ${typeLower}DAO.selectById(id);
+            Assert.notNull(record, ErrorMessage.DATA_ABSENT);
+            // 转换
+                ${type}DO updateRecord = ${type}Convert.MAPPER.to(request);
+            // 查询数据是否冲突
+            this.check${type}Present(updateRecord);
+            // 更新
+            int effect = ${typeLower}DAO.updateById(updateRecord);
+            log.info("${type}Service-update${type}ById effect: {}", effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
+            #end
+            return effect;
+        }
+
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) {
+            log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
+            // 条件
+            LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query);
+            // 转换
+                ${type}DO updateRecord = ${type}Convert.MAPPER.to(update);
+            // 更新
+            int effect = ${typeLower}DAO.update(updateRecord, wrapper);
+            log.info("${type}Service.update${type} effect: {}", effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
+            #end
+            return effect;
+        }
+
+        @Override
+        public ${type}VO get${type}ById(Long id) {
+            // 查询
+                ${type}DO record = ${typeLower}DAO.selectById(id);
+            Assert.notNull(record, ErrorMessage.DATA_ABSENT);
+            // 转换
+            return ${type}Convert.MAPPER.to(record);
+        }
+
+        @Override
+        public List<${type}VO> get${type}ByIdList(List<Long> idList) {
+            // 查询
+            List<${type}DO> records = ${typeLower}DAO.selectBatchIds(idList);
+            if (records.isEmpty()) {
+                return Lists.empty();
+            }
+            // 转换
+            return ${type}Convert.MAPPER.to(records);
+        }
+
+        @Override
+        public List<${type}VO> get${type}List(${type}QueryRequest request) {
+            // 条件
+            LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+            // 查询
+            return ${typeLower}DAO.of(wrapper)
+                    .order(request, ${type}DO::getId)
+                    .list(${type}Convert.MAPPER::to);
+        }
     #if($meta.enableCache)
 
-    @Override
-    public List<${type}VO> get${type}ListByCache() {
-        // 查询缓存
-        List<${type}CacheDTO> list = RedisMaps.valuesJson(${type}CacheKeyDefine.${typeConst});
-        if (list.isEmpty()) {
-            // 查询数据库
-            list = ${typeLower}DAO.of().list(${type}Convert.MAPPER::toCache);
-            // 设置屏障 防止穿透
-            CacheBarriers.checkBarrier(list, ${type}CacheDTO::new);
-            // 设置缓存
-            RedisMaps.putAllJson(${type}CacheKeyDefine.${typeConst}, s -> s.getId().toString(), list);
-        }
-        // 删除屏障
-        CacheBarriers.removeBarrier(list);
-        // 转换
-        return list.stream()
-                .map(${type}Convert.MAPPER::to)
-                .sorted(Comparator.comparing(${type}VO::getId).reversed())
-                .collect(Collectors.toList());
-    }
+            @Override
+            public List<${type}VO> get${type}ListByCache() {
+                // 查询缓存
+                List<${type}CacheDTO> list = RedisMaps.valuesJson(${type}CacheKeyDefine.${typeConst});
+                if (list.isEmpty()) {
+                    // 查询数据库
+                    list = ${typeLower}DAO.of().list(${type}Convert.MAPPER::toCache);
+                    // 设置屏障 防止穿透
+                    CacheBarriers.checkBarrier(list, ${type}CacheDTO::new);
+                    // 设置缓存
+                    RedisMaps.putAllJson(${type}CacheKeyDefine.${typeConst}, s -> s.getId().toString(), list);
+                }
+                // 删除屏障
+                CacheBarriers.removeBarrier(list);
+                // 转换
+                return list.stream()
+                        .map(${type}Convert.MAPPER::to)
+                        .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);
-        // 查询
-        return ${typeLower}DAO.of()
-                .wrapper(wrapper)
-                .page(request)
-                .order(request, ${type}DO::getId)
-                .dataGrid(${type}Convert.MAPPER::to);
-    }
+        @Override
+        public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) {
+            // 条件
+            LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+            // 查询
+            return ${typeLower}DAO.of()
+                    .wrapper(wrapper)
+                    .page(request)
+                    .order(request, ${type}DO::getId)
+                    .dataGrid(${type}Convert.MAPPER::to);
+        }
 
-    @Override
-    public Long get${type}Count(${type}QueryRequest request) {
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 查询
-        return ${typeLower}DAO.of()
-                .wrapper(wrapper)
-                .countMax(request.getLimit());
-    }
+        @Override
+        public Long get${type}Count(${type}QueryRequest request) {
+            // 条件
+            LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+            // 查询
+            return ${typeLower}DAO.of()
+                    .wrapper(wrapper)
+                    .countMax(request.getLimit());
+        }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer delete${type}ById(Long id) {
-        log.info("${type}Service-delete${type}ById id: {}", id);
-        // 检查数据是否存在
-        ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
-        // 删除
-        int effect = ${typeLower}DAO.deleteById(id);
-        log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, id);
-        #end
-        return effect;
-    }
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Integer delete${type}ById(Long id) {
+            log.info("${type}Service-delete${type}ById id: {}", id);
+            // 检查数据是否存在
+                ${type}DO record = ${typeLower}DAO.selectById(id);
+            Assert.notNull(record, ErrorMessage.DATA_ABSENT);
+            // 删除
+            int effect = ${typeLower}DAO.deleteById(id);
+            log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, id);
+            #end
+            return effect;
+        }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer delete${type}ByIdList(List<Long> idList) {
-        log.info("${type}Service-delete${type}ByIdList idList: {}", idList);
-        int effect = ${typeLower}DAO.deleteBatchIds(idList);
-        log.info("${type}Service-delete${type}ByIdList effect: {}", effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, idList);
-        #end
-        return effect;
-    }
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Integer delete${type}ByIdList(List<Long> idList) {
+            log.info("${type}Service-delete${type}ByIdList idList: {}", idList);
+            int effect = ${typeLower}DAO.deleteBatchIds(idList);
+            log.info("${type}Service-delete${type}ByIdList effect: {}", effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, idList);
+            #end
+            return effect;
+        }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer delete${type}(${type}QueryRequest request) {
-        log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request));
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 删除
-        int effect = ${typeLower}DAO.delete(wrapper);
-        log.info("${type}Service.delete${type} effect: {}", effect);
-        #if($meta.enableCache)
-        // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
-        #end
-        return effect;
-    }
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public Integer delete${type}(${type}QueryRequest request) {
+            log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request));
+            // 条件
+            LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+            // 删除
+            int effect = ${typeLower}DAO.delete(wrapper);
+            log.info("${type}Service.delete${type} effect: {}", effect);
+            #if($meta.enableCache)
+                // 删除缓存
+                RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
+            #end
+            return effect;
+        }
 
-    /**
-     * 检查对象是否存在
-     *
-     * @param domain domain
-     */
-    private void check${type}Present(${type}DO domain) {
-        // 构造条件
-        LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.wrapper()
+        /**
+         * 检查对象是否存在
+         *
+         * @param domain domain
+         */
+        private void check${type}Present(${type}DO domain) {
+            // 构造条件
+                LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.wrapper()
                 // 更新时忽略当前记录
                 .ne(${type}DO::getId, domain.getId())
                 // 用其他字段做重复校验
-                #foreach($field in ${table.fields})
+            #foreach($field in ${table.fields})
                 #if("$!field.propertyName" != "id")
-                .eq(${type}DO::get${field.capitalName}, domain.get${field.capitalName}())#if(!$foreach.hasNext);#end
+                        .eq(${type}DO::get${field.capitalName}, domain.get${field.capitalName}())#if(!$foreach.hasNext);#end
                 #end
-                #end
-        // 检查是否存在
-        boolean present = ${typeLower}DAO.of(wrapper).present();
-        Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
-    }
+            #end
+            // 检查是否存在
+            boolean present = ${typeLower}DAO.of(wrapper).present();
+            Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        }
 
-    @Override
-    public LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) {
-        String searchValue = request.getSearchValue();
-        return ${typeLower}DAO.wrapper()
+        @Override
+        public LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) {
+            String searchValue = request.getSearchValue();
+            return ${typeLower}DAO.wrapper()
                 #foreach($field in ${table.fields})
-                .eq(${type}DO::get${field.capitalName}, request.get${field.capitalName}())
-                #end
-                .and(Strings.isNotEmpty(searchValue), c -> c
-                        #foreach($field in ${table.fields})
-                        .eq(${type}DO::get${field.capitalName}, searchValue)#if($foreach.hasNext).or()#end
+                        .eq(${type}DO::get${field.capitalName}, request.get${field.capitalName}())
                         #end
-                );
-    }
+                    .and(Strings.isNotEmpty(searchValue), c -> c
+                        #foreach($field in ${table.fields})
+                                .eq(${type}DO::get${field.capitalName}, searchValue)#if($foreach.hasNext).or()#end
+                        #end
+                    );
+        }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm

@@ -23,17 +23,17 @@
 package ${currentPackage};
 
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
-#foreach($pkg in ${customModuleFilePackages})
-import ${pkg}.*;
-#end
-#foreach($pkg in ${customProviderFilePackages})
-import ${pkg}.*;
-#end
+import org.dromara.visor.common.utils.Assert;
+    #foreach($pkg in ${customModuleFilePackages})
+    import ${pkg}.*;
+    #end
+    #foreach($pkg in ${customProviderFilePackages})
+    import ${pkg}.*;
+    #end
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
@@ -64,9 +64,9 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Long create${type}(${type}CreateDTO dto) {
         log.info("${type}Api.create${type} dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 转换
-        ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
+            ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
         // 创建
         return ${typeLower}Service.create${type}(request);
     }
@@ -74,9 +74,9 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer update${type}ById(${type}UpdateDTO dto) {
         log.info("${type}Api.update${type}ById dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 转换
-        ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
+            ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
         // 修改
         return ${typeLower}Service.update${type}ById(request);
     }
@@ -84,11 +84,11 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer update${type}(${type}QueryDTO query, ${type}UpdateDTO update) {
         log.info("${type}Api.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
-        Valid.valid(query);
-        Valid.valid(update);
+        Assert.valid(query);
+        Assert.valid(update);
         // 更新
         int effect = ${typeLower}Service.update${type}(${type}ProviderConvert.MAPPER.toRequest(query),
-                ${type}ProviderConvert.MAPPER.toRequest(update));
+                    ${type}ProviderConvert.MAPPER.toRequest(update));
         log.info("${type}Api.update${type} effect: {}", effect);
         return effect;
     }
@@ -96,9 +96,9 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public ${type}DTO get${type}ById(Long id) {
         log.info("${type}Api.get${type}ById id: {}", id);
-        Valid.notNull(id, ErrorMessage.ID_MISSING);
+        Assert.notNull(id, ErrorMessage.ID_MISSING);
         // 修改
-        ${type}DO record = ${typeLower}DAO.selectById(id);
+            ${type}DO record = ${typeLower}DAO.selectById(id);
         if (record == null) {
             return null;
         }
@@ -121,7 +121,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public List<${type}DTO> get${type}List(${type}QueryDTO dto) {
         log.info("${type}Api.get${type}List dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
         // 查询
@@ -129,20 +129,20 @@ public class ${type}ApiImpl implements ${type}Api {
     }
 
     #if($meta.enableCache)
-    @Override
-    public List<${type}DTO> get${type}ListByCache() {
-        return ${typeLower}Service.get${type}ListByCache()
-                .stream()
-                .map(${type}ProviderConvert.MAPPER::to)
-                .sorted(Comparator.comparing(${type}DTO::getId))
-                .collect(Collectors.toList());
-    }
+        @Override
+        public List<${type}DTO> get${type}ListByCache() {
+            return ${typeLower}Service.get${type}ListByCache()
+                    .stream()
+                    .map(${type}ProviderConvert.MAPPER::to)
+                    .sorted(Comparator.comparing(${type}DTO::getId))
+                    .collect(Collectors.toList());
+        }
 
     #end
     @Override
     public Long get${type}Count(${type}QueryDTO dto) {
         log.info("${type}Api.get${type}Count dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
         // 查询
@@ -152,7 +152,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}ById(Long id) {
         log.info("${type}Api.delete${type}ById id: {}", id);
-        Valid.notNull(id, ErrorMessage.ID_MISSING);
+        Assert.notNull(id, ErrorMessage.ID_MISSING);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}ById(id);
         log.info("${type}Api.delete${type}ById id: {}, effect: {}", id, effect);
@@ -162,7 +162,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}ByIdList(List<Long> idList) {
         log.info("${type}Api.delete${type}ByIdList idList: {}", idList);
-        Valid.notEmpty(idList, ErrorMessage.ID_MISSING);
+        Assert.notEmpty(idList, ErrorMessage.ID_MISSING);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}ByIdList(idList);
         log.info("${type}Api.delete${type}ByIdList effect: {}", effect);
@@ -172,7 +172,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}(${type}QueryDTO dto) {
         log.info("${type}Api.delete${type} dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}(${type}ProviderConvert.MAPPER.toRequest(dto));
         log.info("${type}Api.delete${type} effect: {}", effect);
@@ -186,7 +186,7 @@ public class ${type}ApiImpl implements ${type}Api {
      * @return wrapper
      */
     private LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryDTO dto) {
-        return ${typeLower}DAO.wrapper()
+            return ${typeLower}DAO.wrapper()
         #foreach($field in ${table.fields})
                 .eq(${type}DO::get${field.capitalName}, dto.get${field.capitalName}())#if(!$foreach.hasNext);#end
         #end

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm

@@ -169,7 +169,6 @@
           Message.success('删除成功');
           // 重新加载
           reload();
-        } catch (e) {
         } finally {
           setLoading(false);
         }
@@ -200,7 +199,6 @@
       pagination.total = data.total;
       pagination.current = request.page;
       pagination.pageSize = request.limit;
-    } catch (e) {
     } finally {
       setLoading(false);
     }

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm

@@ -6,7 +6,7 @@
             :unmount-on-close="true"
             :ok-button-props="{ disabled: loading }"
             :cancel-button-props="{ disabled: loading }"
-            :on-before-ok="handlerOk"
+            :on-before-ok="handleOk"
             @cancel="handleClose">
     <a-spin class="full drawer-form-small" :loading="loading">
       <a-form :model="formModel"
@@ -114,7 +114,7 @@
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -133,10 +133,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
-    } catch (e) {
-      return false;
+      handleClose();
+      return true;
     } finally {
       setLoading(false);
     }
@@ -144,11 +142,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm

@@ -10,7 +10,7 @@
            :unmount-on-close="true"
            :ok-button-props="{ disabled: loading }"
            :cancel-button-props="{ disabled: loading }"
-           :on-before-ok="handlerOk"
+           :on-before-ok="handleOk"
            @close="handleClose">
     <a-spin class="full" :loading="loading">
       <a-form :model="formModel"
@@ -118,7 +118,7 @@
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -137,10 +137,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
-    } catch (e) {
-      return false;
+      handleClose();
+      return true;
     } finally {
       setLoading(false);
     }
@@ -148,11 +146,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm

@@ -91,6 +91,7 @@
     <a-table row-key="id"
     #end
              ref="tableRef"
+             class="table-resize"
              :loading="loading"
              :columns="tableColumns"
              #if($vue.enableRowSelection)
@@ -99,6 +100,7 @@
              :data="tableRenderData"
              :pagination="pagination"
              :bordered="false"
+             :column-resizable="true"
              @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
              @page-size-change="(size: number) => fetchTableData(1, size)">
       #foreach($field in ${table.fields})
@@ -200,7 +202,6 @@
       selectedKeys.value = [];
       // 重新加载
       reload();
-    } catch (e) {
     } finally {
       setLoading(false);
     }
@@ -218,7 +219,6 @@
       Message.success('删除成功');
       // 重新加载
       reload();
-    } catch (e) {
     } finally {
       setLoading(false);
     }
@@ -244,7 +244,6 @@
       #if($vue.enableRowSelection)
       selectedKeys.value = [];
       #end
-    } catch (e) {
     } finally {
       setLoading(false);
     }

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java

@@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.core.utils;
 
 import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine;
 import cn.orionsec.kit.lang.utils.collect.Lists;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.dromara.visor.common.constant.Const;
 
 import java.util.List;

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java

@@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.function.Functions;
 import cn.orionsec.kit.lang.utils.Objects1;
 import cn.orionsec.kit.lang.utils.collect.Lists;
 import cn.orionsec.kit.lang.utils.collect.Maps;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import org.springframework.data.redis.core.HashOperations;
 
 import java.util.List;
@@ -312,6 +312,19 @@ public class RedisMaps extends RedisUtils {
         return getJson(key.getKey(), hashKey, (Class<V>) key.getType());
     }
 
+    /**
+     * 获取值 json
+     *
+     * @param define  define
+     * @param key     key
+     * @param hashKey hashKey
+     * @param <V>     V
+     * @return value
+     */
+    public static <V> V getJson(String key, CacheKeyDefine define, Object hashKey) {
+        return getJson(key, hashKey, (Class<V>) define.getType());
+    }
+
     /**
      * 获取值 json
      *
@@ -355,9 +368,9 @@ public class RedisMaps extends RedisUtils {
     /**
      * 获取值 json
      *
-     * @param key       key
-     * @param hashKeys  hashKeys
-     * @param <V>       V
+     * @param key      key
+     * @param hashKeys hashKeys
+     * @param <V>      V
      * @return values
      */
     public static <V> List<V> multiGetJson(CacheKeyDefine key, List<?> hashKeys) {
@@ -367,10 +380,10 @@ public class RedisMaps extends RedisUtils {
     /**
      * 获取值 json
      *
-     * @param key       key
-     * @param hashKeys  hashKeys
-     * @param clazz     clazz
-     * @param <V>       V
+     * @param key      key
+     * @param hashKeys hashKeys
+     * @param clazz    clazz
+     * @param <V>      V
      * @return values
      */
     public static <V> List<V> multiGetJson(String key, List<?> hashKeys, Class<V> clazz) {

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java

@@ -24,9 +24,9 @@ package org.dromara.visor.framework.redis.core.utils;
 
 import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine;
 import cn.orionsec.kit.lang.utils.Strings;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Collection;

orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java

@@ -22,8 +22,8 @@
  */
 package org.dromara.visor.framework.security.core.context;
 
-import cn.orionsec.kit.lang.utils.Valid;
 import com.alibaba.ttl.TransmittableThreadLocal;
+import org.dromara.visor.common.utils.Assert;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolderStrategy;
 import org.springframework.security.core.context.SecurityContextImpl;
@@ -60,7 +60,7 @@ public class TransmittableThreadLocalSecurityContextHolderStrategy implements Se
 
     @Override
     public void setContext(SecurityContext context) {
-        Valid.notNull(context, "only non-null SecurityContext instances are permitted");
+        Assert.notNull(context, "only non-null SecurityContext instances are permitted");
         CONTEXT_HOLDER.set(context);
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java

@@ -24,6 +24,7 @@ package org.dromara.visor.framework.test.core.base;
 
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import org.dromara.visor.common.configuration.CommonConfiguration;
 import org.dromara.visor.common.configuration.SpringConfiguration;
 import org.dromara.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration;
 import org.dromara.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration;
@@ -60,6 +61,7 @@ public class BaseUnitTest {
     @Import({
             // spring
             SpringConfiguration.class,
+            CommonConfiguration.class,
             // mock
             OrionMockBeanTestConfiguration.class,
             OrionMockRedisTestConfiguration.class,

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java

@@ -29,6 +29,7 @@ import org.dromara.visor.common.constant.AutoConfigureOrderConst;
 import org.dromara.visor.common.constant.FilterOrderConst;
 import org.dromara.visor.common.web.WebFilterCreator;
 import org.dromara.visor.framework.web.configuration.config.ExposeApiConfig;
+import org.dromara.visor.framework.web.configuration.config.OrionApiConfig;
 import org.dromara.visor.framework.web.core.aspect.DemoDisableApiAspect;
 import org.dromara.visor.framework.web.core.aspect.ExposeApiAspect;
 import org.dromara.visor.framework.web.core.filter.TraceIdFilter;
@@ -42,6 +43,7 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -67,9 +69,10 @@ import java.util.List;
  * @version 1.0.0
  * @since 2023/6/16 16:26
  */
+@DependsOn({"executorContext"})
 @AutoConfiguration
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_WEB)
-@EnableConfigurationProperties(ExposeApiConfig.class)
+@EnableConfigurationProperties({ExposeApiConfig.class, OrionApiConfig.class})
 public class OrionWebAutoConfiguration implements WebMvcConfigurer {
 
     @Value("${orion.prefix}")

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/config/ExposeApiConfig.java

@@ -36,6 +36,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties("orion.api.expose")
 public class ExposeApiConfig {
 
+    /**
+     * 对外服务地址
+     */
+    private String host;
+
     /**
      * 对外服务请求头
      */

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/config/OrionApiConfig.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.web.configuration.config;
+
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.net.IPs;
+import lombok.Data;
+import org.dromara.visor.common.constant.Const;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * api 配置属性
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/12/8 14:00
+ */
+@Data
+@ConfigurationProperties("orion.api")
+public class OrionApiConfig {
+
+    private static final String URL_TEMPLATE = "http://{}:{}{}";
+
+    /**
+     * 公共 api 前缀
+     */
+    private String prefix;
+
+    /**
+     * 服务端主机地址
+     */
+    private String host;
+
+    /**
+     * 服务端口
+     */
+    @Value("${server.port}")
+    private Integer port;
+
+    /**
+     * 服务端 url
+     */
+    private String url;
+
+    public String getHost() {
+        if (Const.IP_0000.equalsIgnoreCase(host)) {
+            // 本机
+            return IPs.IP;
+        } else {
+            return host;
+        }
+    }
+
+    public String getUrl() {
+        if (!Strings.isBlank(url)) {
+            return url;
+        }
+        // 构建
+        return Strings.format(URL_TEMPLATE, this.getHost(), port, prefix);
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java

@@ -28,8 +28,8 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.dromara.visor.common.constant.ErrorMessage;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.RsaParamDecryptUtils;
-import org.dromara.visor.common.utils.Valid;
 
 import java.io.IOException;
 
@@ -52,7 +52,7 @@ public class ParamDecryptDeserializer extends JsonDeserializer<String> {
         }
         // 解密参数
         String decrypt = RsaParamDecryptUtils.decrypt(value);
-        return Valid.notNull(decrypt, ErrorMessage.DECRYPT_ERROR);
+        return Assert.notNull(decrypt, ErrorMessage.DECRYPT_ERROR);
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -33,6 +33,21 @@
       "type": "java.lang.Boolean",
       "description": "是否开启 cors 过滤器."
     },
+    {
+      "name": "orion.api.host",
+      "type": "java.lang.String",
+      "description": "服务端主机地址."
+    },
+    {
+      "name": "orion.api.url",
+      "type": "java.lang.String",
+      "description": "服务端接口地址."
+    },
+    {
+      "name": "orion.api.ip-headers",
+      "type": "java.lang.String",
+      "description": "获取 IP 的请求头."
+    },
     {
       "name": "orion.api.expose.header",
       "type": "java.lang.String",

orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.constant.StandardHttpHeader;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Threads;
 import cn.orionsec.kit.lang.utils.io.Streams;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.framework.websocket.core.constant.CloseCode;

orion-visor-framework/pom.xml

@@ -24,6 +24,7 @@
         <module>orion-visor-spring-boot-starter-cipher</module>
         <module>orion-visor-spring-boot-starter-config</module>
         <module>orion-visor-spring-boot-starter-job</module>
+        <module>orion-visor-spring-boot-starter-executor</module>
         <module>orion-visor-spring-boot-starter-websocket</module>
         <module>orion-visor-spring-boot-starter-redis</module>
         <module>orion-visor-spring-boot-starter-desensitize</module>
@@ -37,4 +38,4 @@
         <module>orion-visor-spring-boot-starter-biz-operator-log</module>
     </modules>
 
-</project>
+</project>

orion-visor-launch/pom.xml

@@ -102,6 +102,10 @@
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-job</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-spring-boot-starter-executor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-websocket</artifactId>
@@ -199,4 +203,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

orion-visor-launch/src/main/resources/application-dev.yaml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     druid:
-      url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false
       username: ${MYSQL_USER:root}
       password: ${MYSQL_PASSWORD:Data@123456}
       initial-size: 0
@@ -14,7 +14,7 @@ spring:
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:Data@123456}
     database: ${REDIS_DATABASE:1}
-    data-version: ${REDIS_DATA_VERSION:1}
+    data-version: ${REDIS_DATA_VERSION:2}
     mock: false
   redisson:
     threads: 2
@@ -49,3 +49,84 @@ mybatis-plus:
   configuration:
     # 日志打印
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+app:
+  executors:
+    # 默认异步线程池
+    asyncExecutor:
+      mdc: true
+      core-pool-size: 2
+      max-pool-size: 4
+      queue-capacity: 30
+      allow-core-timeout: false
+      thread-name-prefix: async-executor-
+    # 指标存储异步线程池
+    metricsExecutor:
+      mdc: true
+      core-pool-size: 2
+      max-pool-size: 2
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: metrics-task-
+    # 推送异步线程池
+    pushExecutor:
+      mdc: true
+      core-pool-size: 1
+      max-pool-size: 1
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: message-push-
+    # 探针安装线程池
+    agentInstallExecutor:
+      core-pool-size: 2
+      max-pool-size: 2
+      queue-capacity: 200
+      allow-core-timeout: true
+      thread-name-prefix: agent-install-
+    # 终端标准输出线程池
+    terminalStdoutExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: terminal-stdout-
+    # 终端操作线程池
+    terminalOperatorExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: terminal-operator-
+    # 终端异步保存线程池
+    terminalAsyncSaverExecutor:
+      core-pool-size: 1
+      max-pool-size: 1
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: terminal-watcher-
+    # 批量执行超时检查线程池
+    execTimeoutCheckExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: timeout-check-
+    # 批量执行任务线程池
+    execTaskExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-task-
+    # 批量执行主机命令线程池
+    execHostCommandExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-host-
+    # 批量执行日志查看线程池
+    execLogViewExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-log-
+    # 批量上传任务线程池
+    uploadTaskExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: upload-task-
+    # 批量上传主机线程池
+    uploadHostExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: upload-host-

orion-visor-launch/src/main/resources/application-prod.yaml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     druid:
-      url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false
       username: ${MYSQL_USER:root}
       password: ${MYSQL_PASSWORD:Data@123456}
       # 初始连接数
@@ -25,7 +25,7 @@ spring:
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:Data@123456}
     database: ${REDIS_DATABASE:0}
-    data-version: ${REDIS_DATA_VERSION:1}
+    data-version: ${REDIS_DATA_VERSION:2}
   redisson:
     threads: 4
     netty-threads: 4
@@ -74,6 +74,13 @@ orion:
   api:
     # 是否允许跨域
     cors: ${API_CORS:true}
+    # 服务端主机地址
+    host: ${API_HOST:0.0.0.0}
+    # 服务端接口地址 默认自动生成
+    url: ${API_URL:}
+    # 获取 IP 的请求头
+    ip-headers: ${API_IP_HEADERS:X-Forwarded-For,X-Real-IP}
+    # 对外服务
     expose:
       # 暴露接口请求头值
       token: ${API_EXPOSE_TOKEN:pmqeHOyZaumHm0Wt}
@@ -84,9 +91,81 @@ orion:
     aes:
       # 加密密钥
       secret-key: ${SECRET_KEY:uQeacXV8b3isvKLK}
-  async:
-    executor:
+
+app:
+  executors:
+    # 默认异步线程池
+    asyncExecutor:
+      mdc: true
       core-pool-size: 8
       max-pool-size: 16
-      queue-capacity: 200
-      keep-alive-seconds: 300
+      queue-capacity: 100
+      allow-core-timeout: false
+      thread-name-prefix: async-executor-
+    # 指标存储异步线程池
+    metricsExecutor:
+      mdc: true
+      core-pool-size: 4
+      max-pool-size: 4
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: metrics-task-
+    # 推送异步线程池
+    pushExecutor:
+      mdc: true
+      core-pool-size: 4
+      max-pool-size: 4
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: message-push-
+    # 探针安装线程池
+    agentInstallExecutor:
+      allow-core-timeout: true
+      thread-name-prefix: agent-install-
+    # 终端标准输出线程池
+    terminalStdoutExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: terminal-stdout-
+    # 终端操作线程池
+    terminalOperatorExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: terminal-operator-
+    # 终端异步保存线程池
+    terminalAsyncSaverExecutor:
+      core-pool-size: 1
+      max-pool-size: 1
+      queue-capacity: 1000
+      allow-core-timeout: true
+      thread-name-prefix: terminal-watcher-
+    # 批量执行超时检查线程池
+    execTimeoutCheckExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: timeout-check-
+    # 批量执行任务线程池
+    execTaskExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-task-
+    # 批量执行主机命令线程池
+    execHostCommandExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-host-
+    # 批量执行日志查看线程池
+    execLogViewExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: exec-log-
+    # 批量上传任务线程池
+    uploadTaskExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: upload-task-
+    # 批量上传主机线程池
+    uploadHostExecutor:
+      synchronous-queue: true
+      allow-core-timeout: true
+      thread-name-prefix: upload-host-

orion-visor-launch/src/main/resources/application.yaml

@@ -22,6 +22,11 @@ spring:
     async:
       # 异步请求时间 30min
       request-timeout: 1800000
+  task:
+    scheduling:
+      thread-name-prefix: scheduling-task-
+      pool:
+        size: 4
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -170,6 +175,12 @@ orion:
     prefix: ${orion.prefix}/api
     # 是否允许跨域
     cors: true
+    # 服务端主机地址
+    host: 0.0.0.0
+    # 服务端接口地址 默认自动生成
+    url:
+    # 获取 IP 的请求头
+    ip-headers: X-Forwarded-For,X-Real-IP
     # 对外服务
     expose:
       # 暴露接口请求头
@@ -255,13 +266,6 @@ orion:
       secret-key: I66AndrKWrwXjtBL
       use-generator-key: true
       generator-key-length: 128
-  async:
-    # 线程池配置
-    executor:
-      core-pool-size: 2
-      max-pool-size: 4
-      queue-capacity: 30
-      keep-alive-seconds: 180
   operator-log:
     error-message-length: 255
     user-agent-length: 128

orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceFastjson.java

@@ -0,0 +1,67 @@
+package org.dromara.visor.launch;
+
+import cn.orionsec.kit.lang.define.StopWatch;
+import cn.orionsec.kit.lang.utils.io.FileReaders;
+import cn.orionsec.kit.lang.utils.io.FileWriters;
+import cn.orionsec.kit.lang.utils.io.Files1;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * 替换 fastjson 版本
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/12/23 10:21
+ */
+public class ReplaceFastjson {
+
+    private static final String PATH = new File("").getAbsolutePath();
+
+    public static void main(String[] args) {
+        StopWatch sw = StopWatch.begin();
+        // 扫描文件
+        List<File> files = Files1.listFilesFilter(PATH, file -> file.isFile()
+                && (file.getName().endsWith(".java") || file.getName().endsWith(".java.vm"))
+                && !file.getAbsolutePath().contains("generated-sources")
+                && !file.getAbsolutePath().contains("node_modules"), true, false);
+        sw.tag("   list");
+        // 添加头
+        files.forEach(ReplaceFastjson::replaceFastjson2ToFile);
+        sw.tag("replace");
+        sw.stop();
+        System.out.println();
+        System.out.println(sw);
+    }
+
+    /**
+     * 替换 license
+     *
+     * @param file file
+     */
+    private static void replaceFastjson2ToFile(File file) {
+        String path = file.getAbsolutePath().substring(PATH.length());
+        if (path.contains("ReplaceFastjson")) {
+            return;
+        }
+        try {
+            String line = FileReaders.readLine(file);
+            if (line == null) {
+                return;
+            }
+            // 替换文件内容
+            byte[] bytes = new String(FileReaders.readAllBytesFast(file))
+                    .replaceAll("com.alibaba.fastjson\\.", "com.alibaba.fastjson2.")
+                    .replaceAll("com.alibaba.fastjson2.JSONPath", "com.alibaba.fastjson.JSONPath")
+                    .getBytes(StandardCharsets.UTF_8);
+            // 写入
+            FileWriters.writeFast(file, bytes);
+            System.out.println("OK     " + path);
+        } catch (Exception e) {
+            System.err.println("Failed " + path);
+        }
+    }
+
+}

orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java

@@ -39,9 +39,9 @@ import java.util.function.Function;
  */
 public class ReplaceVersion {
 
-    private static final String TARGET_VERSION = "2.5.0";
+    private static final String TARGET_VERSION = "2.5.6";
 
-    private static final String REPLACE_VERSION = "2.5.1";
+    private static final String REPLACE_VERSION = "2.5.7";
 
     private static final String PATH = new File("").getAbsolutePath();
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostAgentApi.java

@@ -48,10 +48,10 @@ public interface HostAgentApi {
     /**
      * 获取缓存名称
      *
-     * @param agentKeyList agentKeyList
+     * @param agentKeys agentKeys
      * @return nameMap
      */
-    Map<String, String> getNameCacheByAgentKey(List<String> agentKeyList);
+    Map<String, String> getNameCacheByAgentKey(List<String> agentKeys);
 
     /**
      * 获取缓存名称

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.module.asset.enums;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import lombok.AllArgsConstructor;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO;

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml

@@ -88,6 +88,10 @@
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-job</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-spring-boot-starter-executor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-test</artifactId>
@@ -102,4 +106,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/HostAgentApiImpl.java

@@ -103,11 +103,11 @@ public class HostAgentApiImpl implements HostAgentApi {
     }
 
     @Override
-    public Map<String, String> getNameCacheByAgentKey(List<String> agentKeyList) {
+    public Map<String, String> getNameCacheByAgentKey(List<String> agentKeys) {
         Map<String, String> result = new HashMap<>();
         List<String> queryList = new ArrayList<>();
         // 查询缓存
-        for (String agentKey : agentKeyList) {
+        for (String agentKey : agentKeys) {
             HostBaseDTO host = AGENT_HOST_CACHE.get(agentKey);
             if (host != null) {
                 result.put(agentKey, host.getName());

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentController.java

@@ -45,6 +45,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 主机探针端点 api
@@ -90,9 +91,8 @@ public class HostAgentController {
     @PostMapping("/install")
     @Operation(summary = "安装主机探针")
     @PreAuthorize("@ss.hasPermission('asset:host:install-agent')")
-    public Boolean installAgent(@Validated @RequestBody HostAgentInstallRequest request) {
-        hostAgentService.installAgent(request);
-        return true;
+    public Map<String, Long> installAgent(@Validated @RequestBody HostAgentInstallRequest request) {
+        return hostAgentService.installAgent(request);
     }
 
     @DemoDisableApi

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentEndpointController.java

@@ -22,7 +22,7 @@
  */
 package org.dromara.visor.module.asset.controller;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java

@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
 import org.dromara.visor.framework.log.core.enums.IgnoreLogMode;
 import org.dromara.visor.framework.web.core.annotation.RestWrapper;
@@ -70,8 +70,8 @@ public class HostExtraController {
     @PutMapping("/update")
     @Operation(summary = "修改主机拓展信息")
     public Integer updateHostExtra(@Validated @RequestBody HostExtraUpdateRequest request) {
-        HostExtraItemEnum item = Valid.valid(HostExtraItemEnum::of, request.getItem());
-        Valid.isTrue(item.isUserExtra(), ErrorMessage.PARAM_ERROR);
+        HostExtraItemEnum item = Assert.valid(HostExtraItemEnum::of, request.getItem());
+        Assert.isTrue(item.isUserExtra(), ErrorMessage.PARAM_ERROR);
         return hostExtraService.updateHostExtra(request);
     }
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java

@@ -92,14 +92,14 @@ public interface HostDAO extends IMapper<HostDO> {
     /**
      * 更新探针信息
      *
-     * @param keys   agentKeyList
-     * @param update update
+     * @param agentKeys agentKeys
+     * @param update    update
      * @return effect
      */
-    default int updateByAgentKeys(List<String> keys, HostDO update) {
+    default int updateByAgentKeys(List<String> agentKeys, HostDO update) {
         update.setUpdateTime(new Date());
         // 更新
-        return this.update(update, Conditions.in(HostDO::getAgentKey, keys));
+        return this.update(update, Conditions.in(HostDO::getAgentKey, agentKeys));
     }
 
 }

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java

@@ -22,12 +22,9 @@
  */
 package org.dromara.visor.module.asset.define;
 
-import cn.orionsec.kit.lang.define.thread.ExecutorBuilder;
-import cn.orionsec.kit.lang.utils.Systems;
-import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.framework.executor.core.utils.ExecutorUtils;
 
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executor;
 
 /**
  * 执行线程池
@@ -41,13 +38,6 @@ public interface AssetThreadPools {
     /**
      * 批量执行主机命令线程池
      */
-    ThreadPoolExecutor AGENT_INSTALL = ExecutorBuilder.create()
-            .namedThreadFactory("agent-install-")
-            .corePoolSize(Systems.PROCESS_NUM)
-            .maxPoolSize(Systems.PROCESS_NUM)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new LinkedBlockingQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor AGENT_INSTALL = ExecutorUtils.getExecutor("agentInstallExecutor");
 
 }