Merge pull request #139 from dromara/dev

Dev

.env.example

@@ -6,8 +6,11 @@ SPRING_PROFILES_ACTIVE=prod
 DEMO_MODE=false
 
 API_CORS=true
-SECRET_KEY=uQeacXV8b3isvKLK
 API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
+SECRET_KEY=uQeacXV8b3isvKLK
+
+NGINX_SERVICE_HOST=service
+NGINX_SERVICE_PORT=9200
 
 MYSQL_HOST=mysql
 MYSQL_PORT=3306

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -3,14 +3,6 @@ description: File a bug report.
 title: "[错误报告]: "
 labels: [ "" ]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        在提交前请确认: 
-         - 使用的是[最新版本](https://github.com/dromara/orion-visor/releases)
-         - 参考了[安装文档](https://visor.orionsec.cn/quickstart/docker.html)
-         - 查阅了[常见问题](https://visor.orionsec.cn/support/faq.html)
-         - 搜索了[已有 issue](https://github.com/dromara/orion-visor/issues)
   - type: checkboxes
     id: confirm
     attributes:

.github/workflows/e2e.yaml

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

.gitignore

@@ -16,7 +16,8 @@ target/
 .sts4-cache
 
 ### IntelliJ IDEA ###
-.idea
+**/.idea/*
+!**/.idea/icon.png
 *.iws
 *.iml
 *.ipr

README.md

@@ -113,7 +113,9 @@ docker compose up -d
 #### 主机监控
 
 ![主机监控](docs/assets/screenshot/monitor-list.png?time=20250627 "主机监控")
-![监控详情](docs/assets/screenshot/monitor-detail.png?time=20250627 "监控详情")
+![监控概览](docs/assets/screenshot/monitor-override.png?time=20250627 "监控概览")
+![监控详情](docs/assets/screenshot/monitor-chart.png?time=20250627 "监控表格")
+![告警通知](docs/assets/screenshot/monitor-alarm.png?time=20250627 "告警通知")
 
 #### 批量执行
 

docker-compose.yaml

@@ -1,6 +1,6 @@
 version: '3.3'
 
-# latest = 2.5.0
+# latest = 2.5.2
 
 # 支持以下源
 # lijiahangmax/*
@@ -12,6 +12,9 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
     ports:
       - ${SERVICE_PORT:-1081}:80
+    environment:
+      NGINX_SERVICE_HOST: ${NGINX_SERVICE_HOST:-service}
+      NGINX_SERVICE_PORT: ${NGINX_SERVICE_PORT:-9200}
     restart: unless-stopped
     depends_on:
       service:
@@ -24,6 +27,10 @@ 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}
@@ -44,8 +51,8 @@ services:
       GUACD_HOST: ${GUACD_HOST:-guacd}
       GUACD_PORT: ${GUACD_PORT:-4822}
       GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive}
-      SECRET_KEY: ${SECRET_KEY:-pmqeHOyZaumHm0Wt}
-      API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-uQeacXV8b3isvKLK}
+      SECRET_KEY: ${SECRET_KEY:-uQeacXV8b3isvKLK}
+      API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-pmqeHOyZaumHm0Wt}
       API_CORS: ${API_CORS:-true}
       DEMO_MODE: ${DEMO_MODE:-false}
     volumes:

docker-upgrade.sh

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

docker/docker-build.sh

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

docker/project-build.sh

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

docker/ui/Dockerfile

@@ -11,13 +11,20 @@ RUN \
   ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
   echo "${TZ}" > /etc/timezone && \
   rm -rf /var/cache/apk/* && \
+  rm -rf /etc/nginx/nginx.conf && \
   rm -rf /etc/nginx/conf.d/*
 
-# 复制包
+# 复制前端静态文件
 COPY ./ui/dist /usr/share/nginx/html
 
 # 复制配置
-COPY ./ui/nginx.conf /etc/nginx/conf.d
+COPY ./ui/nginx.conf /etc/nginx
+COPY ./ui/service.conf /etc/nginx/conf.d
+
+# 复制启动脚本
+COPY ./ui/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
 # 启动
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]

docker/ui/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# 设置环境变量
+NGINX_SERVICE_HOST="${NGINX_SERVICE_HOST:-service}"
+NGINX_SERVICE_PORT="${NGINX_SERVICE_PORT:-9200}"
+
+# 替换环境变量
+sed -i "s|\${NGINX_SERVICE_HOST}|${NGINX_SERVICE_HOST}|g" /etc/nginx/conf.d/service.conf
+sed -i "s|\${NGINX_SERVICE_PORT}|${NGINX_SERVICE_PORT}|g" /etc/nginx/conf.d/service.conf
+
+exec "$@"

docker/ui/nginx.conf

@@ -1,56 +1,30 @@
-server {
-    listen       80;
-    server_name  localhost;
-    client_max_body_size 1024m;
+user  nginx;
+worker_processes  auto;
 
-    # 是否启动 gzip 压缩
-    gzip  on;
-    # 需要压缩的常见静态资源
-    gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
-    # 如果文件大于 1k 就启动压缩
-    gzip_min_length 1k;
-    # 缓冲区
-    gzip_buffers 4 16k;
-    # 压缩的等级
-    gzip_comp_level 2;
-    # access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        # web history 模式 404
-        try_files $uri $uri/ /index.html;
-    }
-
-    location /orion-visor/api {
-        proxy_pass    http://service:9200/orion-visor/api;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-     location /orion-visor/keep-alive {
-        proxy_pass    http://service:9200/orion-visor/keep-alive;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 3600s;
-        proxy_send_timeout 3600s;
-    }
-
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
+error_log  /var/log/nginx/error.log notice;
+pid        /run/nginx.pid;
 
+events {
+    worker_connections  1024;
 }
 
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    server_tokens off;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

docker/ui/service.conf

@@ -0,0 +1,56 @@
+server {
+    listen       80;
+    server_name  localhost;
+    client_max_body_size 1024m;
+
+    # 是否启动 gzip 压缩
+    gzip on;
+    # 需要压缩的常见静态资源
+    gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    # 如果文件大于 1k 就启动压缩
+    gzip_min_length 1k;
+    # 缓冲区
+    gzip_buffers 4 16k;
+    # 压缩的等级
+    gzip_comp_level 2;
+    # access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        # web history 模式 404
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /orion-visor/api {
+        proxy_pass    http://${NGINX_SERVICE_HOST}:${NGINX_SERVICE_PORT}/orion-visor/api;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /orion-visor/keep-alive {
+        proxy_pass    http://${NGINX_SERVICE_HOST}:${NGINX_SERVICE_PORT}/orion-visor/keep-alive;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+}
+

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.0";
+    String VERSION = "2.5.2";
 
     /**
      * 同 ${spring.application.name}

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

@@ -63,13 +63,15 @@ public interface AutoConfigureOrderConst {
 
     int FRAMEWORK_JOB = Integer.MIN_VALUE + 2600;
 
-    int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2700;
+    int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2610;
 
-    int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2800;
+    int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2620;
 
-    int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2900;
+    int FRAMEWORK_BIZ_PUSH = Integer.MIN_VALUE + 2700;
 
-    int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 3000;
+    int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 7000;
+
+    int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 9000;
 
     int FRAMEWORK_BANNER = Integer.MIN_VALUE + 10000;
 

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

@@ -100,6 +100,12 @@ public interface ErrorMessage {
 
     String GROUP_ABSENT = "分组不存在";
 
+    String METRICS_ABSENT = "指标不存在";
+
+    String RULE_ABSENT = "规则不存在";
+
+    String ALARM_POLICY_ABSENT = "告警策略不存在";
+
     String HOST_TYPE_ERROR = "主机类型错误";
 
     String HOST_NOT_ENABLED = "{} 主机未启用";
@@ -132,6 +138,8 @@ public interface ErrorMessage {
 
     String CURRENT_USER_UNSUPPORTED_OPT = "当前" + USER_UNSUPPORTED_OPT;
 
+    String PUSH_USER_NOT_EMPTY = "推送用户不能为空";
+
     String PATH_NOT_NORMALIZE = "路径不合法";
 
     String OPERATE_ERROR = "操作失败";
@@ -140,6 +148,8 @@ public interface ErrorMessage {
 
     String DECRYPT_ERROR = "数据解密失败";
 
+    String GET_REQUEST_URL_ERROR = "获取请求路径失败";
+
     String UNKNOWN_TYPE = "未知类型";
 
     String ERROR_TYPE = "错误的类型";

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

@@ -0,0 +1,62 @@
+/*
+ * 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.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 推送用户
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 21:46
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PushUser", description = "推送用户")
+public class PushUser implements Serializable {
+
+    @NotNull
+    @Schema(description = "用户id")
+    private Long id;
+
+    @NotNull
+    @Schema(description = "用户名")
+    private String username;
+
+    @Schema(description = "花名")
+    private String nickname;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+}

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

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

orion-visor-dependencies/pom.xml

@@ -14,11 +14,11 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.5.0</revision>
+        <revision>2.5.2</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.2</orion.kit.version>
+        <orion.kit.version>2.0.4</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
@@ -156,6 +156,11 @@
                 <artifactId>orion-visor-spring-boot-starter-influxdb</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>org.dromara.visor</groupId>
+                <artifactId>orion-visor-spring-boot-starter-biz-push</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>

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

@@ -23,8 +23,11 @@
 package org.dromara.visor.framework.biz.operator.log.core.factory;
 
 import cn.orionsec.kit.lang.utils.Arrays1;
+import cn.orionsec.kit.spring.SpringHolder;
 import org.dromara.visor.framework.biz.operator.log.core.annotation.Module;
 import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 
 import javax.annotation.PostConstruct;
 
@@ -35,7 +38,14 @@ import javax.annotation.PostConstruct;
  * @version 1.0.0
  * @since 2023/10/13 17:45
  */
