Merge pull request #155 from dromara/dev

Dev

.env.example

@@ -6,6 +6,9 @@ SPRING_PROFILES_ACTIVE=prod
 DEMO_MODE=false
 
 API_CORS=true
+API_HOST=0.0.0.0
+# API_URL=http://127.0.0.1:9700/orion-visor/api
+API_IP_HEADERS=X-Forwarded-For,X-Real-IP
 API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
 SECRET_KEY=uQeacXV8b3isvKLK
 

.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:

docker-compose-testing.yaml

@@ -19,6 +19,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 +91,4 @@ services:
 
 networks:
   orion-visor-net:
-    driver: bridge
+    driver: bridge

docker-compose.yaml

@@ -1,6 +1,6 @@
 version: '3.3'
 
-# latest = 2.5.2
+# latest = 2.5.6
 
 # 支持以下源
 # lijiahangmax/*
@@ -27,10 +27,6 @@ services:
     privileged: true
     ports:
       - "9200:9200"
-    ulimits:
-      nofile:
-        soft: 65536
-        hard: 65536
     environment:
       SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-prod}
       MYSQL_HOST: ${MYSQL_HOST:-mysql}
@@ -53,10 +49,16 @@ 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}
+      API_HOST: ${API_HOST:-0.0.0.0}
       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" ]
@@ -178,4 +180,4 @@ services:
 
 networks:
   orion-visor-net:
-    driver: bridge
+    driver: bridge

docker/docker-build.sh

@@ -7,7 +7,7 @@ set -e
 source ./project-build.sh "$@"
 
 # 版本号
-version=2.5.2
+version=2.5.6
 # 是否推送镜像
 push_image=false
 # 是否构建 latest

docker/project-build.sh

@@ -4,7 +4,7 @@ set -e
 # DockerContext: orion-visor
 
 # 版本号
-version=2.5.2
+version=2.5.6
 # 是否构建 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.2";
+    String VERSION = "2.5.6";
 
     /**
      * 同 ${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,10 @@ public interface ErrorMessage {
 
     String PLEASE_SELECT_SUFFIX_FILE = "请选择 {} 类型的文件";
 
+    String SPEC_FORMAT_INCORRECT = "规格格式不正确";
+
+    String INFLUXDB_UNSUPPORTED = "InfluxDB 服务未开启";
+
     /**
      * 是否为业务异常
      *

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/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/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.2</revision>
+        <revision>2.5.6</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.4</orion.kit.version>
+        <orion.kit.version>2.0.5</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/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

@@ -31,8 +31,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializeFilter;
 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;
@@ -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));

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-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.fastjson.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-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm

@@ -32,6 +32,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
 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})
@@ -76,7 +77,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         log.info("${type}Service-create${type} id: {}, effect: {}", id, effect);
         #if($meta.enableCache)
         // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
+        RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
         #end
         return id;
     }
@@ -98,7 +99,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         log.info("${type}Service-update${type}ById effect: {}", effect);
         #if($meta.enableCache)
         // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
+        RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
         #end
         return effect;
     }
@@ -116,7 +117,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         log.info("${type}Service.update${type} effect: {}", effect);
         #if($meta.enableCache)
         // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
+        RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
         #end
         return effect;
     }
@@ -237,7 +238,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         log.info("${type}Service.delete${type} effect: {}", effect);
         #if($meta.enableCache)
         // 删除缓存
-        RedisMaps.delete(${type}CacheKeyDefine.${typeConst});
+        RedisUtils.delete(${type}CacheKeyDefine.${typeConst});
         #end
         return effect;
     }

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

@@ -135,8 +135,6 @@
       }
       handleClose();
       return true;
-    } catch (e) {
-      return false;
     } finally {
       setLoading(false);
     }

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

@@ -139,8 +139,6 @@
       }
       handleClose();
       return true;
-    } catch (e) {
-      return false;
     } finally {
       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/RedisMaps.java

@@ -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-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/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/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/ReplaceVersion.java

@@ -39,9 +39,9 @@ import java.util.function.Function;
  */
 public class ReplaceVersion {
 
-    private static final String TARGET_VERSION = "2.5.1";
+    private static final String TARGET_VERSION = "2.5.5";
 
-    private static final String REPLACE_VERSION = "2.5.2";
+    private static final String REPLACE_VERSION = "2.5.6";
 
     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-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/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");
 
 }

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostAgentStatusVO.java

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 主机探针状态 视图响应对象
@@ -61,4 +62,7 @@ public class HostAgentStatusVO implements Serializable {
     @Schema(description = "探针在线状态")
     private Integer agentOnlineStatus;
 
+    @Schema(description = "探针切换在线状态时间")
+    private Date agentOnlineChangeTime;
+
 }

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/LinuxAgentInstaller.java

@@ -23,6 +23,7 @@
 package org.dromara.visor.module.asset.handler.agent.intstall;
 
 import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.net.host.ssh.command.CommandExecutors;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.FileConst;