-public abstract class InitializingOperatorTypes implements OperatorTypeDefinition {
+public abstract class InitializingOperatorTypes implements OperatorTypeDefinition, BeanNameAware {
+
+    private String beanName;
+
+    @Override
+    public void setBeanName(String name) {
+        this.beanName = name;
+    }
 
     @PostConstruct
     public void init() {
@@ -55,6 +65,8 @@ public abstract class InitializingOperatorTypes implements OperatorTypeDefinitio
             type.setModule(module);
             OperatorTypeHolder.set(type);
         }
+        // 自动销毁
+        ((BeanDefinitionRegistry) SpringHolder.getBeanFactory()).removeBeanDefinition(beanName);
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/pom.xml

@@ -0,0 +1,37 @@
+<?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-biz-push</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>jar</packaging>
+
+    <description>项目业务推送包</description>
+    <url>https://github.com/dromara/orion-visor</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/configuration/OrionPushAutoConfiguration.java

@@ -0,0 +1,121 @@
+/*
+ * 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.biz.push.configuration;
+
+import cn.orionsec.kit.lang.function.Functions;
+import org.dromara.visor.common.constant.AutoConfigureOrderConst;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.framework.service.PushTemplateFrameworkService;
+import org.dromara.visor.framework.biz.push.core.framework.service.PushTemplateFrameworkServiceDelegate;
+import org.dromara.visor.framework.biz.push.core.framework.service.WebsiteMessageFrameworkService;
+import org.dromara.visor.framework.biz.push.core.listener.PushMessageEventListener;
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+import org.dromara.visor.framework.biz.push.core.service.*;
+import org.dromara.visor.framework.biz.push.core.utils.MessageChannelUtils;
+import org.dromara.visor.framework.biz.push.core.utils.PushUtils;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 推送自动配置类
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/17 23:04
+ */
+@AutoConfiguration
+@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_BIZ_PUSH)
+public class OrionPushAutoConfiguration {
+
+    /**
+     * @return 钉钉推送服务
+     */
+    @Bean
+    public DingPushService dingPushService() {
+        return new DingPushService();
+    }
+
+    /**
+     * @return 飞书推送服务
+     */
+    @Bean
+    public FeiShuPushService feiShuPushService() {
+        return new FeiShuPushService();
+    }
+
+    /**
+     * @return 企业微信推送服务
+     */
+    @Bean
+    public WeComPushService weComPushService() {
+        return new WeComPushService();
+    }
+
+    /**
+     * @param websiteMessageFrameworkService websiteMessageFrameworkService
+     * @return 站内信推送服务
+     */
+    @Bean
+    public WebsitePushService websitePushService(WebsiteMessageFrameworkService websiteMessageFrameworkService) {
+        return new WebsitePushService(websiteMessageFrameworkService);
+    }
+
+    /**
+     * @param impl impl
+     * @return 推送模板服务
+     */
+    @Bean
+    @Primary
+    @ConditionalOnBean(PushTemplateFrameworkService.class)
+    public PushTemplateFrameworkService pushTemplateFrameworkService(PushTemplateFrameworkService impl) {
+        PushTemplateFrameworkServiceDelegate delegate = new PushTemplateFrameworkServiceDelegate(impl);
+        // 设置到工具类
+        PushUtils.setPushTemplateFrameworkService(delegate);
+        return delegate;
+    }
+
+    /**
+     * @param pushServices 推送服务
+     * @return 消息推送事件监听器
+     */
+    @Bean
+    public PushMessageEventListener pushMessageEventListener(List<IPushService<? extends PushMessage>> pushServices) {
+        // 服务列表
+        Map<PushChannelEnum, IPushService<? extends PushMessage>> serviceMap = pushServices.stream()
+                .collect(Collectors.toMap(
+                        MessageChannelUtils::getPushChannel,
+                        Function.identity(),
+                        Functions.right()));
+        // 创建监听器
+        return new PushMessageEventListener(serviceMap);
+    }
+
+}

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

@@ -0,0 +1,48 @@
+/*
+ * 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.biz.push.core.annotation;
+
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 消息渠道
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 21:58
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface MessageChannel {
+
+    /**
+     * 消息渠道
+     *
+     * @return channel
+     */
+    PushChannelEnum value();
+
+}

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