@@ -50,7 +51,7 @@ public class LinuxAgentInstaller extends AbstractAgentInstaller {
         sftpExecutor.write(agentHomePath + FileConst.CONFIG_YAML, this.replaceContent(params.getConfigFilePath()));
         log.info("写入配置文件成功");
         // 写入启动脚本
-        sftpExecutor.write(agentHomePath + startScriptName, this.replaceContent(params.getStartScriptPath()));
+        sftpExecutor.write(agentHomePath + startScriptName, Strings.replaceCRLF(this.replaceContent(params.getStartScriptPath())));
         log.info("写入启动脚本成功");
         // 上传探针文件
         sftpExecutor.uploadFile(agentHomePath + uploadAgentName, params.getAgentFilePath());

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java

@@ -51,6 +51,16 @@ public class HostSpecExtraModel implements GenericsDataModel {
      */
     private String sn;
 
+    /**
+     * 制造商
+     */
+    private String vendor;
+
+    /**
+     * 型号
+     */
+    private String model;
+
     /**
      * 系统名称
      */

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

@@ -212,25 +212,25 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
     /**
      * 标记在线状态
      *
-     * @param agentKeyList agentKeyList
-     * @param status       status
+     * @param agentKeys agentKeys
+     * @param status    status
      */
-    private void markOnlineStatus(List<String> agentKeyList, AgentOnlineStatusEnum status) {
-        if (Lists.isEmpty(agentKeyList)) {
+    private void markOnlineStatus(List<String> agentKeys, AgentOnlineStatusEnum status) {
+        if (Lists.isEmpty(agentKeys)) {
             return;
         }
-        log.info("HostAgentEndpointService mark {}. count: {}, keys: {}", status, agentKeyList.size(), agentKeyList);
+        log.info("HostAgentEndpointService mark {}. count: {}, keys: {}", status, agentKeys.size(), agentKeys);
         // 更新数据
         HostDO update = HostDO.builder()
                 .agentOnlineStatus(status.getValue())
                 .agentOnlineChangeTime(new Date())
                 .build();
-        int effect = hostDAO.updateByAgentKeys(agentKeyList, update);
+        int effect = hostDAO.updateByAgentKeys(agentKeys, update);
         // 更新缓存
-        agentKeyList.forEach(s -> ONLINE_STATUS_CACHE.put(s, status.getValue()));
+        agentKeys.forEach(s -> ONLINE_STATUS_CACHE.put(s, status.getValue()));
         log.info("HostAgentEndpointService mark {}. effect: {}", status, effect);
         // 插入日志
-        List<HostAgentLogDO> logList = hostDAO.selectIdByAgentKeys(agentKeyList)
+        List<HostAgentLogDO> logList = hostDAO.selectIdByAgentKeys(agentKeys)
                 .stream()
                 .map(s -> {
                     HostAgentLogDO agentLog = HostAgentLogDO.builder()
@@ -250,7 +250,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
         }
         // 发送已下线事件
         if (AgentOnlineStatusEnum.OFFLINE.equals(status)) {
-            SpringHolder.publishEvent(new AgentOfflineEvent(agentKeyList));
+            SpringHolder.publishEvent(new AgentOfflineEvent(agentKeys));
         }
     }
 

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

@@ -31,7 +31,6 @@ import cn.orionsec.kit.lang.utils.io.FileReaders;
 import cn.orionsec.kit.lang.utils.io.Files1;
 import cn.orionsec.kit.lang.utils.io.compress.CompressTypeEnum;
 import cn.orionsec.kit.lang.utils.io.compress.FileDecompressor;
-import cn.orionsec.kit.lang.utils.net.IPs;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
@@ -41,6 +40,8 @@ import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.PathUtils;
 import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
 import org.dromara.visor.framework.redis.core.utils.RedisStrings;
+import org.dromara.visor.framework.web.configuration.config.ExposeApiConfig;
+import org.dromara.visor.framework.web.configuration.config.OrionApiConfig;
 import org.dromara.visor.module.asset.convert.HostConvert;
 import org.dromara.visor.module.asset.dao.HostAgentLogDAO;
 import org.dromara.visor.module.asset.dao.HostDAO;
@@ -53,7 +54,6 @@ import org.dromara.visor.module.asset.enums.*;
 import org.dromara.visor.module.asset.handler.agent.intstall.AgentInstaller;
 import org.dromara.visor.module.asset.handler.agent.model.AgentInstallParams;
 import org.dromara.visor.module.asset.service.HostAgentService;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -77,8 +77,11 @@ public class HostAgentServiceImpl implements HostAgentService {
 
     private String localVersion;
 
-    @Value("${orion.api.expose.token}")
-    private String exposeToken;
+    @Resource
+    private OrionApiConfig orionApiConfig;
+
+    @Resource
+    private ExposeApiConfig exposeApiConfig;
 
     @Resource
     private HostDAO hostDAO;
@@ -119,7 +122,8 @@ public class HostAgentServiceImpl implements HostAgentService {
                 .select(HostDO::getId,
                         HostDO::getAgentVersion,
                         HostDO::getAgentInstallStatus,
-                        HostDO::getAgentOnlineStatus)
+                        HostDO::getAgentOnlineStatus,
+                        HostDO::getAgentOnlineChangeTime)
                 .in(HostDO::getId, idList)
                 .then()
                 .stream()
@@ -301,8 +305,8 @@ public class HostAgentServiceImpl implements HostAgentService {
      */
     private Map<String, String> getReplaceVars() {
         Map<String, String> map = new HashMap<>();
-        map.put("SERVER_HOST", IPs.IP);
-        map.put("SERVER_TOKEN", exposeToken);
+        map.put("SERVER_URL", orionApiConfig.getUrl());
+        map.put("SERVER_TOKEN", exposeApiConfig.getToken());
         return map;
     }
 

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

@@ -22,10 +22,13 @@
  */
 package org.dromara.visor.module.asset.service.impl;
 
+import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Lists;
+import cn.orionsec.kit.lang.utils.collect.Maps;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.handler.data.model.GenericsDataModel;
@@ -44,6 +47,7 @@ import org.dromara.visor.module.infra.enums.DataExtraTypeEnum;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -55,6 +59,7 @@ import java.util.stream.Collectors;
  * @version 1.0.0
  * @since 2023/12/20 12:11
  */
+@Slf4j
 @Service
 public class HostExtraServiceImpl implements HostExtraService {
 
@@ -156,40 +161,57 @@ public class HostExtraServiceImpl implements HostExtraService {
 
     @Override
     public void syncHostSpec(String key, String taskId, JSONObject spec) {
-        try {
-            // 查询主机id
-            Long id = hostDAO.selectIdByAgentKey(key);
-            Assert.notNull(id, ErrorMessage.HOST_ABSENT);
-            // 设置已同步标识
-            spec.put(Const.SYNCED, true);
-            // 查询配置信息
-            String newSpec;
-            HostSpecExtraModel beforeSpec = this.getHostSpecMap(Lists.singleton(id)).get(id);
-            if (beforeSpec == null) {
-                // 新增
-                newSpec = spec.toString();
-            } else {
-                // 合并
-                JSONObject beforeSpecValue = JSON.parseObject(beforeSpec.serial());
-                spec.forEach((k, v) -> {
-                    if (v != null) {
-                        beforeSpecValue.put(k, v);
+        // 查询主机id
+        Long id = hostDAO.selectIdByAgentKey(key);
+        Assert.notNull(id, ErrorMessage.HOST_ABSENT);
+        // 设置已同步标识
+        spec.put(Const.SYNCED, true);
+        // 查询配置信息
+        String newSpec;
+        HostSpecExtraModel beforeSpec = this.getHostSpecMap(Lists.singleton(id)).get(id);
+        if (beforeSpec == null) {
+            // 新增
+            newSpec = spec.toString();
+        } else {
+            // 合并
+            JSONObject beforeSpecValue = JSON.parseObject(beforeSpec.serial());
+            spec.forEach((k, v) -> {
+                // 获取原数据
+                Object beforeValue = beforeSpecValue.get(k);
+                // 检查是否存在
+                boolean present = false;
+                if (beforeValue != null) {
+                    if (beforeValue instanceof String) {
+                        present = !Strings.isBlank((String) beforeValue);
+                    } else if (beforeValue instanceof Collection) {
+                        present = !Lists.isEmpty((Collection<?>) beforeValue);
+                    } else if (beforeValue instanceof Map) {
+                        present = !Maps.isEmpty((Map<?, ?>) beforeValue);
+                    } else {
+                        present = true;
                     }
-                });
-                newSpec = beforeSpecValue.toJSONString();
-            }
-            // 修改规格
-            DataExtraSetDTO update = new DataExtraSetDTO();
-            update.setUserId(Const.SYSTEM_USER_ID);
-            update.setRelId(id);
-            update.setItem(HostExtraItemEnum.SPEC.name());
-            update.setValue(newSpec);
-            dataExtraApi.setExtraItem(update, DataExtraTypeEnum.HOST);
-            // 回调成功
-        } catch (Exception e) {
-            // 回调失败
-            throw e;
+                }
+                // 不存在则覆盖
+                if (!present && v != null) {
+                    beforeSpecValue.put(k, v);
+                }
+            });
+            newSpec = beforeSpecValue.toJSONString();
         }
+        // 检查是否能反解析 防止格式错误导致其他地方报错
+        try {
+            JSON.parseObject(newSpec, HostSpecExtraModel.class);
+        } catch (Exception e) {
+            log.error("HostExtraService-setHostSpec error: {}, spec: {}", e.getMessage(), newSpec, e);
+            throw Exceptions.app(ErrorMessage.SPEC_FORMAT_INCORRECT, e);
+        }
+        // 修改规格
+        DataExtraSetDTO update = new DataExtraSetDTO();
+        update.setUserId(Const.SYSTEM_USER_ID);
+        update.setRelId(id);
+        update.setItem(HostExtraItemEnum.SPEC.name());
+        update.setValue(newSpec);
+        dataExtraApi.setExtraItem(update, DataExtraTypeEnum.HOST);
     }
 
     /**

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

@@ -110,7 +110,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
         int effect = hostIdentityDAO.insert(record);
         log.info("HostIdentityService-createHostIdentity effect: {}", effect);
         // 删除缓存
-        RedisMaps.delete(HostCacheKeyDefine.HOST_IDENTITY);
+        RedisUtils.delete(HostCacheKeyDefine.HOST_IDENTITY);
         return record.getId();
     }
 
@@ -143,7 +143,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
         int effect = hostIdentityDAO.update(updateRecord, wrapper);
         log.info("HostIdentityService-updateHostIdentityById effect: {}", effect);
         // 删除缓存
-        RedisMaps.delete(HostCacheKeyDefine.HOST_IDENTITY);
+        RedisUtils.delete(HostCacheKeyDefine.HOST_IDENTITY);
         return effect;
     }
 
@@ -258,7 +258,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
                 .eq(HostIdentityDO::getName, domain.getName());
         // 检查是否存在
         boolean present = hostIdentityDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

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

@@ -104,7 +104,7 @@ public class HostKeyServiceImpl implements HostKeyService {
         log.info("HostKeyService-createHostKey effect: {}", effect);
         Long id = record.getId();
         // 删除缓存
-        RedisMaps.delete(HostCacheKeyDefine.HOST_KEY);
+        RedisUtils.delete(HostCacheKeyDefine.HOST_KEY);
         return id;
     }
 
@@ -128,7 +128,7 @@ public class HostKeyServiceImpl implements HostKeyService {
         int effect = hostKeyDAO.updateById(updateRecord);
         // 删除缓存
         if (!record.getName().equals(updateRecord.getName())) {
-            RedisMaps.delete(HostCacheKeyDefine.HOST_KEY);
+            RedisUtils.delete(HostCacheKeyDefine.HOST_KEY);
         }
         log.info("HostKeyService-updateHostKeyById effect: {}", effect);
         return effect;
@@ -242,7 +242,7 @@ public class HostKeyServiceImpl implements HostKeyService {
                 .eq(HostKeyDO::getName, domain.getName());
         // 检查是否存在
         boolean present = hostKeyDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

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

@@ -39,6 +39,7 @@ import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
 import org.dromara.visor.framework.mybatis.core.query.DataQuery;
 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;
 import org.dromara.visor.module.asset.convert.HostConvert;
 import org.dromara.visor.module.asset.dao.HostConfigDAO;
@@ -376,7 +377,7 @@ public class HostServiceImpl implements HostService {
 
     @Override
     public void clearCache() {
-        RedisMaps.scanKeysDelete(HostCacheKeyDefine.HOST_INFO.format("*"));
+        RedisUtils.scanKeysDelete(HostCacheKeyDefine.HOST_INFO.format("*"));
     }
 
     /**

orion-visor-modules/orion-visor-module-common/src/main/java/org/dromara/visor/module/common/config/AppLogConfig.java

@@ -50,12 +50,12 @@ public class AppLogConfig {
     /**
      * 是否生成详细的执行日志
      */
-    private final ConfigRef<Boolean> execDetailLog;
+    private final ConfigRef<Boolean> execDetailEnabled;
 
     public AppLogConfig(ConfigStore configStore) {
         this.trackerLoadLines = configStore.int32(ConfigKeys.LOG_TRACKER_LOAD_LINES);
         this.trackerLoadInterval = configStore.int32(ConfigKeys.LOG_TRACKER_LOAD_INTERVAL);
-        this.execDetailLog = configStore.bool(ConfigKeys.LOG_EXEC_DETAIL_LOG);
+        this.execDetailEnabled = configStore.bool(ConfigKeys.LOG_EXEC_DETAIL_ENABLED);
     }
 
     public Integer getTrackerLoadLines() {
@@ -66,8 +66,8 @@ public class AppLogConfig {
         return trackerLoadInterval.value;
     }
 
-    public Boolean getExecDetailLog() {
-        return execDetailLog.value;
+    public Boolean getExecDetailEnabled() {
+        return execDetailEnabled.value;
     }
 
 }

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

@@ -87,10 +87,14 @@
             <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>
         </dependency>
     </dependencies>
 
-</project>
+</project>

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/define/ExecThreadPools.java

@@ -22,11 +22,9 @@
  */
 package org.dromara.visor.module.exec.define;
 
-import cn.orionsec.kit.lang.define.thread.ExecutorBuilder;
-import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.framework.executor.core.utils.ExecutorUtils;
 
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executor;
 
 /**
  * 执行线程池
@@ -40,73 +38,31 @@ public interface ExecThreadPools {
     /**
      * 超时检查线程池
      */
-    ThreadPoolExecutor TIMEOUT_CHECK = ExecutorBuilder.create()
-            .namedThreadFactory("timeout-check-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor TIMEOUT_CHECK = ExecutorUtils.getExecutor("execTimeoutCheckExecutor");
 
     /**
      * 批量执行任务线程池
      */
-    ThreadPoolExecutor EXEC_TASK = ExecutorBuilder.create()
-            .namedThreadFactory("exec-task-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor EXEC_TASK = ExecutorUtils.getExecutor("execTaskExecutor");
 
     /**
      * 批量执行主机命令线程池
      */
-    ThreadPoolExecutor EXEC_HOST = ExecutorBuilder.create()
-            .namedThreadFactory("exec-host-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor EXEC_HOST = ExecutorUtils.getExecutor("execHostCommandExecutor");
 
     /**
      * 批量执行日志查看线程池
      */
-    ThreadPoolExecutor EXEC_LOG = ExecutorBuilder.create()
-            .namedThreadFactory("exec-log-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor EXEC_LOG = ExecutorUtils.getExecutor("execLogViewExecutor");
 
     /**
      * 批量上传任务线程池
      */
-    ThreadPoolExecutor UPLOAD_TASK = ExecutorBuilder.create()
-            .namedThreadFactory("upload-task-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor UPLOAD_TASK = ExecutorUtils.getExecutor("uploadTaskExecutor");
 
     /**
      * 批量上传主机线程池
      */
-    ThreadPoolExecutor UPLOAD_HOST = ExecutorBuilder.create()
-            .namedThreadFactory("upload-host-")
-            .corePoolSize(1)
-            .maxPoolSize(Integer.MAX_VALUE)
-            .keepAliveTime(Const.MS_S_60)
-            .workQueue(new SynchronousQueue<>())
-            .allowCoreThreadTimeout(true)
-            .build();
+    Executor UPLOAD_HOST = ExecutorUtils.getExecutor("uploadHostExecutor");
 
 }

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/ExecTaskHandler.java

@@ -193,7 +193,7 @@ public class ExecTaskHandler implements IExecTaskHandler {
      * @return handler
      */
     private IExecCommandHandler createCommandHandler(Long execHostId) {
-        if (Booleans.isTrue(appLogConfig.getExecDetailLog())) {
+        if (Booleans.isTrue(appLogConfig.getExecDetailEnabled())) {
             // 详细日志
             return new ExecCommandDetailHandler(execHostId, execLog, builtParams, timeoutChecker);
         } else {

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java

@@ -408,7 +408,7 @@ public class ExecJobServiceImpl implements ExecJobService {
                 .eq(ExecJobDO::getName, domain.getName());
         // 检查是否存在
         boolean present = execJobDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java

@@ -208,7 +208,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
                 .eq(ExecTemplateDO::getName, domain.getName());
         // 检查是否存在
         boolean present = execTemplateDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java

@@ -25,6 +25,7 @@ package org.dromara.visor.module.infra.api.impl;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.utils.Assert;
+import org.dromara.visor.common.utils.Requests;
 import org.dromara.visor.module.infra.api.AuthenticationApi;
 import org.dromara.visor.module.infra.entity.domain.SystemUserDO;
 import org.dromara.visor.module.infra.entity.dto.user.SystemUserAuthDTO;
@@ -57,7 +58,11 @@ public class AuthenticationApiImpl implements AuthenticationApi {
             result.setUsername(user.getUsername());
             result.setNickname(user.getNickname());
             // 检查用户密码
-            boolean passRight = authenticationService.checkUserPassword(user, password, addFailedCount);
+            boolean passRight = authenticationService.checkUserPassword(user, password);
+            if (!passRight && addFailedCount) {
+                // 发送站内信
+                authenticationService.addLoginFailedCount(user.getUsername(), Requests.getIdentity());
+            }
             result.setPassRight(passRight);
             Assert.isTrue(passRight, ErrorMessage.USERNAME_PASSWORD_ERROR);
             // 检查用户状态

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java

@@ -63,9 +63,8 @@ public class AuthenticationController {
     @PermitAll
     @Operation(summary = "登录")
     @PostMapping("/login")
-    public UserLoginVO login(@Validated @RequestBody UserLoginRequest request,
-                             HttpServletRequest servletRequest) {
-        return authenticationService.login(request, servletRequest);
+    public UserLoginVO login(@Validated @RequestBody UserLoginRequest request) {
+        return authenticationService.login(request);
     }
 
     @OperatorLog(AuthenticationOperatorType.LOGOUT)

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java

@@ -38,6 +38,7 @@ import org.dromara.visor.module.infra.define.operator.SystemUserOperatorType;
 import org.dromara.visor.module.infra.entity.request.user.*;
 import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO;
 import org.dromara.visor.module.infra.entity.vo.SystemUserVO;
+import org.dromara.visor.module.infra.entity.vo.UserLockedVO;
 import org.dromara.visor.module.infra.entity.vo.UserSessionVO;
 import org.dromara.visor.module.infra.service.OperatorLogService;
 import org.dromara.visor.module.infra.service.SystemUserManagementService;
@@ -190,7 +191,33 @@ public class SystemUserController {
     }
 
     @IgnoreLog(IgnoreLogMode.RET)
-    @GetMapping("/session/list")
+    @GetMapping("/locked/list")
+    @Operation(summary = "获取锁定的用户列表")
+    @PreAuthorize("@ss.hasPermission('infra:system-user:query-lock')")
+    public List<UserLockedVO> getLockedUserList() {
+        return systemUserManagementService.getLockedUserList();
+    }
+
+    @OperatorLog(SystemUserOperatorType.UNLOCK)
+    @IgnoreLog(IgnoreLogMode.RET)
+    @PutMapping("/locked/unlock")
+    @Operation(summary = "解锁用户")
+    @PreAuthorize("@ss.hasPermission('infra:system-user:management:unlock')")
+    public Boolean unlockLockedUser(@RequestBody UserUnlockRequest request) {
+        systemUserManagementService.unlockLockedUser(request);
+        return true;
+    }
+
+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/session/users/list")
+    @Operation(summary = "获取全部用户会话列表")
+    @PreAuthorize("@ss.hasPermission('infra:system-user:query-session')")
+    public List<UserSessionVO> getUsersSessionList() {
+        return systemUserManagementService.getUsersSessionList();
+    }
+
+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/session/user/list")
     @Operation(summary = "获取用户会话列表")
     @PreAuthorize("@ss.hasPermission('infra:system-user:query-session')")
     public List<UserSessionVO> getUserSessionList(@RequestParam("id") Long id) {

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java

@@ -22,16 +22,24 @@
  */
 package org.dromara.visor.module.infra.controller;
 
+import cn.orionsec.kit.lang.define.wrapper.DataGrid;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.validator.group.Page;
+import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog;
 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.DemoDisableApi;
 import org.dromara.visor.framework.web.core.annotation.RestWrapper;
+import org.dromara.visor.module.infra.define.operator.TagOperatorType;
 import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest;
+import org.dromara.visor.module.infra.entity.request.tag.TagQueryRequest;
+import org.dromara.visor.module.infra.entity.request.tag.TagUpdateRequest;
 import org.dromara.visor.module.infra.entity.vo.TagVO;
 import org.dromara.visor.module.infra.service.TagService;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,13 +47,13 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * 标签枚举 api
+ * 数据标签 api
  *
  * @author Jiahang Li
  * @version 1.0.0
  * @since 2023-9-5 11:58
  */
-@Tag(name = "infra - 标签枚举服务")
+@Tag(name = "infra - 数据标签服务")
 @Slf4j
 @Validated
 @RestWrapper
@@ -56,12 +64,32 @@ public class TagController {
     @Resource
     private TagService tagService;
 
+    @DemoDisableApi
+    @OperatorLog(TagOperatorType.CREATE)
     @PostMapping("/create")
     @Operation(summary = "创建标签")
+    @PreAuthorize("@ss.hasPermission('infra:tag:create')")
     public Long createTag(@Validated @RequestBody TagCreateRequest request) {
         return tagService.createTag(request);
     }
 
+    @DemoDisableApi
+    @OperatorLog(TagOperatorType.UPDATE)
+    @PutMapping("/update")
+    @Operation(summary = "修改标签")
+    @PreAuthorize("@ss.hasPermission('infra:tag:update')")
+    public Integer updateTag(@Validated @RequestBody TagUpdateRequest request) {
+        return tagService.updateTag(request);
+    }
+
+    @IgnoreLog(IgnoreLogMode.RET)
+    @PostMapping("/query")
+    @Operation(summary = "分页查询标签")
+    @PreAuthorize("@ss.hasPermission('infra:tag:query')")
+    public DataGrid<TagVO> getTagPage(@Validated(Page.class) @RequestBody TagQueryRequest request) {
+        return tagService.getTagPage(request);
+    }
+
     @IgnoreLog(IgnoreLogMode.RET)
     @GetMapping("/list")
     @Operation(summary = "查询标签")
@@ -70,12 +98,14 @@ public class TagController {
         return tagService.getTagList(type);
     }
 
+    @DemoDisableApi
+    @OperatorLog(TagOperatorType.DELETE)
     @DeleteMapping("/delete")
     @Operation(summary = "通过 id 删除标签")
     @Parameter(name = "id", description = "id", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:tag:delete')")
     public Integer deleteTag(@RequestParam("id") Long id) {
         return tagService.deleteTagById(id);
     }
 
 }
-

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java

@@ -22,12 +22,14 @@
  */
 package org.dromara.visor.module.infra.convert;
 
+import org.dromara.visor.common.mapstruct.DateConversion;
 import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
 import org.dromara.visor.module.infra.entity.domain.OperatorLogDO;
 import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest;
 import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO;
 import org.dromara.visor.module.infra.entity.vo.OperatorLogVO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 /**
@@ -37,11 +39,12 @@ import org.mapstruct.factory.Mappers;
  * @version 1.0.0
  * @since 2023-10-10 17:08
  */
-@Mapper
+@Mapper(uses = DateConversion.class)
 public interface OperatorLogConvert {
 
     OperatorLogConvert MAPPER = Mappers.getMapper(OperatorLogConvert.class);
 
+    @Mapping(source = "timestamp", target = "createTime")
     OperatorLogDO to(OperatorLogModel model);
 
     OperatorLogDO to(OperatorLogQueryRequest request);

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java

@@ -26,6 +26,7 @@ import org.dromara.visor.module.infra.entity.domain.TagDO;
 import org.dromara.visor.module.infra.entity.dto.TagCacheDTO;
 import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest;
 import org.dromara.visor.module.infra.entity.request.tag.TagQueryRequest;
+import org.dromara.visor.module.infra.entity.request.tag.TagUpdateRequest;
 import org.dromara.visor.module.infra.entity.vo.TagVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -33,7 +34,7 @@ import org.mapstruct.factory.Mappers;
 import java.util.List;
 
 /**
- * 标签枚举 内部对象转换器
+ * 数据标签 内部对象转换器
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -46,6 +47,8 @@ public interface TagConvert {
 
     TagDO to(TagCreateRequest request);
 
+    TagDO to(TagUpdateRequest request);
+
     TagDO to(TagQueryRequest request);
 
     TagVO to(TagDO domain);

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java

@@ -30,7 +30,7 @@ import org.mapstruct.factory.Mappers;
 import java.util.List;
 
 /**
- * 标签枚举 对外对象转换器
+ * 数据标签 对外对象转换器
  *
  * @author Jiahang Li
  * @version 1.0.0

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java

@@ -45,20 +45,27 @@ public interface DataGroupDAO extends IMapper<DataGroupDO> {
      *
      * @param parentId parentId
      * @param type     type
+     * @param userId   userId
      * @return max(sort)
      */
-    Integer selectMaxSort(@Param("parentId") Long parentId, @Param("type") String type);
+    Integer selectMaxSort(@Param("parentId") Long parentId,
+                          @Param("type") String type,
+                          @Param("userId") Long userId);
 
     /**
      * 修改排序
      *
      * @param parentId  parentId
+     * @param type      type
+     * @param userId    userId
      * @param condition 条件
      * @param referSort 对比值
      * @param addition  自增步长
      * @return effect
      */
     Integer updateSort(@Param("parentId") Long parentId,
+                       @Param("type") String type,
+                       @Param("userId") Long userId,
                        @Param("condition") String condition,
                        @Param("referSort") Integer referSort,
                        @Param("addition") Integer addition);

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java

@@ -30,7 +30,7 @@ import org.dromara.visor.module.infra.entity.domain.TagDO;
 import java.util.List;
 
 /**
- * 标签枚举 Mapper 接口
+ * 数据标签 Mapper 接口
  *
  * @author Jiahang Li
  * @version 1.0.0

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java

@@ -24,8 +24,10 @@ package org.dromara.visor.module.infra.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.visor.framework.mybatis.core.mapper.IMapper;
 import org.dromara.visor.module.infra.entity.domain.TagRelDO;
+import org.dromara.visor.module.infra.entity.po.TagRelCountPO;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -72,4 +74,12 @@ public interface TagRelDAO extends IMapper<TagRelDO> {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 查询标签引用数量
+     *
+     * @param tagIdList tagIdList
+     * @return count
+     */
+    List<TagRelCountPO> selectTagRelCount(@Param("tagIdList") List<Long> tagIdList);
+
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java

@@ -26,6 +26,7 @@ import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder;
 import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine;
 import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct;
 import org.dromara.visor.common.security.LoginUser;
+import org.dromara.visor.module.infra.entity.dto.LoginFailedDTO;
 import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO;
 import org.dromara.visor.module.infra.entity.dto.UserInfoDTO;
 
@@ -56,11 +57,13 @@ public interface UserCacheKeyDefine {
             .timeout(8, TimeUnit.HOURS)
             .build();
 
-    CacheKeyDefine LOGIN_FAILED_COUNT = new CacheKeyBuilder()
-            .key("user:login-failed:{}")
-            .desc("用户登录失败次数 ${username}")
-            .type(Integer.class)
+    CacheKeyDefine LOGIN_FAILED = new CacheKeyBuilder()
+            .key("user:login-failed-info:{}")
+            .desc("用户登录失败信息 ${username}")
+            .noPrefix()
+            .type(LoginFailedDTO.class)
             .struct(RedisCacheStruct.STRING)
+            .timeout(24 * 60, TimeUnit.MINUTES)
             .build();
 
     CacheKeyDefine LOGIN_TOKEN = new CacheKeyBuilder()

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java

@@ -50,6 +50,8 @@ public class SystemUserOperatorType extends InitializingOperatorTypes {
 
     public static final String DELETE = "system-user:delete";
 
+    public static final String UNLOCK = "system-user:unlock";
+
     public static final String OFFLINE = "system-user:offline";
 
     @Override
@@ -61,6 +63,7 @@ public class SystemUserOperatorType extends InitializingOperatorTypes {
                 new OperatorType(M, GRANT_ROLE, "分配用户角色 <sb>${username}</sb>"),
                 new OperatorType(H, RESET_PASSWORD, "重置用户密码 <sb>${username}</sb>"),
                 new OperatorType(H, DELETE, "删除用户 <sb>${username}</sb>"),
+                new OperatorType(M, UNLOCK, "解锁用户 <sb>${username}</sb>"),
                 new OperatorType(M, OFFLINE, "下线用户会话 <sb>${username}</sb>"),
         };
     }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/TagOperatorType.java

@@ -0,0 +1,57 @@
+/*
+ * 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.module.infra.define.operator;
+
+import org.dromara.visor.framework.biz.operator.log.core.annotation.Module;
+import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes;
+import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
+
+import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L;
+import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M;
+
+/**
+ * 数据标签 操作日志类型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/10/10 17:30
+ */
+@Module("infra:tag")
+public class TagOperatorType extends InitializingOperatorTypes {
+
+    public static final String CREATE = "tag:create";
+
+    public static final String UPDATE = "tag:update";
+
+    public static final String DELETE = "tag:delete";
+
+    @Override
+    public OperatorType[] types() {
+        return new OperatorType[]{
+                new OperatorType(L, CREATE, "创建数据标签 <sb>${name}</sb>"),
+                new OperatorType(L, UPDATE, "修改数据标签 <sb>${name}</sb>"),
+                new OperatorType(M, DELETE, "删除数据标签 <sb>${name}</sb>"),
+        };
+    }
+
+}

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java

@@ -33,7 +33,7 @@ import lombok.experimental.SuperBuilder;
 import org.dromara.visor.framework.mybatis.core.domain.BaseDO;
 
 /**
- * 标签枚举 实体对象
+ * 数据标签 实体对象
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -45,7 +45,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "tag", autoResultMap = true)
-@Schema(name = "TagDO", description = "标签枚举 实体对象")
+@Schema(name = "TagDO", description = "数据标签 实体对象")
 public class TagDO extends BaseDO {
 
     private static final long serialVersionUID = 1L;

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginFailedDTO.java

@@ -23,40 +23,42 @@
 package org.dromara.visor.module.infra.entity.dto;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.dromara.visor.common.entity.RequestIdentity;
+import org.dromara.visor.common.entity.RequestIdentityModel;
 
 /**
- * 身份信息
+ * 登录失败信息
  *
  * @author Jiahang Li
  * @version 1.0.0
- * @since 2023/11/1 1:01
+ * @since 2025/10/8 15:44
  */
 @Data
-@NoArgsConstructor
+@Builder
 @AllArgsConstructor
-public class LoginTokenIdentityDTO implements RequestIdentity {
+@NoArgsConstructor
+public class LoginFailedDTO {
 
     /**
-     * 原始登录时间
+     * 用户名
      */
-    private Long loginTime;
+    private String username;
 
     /**
-     * 当前设备登录地址
+     * 失败次数
      */
-    private String address;
+    private Integer failedCount;
 
     /**
-     * 当前设备登录地址
+     * 失效时间
      */
-    private String location;
+    private Long expireTime;
 
     /**
-     * 当前设备 userAgent
+     * 原始登录留痕信息
      */
-    private String userAgent;
+    private RequestIdentityModel origin;
 
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java

@@ -26,7 +26,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum;
+import org.dromara.visor.common.entity.RequestIdentityModel;
 
 /**
  * 登录 token 缓存
@@ -42,14 +42,19 @@ import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum;
 public class LoginTokenDTO {
 
     /**
-     * 用户id
+     * userId
      */
     private Long id;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
     /**
      * token 状态
      *
-     * @see LoginTokenStatusEnum
+     * @see org.dromara.visor.module.infra.enums.LoginTokenStatusEnum
      */
     private Integer status;
 
@@ -59,13 +64,13 @@ public class LoginTokenDTO {
     private Integer refreshCount;
 
     /**
-     * 原始登录身份
+     * 原始登录留痕信息
      */
-    private LoginTokenIdentityDTO origin;
+    private RequestIdentityModel origin;
 
     /**
-     * 覆盖登录身份
+     * 覆盖登录刘海信息
      */
-    private LoginTokenIdentityDTO override;
+    private RequestIdentityModel override;
 
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/TagRelCountPO.java

@@ -20,40 +20,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dromara.visor.module.monitor.engine;
+package org.dromara.visor.module.infra.entity.po;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
- * 告警触发状态 - 轻量级缓存对象
- * 用于减少内存占用，只保存必要的触发状态信息
+ * 标签关联数量
  *
  * @author Jiahang Li
  * @version 1.0.0
- * @since 2024/6/3 18:00
+ * @since 2024/12/23 16:24
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AlarmTriggerState {
+@Schema(name = "TagRelCountPO", description = "标签关联数量")
+public class TagRelCountPO implements Serializable {
 
-    /**
-     * 时间戳
-     */
-    private Long timestamp;
+    private static final long serialVersionUID = 1L;
 
-    /**
-     * 是否触发告警
-     */
-    private Boolean triggered;
+    @Schema(description = "tagId")
+    private Long tagId;
 
-    /**
-     * 规则键
-     */
-    private String ruleKey;
+    @Schema(description = "数量")
+    private Integer count;
 
-}
+}

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java

@@ -33,7 +33,7 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- * 标签枚举 创建请求对象
+ * 数据标签 创建请求对象
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -43,17 +43,17 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(name = "TagCreateRequest", description = "标签枚举 创建请求对象")
+@Schema(name = "TagCreateRequest", description = "数据标签 创建请求对象")
 public class TagCreateRequest implements Serializable {
 
-    @NotBlank
-    @Size(max = 32)
-    @Schema(description = "标签名称")
-    private String name;
-
     @NotBlank
     @Size(max = 12)
     @Schema(description = "标签类型")
     private String type;
 
+    @NotBlank
+    @Size(max = 32)
+    @Schema(description = "标签名称")
+    private String name;
+
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java

@@ -29,7 +29,7 @@ import org.dromara.visor.common.entity.BaseQueryRequest;
 import javax.validation.constraints.Size;
 
 /**
- * 标签枚举 查询请求对象
+ * 数据标签 查询请求对象
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -40,11 +40,15 @@ import javax.validation.constraints.Size;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Schema(name = "TagQueryRequest", description = "标签枚举 查询请求对象")
+@Schema(name = "TagQueryRequest", description = "数据标签 查询请求对象")
 public class TagQueryRequest extends BaseQueryRequest {
 
     @Size(max = 12)
     @Schema(description = "标签类型")
     private String type;
 
+    @Size(max = 32)
+    @Schema(description = "标签名称")
+    private String name;
+
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java

@@ -64,4 +64,7 @@ public class TagRelQueryRequest extends BaseQueryRequest {
     @Schema(description = "关联id")
     private Collection<Long> relIdList;
 
+    @Schema(description = "tagId")
+    private Collection<Long> tagIdList;
+
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java

@@ -34,7 +34,7 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- * 标签枚举 更新请求对象
+ * 数据标签 更新请求对象
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -44,7 +44,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(name = "TagUpdateRequest", description = "标签枚举 更新请求对象")
+@Schema(name = "TagUpdateRequest", description = "数据标签 更新请求对象")
 public class TagUpdateRequest implements Serializable {
 
     @NotNull
@@ -56,9 +56,4 @@ public class TagUpdateRequest implements Serializable {
     @Schema(description = "标签名称")
     private String name;
 
-    @NotBlank
-    @Size(max = 12)
-    @Schema(description = "标签类型")
-    private String type;
-
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUnlockRequest.java

@@ -0,0 +1,45 @@
+/*
+ * 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.module.infra.entity.request.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 用户解锁请求
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/7/17 12:19
+ */
+@Data
+@Schema(name = "UserUnlockRequest", description = "用户解锁请求")
+public class UserUnlockRequest {
+
+    @NotBlank
+    @Schema(description = "用户名")
+    private String username;
+
+}

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java

@@ -29,9 +29,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
- * 标签枚举 视图响应对象
+ * 数据标签 视图响应对象
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -41,7 +42,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(name = "TagVO", description = "标签枚举 视图响应对象")
+@Schema(name = "TagVO", description = "数据标签 视图响应对象")
 public class TagVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -49,7 +50,25 @@ public class TagVO implements Serializable {
     @Schema(description = "id")
     private Long id;
 
+    @Schema(description = "标签类型")
+    private String type;
+
     @Schema(description = "标签名称")
     private String name;
 
+    @Schema(description = "关联数量")
+    private Integer relCount;
+
+    @Schema(description = "创建时间")
+    private Date createTime;
+
+    @Schema(description = "修改时间")
+    private Date updateTime;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "修改人")
+    private String updater;
+
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLockedVO.java

@@ -0,0 +1,68 @@
+/*
+ * 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.module.infra.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户锁定 响应对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023-7-13 18:42
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "UserLockedVO", description = "用户锁定 响应对象")
+public class UserLockedVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "用户名")
+    private String username;
+
+    @Schema(description = "失效时间")
+    private Long expireTime;
+
+    @Schema(description = "请求ip")
+    private String address;
+
+    @Schema(description = "请求地址")
+    private String location;
+
+    @Schema(description = "userAgent")
+    private String userAgent;
+
+    @Schema(description = "登录时间")
+    private Date loginTime;
+
+}

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java

@@ -47,6 +47,12 @@ public class UserSessionVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Schema(description = "id")
+    private Long id;
+
+    @Schema(description = "用户名")
+    private String username;
+
     @Schema(description = "是否为当前会话")
     private Boolean current;
 

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java

@@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.utils.time.Dates;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.dromara.visor.common.constant.ErrorCode;
+import org.dromara.visor.common.entity.RequestIdentityModel;
 import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO;
-import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO;
 
 import java.util.Date;
 
@@ -53,9 +53,9 @@ public enum LoginTokenStatusEnum {
     OTHER_DEVICE(1) {
         @Override
         public RuntimeException toException(LoginTokenDTO token) {
-            LoginTokenIdentityDTO override = token.getOverride();
+            RequestIdentityModel override = token.getOverride();
             return ErrorCode.USER_OTHER_DEVICE_LOGIN.exception(
-                    Dates.format(new Date(override.getLoginTime()), Dates.MD_HM),
+                    Dates.format(new Date(override.getTimestamp()), Dates.MD_HM),
                     override.getAddress(),
                     override.getLocation());
         }
@@ -68,9 +68,9 @@ public enum LoginTokenStatusEnum {
     SESSION_OFFLINE(2) {
         @Override
         public RuntimeException toException(LoginTokenDTO token) {
-            LoginTokenIdentityDTO override = token.getOverride();
+            RequestIdentityModel override = token.getOverride();
             return ErrorCode.USER_OFFLINE.exception(
-                    Dates.format(new Date(override.getLoginTime()), Dates.MD_HM),
+                    Dates.format(new Date(override.getTimestamp()), Dates.MD_HM),
                     override.getAddress(),
                     override.getLocation());
         }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java

@@ -82,12 +82,13 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
         if (tokenInfo == null) {
             return null;
         }
+        Long loginTime = tokenInfo.getOrigin().getTimestamp();
         try {
             // 检查 token 状态
             this.checkTokenStatus(tokenInfo);
         } catch (Exception e) {
             // token 失效则删除
-            RedisUtils.delete(UserCacheKeyDefine.LOGIN_TOKEN.format(tokenInfo.getId(), tokenInfo.getOrigin().getLoginTime()));
+            RedisUtils.delete(UserCacheKeyDefine.LOGIN_TOKEN.format(tokenInfo.getId(), loginTime));
             throw e;
         }
         // 获取登录信息
@@ -98,7 +99,7 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
         // 检查用户状态
         UserStatusEnum.checkUserStatus(user.getStatus());
         // 设置登录时间戳
-        user.setTimestamp(tokenInfo.getOrigin().getLoginTime());
+        user.setTimestamp(loginTime);
         return user;
     }