@@ -0,0 +1,104 @@
+/*
+ * 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.biz.push.core.entity;
+
+import cn.orionsec.kit.lang.able.IJsonObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 钉钉请求体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DingRequestBody implements Serializable, IJsonObject {
+
+    /**
+     * 消息类型
+     */
+    @JSONField(name = "msgtype")
+    private String msgType;
+
+    /**
+     * markdown 内容
+     */
+    private DingRequestBody.MarkdownPayload markdown;
+
+    /**
+     * at 配置
+     */
+    private DingRequestBody.AtPayload at;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MarkdownPayload implements Serializable {
+
+        /**
+         * 标题
+         */
+        private String title;
+
+        /**
+         * 内容
+         */
+        private String text;
+
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AtPayload implements Serializable {
+
+        /**
+         * 被 at 的手机号
+         */
+        private List<String> atMobiles;
+
+        /**
+         * 被 at 的 userId
+         */
+        private List<String> atUserIds;
+
+        /**
+         * 是否 at 所有人
+         */
+        private Boolean isAtAll;
+    }
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.biz.push.core.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 钉钉响应体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DingResponseBody implements Serializable {
+
+    /**
+     * 错误码值
+     */
+    @JSONField(name = "errcode")
+    private Integer errCode;
+
+    /**
+     * 错误码描述
+     */
+    @JSONField(name = "errmsg")
+    private String errMsg;
+
+}

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

@@ -0,0 +1,81 @@
+/*
+ * 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.biz.push.core.entity;
+
+import cn.orionsec.kit.lang.able.IJsonObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 飞书请求体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeiShuRequestBody implements Serializable, IJsonObject {
+
+    /**
+     * 时间戳
+     */
+    private Long timestamp;
+
+    /**
+     * 签名
+     */
+    private String sign;
+
+    /**
+     * 消息类型
+     */
+    @JSONField(name = "msg_type")
+    private String msgType;
+
+    /**
+     * text 内容
+     */
+    private TextPayload content;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class TextPayload implements Serializable {
+
+        /**
+         * 内容
+         */
+        private String text;
+
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuResponseBody.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.framework.biz.push.core.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 飞书响应体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeiShuResponseBody implements Serializable {
+
+    /**
+     * code
+     */
+    private Integer code;
+
+    /**
+     * msg
+     */
+    private String msg;
+
+}

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

@@ -0,0 +1,78 @@
+/*
+ * 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.biz.push.core.entity;
+
+import cn.orionsec.kit.lang.able.IJsonObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 企业微信请求体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WeComRequestBody implements Serializable, IJsonObject {
+
+    /**
+     * 消息类型
+     */
+    @JSONField(name = "msgtype")
+    private String msgType;
+
+    /**
+     * markdown 内容
+     */
+    private MarkdownPayload markdown;
+
+    /**
+     * 被 at 的 userId
+     */
+    @JSONField(name = "mentioned_list")
+    private List<String> mentionedList;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MarkdownPayload implements Serializable {
+
+        /**
+         * 内容
+         */
+        private String content;
+
+    }
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.biz.push.core.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 企业微信响应体
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:41
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WeComResponseBody implements Serializable {
+
+    /**
+     * 错误码值
+     */
+    @JSONField(name = "errcode")
+    private Integer errCode;
+
+    /**
+     * 错误码描述
+     */
+    @JSONField(name = "errmsg")
+    private String errMsg;
+
+}

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

@@ -0,0 +1,89 @@
+/*
+ * 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.biz.push.core.enums;
+
+import com.alibaba.fastjson.JSON;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.visor.framework.biz.push.core.message.*;
+
+/**
+ * 通知模板类型枚举
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/15 23:20
+ */
+@Getter
+@AllArgsConstructor
+public enum PushChannelEnum {
+
+    /**
+     * 站内信
+     */
+    WEBSITE(WebsiteMessage.class),
+
+    /**
+     * 钉钉
+     */
+    DING(DingPushMessage.class),
+
+    /**
+     * 飞书
+     */
+    FEI_SHU(FeiShuPushMessage.class),
+
+    /**
+     * 企业微信
+     */
+    WE_COM(WeComPushMessage.class),
+
+    ;
+
+    public final Class<?> messageClass;
+
+    @SuppressWarnings("unchecked")
+    public <T extends PushMessage> T createMessage(String config) {
+        try {
+            return (T) JSON.parseObject(config, messageClass);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 根据渠道名称获取枚举
+     *
+     * @param channel 渠道名称
+     * @return 枚举
+     */
+    public static PushChannelEnum of(String channel) {
+        for (PushChannelEnum value : values()) {
+            if (value.name().equalsIgnoreCase(channel)) {
+                return value;
+            }
+        }
+        return WEBSITE;
+    }
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.biz.push.core.event;
+
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 消息推送事件
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/1/15
+ */
+public class PushMessageEvent extends ApplicationEvent {
+
+    public PushMessageEvent(PushMessage message) {
+        super(message);
+    }
+
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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.biz.push.core.framework.service;
+
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+
+/**
+ * 推送消息模板框架服务
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/21 16:26
+ */
+public interface PushTemplateFrameworkService {
+
+    /**
+     * 根据 templateId 获取消息
+     *
+     * @param templateId templateId
+     * @return message
+     */
+    PushMessage getPushMessageByTemplateId(Long templateId);
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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.biz.push.core.framework.service;
+
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+
+/**
+ * 推送消息模板框架服务委托类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/21 16:26
+ */
+public class PushTemplateFrameworkServiceDelegate implements PushTemplateFrameworkService {
+
+    private final PushTemplateFrameworkService delegate;
+
+    public PushTemplateFrameworkServiceDelegate(PushTemplateFrameworkService delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public PushMessage getPushMessageByTemplateId(Long templateId) {
+        return delegate.getPushMessageByTemplateId(templateId);
+    }
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.biz.push.core.framework.service;
+
+import org.dromara.visor.framework.biz.push.core.message.WebsiteMessage;
+
+/**
+ * 发送站内信框架服务
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 22:09
+ */
+public interface WebsiteMessageFrameworkService {
+
+    /**
+     * 发送站内信
+     *
+     * @param message message
+     */
+    void push(WebsiteMessage message);
+
+}

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

@@ -0,0 +1,71 @@
+/*
+ * 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.biz.push.core.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.event.PushMessageEvent;
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+import org.dromara.visor.framework.biz.push.core.service.IPushService;
+import org.springframework.context.ApplicationListener;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Map;
+
+/**
+ * 消息推送事件监听器
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/1/15
+ */
+@Slf4j
+public class PushMessageEventListener implements ApplicationListener<PushMessageEvent> {
+
+    private final Map<PushChannelEnum, IPushService<? extends PushMessage>> pushServiceMap;
+
+    public PushMessageEventListener(Map<PushChannelEnum, IPushService<? extends PushMessage>> pushServiceMap) {
+        this.pushServiceMap = pushServiceMap;
+    }
+
+    // FIXME
+    @Async("asyncExecutor")
+    @Override
+    public void onApplicationEvent(PushMessageEvent event) {
+        try {
+            // 获取消息
+            PushMessage message = (PushMessage) event.getSource();
+            // 发送消息
+            this.getPushService(message).push(message);
+            log.info("PushMessageEventListener push success");
+        } catch (Exception e) {
+            log.error("PushMessageEventListener push error", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T extends PushMessage> IPushService<T> getPushService(PushMessage message) {
+        return (IPushService<T>) pushServiceMap.get(message.getChannel());
+    }
+
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.biz.push.core.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.common.entity.PushUser;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 推送消息基类
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/15 23:28
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "BasePushMessage", description = "推送消息基类")
+public abstract class BasePushMessage implements PushMessage, Serializable {
+
+    @NotBlank
+    @Schema(description = "消息模板")
+    private String template;
+
+    @Schema(description = "消息参数")
+    private Map<String, Object> params;
+
+    @Valid
+    @Schema(description = "推送用户")
+    private List<PushUser> pushUsers;
+
+}

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

@@ -0,0 +1,66 @@
+/*
+ * 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.biz.push.core.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 钉钉推送消息
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/15 23:29
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "DingPushMessage", description = "钉钉推送消息")
+public class DingPushMessage extends BasePushMessage {
+
+    @NotBlank
+    @Schema(description = "webhook")
+    private String webhook;
+
+    @Schema(description = "密钥")
+    private String secret;
+
+    @NotBlank
+    @Schema(description = "推送标题")
+    private String title;
+
+    @Override
+    public PushChannelEnum getChannel() {
+        return PushChannelEnum.DING;
+    }
+
+}

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

@@ -0,0 +1,62 @@
+/*
+ * 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.biz.push.core.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 飞书推送消息
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/16 00:26
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "FeiShuPushMessage", description = "飞书推送消息")
+public class FeiShuPushMessage extends BasePushMessage {
+
+    @NotBlank
+    @Schema(description = "webhook")
+    private String webhook;
+
+    @Schema(description = "密钥")
+    private String secret;
+
+    @Override
+    public PushChannelEnum getChannel() {
+        return PushChannelEnum.FEI_SHU;
+    }
+
+}

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

@@ -0,0 +1,90 @@
+/*
+ * 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.biz.push.core.message;
+
+import org.dromara.visor.common.entity.PushUser;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 推送消息接口
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:42
+ */
+public interface PushMessage extends Serializable {
+
+    /**
+     * 获取模板
+     *
+     * @return 模板
+     */
+    String getTemplate();
+
+    /**
+     * 设置模板
+     *
+     * @param template template
+     */
+    void setTemplate(String template);
+
+    /**
+     * 获取参数
+     *
+     * @return 参数
+     */
+    Map<String, Object> getParams();
+
+    /**
+     * 设置参数
+     *
+     * @param params params
+     */
+    void setParams(Map<String, Object> params);
+
+    /**
+     * 获取推送用户
+     *
+     * @return 推送用户
+     */
+    List<PushUser> getPushUsers();
+
+    /**
+     * 设置推送用户列表
+     *
+     * @param pushUsers pushUsers
+     */
+    void setPushUsers(List<PushUser> pushUsers);
+
+    /**
+     * 获取推送渠道
+     *
+     * @return 推送渠道
+     */
+    PushChannelEnum getChannel();
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/message/WeComPushMessage.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.framework.biz.push.core.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 企业微信推送消息
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/15 23:30
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "WeComPushMessage", description = "企业微信推送消息")
+public class WeComPushMessage extends BasePushMessage {
+
+    @NotBlank
+    @Schema(description = "webhook")
+    private String webhook;
+
+    @Override
+    public PushChannelEnum getChannel() {
+        return PushChannelEnum.WE_COM;
+    }
+
+}

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

@@ -0,0 +1,74 @@
+/*
+ * 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.biz.push.core.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 站内信推送
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 19:56
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "WebsiteMessage", description = "站内信消息")
+public class WebsiteMessage extends BasePushMessage {
+
+    @NotBlank
+    @Size(max = 10)
+    @Schema(description = "消息分类")
+    private String messageClassify;
+
+    @NotBlank
+    @Size(max = 32)
+    @Schema(description = "消息类型")
+    private String messageType;
+
+    @Schema(description = "消息关联")
+    private String relKey;
+
+    @NotBlank
+    @Size(max = 128)
+    @Schema(description = "标题")
+    private String title;
+
+    @Override
+    public PushChannelEnum getChannel() {
+        return PushChannelEnum.WEBSITE;
+    }
+
+}

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

@@ -0,0 +1,126 @@
+/*
+ * 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.biz.push.core.service;
+
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.collect.Lists;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.entity.PushUser;
+import org.dromara.visor.common.utils.Assert;
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+
+import java.util.stream.Collectors;
+
+/**
+ * 消息推送抽象服务
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 18:51
+ */
+@Slf4j
+public abstract class BasePushService<Message extends PushMessage> implements IPushService<Message> {
+
+    @Override
+    public void push(Message message) {
+        try {
+            // 验证消息
+            this.validateMessage(message);
+        } catch (Exception e) {
+            log.error("BasePushService validateMessage message: {}", JSON.toJSONString(message), e);
+            return;
+        }
+        // 请求路径
+        String url = this.buildRequestUrl(message);
+        // 构建请求体
+        String body = this.buildRequestBody(message);
+        // 发送请求
+        this.sendRequest(message, url, body);
+    }
+
+    /**
+     * 验证消息
+     *
+     * @param message message
+     */
+    protected void validateMessage(Message message) {
+        // 验证消息
+        Assert.valid(message);
+    }
+
+    /**
+     * 构建请求 url
+     *
+     * @param message message
+     * @return url
+     */
+    protected abstract String buildRequestUrl(Message message);
+
+    /**
+     * 构建请求体
+     *
+     * @param message message
+     * @return body
+     */
+    protected abstract String buildRequestBody(Message message);
+
+    /**
+     * 发送请求
+     *
+     * @param message message
+     * @param url     url
+     * @param body    body
+     */
+    protected abstract void sendRequest(Message message, String url, String body);
+
+    /**
+     * 追加 at 用户
+     *
+     * @param message message
+     * @param content content
+     * @return content
+     */
+    protected String appendAtUsers(Message message, String content) {
+        if (Lists.isEmpty(message.getPushUsers())) {
+            return content;
+        }
+        return content + Const.LF + this.getAtUsers(message);
+    }
+
+    /**
+     * 获取 @ 的用户
+     *
+     * @param message message
+     * @return users
+     */
+    protected String getAtUsers(Message message) {
+        return Lists.stream(message.getPushUsers())
+                .map(PushUser::getNickname)
+                .filter(Strings::isNotBlank)
+                .map(s -> Const.AT + s)
+                .collect(Collectors.joining(Const.SPACE));
+    }
+
+}

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

@@ -0,0 +1,114 @@
+/*
+ * 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.biz.push.core.service;
+
+import cn.orionsec.kit.http.ok.OkRequests;
+import cn.orionsec.kit.http.ok.OkResponse;
+import cn.orionsec.kit.lang.constant.StandardContentType;
+import cn.orionsec.kit.lang.utils.Assert;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.codec.Base64s;
+import cn.orionsec.kit.lang.utils.crypto.Signatures;
+import cn.orionsec.kit.lang.utils.math.Hex;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.constant.ErrorMessage;
+import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
+import org.dromara.visor.framework.biz.push.core.entity.DingRequestBody;
+import org.dromara.visor.framework.biz.push.core.entity.DingResponseBody;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.message.DingPushMessage;
+import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
+
+/**
+ * 钉钉推送服务类
+ * <p>
+ * <a href="https://open.dingtalk.com/document/dingstart/obtain-the-webhook-address-of-a-custom-robot">doc</a>
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/17 23:13
+ */
+@Slf4j
+@MessageChannel(value = PushChannelEnum.DING)
+public class DingPushService extends BasePushService<DingPushMessage> {
+
+    private static final String MARKDOWN = "markdown";
+
+    private static final Integer SUCCESS_CODE = 0;
+
+    @Override
+    protected String buildRequestUrl(DingPushMessage message) {
+        String secret = message.getSecret();
+        if (Strings.isBlank(secret)) {
+            return message.getWebhook();
+        }
+        // 加签
+        try {
+            long timestamp = System.currentTimeMillis();
+            String plainText = timestamp + "\n" + secret;
+            String hexSign = Signatures.hmacSha256(plainText, secret);
+            if (hexSign == null) {
+                log.error("DingPushService-sign error plain: {}", plainText);
+                throw Exceptions.argument(ErrorMessage.GET_REQUEST_URL_ERROR);
+            }
+            byte[] signData = Hex.hexToBytes(hexSign);
+            String sign = Base64s.encodeToString(signData);
+            // 实际请求地址
+            return message.getWebhook() + "&timestamp=" + timestamp + "&sign=" + sign;
+        } catch (Exception e) {
+            log.error("DingPushService-buildRequestUrl error", e);
+            throw e;
+        }
+    }
+
+    @Override
+    protected String buildRequestBody(DingPushMessage message) {
+        // 格式化内容
+        String formattedContent = MessageUtils.format(message.getTemplate(), message.getParams());
+        String formattedTitle = MessageUtils.format(message.getTitle(), message.getParams());
+        // at 用户
+        formattedContent = this.appendAtUsers(message, formattedContent);
+
+        // 构建请求体
+        return DingRequestBody.builder()
+                .msgType(MARKDOWN)
+                .markdown(DingRequestBody.MarkdownPayload.builder()
+                        .title(formattedTitle)
+                        .text(formattedContent)
+                        .build())
+                .build()
+                .toJsonString();
+    }
+
+    @Override
+    protected void sendRequest(DingPushMessage message, String url, String body) {
+        // 发送请求
+        OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
+        DingResponseBody responseBody = JSON.parseObject(response.getBodyString(), DingResponseBody.class);
+        // 验证发送结果
+        Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
+    }
+
+}

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

@@ -0,0 +1,118 @@
+/*
+ * 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.biz.push.core.service;
+
+import cn.orionsec.kit.http.ok.OkRequests;
+import cn.orionsec.kit.http.ok.OkResponse;
+import cn.orionsec.kit.lang.constant.Const;
+import cn.orionsec.kit.lang.constant.StandardContentType;
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.codec.Base64s;
+import cn.orionsec.kit.lang.utils.crypto.Signatures;
+import cn.orionsec.kit.lang.utils.crypto.enums.SecretKeySpecMode;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.utils.Assert;
+import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
+import org.dromara.visor.framework.biz.push.core.entity.FeiShuRequestBody;
+import org.dromara.visor.framework.biz.push.core.entity.FeiShuResponseBody;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.message.FeiShuPushMessage;
+import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
+
+/**
+ * 飞书推送服务类
+ * <p>
+ * <a href="https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot?lang=zh-CN">doc</a>
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/17 23:13
+ */
+@Slf4j
+@MessageChannel(value = PushChannelEnum.FEI_SHU)
+public class FeiShuPushService extends BasePushService<FeiShuPushMessage> {
+
+    private static final String TEXT = "text";
+
+    private static final Integer SUCCESS_CODE = 0;
+
+    @Override
+    protected String buildRequestUrl(FeiShuPushMessage message) {
+        return message.getWebhook();
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param message   message
+     * @param timestamp timestamp
+     * @return sign
+     */
+    protected String buildSign(FeiShuPushMessage message, long timestamp) {
+        String secret = message.getSecret();
+        if (Strings.isBlank(secret)) {
+            return null;
+        }
+        // 加签
+        try {
+            String stringToSign = timestamp + "\n" + secret;
+            byte[] signData = Signatures.hmacHashSignBytes(new byte[]{}, Strings.bytes(stringToSign), SecretKeySpecMode.HMAC_SHA256);
+            return Base64s.encodeToString(signData);
+        } catch (Exception e) {
+            log.error("FeiShuPushService-buildSign error", e);
+            return null;
+        }
+    }
+
+    @Override
+    protected String buildRequestBody(FeiShuPushMessage message) {
+        long timestamp = System.currentTimeMillis() / Const.MS_S_1;
+        // 加签
+        String sign = this.buildSign(message, timestamp);
+        // 格式化内容
+        String formattedContent = MessageUtils.format(message.getTemplate(), message.getParams());
+        // at 的用户
+        formattedContent = this.appendAtUsers(message, formattedContent);
+        // 构建请求体
+        return FeiShuRequestBody.builder()
+                .timestamp(timestamp)
+                .sign(sign)
+                .msgType(TEXT)
+                .content(FeiShuRequestBody.TextPayload.builder()
+                        .text(formattedContent)
+                        .build())
+                .build()
+                .toJsonString();
+    }
+
+    @Override
+    protected void sendRequest(FeiShuPushMessage message, String url, String body) {
+        // 发送请求
+        OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
+        FeiShuResponseBody responseBody = JSON.parseObject(response.getBodyString(), FeiShuResponseBody.class);
+        // 验证发送结果
+        Assert.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg());
+    }
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.biz.push.core.service;
+
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+
+/**
+ * 消息推送服务
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/17 17:17
+ */
+public interface IPushService<Message extends PushMessage> {
+
+    /**
+     * 推送消息
+     *
+     * @param message message
+     */
+    void push(Message message);
+
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.biz.push.core.service;
+
+import cn.orionsec.kit.http.ok.OkRequests;
+import cn.orionsec.kit.http.ok.OkResponse;
+import cn.orionsec.kit.lang.constant.StandardContentType;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.common.utils.Assert;
+import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
+import org.dromara.visor.framework.biz.push.core.entity.WeComRequestBody;
+import org.dromara.visor.framework.biz.push.core.entity.WeComResponseBody;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.message.WeComPushMessage;
+import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
+
+/**
+ * 企业微信推送服务
+ * <p>
+ * <a href="https://developer.work.weixin.qq.com/document/path/99110">docs</a>
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/17 23:13
+ */
+@Slf4j
+@MessageChannel(value = PushChannelEnum.WE_COM)
+public class WeComPushService extends BasePushService<WeComPushMessage> {
+
+    private static final String MAKRDOWN = "markdown";
+
+    private static final Integer SUCCESS_CODE = 0;
+
+    @Override
+    protected String buildRequestUrl(WeComPushMessage message) {
+        return message.getWebhook();
+    }
+
+    @Override
+    protected String buildRequestBody(WeComPushMessage message) {
+        // 格式化内容
+        String formattedContent = MessageUtils.format(message.getTemplate(), message.getParams());
+        // at 用户
+        formattedContent = this.appendAtUsers(message, formattedContent);
+        // 构建请求体
+        WeComRequestBody.WeComRequestBodyBuilder builder = WeComRequestBody.builder()
+                .msgType(MAKRDOWN)
+                .markdown(WeComRequestBody.MarkdownPayload.builder()
+                        .content(formattedContent)
+                        .build());
+
+        return builder.build().toJsonString();
+    }
+
+    @Override
+    protected void sendRequest(WeComPushMessage message, String url, String body) {
+        // 发送请求
+        OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
+        WeComResponseBody responseBody = JSON.parseObject(response.getBodyString(), WeComResponseBody.class);
+        // 验证发送结果
+        Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WebsitePushService.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.framework.biz.push.core.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.framework.service.WebsiteMessageFrameworkService;
+import org.dromara.visor.framework.biz.push.core.message.WebsiteMessage;
+import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
+
+/**
+ * 站内信推送服务
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 22:13
+ */
+@Slf4j
+@MessageChannel(value = PushChannelEnum.WEBSITE)
+public class WebsitePushService extends BasePushService<WebsiteMessage> {
+
+    private final WebsiteMessageFrameworkService websiteMessageFrameworkService;
+
+    public WebsitePushService(WebsiteMessageFrameworkService websiteMessageFrameworkService) {
+        this.websiteMessageFrameworkService = websiteMessageFrameworkService;
+    }
+
+    @Override
+    protected String buildRequestUrl(WebsiteMessage message) {
+        return null;
+    }
+
+    @Override
+    protected String buildRequestBody(WebsiteMessage message) {
+        // 格式化内容
+        message.setTemplate(MessageUtils.format(message.getTemplate(), message.getParams()));
+        // 格式化标题
+        message.setTitle(MessageUtils.format(message.getTitle(), message.getParams()));
+        return null;
+    }
+
+    @Override
+    protected void sendRequest(WebsiteMessage message, String url, String body) {
+        websiteMessageFrameworkService.push(message);
+    }
+
+}

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

@@ -0,0 +1,60 @@
+/*
+ * 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.biz.push.core.utils;
+
+import cn.orionsec.kit.lang.utils.Strings;
+import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
+import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+import org.dromara.visor.framework.biz.push.core.service.IPushService;
+import org.springframework.beans.factory.BeanInitializationException;
+import org.springframework.core.annotation.AnnotationUtils;
+
+/**
+ * 消息渠道工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/18 22:05
+ */
+public class MessageChannelUtils {
+
+    private MessageChannelUtils() {
+    }
+
+    /**
+     * 获取推送渠道
+     *
+     * @param service service
+     * @return channel
+     */
+    public static PushChannelEnum getPushChannel(IPushService<? extends PushMessage> service) {
+        // 获取类型注解
+        MessageChannel messageChannel = AnnotationUtils.findAnnotation(service.getClass(), MessageChannel.class);
+        if (messageChannel == null) {
+            throw new BeanInitializationException(Strings.format("Push service [{}] not found @MessageChannel annotation", service.getClass().getName()));
+        }
+        return messageChannel.value();
+    }
+
+}

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

@@ -0,0 +1,71 @@
+/*
+ * 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.biz.push.core.utils;
+
+import cn.orionsec.kit.lang.utils.json.matcher.NoMatchStrategy;
+import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatter;
+import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters;
+
+import java.util.Map;
+
+/**
+ * 消息工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/1/16 17:28
+ */
+public class MessageUtils {
+
+    private static final ReplacementFormatter FORMATTER = ReplacementFormatters.create("@{{ ", " }}")
+            .noMatchStrategy(NoMatchStrategy.KEEP);
+
+    private MessageUtils() {
+    }
+
+    /**
+     * 替换模板
+     *
+     * @param template template
+     * @param params   params
+     * @return template
+     */
+    public static String format(String template, Map<String, Object> params) {
+        if (params == null) {
+            return template;
+        }
+        return FORMATTER.format(template, params);
+    }
+
+    /**
+     * 替换模板
+     *
+     * @param template template
+     * @param json     json
+     * @return template
+     */
+    public static String format(String template, String json) {
+        return FORMATTER.format(template, json);
+    }
+
+}

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

@@ -0,0 +1,92 @@
+/*
+ * 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.biz.push.core.utils;
+
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.spring.SpringHolder;
+import org.dromara.visor.common.entity.PushUser;
+import org.dromara.visor.framework.biz.push.core.event.PushMessageEvent;
+import org.dromara.visor.framework.biz.push.core.framework.service.PushTemplateFrameworkService;
+import org.dromara.visor.framework.biz.push.core.message.PushMessage;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 消息推送工具类
+ *
+ * @author Shihao Lv
+ * @version 1.0.0
+ * @since 2025/9/17 23:13
+ */
+public class PushUtils {
+
+    private static PushTemplateFrameworkService pushTemplateFrameworkService;
+
+    /**
+     * 发布消息推送事件
+     *
+     * @param pushMessage 推送消息配置
+     */
+    public static void push(PushMessage pushMessage) {
+        SpringHolder.publishEvent(new PushMessageEvent(pushMessage));
+    }
+
+    /**
+     * 根据模板推送消息
+     *
+     * @param templateId 模板ID
+     * @param params     模板参数
+     */
+    public static void pushTemplate(Long templateId, Map<String, Object> params) {
+        pushTemplate(templateId, params, null);
+    }
+
+    /**
+     * 根据模板推送消息
+     *
+     * @param templateId 模板ID
+     * @param params     模板参数
+     * @param pushUsers  推送用户
+     */
+    public static void pushTemplate(Long templateId, Map<String, Object> params, List<PushUser> pushUsers) {
+        PushMessage pushMessage = pushTemplateFrameworkService.getPushMessageByTemplateId(templateId);
+        if (pushMessage == null) {
+            return;
+        }
+        // 设置模板参数
+        pushMessage.setParams(params);
+        pushMessage.setPushUsers(pushUsers);
+        // 发布消息
+        push(pushMessage);
+    }
+
+    public static void setPushTemplateFrameworkService(PushTemplateFrameworkService pushTemplateFrameworkService) {
+        if (PushUtils.pushTemplateFrameworkService != null) {
+            // unmodified
+            throw Exceptions.state();
+        }
+        PushUtils.pushTemplateFrameworkService = pushTemplateFrameworkService;
+    }
+
+}

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

@@ -0,0 +1 @@
+org.dromara.visor.framework.biz.push.configuration.OrionPushAutoConfiguration

orion-visor-framework/orion-visor-spring-boot-starter-influxdb/src/main/java/org/dromara/visor/framework/influxdb/configuration/OrionInfluxdbAutoConfiguration.java

@@ -54,8 +54,6 @@ import java.net.ConnectException;
 public class OrionInfluxdbAutoConfiguration {
 
     /**
-     * TODO 重连
-     *
      * @param config config
      * @return influxdb 客户端
      */

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

@@ -54,19 +54,19 @@ public class BaseDO implements Serializable {
     private Long id;
 
     @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @Schema(description = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @Schema(description = "创建人")
-    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
+    @TableField(value = "creator", fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private String creator;
 
     @Schema(description = "修改人")
-    @TableField(fill = FieldFill.INSERT_UPDATE, update = "IFNULL(#{et.updater}, updater)", jdbcType = JdbcType.VARCHAR)
+    @TableField(value = "updater", fill = FieldFill.INSERT_UPDATE, update = "IFNULL(#{et.updater}, updater)", jdbcType = JdbcType.VARCHAR)
     private String updater;
 
     /**
@@ -75,7 +75,7 @@ public class BaseDO implements Serializable {
      */
     @Schema(description = "是否删除 0未删除 1已删除")
     @TableLogic
-    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.TINYINT)
+    @TableField(value = "deleted", fill = FieldFill.INSERT, jdbcType = JdbcType.TINYINT)
     private Boolean deleted;
 
 }

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

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

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

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

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

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

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

@@ -90,6 +90,20 @@ public class DomainFillUtils {
         }
     }
 
+    /**
+     * 清空基础字段
+     *
+     * @param baseDO baseDO
+     */
+    public static void clearBaseFields(BaseDO baseDO) {
+        baseDO.setId(null);
+        baseDO.setCreateTime(null);
+        baseDO.setUpdateTime(null);
+        baseDO.setCreator(null);
+        baseDO.setUpdater(null);
+        baseDO.setDeleted(null);
+    }
+
     public static void setSecurityHolder(SecurityHolder securityHolder) {
         if (DomainFillUtils.securityHolder != null) {
             // unmodified

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

@@ -29,7 +29,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+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.barrier.CacheBarriers;
@@ -84,11 +84,11 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer update${type}ById(${type}UpdateRequest request) {
-        Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
+        Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
         log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request));
         // 查询
         ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
+        Assert.notNull(record, ErrorMessage.DATA_ABSENT);
         // 转换
         ${type}DO updateRecord = ${type}Convert.MAPPER.to(request);
         // 查询数据是否冲突
@@ -125,7 +125,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     public ${type}VO get${type}ById(Long id) {
         // 查询
         ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
+        Assert.notNull(record, ErrorMessage.DATA_ABSENT);
         // 转换
         return ${type}Convert.MAPPER.to(record);
     }
@@ -202,7 +202,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         log.info("${type}Service-delete${type}ById id: {}", id);
         // 检查数据是否存在
         ${type}DO record = ${typeLower}DAO.selectById(id);
-        Valid.notNull(record, ErrorMessage.DATA_ABSENT);
+        Assert.notNull(record, ErrorMessage.DATA_ABSENT);
         // 删除
         int effect = ${typeLower}DAO.deleteById(id);
         log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect);
@@ -260,7 +260,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
                 #end
         // 检查是否存在
         boolean present = ${typeLower}DAO.of(wrapper).present();
-        Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
     }
 
     @Override

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

@@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 #foreach($pkg in ${customModuleFilePackages})
 import ${pkg}.*;
 #end
@@ -64,7 +64,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Long create${type}(${type}CreateDTO dto) {
         log.info("${type}Api.create${type} dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 转换
         ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
         // 创建
@@ -74,7 +74,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer update${type}ById(${type}UpdateDTO dto) {
         log.info("${type}Api.update${type}ById dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 转换
         ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
         // 修改
@@ -84,8 +84,8 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer update${type}(${type}QueryDTO query, ${type}UpdateDTO update) {
         log.info("${type}Api.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
-        Valid.valid(query);
-        Valid.valid(update);
+        Assert.valid(query);
+        Assert.valid(update);
         // 更新
         int effect = ${typeLower}Service.update${type}(${type}ProviderConvert.MAPPER.toRequest(query),
                 ${type}ProviderConvert.MAPPER.toRequest(update));
@@ -96,7 +96,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public ${type}DTO get${type}ById(Long id) {
         log.info("${type}Api.get${type}ById id: {}", id);
-        Valid.notNull(id, ErrorMessage.ID_MISSING);
+        Assert.notNull(id, ErrorMessage.ID_MISSING);
         // 修改
         ${type}DO record = ${typeLower}DAO.selectById(id);
         if (record == null) {
@@ -121,7 +121,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public List<${type}DTO> get${type}List(${type}QueryDTO dto) {
         log.info("${type}Api.get${type}List dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
         // 查询
@@ -142,7 +142,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Long get${type}Count(${type}QueryDTO dto) {
         log.info("${type}Api.get${type}Count dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
         // 查询
@@ -152,7 +152,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}ById(Long id) {
         log.info("${type}Api.delete${type}ById id: {}", id);
-        Valid.notNull(id, ErrorMessage.ID_MISSING);
+        Assert.notNull(id, ErrorMessage.ID_MISSING);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}ById(id);
         log.info("${type}Api.delete${type}ById id: {}, effect: {}", id, effect);
@@ -162,7 +162,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}ByIdList(List<Long> idList) {
         log.info("${type}Api.delete${type}ByIdList idList: {}", idList);
-        Valid.notEmpty(idList, ErrorMessage.ID_MISSING);
+        Assert.notEmpty(idList, ErrorMessage.ID_MISSING);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}ByIdList(idList);
         log.info("${type}Api.delete${type}ByIdList effect: {}", effect);
@@ -172,7 +172,7 @@ public class ${type}ApiImpl implements ${type}Api {
     @Override
     public Integer delete${type}(${type}QueryDTO dto) {
         log.info("${type}Api.delete${type} dto: {}", JSON.toJSONString(dto));
-        Valid.valid(dto);
+        Assert.valid(dto);
         // 删除
         Integer effect = ${typeLower}Service.delete${type}(${type}ProviderConvert.MAPPER.toRequest(dto));
         log.info("${type}Api.delete${type} effect: {}", effect);

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

@@ -4,7 +4,7 @@
              :create-card-position="false"
              :loading="loading"
              :field-config="cardFieldConfig"
-             :list="list"
+             :list="renderList"
              :pagination="pagination"
              :card-layout-cols="cardColLayout"
              :filter-count="filterCount"
@@ -140,7 +140,7 @@
   const { toOptions, getDictValue } = useDictStore();
   #end
 
-  const list = ref<Array<${vue.featureEntity}QueryResponse>>([]);
+  const renderList = ref<Array<${vue.featureEntity}QueryResponse>>([]);
   const formRef = ref();
   const formModel = reactive<${vue.featureEntity}QueryRequest>({
     searchValue: undefined,
@@ -196,7 +196,7 @@
     try {
       setLoading(true);
       const { data } = await get${vue.featureEntity}Page(queryOrder.markOrderly(request));
-      list.value = data.rows;
+      renderList.value = data.rows;
       pagination.total = data.total;
       pagination.current = request.page;
       pagination.pageSize = request.limit;

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

@@ -6,7 +6,7 @@
             :unmount-on-close="true"
             :ok-button-props="{ disabled: loading }"
             :cancel-button-props="{ disabled: loading }"
-            :on-before-ok="handlerOk"
+            :on-before-ok="handleOk"
             @cancel="handleClose">
     <a-spin class="full drawer-form-small" :loading="loading">
       <a-form :model="formModel"
@@ -57,10 +57,12 @@
 
 <script lang="ts" setup>
   import type { ${vue.featureEntity}UpdateRequest } from '@/api/${vue.module}/${vue.feature}';
+  import type { FormHandle } from '@/types/form';
   import { ref } from 'vue';
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
+  import { assignOmitRecord } from '@/utils';
   #if($dictMap.entrySet().size() > 0)
   import { #foreach($entry in ${dictMap.entrySet()})${entry.value.keyField}#if($foreach.hasNext), #end#end } from '../types/const';
   #else
@@ -81,14 +83,14 @@
   #end
 
   const title = ref<string>();
-  const isAddHandle = ref<boolean>(true);
+  const formHandle = ref<FormHandle>('add');
   const formRef = ref<any>();
   const formModel = ref<${vue.featureEntity}UpdateRequest>({});
 
   const defaultForm = (): ${vue.featureEntity}UpdateRequest => {
     return {
     #foreach($field in ${table.fields})
-      ${field.propertyName}: undefined,
+  ${field.propertyName}: undefined,
     #end
     };
   };
@@ -96,28 +98,23 @@
   // 打开新增
   const openAdd = () => {
     title.value = '添加${table.comment}';
-    isAddHandle.value = true;
-    renderForm({ ...defaultForm() });
+    formHandle.value = 'add';
+    formModel.value = assignOmitRecord({ ...defaultForm() });
     setVisible(true);
   };
 
   // 打开修改
   const openUpdate = (record: any) => {
     title.value = '修改${table.comment}';
-    isAddHandle.value = false;
-    renderForm({ ...defaultForm(), ...record });
+    formHandle.value = 'update';
+    formModel.value = assignOmitRecord({ ...defaultForm(), ...record });
     setVisible(true);
   };
 
-  // 渲染表单
-  const renderForm = (record: any) => {
-    formModel.value = Object.assign({}, record);
-  };
-
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -125,7 +122,7 @@
       if (error) {
         return false;
       }
-      if (isAddHandle.value) {
+      if (formHandle.value === 'add') {
         // 新增
         await create${vue.featureEntity}(formModel.value);
         Message.success('创建成功');
@@ -136,8 +133,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
+      handleClose();
+      return true;
     } catch (e) {
       return false;
     } finally {
@@ -147,11 +144,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };
 

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

@@ -10,7 +10,7 @@
            :unmount-on-close="true"
            :ok-button-props="{ disabled: loading }"
            :cancel-button-props="{ disabled: loading }"
-           :on-before-ok="handlerOk"
+           :on-before-ok="handleOk"
            @close="handleClose">
     <a-spin class="full" :loading="loading">
       <a-form :model="formModel"
@@ -61,10 +61,12 @@
 
 <script lang="ts" setup>
   import type { ${vue.featureEntity}UpdateRequest } from '@/api/${vue.module}/${vue.feature}';
+  import type { FormHandle } from '@/types/form';
   import { ref } from 'vue';
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
+  import { assignOmitRecord } from '@/utils';
   #if($dictMap.entrySet().size() > 0)
   import { #foreach($entry in ${dictMap.entrySet()})${entry.value.keyField}#if($foreach.hasNext), #end#end } from '../types/const';
   #else
@@ -85,7 +87,7 @@
   #end
 
   const title = ref<string>();
-  const isAddHandle = ref<boolean>(true);
+  const formHandle = ref<FormHandle>('add');
   const formRef = ref<any>();
   const formModel = ref<${vue.featureEntity}UpdateRequest>({});
 
@@ -100,28 +102,23 @@
   // 打开新增
   const openAdd = () => {
     title.value = '添加${table.comment}';
-    isAddHandle.value = true;
-    renderForm({ ...defaultForm() });
+    formHandle.value = 'add';
+    formModel.value = assignOmitRecord({ ...defaultForm() });
     setVisible(true);
   };
 
   // 打开修改
   const openUpdate = (record: any) => {
     title.value = '修改${table.comment}';
-    isAddHandle.value = false;
-    renderForm({ ...defaultForm(), ...record });
+    formHandle.value = 'update';
+    formModel.value = assignOmitRecord({ ...defaultForm(), ...record });
     setVisible(true);
   };
 
-  // 渲染表单
-  const renderForm = (record: any) => {
-    formModel.value = Object.assign({}, record);
-  };
-
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -129,7 +126,7 @@
       if (error) {
         return false;
       }
-      if (isAddHandle.value) {
+      if (formHandle.value === 'add') {
         // 新增
         await create${vue.featureEntity}(formModel.value);
         Message.success('创建成功');
@@ -140,8 +137,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
+      handleClose();
+      return true;
     } catch (e) {
       return false;
     } finally {
@@ -151,11 +148,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };
 

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

@@ -146,7 +146,7 @@
 <script lang="ts" setup>
   import type { ${vue.featureEntity}QueryRequest, ${vue.featureEntity}QueryResponse } from '@/api/${vue.module}/${vue.feature}';
   import { reactive, ref, onMounted } from 'vue';
-  import { batchDelete${vue.featureEntity}, delete${vue.featureEntity}, get${vue.featureEntity}Page } from '@/api/${vue.module}/${vue.feature}';
+  import {#if($vue.enableRowSelection) batchDelete${vue.featureEntity},#end delete${vue.featureEntity}, get${vue.featureEntity}Page } from '@/api/${vue.module}/${vue.feature}';
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';

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

@@ -5,17 +5,17 @@
     <${vue.feature}-table v-if="renderTable"
                   ref="table"
                   @open-add="() =>#if($vue.enableDrawerForm) drawer#else modal#end.openAdd()"
-                  @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
+                  @open-update="(e: any) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
     <!-- 列表-卡片 -->
     <${vue.feature}-card-list v-else
                   ref="card"
                   @open-add="() =>#if($vue.enableDrawerForm) drawer#else modal#end.openAdd()"
-                  @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
+                  @open-update="(e: any) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
     #else
     <!-- 列表-表格 -->
     <${vue.feature}-table ref="table"
                   @open-add="() =>#if($vue.enableDrawerForm) drawer#else modal#end.openAdd()"
-                  @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
+                  @open-update="(e: any) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
     #end
     #if($vue.enableDrawerForm)
     <!-- 添加修改抽屉 -->

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm

@@ -30,7 +30,6 @@ const fieldConfig = {
       render: ({ record }) => {
         return dateFormat(new Date(record.createTime));
       },
-      default: true,
     }, {
       label: '修改时间',
       dataIndex: 'updateTime',
@@ -38,6 +37,7 @@ const fieldConfig = {
       render: ({ record }) => {
         return dateFormat(new Date(record.updateTime));
       },
+      default: true,
     }, {
       label: '创建人',
       dataIndex: 'creator',
@@ -45,7 +45,6 @@ const fieldConfig = {
       width: 148,
       ellipsis: true,
       tooltip: true,
-      default: true,
     }, {
       label: '修改人',
       dataIndex: 'updater',
@@ -53,6 +52,7 @@ const fieldConfig = {
       width: 148,
       ellipsis: true,
       tooltip: true,
+      default: true,
     }
   ] as CardField[]
 } as CardFieldConfig;

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm

@@ -1,28 +1,17 @@
 import type { FieldRule } from '@arco-design/web-vue';
 
+const rules = {
 #foreach($field in ${table.fields})
 #if("$!field.propertyName" != "id")
-#if(${field.propertyType} == 'String' && "$field.metaInfo.jdbcType" != "LONGVARCHAR")
-export const ${field.propertyName} = [{
-  required: true,
-  message: '请输入${field.comment}'
-}, {
-  maxLength: $field.metaInfo.length,
-  message: '${field.comment}长度不能大于$field.metaInfo.length位'
-}] as FieldRule[];
-#else
-export const ${field.propertyName} = [{
-  required: true,
-  message: '请输入${field.comment}'
-}] as FieldRule[];
-#end
-#end
-
-#end
-export default {
-#foreach($field in ${table.fields})
-#if("$!field.propertyName" != "id")
-  ${field.propertyName},
+  ${field.propertyName}: [{
+    required: true,
+    message: '请输入${field.comment}'
+  }#if(${field.propertyType} == 'String' && "$field.metaInfo.jdbcType" != "LONGVARCHAR"), {
+    maxLength: $field.metaInfo.length,
+    message: '${field.comment}长度不能大于$field.metaInfo.length位'
+  }#end],
 #end
 #end
 } as Record<string, FieldRule | FieldRule[]>;
+
+export default rules;

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

@@ -37,7 +37,6 @@ const columns = [
     render: ({ record }) => {
       return dateFormat(new Date(record.createTime));
     },
-    default: true,
   }, {
     title: '修改时间',
     dataIndex: 'updateTime',
@@ -47,15 +46,18 @@ const columns = [
     render: ({ record }) => {
       return dateFormat(new Date(record.updateTime));
     },
+    default: true,
   }, {
     title: '创建人',
     dataIndex: 'creator',
     slotName: 'creator',
-    default: true,
+    width: 148,
   }, {
     title: '修改人',
     dataIndex: 'updater',
     slotName: 'updater',
+    width: 148,
+    default: true,
   }, {
     title: '操作',
     slotName: 'handle',

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

@@ -357,8 +357,6 @@ public class RedisMaps extends RedisUtils {
      *
      * @param key       key
      * @param hashKeys  hashKeys
-     * @param keyMapper keyMapper
-     * @param <K>       K
      * @param <V>       V
      * @return values
      */
@@ -371,9 +369,7 @@ public class RedisMaps extends RedisUtils {
      *
      * @param key       key
      * @param hashKeys  hashKeys
-     * @param keyMapper keyMapper
      * @param clazz     clazz
-     * @param <K>       K
      * @param <V>       V
      * @return values
      */

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

@@ -272,6 +272,16 @@ public class RedisStrings extends RedisUtils {
         return getList(keys, s -> JSON.parseArray(s, type));
     }
 
+    /**
+     * 设置值
+     *
+     * @param key   key
+     * @param value value
+     */
+    public static void set(String key, Object value) {
+        set(key, null, value);
+    }
+
     /**
      * 设置值
      *

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

@@ -49,6 +49,26 @@ public class RedisUtils {
     protected RedisUtils() {
     }
 
+    /**
+     * 是否包含 key
+     *
+     * @param define define
+     * @return has
+     */
+    public static boolean hasKey(CacheKeyDefine define) {
+        return hasKey(define.getKey());
+    }
+
+    /**
+     * 是否包含 key
+     *
+     * @param key key
+     * @return has
+     */
+    public static boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
     /**
      * 扫描 key
      *

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

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

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

@@ -25,6 +25,7 @@ package org.dromara.visor.framework.security.core.utils;
 import cn.orionsec.kit.lang.constant.StandardHttpHeader;
 import cn.orionsec.kit.lang.utils.Strings;
 import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.constant.ErrorCode;
 import org.dromara.visor.common.security.LoginUser;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -90,6 +91,19 @@ public class SecurityUtils {
         return authentication.getPrincipal() instanceof LoginUser ? (LoginUser) authentication.getPrincipal() : null;
     }
 
+    /**
+     * 获取当前用户 不为空
+     *
+     * @return 当前用户
+     */
+    public static LoginUser getLoginUserNotNull() {
+        LoginUser user = getLoginUser();
+        if (user == null) {
+            throw ErrorCode.UNAUTHORIZED.exception();
+        }
+        return user;
+    }
+
     /**
      * 获取当前 userId
      *

orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java

@@ -39,8 +39,6 @@ import org.springframework.context.annotation.Bean;
  * @author Jiahang Li
  * @version 1.0.0
  * @since 2023/6/30 16:21
- * <p>
- * TODO 后续添加 FAST MINIO OSS 等
  */
 @AutoConfiguration
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_STORAGE)

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

@@ -62,8 +62,6 @@ import java.util.List;
 
 /**
  * web 配置类
- * <p>
- * TODO XSS 后续选择性的配置
  *
  * @author Jiahang Li
  * @version 1.0.0
@@ -85,7 +83,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer {
         // 公共 api 前缀
         AntPathMatcher antPathMatcher = new AntPathMatcher(".");
         configurer.addPathPrefix(orionApiPrefix, clazz -> clazz.isAnnotationPresent(RestController.class)
-                && antPathMatcher.match("org.dromara.visor.module.**.controller.**", clazz.getPackage().getName()));
+                && antPathMatcher.match("org.dromara.visor.**.controller.**", clazz.getPackage().getName()));
     }
 
     @Override

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

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

orion-visor-framework/pom.xml

@@ -33,6 +33,7 @@
         <module>orion-visor-spring-boot-starter-monitor</module>
         <module>orion-visor-spring-boot-starter-test</module>
         <module>orion-visor-spring-boot-starter-influxdb</module>
+        <module>orion-visor-spring-boot-starter-biz-push</module>
         <module>orion-visor-spring-boot-starter-biz-operator-log</module>
     </modules>
 

orion-visor-launch/pom.xml

@@ -134,6 +134,10 @@
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-influxdb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-spring-boot-starter-biz-push</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>

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.4.3";
+    private static final String TARGET_VERSION = "2.5.1";
 
-    private static final String REPLACE_VERSION = "2.5.0";
+    private static final String REPLACE_VERSION = "2.5.2";
 
     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

@@ -23,6 +23,7 @@
 package org.dromara.visor.module.asset.api;
 
 import org.dromara.visor.module.asset.entity.dto.host.HostAgentLogDTO;
+import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -50,7 +51,15 @@ public interface HostAgentApi {
      * @param agentKeyList agentKeyList
      * @return nameMap
      */
-    Map<String, String> getCacheNameByAgentKey(List<String> agentKeyList);
+    Map<String, String> getNameCacheByAgentKey(List<String> agentKeyList);
+
+    /**
+     * 获取缓存名称
+     *
+     * @param agentKey agentKey
+     * @return nameMap
+     */
+    HostBaseDTO getHostCacheByAgentKey(String agentKey);
 
     /**
      * 获取探针版本

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/event/AgentOfflineEvent.java

@@ -0,0 +1,47 @@
+/*
+ * 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.asset.entity.event;
+
+import cn.orionsec.kit.lang.utils.collect.Lists;
+import org.springframework.context.ApplicationEvent;
+
+import java.util.List;
+
+/**
+ * agent 下线事件
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/9/19 20:57
+ */
+public class AgentOfflineEvent extends ApplicationEvent {
+
+    public AgentOfflineEvent(String agentKey) {
+        this(Lists.singleton(agentKey));
+    }
+
+    public AgentOfflineEvent(List<String> agentKeys) {
+        super(agentKeys);
+    }
+
+}

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

@@ -56,10 +56,6 @@
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-log</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dromara.visor</groupId>
-            <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-desensitize</artifactId>
@@ -96,6 +92,14 @@
             <groupId>org.dromara.visor</groupId>
             <artifactId>orion-visor-spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-spring-boot-starter-biz-push</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara.visor</groupId>
+            <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
+        </dependency>
     </dependencies>
 
 </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

@@ -26,18 +26,22 @@ import cn.orionsec.kit.lang.define.cache.TimedCache;
 import cn.orionsec.kit.lang.define.cache.TimedCacheBuilder;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Lists;
+import cn.orionsec.kit.lang.utils.io.Streams;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.framework.redis.core.utils.RedisStrings;
 import org.dromara.visor.module.asset.api.HostAgentApi;
 import org.dromara.visor.module.asset.convert.HostAgentLogProviderConvert;
+import org.dromara.visor.module.asset.convert.HostProviderConvert;
 import org.dromara.visor.module.asset.dao.HostAgentLogDAO;
 import org.dromara.visor.module.asset.dao.HostDAO;
 import org.dromara.visor.module.asset.define.cache.HostCacheKeyDefine;
 import org.dromara.visor.module.asset.entity.domain.HostDO;
 import org.dromara.visor.module.asset.entity.dto.host.HostAgentLogDTO;
+import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO;
 import org.dromara.visor.module.asset.service.HostAgentService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,9 +59,9 @@ import java.util.stream.Collectors;
 @Service
 public class HostAgentApiImpl implements HostAgentApi {
 
-    private static final TimedCache AGENT_NAME_CACHE = TimedCacheBuilder.create()
-            .expiredDelay(Const.MS_S_60 * 30)
-            .checkDelay(Const.MS_S_60)
+    private static final TimedCache<HostBaseDTO> AGENT_HOST_CACHE = TimedCacheBuilder.<HostBaseDTO>create()
+            .expireAfter(30 * Const.MS_S_60)
+            .checkInterval(Const.MS_S_60)
             .build();
 
     @Resource
@@ -69,6 +73,11 @@ public class HostAgentApiImpl implements HostAgentApi {
     @Resource
     private HostAgentService hostAgentService;
 
+    @PreDestroy
+    public void destroyTimedCache() {
+        Streams.close(AGENT_HOST_CACHE);
+    }
+
     @Override
     public List<HostAgentLogDTO> selectAgentInstallLog(List<Long> hostIdList) {
         if (Lists.isEmpty(hostIdList)) {
@@ -94,39 +103,67 @@ public class HostAgentApiImpl implements HostAgentApi {
     }
 
     @Override
-    public Map<String, String> getCacheNameByAgentKey(List<String> agentKeyList) {
+    public Map<String, String> getNameCacheByAgentKey(List<String> agentKeyList) {
         Map<String, String> result = new HashMap<>();
         List<String> queryList = new ArrayList<>();
         // 查询缓存
         for (String agentKey : agentKeyList) {
-            String name = AGENT_NAME_CACHE.get(agentKey);
-            if (name != null) {
-                result.put(agentKey, name);
+            HostBaseDTO host = AGENT_HOST_CACHE.get(agentKey);
+            if (host != null) {
+                result.put(agentKey, host.getName());
             } else {
                 queryList.add(agentKey);
             }
         }
-        // 查询数据库
         if (!queryList.isEmpty()) {
-            // 查询数据
-            hostDAO.of()
-                    .createWrapper()
-                    .select(HostDO::getName, HostDO::getAgentKey)
-                    .in(HostDO::getAgentKey, queryList)
-                    .then()
-                    .list()
-                    .forEach(s -> result.put(s.getAgentKey(), s.getName()));
-            for (String agentKey : queryList) {
-                result.putIfAbsent(agentKey, Const.EMPTY);
-                AGENT_NAME_CACHE.put(agentKey, result.get(agentKey));
-            }
+            // 加载缓存
+            this.loadHostCache(queryList);
+            // 重新设置返回结果
+            queryList.forEach(agentKey -> {
+                HostBaseDTO host = AGENT_HOST_CACHE.get(agentKey);
+                if (host != null) {
+                    result.put(agentKey, host.getName());
+                }
+            });
         }
         return result;
     }
 
+    @Override
+    public HostBaseDTO getHostCacheByAgentKey(String agentKey) {
+        HostBaseDTO host = AGENT_HOST_CACHE.get(agentKey);
+        // 加载缓存
+        if (host == null) {
+            this.loadHostCache(Lists.singleton(agentKey));
+            host = AGENT_HOST_CACHE.get(agentKey);
+        }
+        return host;
+    }
+
     @Override
     public String getAgentVersion() {
         return hostAgentService.getAgentVersion();
     }
 
+    /**
+     * 加载主机缓存
+     *
+     * @param agentKeys agentKeys
+     */
+    private void loadHostCache(List<String> agentKeys) {
+        // 查询数据并设置缓存
+        hostDAO.of()
+                .createWrapper()
+                .select(HostDO::getId,
+                        HostDO::getName,
+                        HostDO::getCode,
+                        HostDO::getAddress,
+                        HostDO::getAgentKey)
+                .in(HostDO::getAgentKey, agentKeys)
+                .then()
+                .list(HostProviderConvert.MAPPER::toBase)
+                .forEach(s -> AGENT_HOST_CACHE.put(s.getAgentKey(), s));
+
+    }
+
 }

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

@@ -33,6 +33,7 @@ import org.dromara.visor.module.asset.entity.dto.host.HostDTO;
 import org.dromara.visor.module.asset.entity.dto.host.HostQueryDTO;
 import org.dromara.visor.module.asset.entity.request.host.HostQueryRequest;
 import org.dromara.visor.module.asset.service.HostService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -53,6 +54,7 @@ public class HostApiImpl implements HostApi {
     @Resource
     private HostDAO hostDAO;
 
+    @Lazy
     @Resource
     private HostService hostService;
 

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

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

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

@@ -87,6 +87,9 @@ public class HostVO implements Serializable {
     @Schema(description = "探针在线状态")
     private Integer agentOnlineStatus;
 
+    @Schema(description = "探针切换在线状态时间")
+    private Date agentOnlineChangeTime;
+
     @Schema(description = "描述")
     private String description;
 

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

@@ -23,7 +23,6 @@
 package org.dromara.visor.module.asset.handler.agent.intstall;
 
 import cn.orionsec.kit.lang.utils.Strings;
-import cn.orionsec.kit.lang.utils.Valid;
 import cn.orionsec.kit.lang.utils.io.FileReaders;
 import cn.orionsec.kit.lang.utils.io.Streams;
 import cn.orionsec.kit.net.host.SessionStore;
@@ -36,6 +35,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.constant.FileConst;
 import org.dromara.visor.common.session.config.SshConnectConfig;
 import org.dromara.visor.common.session.ssh.SessionStores;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.PathUtils;
 import org.dromara.visor.module.asset.entity.domain.HostAgentLogDO;
 import org.dromara.visor.module.asset.enums.AgentLogStatusEnum;
@@ -94,8 +94,8 @@ public abstract class AbstractAgentInstaller implements AgentInstaller {
         log.info("AgentInstaller install start {}", logId);
         // 查询记录
         this.record = hostAgentLogService.selectById(logId);
-        Valid.notNull(record, "AgentInstaller record is null {}", logId);
-        Valid.eq(record.getStatus(), AgentLogStatusEnum.WAIT.name(), "AgentInstaller record status is not WAIT {}", logId);
+        Assert.notNull(record, "AgentInstaller record is null {}", logId);
+        Assert.eq(record.getStatus(), AgentLogStatusEnum.WAIT.name(), "AgentInstaller record status is not WAIT {}", logId);
         try {
             // 更新状态
             this.updateStatus(AgentLogStatusEnum.RUNNING, null);

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/AbstractHostConfigStrategy.java

@@ -29,8 +29,8 @@ import org.dromara.visor.common.handler.data.model.GenericsDataModel;
 import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
 import org.dromara.visor.common.security.UpdatePasswordAction;
 import org.dromara.visor.common.utils.AesEncryptUtils;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.RsaParamDecryptUtils;
-import org.dromara.visor.common.utils.Valid;
 import org.dromara.visor.module.asset.enums.HostAuthTypeEnum;
 
 /**
@@ -61,10 +61,10 @@ public abstract class AbstractHostConfigStrategy<T extends GenericsDataModel> ex
             return;
         }
         // 检查新密码
-        String newPassword = Valid.notBlank(after.getPassword(), ErrorMessage.PASSWORD_MISSING);
+        String newPassword = Assert.notBlank(after.getPassword(), ErrorMessage.PASSWORD_MISSING);
         // 解密密码
         newPassword = RsaParamDecryptUtils.decrypt(newPassword);
-        Valid.notBlank(newPassword, ErrorMessage.DECRYPT_ERROR);
+        Assert.notBlank(newPassword, ErrorMessage.DECRYPT_ERROR);
         // 设置密码
         after.setPassword(AesEncryptUtils.encryptAsString(newPassword));
     }
@@ -75,7 +75,7 @@ public abstract class AbstractHostConfigStrategy<T extends GenericsDataModel> ex
      * @param charset charset
      */
     protected void validCharset(String charset) {
-        Valid.isTrue(Charsets.isSupported(charset), ErrorMessage.UNSUPPORTED_CHARSET, charset);
+        Assert.isTrue(Charsets.isSupported(charset), ErrorMessage.UNSUPPORTED_CHARSET, charset);
     }
 
 }

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostRdpConfigStrategy.java

@@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.config;
 import cn.orionsec.kit.lang.utils.Strings;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
 import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO;
@@ -71,15 +71,15 @@ public class HostRdpConfigStrategy extends AbstractHostConfigStrategy<HostRdpCon
         // 检查主机身份是否存在
         Long identityId = model.getIdentityId();
         if (identityId != null) {
-            HostIdentityDO identity = Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
-            Valid.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
+            HostIdentityDO identity = Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Assert.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
         }
     }
 
     @Override
     protected void valid(HostRdpConfigDTO model) {
         // 验证填充后的参数
-        Valid.valid(model);
+        Assert.valid(model);
     }
 
     @Override

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostSshConfigStrategy.java

@@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.config;
 import cn.orionsec.kit.lang.utils.Strings;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.dao.HostKeyDAO;
 import org.dromara.visor.module.asset.entity.dto.host.HostSshConfigDTO;
@@ -77,19 +77,19 @@ public class HostSshConfigStrategy extends AbstractHostConfigStrategy<HostSshCon
         // 检查主机密钥是否存在
         Long keyId = model.getKeyId();
         if (keyId != null) {
-            Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
+            Assert.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
         }
         // 检查主机身份是否存在
         Long identityId = model.getIdentityId();
         if (identityId != null) {
-            Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
         }
     }
 
     @Override
     protected void valid(HostSshConfigDTO model) {
         // 验证填充后的参数
-        Valid.valid(model);
+        Assert.valid(model);
     }
 
     @Override

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Booleans;
 import cn.orionsec.kit.lang.utils.Strings;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
 import org.dromara.visor.module.asset.entity.dto.host.HostVncConfigDTO;
@@ -77,15 +77,15 @@ public class HostVncConfigStrategy extends AbstractHostConfigStrategy<HostVncCon
         // 检查主机身份是否存在
         Long identityId = model.getIdentityId();
         if (identityId != null) {
-            HostIdentityDO identity = Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
-            Valid.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
+            HostIdentityDO identity = Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Assert.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
         }
     }
 
     @Override
     protected void valid(HostVncConfigDTO model) {
         // 验证填充后的参数
-        Valid.valid(model);
+        Assert.valid(model);
     }
 
     @Override

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

@@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.extra.strategy;
 
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.security.core.utils.SecurityUtils;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.enums.HostExtraAuthTypeEnum;
@@ -65,17 +65,17 @@ public class HostRdpExtraStrategy extends AbstractGenericsDataStrategy<HostRdpEx
 
     @Override
     public void preValid(HostRdpExtraModel model) {
-        HostExtraAuthTypeEnum authType = Valid.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
+        HostExtraAuthTypeEnum authType = Assert.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
         model.setAuthType(authType.name());
         Long identityId = model.getIdentityId();
         Long userId = SecurityUtils.getLoginUserId();
         // 必填验证
         if (HostExtraAuthTypeEnum.CUSTOM_IDENTITY.equals(authType)) {
-            Valid.notNull(identityId);
+            Assert.notNull(identityId);
             // 验证主机身份是否存在
-            Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
             // 验证主机身份是否有权限
-            Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
+            Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
                     ErrorMessage.ANY_NO_PERMISSION,
                     DataPermissionTypeEnum.HOST_IDENTITY.getPermissionName());
         }

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

@@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.extra.strategy;
 
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.security.core.utils.SecurityUtils;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -68,34 +68,34 @@ public class HostSshExtraStrategy extends AbstractGenericsDataStrategy<HostSshEx
 
     @Override
     public void preValid(HostSshExtraModel model) {
-        HostExtraAuthTypeEnum authType = Valid.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
+        HostExtraAuthTypeEnum authType = Assert.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
         model.setAuthType(authType.name());
         Long keyId = model.getKeyId();
         Long identityId = model.getIdentityId();
         // 必填验证
         if (HostExtraAuthTypeEnum.CUSTOM_KEY.equals(authType)) {
-            Valid.notNull(keyId);
+            Assert.notNull(keyId);
         } else if (HostExtraAuthTypeEnum.CUSTOM_IDENTITY.equals(authType)) {
-            Valid.notNull(identityId);
+            Assert.notNull(identityId);
         }
         // 验证主机密钥是否存在
         if (keyId != null) {
-            Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
+            Assert.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
         }
         // 验证主机身份是否存在
         if (identityId != null) {
-            Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
         }
         Long userId = SecurityUtils.getLoginUserId();
         // 验证主机密钥是否有权限
         if (keyId != null) {
-            Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
+            Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
                     ErrorMessage.ANY_NO_PERMISSION,
                     DataPermissionTypeEnum.HOST_KEY.getPermissionName());
         }
         // 验证主机身份是否有权限
         if (identityId != null) {
-            Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
+            Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
                     ErrorMessage.ANY_NO_PERMISSION,
                     DataPermissionTypeEnum.HOST_IDENTITY.getPermissionName());
         }

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

@@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Maps;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.TreeUtils;
-import org.dromara.visor.common.utils.Valid;
 import org.dromara.visor.module.asset.convert.HostGroupConvert;
 import org.dromara.visor.module.asset.dao.HostDAO;
 import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest;
@@ -98,7 +98,7 @@ public class AssetAuthorizedDataServiceImpl implements AssetAuthorizedDataServic
     public List<Long> getAuthorizedDataRelId(DataPermissionTypeEnum type, AssetAuthorizedDataQueryRequest request) {
         Long userId = request.getUserId();
         Long roleId = request.getRoleId();
-        Valid.isTrue(userId != null || roleId != null);
+        Assert.isTrue(userId != null || roleId != null);
         if (userId != null) {
             // 查询用户数据
             return dataPermissionApi.getRelIdListByUserId(type, userId);

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

@@ -27,7 +27,7 @@ import cn.orionsec.kit.spring.SpringHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
-import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
 import org.dromara.visor.module.asset.dao.HostIdentityDAO;
 import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -150,18 +150,18 @@ public class AssetDataGrantServiceImpl implements AssetDataGrantService {
     private void checkGrantIdentity(AssetDataGrantRequest request) {
         Long userId = request.getUserId();
         Long roleId = request.getRoleId();
-        Valid.isTrue(userId != null || roleId != null);
+        Assert.isTrue(userId != null || roleId != null);
         if (userId != null) {
             // 检测用户是否存在
             SystemUserDTO user = systemUserApi.getUserById(userId);
-            Valid.notNull(user, ErrorMessage.USER_ABSENT);
+            Assert.notNull(user, ErrorMessage.USER_ABSENT);
             OperatorLogs.add(OperatorLogs.GRANT_TYPE, Const.CN_USER);
             OperatorLogs.add(OperatorLogs.GRANT_NAME, user.getNickname() + "(" + user.getUsername() + ")");
         }
         if (roleId != null) {
             // 检测角色是否存在
             SystemRoleDTO role = systemRoleApi.getRoleById(roleId);
-            Valid.notNull(role, ErrorMessage.ROLE_ABSENT);
+            Assert.notNull(role, ErrorMessage.ROLE_ABSENT);
             OperatorLogs.add(OperatorLogs.GRANT_TYPE, Const.CN_ROLE);
             OperatorLogs.add(OperatorLogs.GRANT_NAME, role.getName() + "(" + role.getCode() + ")");
         }

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

@@ -23,15 +23,17 @@
 package org.dromara.visor.module.asset.service.impl;
 
 import cn.orionsec.kit.lang.utils.Booleans;
-import cn.orionsec.kit.lang.utils.Valid;
 import cn.orionsec.kit.lang.utils.collect.Lists;
+import cn.orionsec.kit.spring.SpringHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.module.asset.dao.HostAgentLogDAO;
 import org.dromara.visor.module.asset.dao.HostDAO;
 import org.dromara.visor.module.asset.entity.domain.HostAgentLogDO;
 import org.dromara.visor.module.asset.entity.domain.HostDO;
+import org.dromara.visor.module.asset.entity.event.AgentOfflineEvent;
 import org.dromara.visor.module.asset.entity.vo.HostOnlineAgentConfigVO;
 import org.dromara.visor.module.asset.enums.AgentInstallStatusEnum;
 import org.dromara.visor.module.asset.enums.AgentLogStatusEnum;
@@ -41,7 +43,6 @@ import org.dromara.visor.module.asset.handler.host.extra.HostExtraItemEnum;
 import org.dromara.visor.module.asset.handler.host.extra.model.HostSpecExtraModel;
 import org.dromara.visor.module.asset.service.HostAgentEndpointService;
 import org.dromara.visor.module.asset.service.HostExtraService;
-import org.dromara.visor.module.monitor.api.MonitorHostApi;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -83,14 +84,12 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
     @Resource
     private HostExtraService hostExtraService;
 
-    @Resource
-    private MonitorHostApi monitorHostApi;
-
     /**
      * 初始化主机在线状态
      */
     @PostConstruct
     public void initHostOnlineStatus() {
+        log.info("HostAgentEndpointService-initHostOnlineStatus start.");
         List<HostDO> hosts = hostDAO.selectList(null);
         for (HostDO host : hosts) {
             Integer agentOnlineStatus = host.getAgentOnlineStatus();
@@ -98,6 +97,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
                 ONLINE_STATUS_CACHE.put(host.getAgentKey(), agentOnlineStatus);
             }
         }
+        log.info("HostAgentEndpointService-initHostOnlineStatus end.");
     }
 
     @Override
@@ -106,7 +106,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
         try {
             // 查询主机信息
             Long hostId = hostDAO.selectIdByAgentKey(agentKey);
-            Valid.notNull(hostId, ErrorMessage.HOST_ABSENT);
+            Assert.notNull(hostId, ErrorMessage.HOST_ABSENT);
             // 查询主机规格信息
             HostSpecExtraModel spec = hostExtraService.getHostExtra(Const.SYSTEM_USER_ID, hostId, HostExtraItemEnum.SPEC);
             Boolean synced = Optional.ofNullable(spec)
@@ -149,7 +149,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
         log.info("HostAgentEndpointService setAgentOffline agentKey: {}", agentKey);
         // 查询主机信息
         Long hostId = hostDAO.selectIdByAgentKey(agentKey);
-        Valid.notNull(hostId, ErrorMessage.HOST_ABSENT);
+        Assert.notNull(hostId, ErrorMessage.HOST_ABSENT);
         // 修改缓存
         ONLINE_STATUS_CACHE.put(agentKey, AgentOnlineStatusEnum.OFFLINE.getValue());
         HEARTBEAT_RECV_CACHE.put(agentKey, 0L);
@@ -167,8 +167,8 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
                 .status(AgentLogStatusEnum.SUCCESS.name())
                 .build();
         hostAgentLogDAO.insert(agentLog);
-        // 设置监控上下文为已下线
-        monitorHostApi.setAgentOffline(Lists.singleton(agentKey));
+        // 发送已下线事件
+        SpringHolder.publishEvent(new AgentOfflineEvent(agentKey));
     }
 
     @Override
@@ -248,9 +248,9 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
         if (!logList.isEmpty()) {
             hostAgentLogDAO.insertBatch(logList);
         }
-        // 设置监控上下文为已下线
+        // 发送已下线事件
         if (AgentOnlineStatusEnum.OFFLINE.equals(status)) {
-            monitorHostApi.setAgentOffline(agentKeyList);
+            SpringHolder.publishEvent(new AgentOfflineEvent(agentKeyList));
         }
     }
 

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

@@ -37,8 +37,8 @@ import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.constant.ExtraFieldConst;
 import org.dromara.visor.common.constant.FileConst;
+import org.dromara.visor.common.utils.Assert;
 import org.dromara.visor.common.utils.PathUtils;
-import org.dromara.visor.common.utils.Valid;
 import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
 import org.dromara.visor.framework.redis.core.utils.RedisStrings;
 import org.dromara.visor.module.asset.convert.HostConvert;
@@ -133,7 +133,7 @@ public class HostAgentServiceImpl implements HostAgentService {
         // 查询主机信息
         List<Long> idList = request.getIdList();
         List<HostDO> hosts = hostDAO.selectBatchIds(idList);
-        Valid.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT);
+        Assert.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT);
 
         // 检查并创建安装任务参数
         List<AgentInstallParams> installTaskParams = this.createInstallTaskParams(hosts);
@@ -146,7 +146,7 @@ public class HostAgentServiceImpl implements HostAgentService {
                 .in(HostAgentLogDO::getStatus, AgentLogStatusEnum.WAIT.name(), AgentLogStatusEnum.RUNNING.name())
                 .then()
                 .present();
-        Valid.isFalse(hasRunning, ErrorMessage.ILLEGAL_STATUS);
+        Assert.isFalse(hasRunning, ErrorMessage.ILLEGAL_STATUS);
 
         // 创建日志记录
         List<HostAgentLogDO> agentLogs = hosts.stream()
@@ -186,8 +186,8 @@ public class HostAgentServiceImpl implements HostAgentService {
                 .map(MultipartFile::getOriginalFilename)
                 .map(String::toLowerCase)
                 .orElse(Const.EMPTY);
-        Valid.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE);
-        Valid.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE);
+        Assert.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE);
+        Assert.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE);
         // 保存文件
         String releaseDir = PathUtils.getOrionPath(FileConst.INSTANCE_AGENT_RELEASE);
         String releaseTempDir = PathUtils.getOrionPath(FileConst.INSTANCE_AGENT_RELEASE_TEMP);
@@ -227,7 +227,7 @@ public class HostAgentServiceImpl implements HostAgentService {
         log.info("HostAgentService.installAgent decompressFiles: {}", Lists.map(decompressFiles, File::getName));
         // 检查版本文件
         String versionFile = releaseTempDir + Const.SLASH + FileConst.VERSION;
-        Valid.isTrue(Files1.isFile(versionFile), ErrorMessage.DECOMPRESS_FILE_ABSENT + Const.SPACE + FileConst.VERSION);
+        Assert.isTrue(Files1.isFile(versionFile), ErrorMessage.DECOMPRESS_FILE_ABSENT + Const.SPACE + FileConst.VERSION);
         // 移动文件
         for (File decompressFile : decompressFiles) {
             String releaseFile = releaseDir + Const.SLASH + decompressFile.getName();
@@ -261,10 +261,10 @@ public class HostAgentServiceImpl implements HostAgentService {
         // 任务参数
         for (HostDO host : hosts) {
             // 是否启用
-            Valid.eq(HostStatusEnum.ENABLED.name(), host.getStatus(), ErrorMessage.HOST_NOT_ENABLED, host.getName());
+            Assert.eq(HostStatusEnum.ENABLED.name(), host.getStatus(), ErrorMessage.HOST_NOT_ENABLED, host.getName());
             // 是否支持 ssh
             boolean supportSsh = HostTypeEnum.SSH.contains(host.getTypes());
-            Valid.isTrue(supportSsh, ErrorMessage.PLEASE_CHECK_HOST_SSH, host.getName());
+            Assert.isTrue(supportSsh, ErrorMessage.PLEASE_CHECK_HOST_SSH, host.getName());
             // 文件名称
             HostOsTypeEnum os = HostOsTypeEnum.of(host.getOsType());
             String agentFileName = Strings.format(FileConst.INSTANCE_AGENT_FILE_FORMAT,
@@ -289,7 +289,7 @@ public class HostAgentServiceImpl implements HostAgentService {
 
         // 检查文件是否存在
         for (String file : checkFileList) {
-            Valid.isTrue(Files1.isFile(file), ErrorMessage.FILE_ABSENT + Const.SPACE + file);
+            Assert.isTrue(Files1.isFile(file), ErrorMessage.FILE_ABSENT + Const.SPACE + file);
         }
         return taskParams;
     }