!839 发布 5.6.0 版本 新年第一版

Merge pull request !839 from 疯狂的狮子Li/dev

.gitattributes

@@ -1,2 +0,0 @@
-/mvnw text eol=lf
-*.cmd text eol=crlf

.mvn/wrapper/maven-wrapper.properties

@@ -1,8 +0,0 @@
-wrapperVersion=3.3.4
-distributionType=only-script
-# Maven 3.9.X
-distributionUrl=https://mirrors.huaweicloud.com/apache/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip
-# Maven 4.0
-#distributionUrl=https://mirrors.huaweicloud.com/apache/maven/maven-4/4.0.0-rc-5/binaries/apache-maven-4.0.0-rc-5-bin.zip
-# 分发类型为 only-script 或 bin 可以不需要该项（因为用不到），具体参考：https://maven.apache.org/tools/wrapper/maven-wrapper-distribution/index.html
-#wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

.run/ruoyi-monitor-admin.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.5.3" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.6.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
       </settings>

.run/ruoyi-server.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:5.5.3" />
+        <option name="imageTag" value="ruoyi/ruoyi-server:5.6.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
       </settings>

.run/ruoyi-snailjob-server.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.5.3" />
+        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.6.0" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-snailjob-server/Dockerfile" />
       </settings>

README.md

@@ -9,7 +9,7 @@
 [![Star](https://gitcode.com/dromara/RuoYi-Vue-Plus/star/badge.svg)](https://gitcode.com/dromara/RuoYi-Vue-Plus)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/5.X/LICENSE)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.5.3-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.6.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.5-blue.svg)]()
 [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
 [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()
@@ -47,8 +47,8 @@ Topiam IAM/IDaaS身份管理平台 - https://www.topiam.cn/ <br>
 |-------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------|
 | 前端项目        | 采用 Vue3 + TS + ElementPlus 重写                                                                                     | 基于Vue2/Vue3 + JS                                                                   | 
 | 后端项目结构      | 采用插件化 + 扩展包形式 结构解耦 易于扩展                                                                                           | 模块相互注入耦合严重难以扩展                                                                     | 
-| 后端代码风格      | 参考 Alibaba 规范与项目统一配置的代码格式化                                                                                        | 代码书写与常规结构不同阅读障碍大                                                                   |
-| Web容器       | 采用 Jetty 基于 Netty 的高性能容器                                                                                          | 采用 Tomcat                                                                          |
+| 后端代码风格      | 严格遵守Alibaba规范与项目统一配置的代码格式化                                                                                        | 代码书写与常规结构不同阅读障碍大                                                                   |
+| Web容器       | 采用 Undertow 基于 XNIO 的高性能容器                                                                                        | 采用 Tomcat                                                                          |
 | 权限认证        | 采用 Sa-Token、Jwt 静态使用功能齐全 低耦合 高扩展                                                                                  | Spring Security 配置繁琐扩展性极差                                                          |
 | 权限注解        | 采用 Sa-Token 支持注解 登录校验、角色校验、权限校验、二级认证校验、HttpBasic校验、忽略校验<br/>角色与权限校验支持多种条件 如 `AND` `OR` 或 `权限 OR 角色` 等复杂表达式        | 只支持是否存在匹配                                                                          |
 | 三方鉴权        | 采用 JustAuth 第三方登录组件 支持微信、钉钉等数十种三方认证                                                                               | 无                                                                                  |
@@ -74,14 +74,14 @@ Topiam IAM/IDaaS身份管理平台 - https://www.topiam.cn/ <br>
 | 分布式幂等       | 参考美团GTIS防重系统简化实现(细节可看文档)                                                                                          | 手动编写注解基于aop实现                                                                      |
 | 分布式锁        | 采用 Lock4j 底层基于 Redisson                                                                                           | 无                                                                                  |
 | 分布式任务调度     | 采用 SnailJob 天生支持分布式 统一的管理中心 支持多种数据库 支持分片重试DAG任务流等                                                                 | 采用 Quartz 基于数据库锁性能差 集群需要做很多配置与改造                                                   | 
-| 文件存储        | 采用 Minio、RustFS 分布式文件存储 天生支持多机、多硬盘、多分片、多副本存储<br/>支持权限管理 安全可靠 文件可加密存储                                              | 采用 本机文件存储 文件裸漏 易丢失泄漏 不支持集群有单点效应                                                    |
+| 文件存储        | 采用 Minio 分布式文件存储 天生支持多机、多硬盘、多分片、多副本存储<br/>支持权限管理 安全可靠 文件可加密存储                                                     | 采用 本机文件存储 文件裸漏 易丢失泄漏 不支持集群有单点效应                                                    |
 | 云存储         | 采用 AWS S3 协议客户端 支持 七牛、阿里、腾讯 等一切支持S3协议的厂家                                                                          | 不支持                                                                                |
 | 短信          | 采用 sms4j 短信融合包 支持数十种短信厂家 只需在yml配置好厂家密钥即可使用 可多厂家共用                                                                 | 不支持                                                                                |
 | 邮件          | 采用 mail-api 通用协议支持大部分邮件厂商                                                                                         | 不支持                                                                                |
 | 接口文档        | 采用 SpringDoc、javadoc 无注解零入侵基于java注释<br/>只需把注释写好 无需再写一大堆的文档注解了                                                     | 采用 Springfox 已停止维护 需要编写大量的注解来支持文档生成                                                | 
 | 校验框架        | 采用 Validation 支持注解与工具类校验 注解支持国际化                                                                                  | 仅支持注解 且注解不支持国际化                                                                    |
-| Excel框架     | 采用 Apache Fesod(原Alibaba EasyExcel) 基于插件化<br/>框架对其增加了很多功能 例如 自动合并相同内容 自动排列布局 字典翻译等                                | 基于 POI 手写实现 功能有限 复杂 扩展性差                                                           |
-| 工作流支持       | 采用 WarmFlow 支持各种复杂审批 转办 委派 加减签 会签 或签 票签 等功能                                                                       | 无                                                                                  |
+| Excel框架     | 采用 FastExcel(原Alibaba EasyExcel) 基于插件化<br/>框架对其增加了很多功能 例如 自动合并相同内容 自动排列布局 字典翻译等                                   | 基于 POI 手写实现 功能有限 复杂 扩展性差                                                           |
+| 工作流支持       | 支持各种复杂审批 转办 委派 加减签 会签 或签 票签 等功能                                                                                   | 无                                                                                  |
 | 工具类框架       | 采用 Hutool、Lombok 上百种工具覆盖90%的使用需求 基于注解自动生成 get set 等简化框架大量代码                                                       | 手写工具稳定性差易出问题 工具数量有限 代码臃肿需自己手写 get set 等                                            | 
 | 监控框架        | 采用 SpringBoot-Admin 基于SpringBoot官方 actuator 探针机制<br/>实时监控服务状态 框架还为其扩展了在线日志查看监控                                    | 无                                                                                  | 
 | 链路追踪        | 采用 Apache SkyWalking 还在为请求不知道去哪了 到哪出了问题而烦恼吗<br/>用了它即可实时查看请求经过的每一处每一个节点                                            | 无                                                                                  |
@@ -97,6 +97,8 @@ Topiam IAM/IDaaS身份管理平台 - https://www.topiam.cn/ <br>
 
 | 业务     | 功能说明                                                                 | 本框架 | RuoYi            |
 |--------|----------------------------------------------------------------------|-----|------------------|
+| 租户管理   | 系统内租户的管理 如:租户套餐、过期时间、用户数量、企业信息等                                      | 支持  | 无                |
+| 租户套餐管理 | 系统内租户所能使用的套餐管理 如:套餐内所包含的菜单等                                          | 支持  | 无                |
 | 客户端管理  | 系统内对接的所有客户端管理 如: pc端、小程序端等<br>支持动态授权登录方式 如: 短信登录、密码登录等 支持动态控制token时效 | 支持  | 无                |
 | 用户管理   | 用户的管理配置 如:新增用户、分配用户所属部门、角色、岗位等                                       | 支持  | 支持               |
 | 部门管理   | 配置系统组织机构（公司、部门、小组） 树结构展现支持数据权限                                       | 支持  | 支持               |

mvnw

@@ -1,295 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.4
-#
-# Optional ENV vars
-# -----------------
-#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
-#   MVNW_REPOURL - repo url base for downloading maven distribution
-#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
-# ----------------------------------------------------------------------------
-
-set -euf
-[ "${MVNW_VERBOSE-}" != debug ] || set -x
-
-# OS specific support.
-native_path() { printf %s\\n "$1"; }
-case "$(uname)" in
-CYGWIN* | MINGW*)
-  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
-  native_path() { cygpath --path --windows "$1"; }
-  ;;
-esac
-
-# set JAVACMD and JAVACCMD
-set_java_home() {
-  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
-  if [ -n "${JAVA_HOME-}" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-      JAVACCMD="$JAVA_HOME/jre/sh/javac"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-      JAVACCMD="$JAVA_HOME/bin/javac"
-
-      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
-        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
-        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
-        return 1
-      fi
-    fi
-  else
-    JAVACMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v java
-    )" || :
-    JAVACCMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v javac
-    )" || :
-
-    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
-      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
-      return 1
-    fi
-  fi
-}
-
-# hash string like Java String::hashCode
-hash_string() {
-  str="${1:-}" h=0
-  while [ -n "$str" ]; do
-    char="${str%"${str#?}"}"
-    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
-    str="${str#?}"
-  done
-  printf %x\\n $h
-}
-
-verbose() { :; }
-[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
-
-die() {
-  printf %s\\n "$1" >&2
-  exit 1
-}
-
-trim() {
-  # MWRAPPER-139:
-  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
-  #   Needed for removing poorly interpreted newline sequences when running in more
-  #   exotic environments such as mingw bash on Windows.
-  printf "%s" "${1}" | tr -d '[:space:]'
-}
-
-scriptDir="$(dirname "$0")"
-scriptName="$(basename "$0")"
-
-# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
-while IFS="=" read -r key value; do
-  case "${key-}" in
-  distributionUrl) distributionUrl=$(trim "${value-}") ;;
-  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
-  esac
-done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-
-case "${distributionUrl##*/}" in
-maven-mvnd-*bin.*)
-  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
-  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
-  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
-  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
-  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
-  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
-  *)
-    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
-    distributionPlatform=linux-amd64
-    ;;
-  esac
-  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
-  ;;
-maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
-*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
-esac
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
-distributionUrlName="${distributionUrl##*/}"
-distributionUrlNameMain="${distributionUrlName%.*}"
-distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
-MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
-
-exec_maven() {
-  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
-  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
-}
-
-if [ -d "$MAVEN_HOME" ]; then
-  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  exec_maven "$@"
-fi
-
-case "${distributionUrl-}" in
-*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
-*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
-esac
-
-# prepare tmp dir
-if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
-  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
-  trap clean HUP INT TERM EXIT
-else
-  die "cannot create temp dir"
-fi
-
-mkdir -p -- "${MAVEN_HOME%/*}"
-
-# Download and Install Apache Maven
-verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-verbose "Downloading from: $distributionUrl"
-verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-# select .zip or .tar.gz
-if ! command -v unzip >/dev/null; then
-  distributionUrl="${distributionUrl%.zip}.tar.gz"
-  distributionUrlName="${distributionUrl##*/}"
-fi
-
-# verbose opt
-__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
-[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-
-# normalize http auth
-case "${MVNW_PASSWORD:+has-password}" in
-'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-esac
-
-if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
-  verbose "Found wget ... using wget"
-  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
-elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
-  verbose "Found curl ... using curl"
-  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
-elif set_java_home; then
-  verbose "Falling back to use Java to download"
-  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
-  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
-  cat >"$javaSource" <<-END
-	public class Downloader extends java.net.Authenticator
-	{
-	  protected java.net.PasswordAuthentication getPasswordAuthentication()
-	  {
-	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
-	  }
-	  public static void main( String[] args ) throws Exception
-	  {
-	    setDefault( new Downloader() );
-	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
-	  }
-	}
-	END
-  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
-  verbose " - Compiling Downloader.java ..."
-  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
-  verbose " - Running Downloader.java ..."
-  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
-fi
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-if [ -n "${distributionSha256Sum-}" ]; then
-  distributionSha256Result=false
-  if [ "$MVN_CMD" = mvnd.sh ]; then
-    echo "Checksum validation is not supported for maven-mvnd." >&2
-    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  elif command -v sha256sum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  elif command -v shasum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
-    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  fi
-  if [ $distributionSha256Result = false ]; then
-    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
-    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-# unzip and move
-if command -v unzip >/dev/null; then
-  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
-else
-  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
-fi
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-actualDistributionDir=""
-
-# First try the expected directory name (for regular distributions)
-if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
-  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
-    actualDistributionDir="$distributionUrlNameMain"
-  fi
-fi
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if [ -z "$actualDistributionDir" ]; then
-  # enable globbing to iterate over items
-  set +f
-  for dir in "$TMP_DOWNLOAD_DIR"/*; do
-    if [ -d "$dir" ]; then
-      if [ -f "$dir/bin/$MVN_CMD" ]; then
-        actualDistributionDir="$(basename "$dir")"
-        break
-      fi
-    fi
-  done
-  set -f
-fi
-
-if [ -z "$actualDistributionDir" ]; then
-  verbose "Contents of $TMP_DOWNLOAD_DIR:"
-  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
-  die "Could not find Maven distribution directory in extracted archive"
-fi
-
-verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
-mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
-
-clean || :
-exec_maven "$@"

mvnw.cmd

@@ -1,191 +0,0 @@
-<# : batch portion
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.4
-@REM
-@REM Optional ENV vars
-@REM   MVNW_REPOURL - repo url base for downloading maven distribution
-@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM ----------------------------------------------------------------------------
-
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
-  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
-: end batch / begin powershell #>
-
-$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
-  $VerbosePreference = "Continue"
-}
-
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
-  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
-
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
-  "maven-mvnd-*" {
-    $USE_MVND = $true
-    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
-    $MVN_CMD = "mvnd.cmd"
-    break
-  }
-  default {
-    $USE_MVND = $false
-    $MVN_CMD = $script -replace '^mvnw','mvn'
-    break
-  }
-}
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
-}
-$distributionUrlName = $distributionUrl -replace '^.*/',''
-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-
-$MAVEN_M2_PATH = "$HOME/.m2"
-if ($env:MAVEN_USER_HOME) {
-  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
-}
-
-if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
-    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
-}
-
-$MAVEN_WRAPPER_DISTS = $null
-$mavenM2Item = Get-Item $MAVEN_M2_PATH
-$mavenM2Target = @($mavenM2Item.Target)
-if ($mavenM2Target.Count -gt 0 -and $null -ne $mavenM2Target[0]) {
-  $MAVEN_WRAPPER_DISTS = $mavenM2Target[0] + "/wrapper/dists"
-} else {
-  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
-}
-
-$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
-
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
-  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-  exit $?
-}
-
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
-  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
-}
-
-# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
-  if ($TMP_DOWNLOAD_DIR.Exists) {
-    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-  }
-}
-
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
-# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
-  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
-  if ($USE_MVND) {
-    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
-  }
-  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
-  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
-    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
-  }
-}
-
-# unzip and move
-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-$actualDistributionDir = ""
-
-# First try the expected directory name (for regular distributions)
-$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
-$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
-if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
-  $actualDistributionDir = $distributionUrlNameMain
-}
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if (!$actualDistributionDir) {
-  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
-    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
-    if (Test-Path -Path $testPath -PathType Leaf) {
-      $actualDistributionDir = $_.Name
-    }
-  }
-}
-
-if (!$actualDistributionDir) {
-  Write-Error "Could not find Maven distribution directory in extracted archive"
-}
-
-Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
-try {
-  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
-} catch {
-  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
-    Write-Error "fail to move MAVEN_HOME"
-  }
-} finally {
-  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
-
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

pom.xml

@@ -13,25 +13,24 @@
     <description>Dromara RuoYi-Vue-Plus多租户管理系统</description>
 
     <properties>
-        <revision>5.5.3</revision>
-        <spring-boot.version>4.0.3</spring-boot.version>
+        <revision>5.6.0</revision>
+        <spring-boot.version>3.5.12</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
         <mybatis.version>3.5.19</mybatis.version>
-        <springdoc.version>3.0.2</springdoc.version>
+        <springdoc.version>2.8.15</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
-        <fesod.version>2.0.1-incubating</fesod.version>
-        <velocity.version>2.4.1</velocity.version>
-        <satoken.version>1.45.0</satoken.version>
+        <fastexcel.version>1.3.0</fastexcel.version>
+        <velocity.version>2.3</velocity.version>
+        <satoken.version>1.44.0</satoken.version>
         <mybatis-plus.version>3.5.16</mybatis-plus.version>
-        <mybatis-plus-join.version>1.5.6</mybatis-plus-join.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.43</hutool.version>
-        <spring-boot-admin.version>4.0.2</spring-boot-admin.version>
-        <redisson.version>4.3.0</redisson.version>
+        <spring-boot-admin.version>3.5.6</spring-boot-admin.version>
+        <redisson.version>3.52.0</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
-        <dynamic-ds.version>4.5.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <snailjob.version>1.9.0</snailjob.version>
         <mapstruct-plus.version>1.5.0</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
@@ -39,27 +38,24 @@
         <bouncycastle.version>1.83</bouncycastle.version>
         <justauth.version>1.16.7</justauth.version>
         <!-- 离线IP地址定位库 -->
-        <ip2region.version>3.3.6</ip2region.version>
+        <ip2region.version>3.3.4</ip2region.version>
         <!-- OSS 配置 -->
-        <aws.sdk.version>2.42.9</aws.sdk.version>
+        <aws.sdk.version>2.28.22</aws.sdk.version>
         <!-- SMS 配置 -->
         <sms4j.version>3.3.5</sms4j.version>
         <!-- 限制框架中的fastjson版本 -->
         <fastjson.version>1.2.83</fastjson.version>
         <!-- 面向运行时的D-ORM依赖 -->
-        <anyline.version>8.7.3-20260306</anyline.version>
+        <anyline.version>8.7.3-20251210</anyline.version>
         <!-- 工作流配置 -->
         <warm-flow.version>1.8.4</warm-flow.version>
-        <!-- mqtt客户端 -->
-        <mica-mqtt.version>2.5.12</mica-mqtt.version>
 
         <!-- 插件版本 -->
-        <maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
-        <maven-war-plugin.version>3.5.1</maven-war-plugin.version>
-        <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
-        <!-- 统一版本号管理：Maven3.X需要，Maven4.0之后已原生支持 -->
-        <flatten-maven-plugin.version>1.7.3</flatten-maven-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
         <!-- 打包默认跳过测试 -->
         <skipTests>true</skipTests>
     </properties>
@@ -122,16 +118,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- sa-token-bom 依赖 -->
-            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
-            <dependency>
-                <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-bom</artifactId>
-                <version>${satoken.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- common 的依赖配置-->
             <dependency>
                 <groupId>org.dromara</groupId>
@@ -159,11 +145,10 @@
                 <version>${lombok.version}</version>
             </dependency>
 
-            <!-- fesod (EasyExcel/FastExcel的前身) 的依赖 -->
             <dependency>
-                <groupId>org.apache.fesod</groupId>
-                <artifactId>fesod-sheet</artifactId>
-                <version>${fesod.version}</version>
+                <groupId>cn.idev.excel</groupId>
+                <artifactId>fastexcel</artifactId>
+                <version>${fastexcel.version}</version>
             </dependency>
 
             <!-- velocity代码生成使用模板 -->
@@ -173,10 +158,34 @@
                 <version>${velocity.version}</version>
             </dependency>
 
+            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot3-starter</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+            <!-- Sa-Token 整合 jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${satoken.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-all</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-core</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+
             <!-- dynamic-datasource 多数据源-->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>
+                <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
                 <version>${dynamic-ds.version}</version>
             </dependency>
 
@@ -188,7 +197,7 @@
 
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
@@ -204,12 +213,6 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.github.yulichang</groupId>
-                <artifactId>mybatis-plus-join-boot-starter</artifactId>
-                <version>${mybatis-plus-join.version}</version>
-            </dependency>
-
             <!-- sql性能分析插件 -->
             <dependency>
                 <groupId>p6spy</groupId>
@@ -303,12 +306,6 @@
                 <version>${warm-flow.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.dromara.mica-mqtt</groupId>
-                <artifactId>mica-mqtt-client-spring-boot-starter</artifactId>
-                <version>${mica-mqtt.version}</version>
-            </dependency>
-
             <!-- JustAuth 的依赖配置-->
             <dependency>
                 <groupId>me.zhyd.oauth</groupId>

ruoyi-admin/pom.xml

@@ -55,6 +55,11 @@
             <artifactId>ruoyi-common-social</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-ratelimiter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-mail</artifactId>

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -1,7 +1,10 @@
 package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
@@ -12,43 +15,48 @@ import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.PushPayload;
 import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
 import org.dromara.common.core.domain.model.SocialLoginBody;
-import org.dromara.common.core.enums.PushSourceEnum;
-import org.dromara.common.core.enums.PushTypeEnum;
-import org.dromara.common.core.utils.DateUtils;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.core.utils.*;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.redis.annotation.RateLimiter;
-import org.dromara.common.redis.enums.LimitType;
-import org.dromara.common.push.helper.PushHelper;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysTenantVo;
 import org.dromara.system.service.ISysClientService;
 import org.dromara.system.service.ISysConfigService;
 import org.dromara.system.service.ISysSocialService;
+import org.dromara.system.service.ISysTenantService;
+import org.dromara.web.domain.vo.LoginTenantVo;
 import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.domain.vo.TenantListVo;
 import org.dromara.web.service.IAuthStrategy;
 import org.dromara.web.service.SysLoginService;
 import org.dromara.web.service.SysRegisterService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
- * 认证控制器，提供登录、注册、社交绑定和退出能力。
+ * 认证
  *
  * @author Lion Li
  */
@@ -63,6 +71,7 @@ public class AuthController {
     private final SysLoginService loginService;
     private final SysRegisterService registerService;
     private final ISysConfigService configService;
+    private final ISysTenantService tenantService;
     private final ISysSocialService socialUserService;
     private final ISysClientService clientService;
     private final ScheduledExecutorService scheduledExecutorService;
@@ -90,46 +99,48 @@ public class AuthController {
         } else if (!SystemConstants.NORMAL.equals(client.getStatus())) {
             return R.fail(MessageUtils.message("auth.grant.type.blocked"));
         }
+        // 校验租户
+        loginService.checkTenant(loginBody.getTenantId());
         // 登录
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
 
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {
-            PushHelper.publishMessage(
-                List.of(userId),
-                PushPayload.of(
-                    PushTypeEnum.MESSAGE,
-                    PushSourceEnum.BACKEND,
-                    DateUtils.getTodayHour(new Date()) + "好，欢迎登录 RuoYi-Vue-Plus 后台管理系统",
-                    null
-                )
-            );
+            SseMessageDto dto = new SseMessageDto();
+            dto.setMessage(DateUtils.getTodayHour(new Date()) + "好，欢迎登录 RuoYi-Vue-Plus 后台管理系统");
+            dto.setUserIds(List.of(userId));
+            SseMessageUtils.publishMessage(dto);
         }, 5, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }
 
     /**
-     * 获取第三方绑定跳转地址。
+     * 获取跳转URL
      *
      * @param source 登录来源
-     * @return 跳转地址
+     * @return 结果
      */
     @GetMapping("/binding/{source}")
-    public R<String> authBinding(@PathVariable("source") String source) {
+    public R<String> authBinding(@PathVariable("source") String source,
+                                 @RequestParam String tenantId, @RequestParam String domain) {
         SocialLoginConfigProperties obj = socialProperties.getType().get(source);
         if (ObjectUtil.isNull(obj)) {
             return R.fail(source + "平台账号暂不支持");
         }
         AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
-        String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
+        Map<String, String> map = new HashMap<>();
+        map.put("tenantId", tenantId);
+        map.put("domain", domain);
+        map.put("state", AuthStateUtils.createState());
+        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));
         return R.ok("操作成功", authorizeUrl);
     }
 
     /**
-     * 处理前端回调后的社交账号绑定。
+     * 前端回调绑定授权(需要token)
      *
      * @param loginBody 请求体
-     * @return 操作结果
+     * @return 结果
      */
     @PostMapping("/social/callback")
     public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
@@ -150,10 +161,9 @@ public class AuthController {
 
 
     /**
-     * 取消当前用户的社交账号授权。
+     * 取消授权(需要token)
      *
      * @param socialId socialId
-     * @return 操作结果
      */
     @DeleteMapping(value = "/unlock/{socialId}")
     public R<Void> unlockSocial(@PathVariable Long socialId) {
@@ -174,15 +184,12 @@ public class AuthController {
     }
 
     /**
-     * 用户注册。
-     *
-     * @param user 注册信息
-     * @return 操作结果
+     * 用户注册
      */
     @ApiEncrypt
     @PostMapping("/register")
     public R<Void> register(@Validated @RequestBody RegisterBody user) {
-        if (!configService.selectRegisterEnabled()) {
+        if (!configService.selectRegisterEnabled(user.getTenantId())) {
             return R.fail("当前系统没有开启注册功能！");
         }
         registerService.register(user);
@@ -190,24 +197,47 @@ public class AuthController {
     }
 
     /**
-     * 获取登录页租户下拉框数据，当前仅预留返回结构。
+     * 登录页面租户下拉框
      *
-     * @param request 当前请求
      * @return 租户列表
-     * @throws Exception 异常
      */
     @RateLimiter(time = 60, count = 20, limitType = LimitType.IP)
     @GetMapping("/tenant/list")
     public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
-        // 暂时预留给前端使用 后续删除
-        return R.ok(new LoginTenantVo(false));
+        // 返回对象
+        LoginTenantVo result = new LoginTenantVo();
+        boolean enable = TenantHelper.isEnable();
+        result.setTenantEnabled(enable);
+        // 如果未开启租户这直接返回
+        if (!enable) {
+            return R.ok(result);
+        }
+
+        List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
+        List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
+        try {
+            // 如果只超管返回所有租户
+            if (LoginHelper.isSuperAdmin()) {
+                result.setVoList(voList);
+                return R.ok(result);
+            }
+        } catch (NotLoginException ignored) {
+        }
+
+        // 获取域名
+        String host;
+        String referer = request.getHeader("referer");
+        if (StringUtils.isNotBlank(referer)) {
+            // 这里从referer中取值是为了本地使用hosts添加虚拟域名，方便本地环境调试
+            host = referer.split("//")[1].split("/")[0];
+        } else {
+            host = new URL(request.getRequestURL().toString()).getHost();
+        }
+        // 根据域名进行筛选
+        List<TenantListVo> list = StreamUtils.filter(voList, vo ->
+            StringUtils.equalsIgnoreCase(vo.getDomain(), host));
+        result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+        return R.ok(result);
     }
 
-    /**
-     * 登录租户列表响应对象。
-     *
-     * @param tenantEnabled 是否启用租户
-     */
-    public record LoginTenantVo(Boolean tenantEnabled) {
-    }
 }

ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -15,17 +15,17 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.regex.RegexValidator;
 import org.dromara.common.mail.config.properties.MailProperties;
 import org.dromara.common.mail.utils.MailUtils;
-import org.dromara.common.redis.annotation.RateLimiter;
-import org.dromara.common.redis.enums.LimitType;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
 import org.dromara.common.redis.utils.RedisUtils;
-import org.dromara.common.web.config.properties.CaptchaProperties;
 import org.dromara.common.web.core.WaveAndCircleCaptcha;
+import org.dromara.common.web.config.properties.CaptchaProperties;
 import org.dromara.sms4j.api.SmsBlend;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.core.factory.SmsFactory;
+import org.dromara.web.domain.vo.CaptchaVo;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -53,18 +53,14 @@ public class CaptchaController {
     private final MailProperties mailProperties;
 
     /**
-     * 发送短信验证码。
+     * 短信验证码
      *
-     * @param phoneNumber 用户手机号
-     * @return 操作结果
+     * @param phonenumber 用户手机号
      */
     @RateLimiter(key = "#phonenumber", time = 60, count = 1)
     @GetMapping("/resource/sms/code")
-    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phoneNumber) {
-        if (!RegexValidator.isMobile(phoneNumber)) {
-            return R.fail("请输入正确的手机号！");
-        }
-        String key = GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber;
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(4);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         // 验证码模板id 自行处理 (查数据库或写死均可)
@@ -72,7 +68,7 @@ public class CaptchaController {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);
         SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-        SmsResponse smsResponse = smsBlend.sendMessage(phoneNumber, templateId, map);
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());
@@ -81,27 +77,22 @@ public class CaptchaController {
     }
 
     /**
-     * 发送邮箱验证码
+     * 邮箱验证码
      *
      * @param email 邮箱
-     * @return 操作结果
      */
     @GetMapping("/resource/email/code")
     public R<Void> emailCode(@NotBlank(message = "{user.email.not.blank}") String email) {
         if (!mailProperties.getEnabled()) {
             return R.fail("当前系统没有开启邮箱功能！");
         }
-        if (!RegexValidator.isEmail(email)) {
-            return R.fail("请输入正确的邮箱地址！");
-        }
         SpringUtils.getAopProxy(this).emailCodeImpl(email);
         return R.ok();
     }
 
     /**
-     * 发送邮箱验证码的实际执行方法，拆分出来避免开关关闭时仍触发限流。
-     *
-     * @param email 邮箱
+     * 邮箱验证码
+     * 独立方法避免验证码关闭之后仍然走限流
      */
     @RateLimiter(key = "#email", time = 60, count = 1)
     public void emailCodeImpl(String email) {
@@ -117,23 +108,22 @@ public class CaptchaController {
     }
 
     /**
-     * 获取图片验证码。
-     *
-     * @return 验证码信息
+     * 生成验证码
      */
     @GetMapping("/auth/code")
     public R<CaptchaVo> getCode() {
         boolean captchaEnabled = captchaProperties.getEnable();
         if (!captchaEnabled) {
-            return R.ok(new CaptchaVo(false, null, null));
+            CaptchaVo captchaVo = new CaptchaVo();
+            captchaVo.setCaptchaEnabled(false);
+            return R.ok(captchaVo);
         }
         return R.ok(SpringUtils.getAopProxy(this).getCodeImpl());
     }
 
     /**
-     * 实际生成图片验证码并缓存结果。
-     *
-     * @return 验证码信息
+     * 生成验证码
+     * 独立方法避免验证码关闭之后仍然走限流
      */
     @RateLimiter(time = 60, count = 10, limitType = LimitType.IP)
     public CaptchaVo getCodeImpl() {
@@ -161,17 +151,10 @@ public class CaptchaController {
             code = exp.getValue(String.class);
         }
         RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        return new CaptchaVo(true, uuid, captcha.getImageBase64());
-    }
-
-    /**
-     * 图片验证码响应对象。
-     *
-     * @param captchaEnabled 是否启用验证码
-     * @param uuid           验证码标识
-     * @param img            Base64 图片数据
-     */
-    public record CaptchaVo(Boolean captchaEnabled, String uuid, String img) {
+        CaptchaVo captchaVo = new CaptchaVo();
+        captchaVo.setUuid(uuid);
+        captchaVo.setImg(captcha.getImageBase64());
+        return captchaVo;
     }
 
 }

ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java

@@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class IndexController {
 
     /**
-     * 访问首页时返回引导提示。
-     *
-     * @return 首页提示语
+     * 访问首页，提示语
      */
     @GetMapping("/")
     public String index() {

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java

@@ -0,0 +1,25 @@
+package org.dromara.web.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 验证码信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class CaptchaVo {
+
+    /**
+     * 是否开启验证码
+     */
+    private Boolean captchaEnabled = true;
+
+    private String uuid;
+
+    /**
+     * 验证码图片
+     */
+    private String img;
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java

@@ -0,0 +1,25 @@
+package org.dromara.web.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 登录租户对象
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class LoginTenantVo {
+
+    /**
+     * 租户开关
+     */
+    private Boolean tenantEnabled;
+
+    /**
+     * 租户对象列表
+     */
+    private List<TenantListVo> voList;
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
- * 登录成功后的令牌信息返回对象。
+ * 登录验证信息
  *
  * @author Michelle.Chung
  */

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java

@@ -0,0 +1,31 @@
+package org.dromara.web.domain.vo;
+
+import org.dromara.system.domain.vo.SysTenantVo;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+/**
+ * 租户列表
+ *
+ * @author Lion Li
+ */
+@Data
+@AutoMapper(target = SysTenantVo.class)
+public class TenantListVo {
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 域名
+     */
+    private String domain;
+
+}

ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java

@@ -1,28 +1,31 @@
 package org.dromara.web.listener;
 
 import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.domain.dto.UserOnlineDTO;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
-import org.dromara.common.log.event.LoginInfoEvent;
+import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.web.service.SysLoginService;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 
 /**
- * 用户行为监听器，用于同步在线状态和登录日志。
+ * 用户行为 侦听器的实现
  *
  * @author Lion Li
  */
@@ -34,7 +37,7 @@ public class UserActionListener implements SaTokenListener {
     private final SysLoginService loginService;
 
     /**
-     * 登录成功后记录在线信息并写入登录日志。
+     * 每次登录时触发
      */
     @Override
     public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
@@ -48,52 +51,64 @@ public class UserActionListener implements SaTokenListener {
         dto.setLoginTime(System.currentTimeMillis());
         dto.setTokenId(tokenValue);
         String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
         dto.setUserName(username);
         dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
         dto.setDeviceType(loginParameter.getDeviceType());
         dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
-        if (loginParameter.getTimeout() == -1) {
-            RedisUtils.setCacheObject(CacheNames.ONLINE_TOKEN_KEY + tokenValue, dto);
-        } else {
-            RedisUtils.setCacheObject(CacheNames.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
-        }
-
+        TenantHelper.dynamic(tenantId, () -> {
+            if(loginParameter.getTimeout() == -1) {
+                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+            } else {
+                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+            }
+        });
         // 记录登录日志
-        LoginInfoEvent loginInfoEvent = new LoginInfoEvent();
-        loginInfoEvent.setUsername(username);
-        loginInfoEvent.setStatus(Constants.LOGIN_SUCCESS);
-        loginInfoEvent.setMessage(MessageUtils.message("user.login.success"));
-        loginInfoEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(loginInfoEvent);
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
         // 更新登录信息
         loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
         log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
     }
 
     /**
-     * 注销时清理在线缓存。
+     * 每次注销时触发
      */
     @Override
     public void doLogout(String loginType, Object loginId, String tokenValue) {
-        RedisUtils.deleteObject(CacheNames.ONLINE_TOKEN_KEY + tokenValue);
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
         log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
     }
 
     /**
-     * 被踢下线时清理在线缓存。
+     * 每次被踢下线时触发
      */
     @Override
     public void doKickout(String loginType, Object loginId, String tokenValue) {
-        RedisUtils.deleteObject(CacheNames.ONLINE_TOKEN_KEY + tokenValue);
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
         log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
     }
 
     /**
-     * 被顶下线时清理在线缓存。
+     * 每次被顶下线时触发
      */
     @Override
     public void doReplaced(String loginType, Object loginId, String tokenValue) {
-        RedisUtils.deleteObject(CacheNames.ONLINE_TOKEN_KEY + tokenValue);
+        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+        TenantHelper.dynamic(tenantId, () -> {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        });
         log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
     }
 

ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java

@@ -39,7 +39,7 @@ public interface IAuthStrategy {
      *
      * @param body   登录对象
      * @param client 授权管理视图对象
-     * @return 当前策略完成认证后的登录结果
+     * @return 登录验证信息
      */
     LoginVo login(String body, SysClientVo client);
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -10,8 +10,10 @@ import com.baomidou.lock.annotation.Lock4j;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthUser;
-import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.dto.PostDTO;
 import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.domain.model.LoginUser;
@@ -19,10 +21,12 @@ import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.*;
-import org.dromara.common.log.event.LoginInfoEvent;
+import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.exception.TenantException;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysSocialBo;
 import org.dromara.system.domain.vo.*;
@@ -32,6 +36,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
+import java.util.Date;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -51,6 +56,7 @@ public class SysLoginService {
     @Value("${user.password.lockTime}")
     private Integer lockTime;
 
+    private final ISysTenantService tenantService;
     private final ISysPermissionService permissionService;
     private final ISysSocialService sysSocialService;
     private final ISysRoleService roleService;
@@ -107,7 +113,11 @@ public class SysLoginService {
             if (ObjectUtil.isNull(loginUser)) {
                 return;
             }
-            recordLoginInfo(loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+            if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+                // 超级管理员 登出清除动态租户
+                TenantHelper.clearDynamic();
+            }
+            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
         } catch (NotLoginException ignored) {
         } finally {
             try {
@@ -120,59 +130,51 @@ public class SysLoginService {
     /**
      * 记录登录信息
      *
+     * @param tenantId 租户ID
      * @param username 用户名
      * @param status   状态
      * @param message  消息内容
      */
-    public void recordLoginInfo(String username, String status, String message) {
-        LoginInfoEvent loginInfoEvent = new LoginInfoEvent();
-        loginInfoEvent.setUsername(username);
-        loginInfoEvent.setStatus(status);
-        loginInfoEvent.setMessage(message);
-        loginInfoEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(loginInfoEvent);
+    public void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
     }
 
     /**
-     * 根据用户视图对象组装登录态上下文。
-     *
-     * @param user 用户基础信息
-     * @return 包含部门、角色、岗位与权限数据的登录用户
+     * 构建登录用户
      */
     public LoginUser buildLoginUser(SysUserVo user) {
         LoginUser loginUser = new LoginUser();
         Long userId = user.getUserId();
+        loginUser.setTenantId(user.getTenantId());
         loginUser.setUserId(userId);
         loginUser.setDeptId(user.getDeptId());
         loginUser.setUsername(user.getUserName());
         loginUser.setNickname(user.getNickName());
         loginUser.setUserType(user.getUserType());
+        loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
+        loginUser.setRolePermission(permissionService.getRolePermission(userId));
         if (ObjectUtil.isNotNull(user.getDeptId())) {
             Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
             loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
             loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
         }
-        ThreadUtils.virtualSubmit(() -> {
-            loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
-        }, () -> {
-            loginUser.setRolePermission(permissionService.getRolePermission(userId));
-        }, () -> {
-            List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
-            List<RoleDTO> roleDtos = BeanUtil.copyToList(roles, RoleDTO.class);
-            loginUser.setRoles(roleDtos);
-            loginUser.setDataScopeRoleMap(permissionService.getDataScopeRoleMap(roleDtos));
-        }, () -> {
-            List<SysPostVo> posts = postService.selectPostsByUserId(userId);
-            loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
-        });
+        List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        List<SysPostVo> posts = postService.selectPostsByUserId(userId);
+        loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
         return loginUser;
     }
 
     /**
-     * 更新用户最近一次登录IP与登录时间。
+     * 记录登录信息
      *
      * @param userId 用户ID
-     * @param ip     登录IP
      */
     public void recordLoginInfo(Long userId, String ip) {
         SysUser sysUser = new SysUser();
@@ -184,21 +186,17 @@ public class SysLoginService {
     }
 
     /**
-     * 执行登录失败次数校验，并在成功后清空失败计数。
-     *
-     * @param loginType 登录类型
-     * @param username  登录标识
-     * @param supplier  返回 {@code true} 表示本次认证失败
+     * 登录校验
      */
-    public void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
-        String errorKey = CacheNames.PWD_ERR_CNT_KEY + username;
+    public void checkLogin(LoginType loginType, String tenantId, String username, Supplier<Boolean> supplier) {
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
         String loginFail = Constants.LOGIN_FAIL;
 
         // 获取用户登录错误次数，默认为0 (可自定义限制策略 例如: key + username + ip)
         int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
         // 锁定时间内登录 则踢出
         if (errorNumber >= maxRetryCount) {
-            recordLoginInfo(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+            recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
             throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
         }
 
@@ -208,11 +206,11 @@ public class SysLoginService {
             RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
             // 达到规定错误次数 则锁定登录
             if (errorNumber >= maxRetryCount) {
-                recordLoginInfo(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
                 throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
             } else {
                 // 未达到规定错误次数
-                recordLoginInfo(username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
                 throw new UserException(loginType.getRetryLimitCount(), errorNumber);
             }
         }
@@ -221,4 +219,33 @@ public class SysLoginService {
         RedisUtils.deleteObject(errorKey);
     }
 
+    /**
+     * 校验租户
+     *
+     * @param tenantId 租户ID
+     */
+    public void checkTenant(String tenantId) {
+        if (!TenantHelper.isEnable()) {
+            return;
+        }
+        if (StringUtils.isBlank(tenantId)) {
+            throw new TenantException("tenant.number.not.blank");
+        }
+        if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+            return;
+        }
+        SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
+        if (ObjectUtil.isNull(tenant)) {
+            log.info("登录租户：{} 不存在.", tenantId);
+            throw new TenantException("tenant.not.exists");
+        } else if (SystemConstants.DISABLE.equals(tenant.getStatus())) {
+            log.info("登录租户：{} 已被停用.", tenantId);
+            throw new TenantException("tenant.blocked");
+        } else if (ObjectUtil.isNotNull(tenant.getExpireTime())
+            && new Date().after(tenant.getExpireTime())) {
+            log.info("登录租户：{} 已超过有效期.", tenantId);
+            throw new TenantException("tenant.expired");
+        }
+    }
+
 }

ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -14,8 +14,9 @@ import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.log.event.LoginInfoEvent;
+import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.web.config.properties.CaptchaProperties;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysUserBo;
@@ -38,10 +39,9 @@ public class SysRegisterService {
 
     /**
      * 注册
-     *
-     * @param registerBody 注册请求参数
      */
     public void register(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
         String username = registerBody.getUsername();
         String password = registerBody.getPassword();
         // 校验用户类型是否存在
@@ -50,7 +50,7 @@ public class SysRegisterService {
         boolean captchaEnabled = captchaProperties.getEnable();
         // 验证码开关
         if (captchaEnabled) {
-            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
+            validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid());
         }
         SysUserBo sysUser = new SysUserBo();
         sysUser.setUserName(username);
@@ -58,16 +58,18 @@ public class SysRegisterService {
         sysUser.setPassword(BCrypt.hashpw(password));
         sysUser.setUserType(userType);
 
-        boolean exist = userMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getUserName, sysUser.getUserName()));
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUserName, sysUser.getUserName()));
+        });
         if (exist) {
             throw new UserException("user.register.save.error", username);
         }
-        boolean regFlag = userService.registerUser(sysUser);
+        boolean regFlag = userService.registerUser(sysUser, tenantId);
         if (!regFlag) {
             throw new UserException("user.register.error");
         }
-        recordLoginInfo(username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
     }
 
     /**
@@ -77,16 +79,16 @@ public class SysRegisterService {
      * @param code     验证码
      * @param uuid     唯一标识
      */
-    public void validateCaptcha(String username, String code, String uuid) {
+    public void validateCaptcha(String tenantId, String username, String code, String uuid) {
         String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
         String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.deleteObject(verifyKey);
         if (captcha == null) {
-            recordLoginInfo(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
             throw new CaptchaExpireException();
         }
         if (!StringUtils.equalsIgnoreCase(code, captcha)) {
-            recordLoginInfo(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
             throw new CaptchaException();
         }
     }
@@ -94,17 +96,20 @@ public class SysRegisterService {
     /**
      * 记录登录信息
      *
+     * @param tenantId 租户ID
      * @param username 用户名
      * @param status   状态
      * @param message  消息内容
+     * @return
      */
-    private void recordLoginInfo(String username, String status, String message) {
-        LoginInfoEvent loginInfoEvent = new LoginInfoEvent();
-        loginInfoEvent.setUsername(username);
-        loginInfoEvent.setStatus(status);
-        loginInfoEvent.setMessage(message);
-        loginInfoEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(loginInfoEvent);
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
     }
 
 }

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java

@@ -20,6 +20,7 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -42,23 +43,19 @@ public class EmailAuthStrategy implements IAuthStrategy {
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
-    /**
-     * 执行邮箱验证码登录，并按客户端配置生成访问令牌。
-     *
-     * @param body   登录请求体
-     * @param client 当前客户端配置
-     * @return 登录结果
-     */
     @Override
     public LoginVo login(String body, SysClientVo client) {
         EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
         ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
         String email = loginBody.getEmail();
         String emailCode = loginBody.getEmailCode();
-        SysUserVo user = loadUserByEmail(email);
-        loginService.checkLogin(LoginType.EMAIL, user.getUserName(), () -> !validateEmailCode(email, emailCode));
-        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
-        LoginUser loginUser = loginService.buildLoginUser(user);
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByEmail(email);
+            loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
         loginUser.setClientKey(client.getClientKey());
         loginUser.setDeviceType(client.getDeviceType());
         SaLoginParameter model = new SaLoginParameter();
@@ -79,27 +76,17 @@ public class EmailAuthStrategy implements IAuthStrategy {
     }
 
     /**
-     * 校验邮箱验证码是否存在且匹配。
-     *
-     * @param email     邮箱地址
-     * @param emailCode 用户输入的邮箱验证码
-     * @return 是否校验通过
+     * 校验邮箱验证码
      */
-    private boolean validateEmailCode(String email, String emailCode) {
+    private boolean validateEmailCode(String tenantId, String email, String emailCode) {
         String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
         if (StringUtils.isBlank(code)) {
-            loginService.recordLoginInfo(email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            loginService.recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
             throw new CaptchaExpireException();
         }
         return code.equals(emailCode);
     }
 
-    /**
-     * 按邮箱加载可登录用户，并校验是否存在或被停用。
-     *
-     * @param email 邮箱地址
-     * @return 用户信息
-     */
     private SysUserVo loadUserByEmail(String email) {
         SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getEmail, email));
         if (ObjectUtil.isNull(user)) {

ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -22,6 +22,7 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.web.config.properties.CaptchaProperties;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
@@ -46,17 +47,11 @@ public class PasswordAuthStrategy implements IAuthStrategy {
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
-    /**
-     * 执行账号密码登录，并按客户端配置生成访问令牌。
-     *
-     * @param body   登录请求体
-     * @param client 当前客户端配置
-     * @return 登录结果
-     */
     @Override
     public LoginVo login(String body, SysClientVo client) {
         PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
         ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
         String username = loginBody.getUsername();
         String password = loginBody.getPassword();
         String code = loginBody.getCode();
@@ -65,12 +60,14 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         boolean captchaEnabled = captchaProperties.getEnable();
         // 验证码开关
         if (captchaEnabled) {
-            validateCaptcha(username, code, uuid);
+            validateCaptcha(tenantId, username, code, uuid);
         }
-        SysUserVo user = loadUserByUsername(username);
-        loginService.checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
-        // 此处可根据登录用户的数据不同 自行创建 loginUser
-        LoginUser loginUser = loginService.buildLoginUser(user);
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByUsername(username);
+            loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword()));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser
+            return loginService.buildLoginUser(user);
+        });
         loginUser.setClientKey(client.getClientKey());
         loginUser.setDeviceType(client.getDeviceType());
         SaLoginParameter model = new SaLoginParameter();
@@ -91,32 +88,26 @@ public class PasswordAuthStrategy implements IAuthStrategy {
     }
 
     /**
-     * 校验图形验证码是否有效且匹配。
+     * 校验验证码
      *
      * @param username 用户名
-     * @param code     用户输入的验证码
-     * @param uuid     验证码缓存标识
+     * @param code     验证码
+     * @param uuid     唯一标识
      */
-    private void validateCaptcha(String username, String code, String uuid) {
+    private void validateCaptcha(String tenantId, String username, String code, String uuid) {
         String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
         String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.deleteObject(verifyKey);
         if (captcha == null) {
-            loginService.recordLoginInfo(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
             throw new CaptchaExpireException();
         }
         if (!StringUtils.equalsIgnoreCase(code, captcha)) {
-            loginService.recordLoginInfo(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
             throw new CaptchaException();
         }
     }
 
-    /**
-     * 按用户名加载可登录用户，并校验是否存在或被停用。
-     *
-     * @param username 用户名
-     * @return 用户信息
-     */
     private SysUserVo loadUserByUsername(String username) {
         SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, username));
         if (ObjectUtil.isNull(user)) {

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java

@@ -20,6 +20,7 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -42,23 +43,19 @@ public class SmsAuthStrategy implements IAuthStrategy {
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
-    /**
-     * 执行短信验证码登录，并按客户端配置生成访问令牌。
-     *
-     * @param body   登录请求体
-     * @param client 当前客户端配置
-     * @return 登录结果
-     */
     @Override
     public LoginVo login(String body, SysClientVo client) {
         SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
         ValidatorUtils.validate(loginBody);
-        String phoneNumber = loginBody.getPhoneNumber();
+        String tenantId = loginBody.getTenantId();
+        String phonenumber = loginBody.getPhonenumber();
         String smsCode = loginBody.getSmsCode();
-        SysUserVo user = loadUserByPhoneNumber(phoneNumber);
-        loginService.checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phoneNumber, smsCode));
-        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
-        LoginUser loginUser = loginService.buildLoginUser(user);
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            SysUserVo user = loadUserByPhonenumber(phonenumber);
+            loginService.checkLogin(LoginType.SMS, tenantId, user.getUserName(), () -> !validateSmsCode(tenantId, phonenumber, smsCode));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
         loginUser.setClientKey(client.getClientKey());
         loginUser.setDeviceType(client.getDeviceType());
         SaLoginParameter model = new SaLoginParameter();
@@ -79,35 +76,25 @@ public class SmsAuthStrategy implements IAuthStrategy {
     }
 
     /**
-     * 校验短信验证码是否存在且匹配。
-     *
-     * @param phoneNumber 手机号
-     * @param smsCode     用户输入的短信验证码
-     * @return 是否校验通过
+     * 校验短信验证码
      */
-    private boolean validateSmsCode(String phoneNumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber);
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
         if (StringUtils.isBlank(code)) {
-            loginService.recordLoginInfo(phoneNumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
             throw new CaptchaExpireException();
         }
         return code.equals(smsCode);
     }
 
-    /**
-     * 按手机号加载可登录用户，并校验是否存在或被停用。
-     *
-     * @param phoneNumber 手机号
-     * @return 用户信息
-     */
-    private SysUserVo loadUserByPhoneNumber(String phoneNumber) {
-        SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhoneNumber, phoneNumber));
+    private SysUserVo loadUserByPhonenumber(String phonenumber) {
+        SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
         if (ObjectUtil.isNull(user)) {
-            log.info("登录用户：{} 不存在.", phoneNumber);
-            throw new UserException("user.not.exists", phoneNumber);
+            log.info("登录用户：{} 不存在.", phonenumber);
+            throw new UserException("user.not.exists", phonenumber);
         } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
-            log.info("登录用户：{} 已被停用.", phoneNumber);
-            throw new UserException("user.blocked", phoneNumber);
+            log.info("登录用户：{} 已被停用.", phonenumber);
+            throw new UserException("user.blocked", phonenumber);
         }
         return user;
     }

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java

@@ -13,11 +13,13 @@ import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.domain.model.SocialLoginBody;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysSocialVo;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -29,6 +31,7 @@ import org.dromara.web.service.SysLoginService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 第三方授权策略
@@ -46,11 +49,10 @@ public class SocialAuthStrategy implements IAuthStrategy {
     private final SysLoginService loginService;
 
     /**
-     * 执行第三方授权登录，并校验授权账号与系统账号的绑定关系。
+     * 登录-第三方授权登录
      *
      * @param body     登录信息
      * @param client   客户端信息
-     * @return 登录结果
      */
     @Override
     public LoginVo login(String body, SysClientVo client) {
@@ -68,9 +70,21 @@ public class SocialAuthStrategy implements IAuthStrategy {
         if (CollUtil.isEmpty(list)) {
             throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！");
         }
-        SysUserVo user = loadUser(list.get(0).getUserId());
-        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
-        LoginUser loginUser = loginService.buildLoginUser(user);
+        SysSocialVo social;
+        if (TenantHelper.isEnable()) {
+            Optional<SysSocialVo> opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(loginBody.getTenantId()));
+            if (opt.isEmpty()) {
+                throw new ServiceException("对不起，你没有权限登录当前租户！");
+            }
+            social = opt.get();
+        } else {
+            social = list.get(0);
+        }
+        LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> {
+            SysUserVo user = loadUser(social.getUserId());
+            // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+            return loginService.buildLoginUser(user);
+        });
         loginUser.setClientKey(client.getClientKey());
         loginUser.setDeviceType(client.getDeviceType());
         SaLoginParameter model = new SaLoginParameter();
@@ -90,12 +104,6 @@ public class SocialAuthStrategy implements IAuthStrategy {
         return loginVo;
     }
 
-    /**
-     * 根据用户ID加载用户，并校验账号状态是否允许登录。
-     *
-     * @param userId 用户ID
-     * @return 用户信息
-     */
     private SysUserVo loadUser(Long userId) {
         SysUserVo user = userMapper.selectVoById(userId);
         if (ObjectUtil.isNull(user)) {

ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java

@@ -38,13 +38,6 @@ public class XcxAuthStrategy implements IAuthStrategy {
 
     private final SysLoginService loginService;
 
-    /**
-     * 执行微信小程序登录，并根据 openid 构建小程序用户登录态。
-     *
-     * @param body   登录请求体
-     * @param client 当前客户端配置
-     * @return 登录结果
-     */
     @Override
     public LoginVo login(String body, SysClientVo client) {
         XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class);
@@ -74,6 +67,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
         SysUserVo user = loadUserByOpenid(openid);
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         XcxLoginUser loginUser = new XcxLoginUser();
+        loginUser.setTenantId(user.getTenantId());
         loginUser.setUserId(user.getUserId());
         loginUser.setUsername(user.getUserName());
         loginUser.setNickname(user.getNickName());
@@ -100,12 +94,6 @@ public class XcxAuthStrategy implements IAuthStrategy {
         return loginVo;
     }
 
-    /**
-     * 按 openid 查询小程序绑定用户。
-     *
-     * @param openid 小程序用户唯一标识
-     * @return 绑定的系统用户信息
-     */
     private SysUserVo loadUserByOpenid(String openid) {
         // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
         // todo 自行实现 userService.selectUserByOpenid(openid);

ruoyi-admin/src/main/resources/application.yml

@@ -5,15 +5,20 @@ server:
   servlet:
     # 应用的访问路径
     context-path: /
-  # jetty 配置
-  jetty:
+  # undertow 配置
+  undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
-    max-http-form-post-size: -1
+    max-http-post-size: 1GB
+    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
+    # 每块buffer的空间大小,越小的空间被利用越充分
+    buffer-size: 512
+    # 是否分配的直接内存
+    direct-buffers: true
     threads:
-      # 最小线程数
-      min: 8
-      # 最大线程数
-      max: 256
+      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
+      io: 8
+      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
+      worker: 256
 
 captcha:
   # 是否启用验证码校验
@@ -112,6 +117,23 @@ security:
     - /*/api-docs/**
     - /warm-flow-ui/config
 
+# 多租户配置
+tenant:
+  # 是否开启
+  enable: true
+  # 排除表
+  excludes:
+    - sys_menu
+    - sys_tenant
+    - sys_tenant_package
+    - sys_role_dept
+    - sys_role_menu
+    - sys_user_post
+    - sys_user_role
+    - sys_client
+    - sys_oss_config
+    - flow_spel
+
 # MyBatisPlus配置
 # https://baomidou.com/config/
 mybatis-plus:
@@ -213,14 +235,18 @@ management:
     logfile:
       external-file: ./logs/sys-console.log
 
---- # 统一消息推送配置
-message:
+--- # 默认/推荐使用sse推送
+sse:
   enabled: true
-  # sse / websocket
-  transport: sse
-  # 统一访问路径
-  path: /resource/message
-  # websocket 允许的跨域来源
+  path: /resource/sse
+
+--- # websocket
+websocket:
+  # 如果关闭 需要和前端开关一起关闭
+  enabled: false
+  # 路径
+  path: /resource/websocket
+  # 设置访问源地址
   allowedOrigins: '*'
 
 --- # warm-flow工作流配置
@@ -235,43 +261,3 @@ warm-flow:
   node-tooltip: true
   # 默认Authorization，如果有多个token，用逗号分隔
   token-name: ${sa-token.token-name},clientid
-
---- # mqtt 配置
-# 具体配置还需查看文档
-# https://mica-mqtt.dreamlu.net/guide/spring/client.html
-mqtt.client:
-  # 是否开启客户端，默认：true
-  enabled: false
-  # 连接的服务端 ip ，默认：127.0.0.1
-  ip: 127.0.0.1
-  # 端口：默认：1883
-  port: 1883
-  # 客户端名称
-  name: Mqtt-Client
-  # 客户端Id（非常重要，一般为设备 sn，不可重复）
-  client-id: 000001
-  username: ruoyi
-  password: 123456
-  # 超时时间，单位：秒，默认：5秒
-  timeout: 5
-  # 重连时间，默认 5000 毫秒
-  re-interval: 5000
-  # mqtt 协议版本，可选 MQTT_3_1、mqtt_3_1_1、mqtt_5，默认：mqtt_3_1_1
-  version: mqtt_3_1_1
-  # 接收数据的 buffer size，默认：8k
-  read-buffer-size: 8KB
-  # 消息解析最大 bytes 长度，默认：10M
-  max-bytes-in-message: 10MB
-  # keep-alive 时间，单位：秒
-  keep-alive-secs: 60
-  # 开启保留 session 时，session 的有效期
-  session-expiry-interval-secs: 0
-  # 工作线程数，如果消息量比较大，例如做 emqx 的转发消息处理，可以调大此参数
-  mqtt-executor-size: 2
-  # 是否开启 ssl
-  ssl:
-    enabled: false
-    keystore-path:
-    keystore-pass:
-    truststore-path:
-    truststore-pass:

ruoyi-admin/src/main/resources/i18n/messages.properties

@@ -55,4 +55,8 @@ xcx.code.not.blank=小程序[code]不能为空
 social.source.not.blank=第三方登录平台[source]不能为空
 social.code.not.blank=第三方登录平台[code]不能为空
 social.state.not.blank=第三方登录平台[state]不能为空
-
+##租户
+tenant.number.not.blank=租户编号不能为空
+tenant.not.exists=对不起, 您的租户不存在，请联系管理员
+tenant.blocked=对不起，您的租户已禁用，请联系管理员
+tenant.expired=对不起，您的租户已过期，请联系管理员

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -55,4 +55,8 @@ xcx.code.not.blank=Mini program [code] cannot be blank
 social.source.not.blank=Social login platform [source] cannot be blank
 social.code.not.blank=Social login platform [code] cannot be blank
 social.state.not.blank=Social login platform [state] cannot be blank
-
+##租户
+tenant.number.not.blank=Tenant number cannot be blank
+tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator
+tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator
+tenant.expired=Sorry, your tenant has expired. Please contact the administrator.

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -55,4 +55,8 @@ xcx.code.not.blank=小程序[code]不能为空
 social.source.not.blank=第三方登录平台[source]不能为空
 social.code.not.blank=第三方登录平台[code]不能为空
 social.state.not.blank=第三方登录平台[state]不能为空
-
+##租户
+tenant.number.not.blank=租户编号不能为空
+tenant.not.exists=对不起, 您的租户不存在，请联系管理员
+tenant.blocked=对不起，您的租户已禁用，请联系管理员
+tenant.expired=对不起，您的租户已过期，请联系管理员

ruoyi-common/pom.xml

@@ -8,12 +8,6 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>ruoyi-common</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        common 通用模块
-    </description>
 
     <modules>
         <module>ruoyi-common-bom</module>
@@ -21,11 +15,13 @@
         <module>ruoyi-common-core</module>
         <module>ruoyi-common-doc</module>
         <module>ruoyi-common-excel</module>
+        <module>ruoyi-common-idempotent</module>
         <module>ruoyi-common-job</module>
         <module>ruoyi-common-log</module>
         <module>ruoyi-common-mail</module>
         <module>ruoyi-common-mybatis</module>
         <module>ruoyi-common-oss</module>
+        <module>ruoyi-common-ratelimiter</module>
         <module>ruoyi-common-redis</module>
         <module>ruoyi-common-satoken</module>
         <module>ruoyi-common-security</module>
@@ -35,8 +31,16 @@
         <module>ruoyi-common-sensitive</module>
         <module>ruoyi-common-json</module>
         <module>ruoyi-common-encrypt</module>
-        <module>ruoyi-common-push</module>
-        <module>ruoyi-common-mqtt</module>
+        <module>ruoyi-common-tenant</module>
+        <module>ruoyi-common-websocket</module>
+        <module>ruoyi-common-sse</module>
     </modules>
 
+    <artifactId>ruoyi-common</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        common 通用模块
+    </description>
+
 </project>

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>5.5.3</revision>
+        <revision>5.6.0</revision>
     </properties>
 
     <dependencyManagement>
@@ -40,6 +40,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!-- 幂等 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-idempotent</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!-- 调度模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
@@ -75,6 +82,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!-- 限流 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-ratelimiter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!-- 缓存服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
@@ -144,16 +158,24 @@
                 <version>${revision}</version>
             </dependency>
 
-            <!-- 消息推送模块 -->
+            <!-- 租户模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-push</artifactId>
+                <artifactId>ruoyi-common-tenant</artifactId>
                 <version>${revision}</version>
             </dependency>
 
+            <!-- WebSocket模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-mqtt</artifactId>
+                <artifactId>ruoyi-common-websocket</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- SSE模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-sse</artifactId>
                 <version>${revision}</version>
             </dependency>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -36,7 +36,7 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aspectj</artifactId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
         <!--常用工具类 -->

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java

@@ -28,8 +28,6 @@ public class ThreadPoolConfig {
 
     /**
      * 执行周期性或定时任务
-     *
-     * @return 全局定时任务线程池
      */
     @Bean(name = "scheduledExecutorService")
     protected ScheduledExecutorService scheduledExecutorService() {
@@ -87,9 +85,6 @@ public class ThreadPoolConfig {
 
     /**
      * 打印线程异常信息
-     *
-     * @param r 已执行的任务
-     * @param t 任务执行过程中抛出的异常
      */
     public static void printException(Runnable r, Throwable t) {
         if (t == null && r instanceof Future<?>) {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java

@@ -3,7 +3,7 @@ package org.dromara.common.core.config;
 import jakarta.validation.Validator;
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration;
+import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@@ -20,9 +20,6 @@ public class ValidatorConfig {
 
     /**
      * 配置校验框架 快速失败模式
-     *
-     * @param messageSource 国际化消息源
-     * @return 启用快速失败模式的校验器
      */
     @Bean
     public Validator validator(MessageSource messageSource) {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java

@@ -0,0 +1,30 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 缓存的key 常量
+ *
+ * @author Lion Li
+ */
+public interface CacheConstants {
+
+    /**
+     * 在线用户 redis key
+     */
+    String ONLINE_TOKEN_KEY = "online_tokens:";
+
+    /**
+     * 参数管理 cache key
+     */
+    String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -1,7 +1,7 @@
 package org.dromara.common.core.constant;
 
 /**
- * 缓存组名称常量，统一约定缓存名和缓存策略配置格式。
+ * 缓存组名称常量
  * <p>
  * key 格式为 cacheNames#ttl#maxIdleTime#maxSize#local
  * <p>
@@ -36,10 +36,15 @@ public interface CacheNames {
      */
     String SYS_DICT_TYPE = "sys_dict_type";
 
+    /**
+     * 租户
+     */
+    String SYS_TENANT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_tenant#30d";
+
     /**
      * 客户端
      */
-    String SYS_CLIENT = "sys_client#30d";
+    String SYS_CLIENT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_client#30d";
 
     /**
      * 用户账户
@@ -74,16 +79,11 @@ public interface CacheNames {
     /**
      * OSS配置
      */
-    String SYS_OSS_CONFIG = "sys_oss_config";
+    String SYS_OSS_CONFIG = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss_config";
 
     /**
      * 在线用户
      */
-    String ONLINE_TOKEN_KEY = "online_tokens:";
-
-    /**
-     * 登录账户密码错误次数 redis key
-     */
-    String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+    String ONLINE_TOKEN = "online_tokens";
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -1,7 +1,7 @@
 package org.dromara.common.core.constant;
 
 /**
- * 通用基础常量定义。
+ * 通用常量信息
  *
  * @author ruoyi
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java

@@ -1,7 +1,7 @@
 package org.dromara.common.core.constant;
 
 /**
- * 全局通用键常量，主要用于业务无关的 Redis Key 前缀定义。
+ * 全局的key常量 (业务无关的key)
  *
  * @author Lion Li
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java

@@ -7,7 +7,7 @@ import cn.hutool.core.lang.RegexPool;
  * <p>
  * 常用正则表达式集合，更多正则见: https://any86.github.io/any-rule/
  *
- * @author AprilWind
+ * @author Feng
  */
 public interface RegexConstants extends RegexPool {
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java

@@ -18,15 +18,25 @@ public interface SystemConstants {
     String DISABLE = "1";
 
     /**
-     * 是
+     * 是否为系统默认（是）
      */
     String YES = "Y";
 
     /**
-     * 否
+     * 是否为系统默认（否）
      */
     String NO = "N";
 
+    /**
+     * 是否菜单外链（是）
+     */
+    String YES_FRAME = "0";
+
+    /**
+     * 是否菜单外链（否）
+     */
+    String NO_FRAME = "1";
+
     /**
      * 菜单类型（目录）
      */
@@ -62,11 +72,6 @@ public interface SystemConstants {
      */
     Long SUPER_ADMIN_ID = 1L;
 
-    /**
-     * 超级管理员角色 roleKey
-     */
-    String SUPER_ADMIN_ROLE_KEY = "superadmin";
-
     /**
      * 根部门祖级列表
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java

@@ -0,0 +1,35 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 租户常量信息
+ *
+ * @author Lion Li
+ */
+public interface TenantConstants {
+
+    /**
+     * 超级管理员ID
+     */
+    Long SUPER_ADMIN_ID = 1L;
+
+    /**
+     * 超级管理员角色 roleKey
+     */
+    String SUPER_ADMIN_ROLE_KEY = "superadmin";
+
+    /**
+     * 租户管理员角色 roleKey
+     */
+    String TENANT_ADMIN_ROLE_KEY = "admin";
+
+    /**
+     * 租户管理员角色名称
+     */
+    String TENANT_ADMIN_ROLE_NAME = "管理员";
+
+    /**
+     * 默认租户ID
+     */
+    String DEFAULT_TENANT_ID = "000000";
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java

@@ -1,70 +0,0 @@
-package org.dromara.common.core.domain;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * 表格分页数据对象
- *
- * @author Lion Li
- */
-@Data
-@NoArgsConstructor
-public class PageResult<T> implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 总记录数
-     */
-    private long total;
-
-    /**
-     * 列表数据
-     */
-    private Collection<T> rows;
-
-    /**
-     * 分页
-     *
-     * @param list  列表数据
-     * @param total 总记录数
-     */
-    public PageResult(Collection<T> list, long total) {
-        this.rows = list;
-        this.total = total;
-    }
-
-    /**
-     * 根据分页对象构建表格分页数据对象
-     */
-    public static <T> PageResult<T> build(Collection<T> list, long total) {
-        PageResult<T> rspData = new PageResult<>();
-        rspData.setRows(list);
-        rspData.setTotal(total);
-        return rspData;
-    }
-
-    /**
-     * 根据数据列表构建表格分页数据对象
-     */
-    public static <T> PageResult<T> build(Collection<T> list) {
-        PageResult<T> rspData = new PageResult<>();
-        rspData.setRows(list);
-        rspData.setTotal(list.size());
-        return rspData;
-    }
-
-    /**
-     * 构建表格分页数据对象
-     */
-    public static <T> PageResult<T> build() {
-        return new PageResult<>();
-    }
-
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java

@@ -1,19 +1,15 @@
 package org.dromara.common.core.domain;
 
+import org.dromara.common.core.constant.HttpStatus;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.dromara.common.core.constant.HttpStatus;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import static org.dromara.common.core.constant.HttpStatus.ERROR;
-import static org.dromara.common.core.constant.HttpStatus.SUCCESS;
-
 /**
  * 响应信息主体
  *
- * @param <T> 响应数据的泛型类型
  * @author Lion Li
  */
 @Data
@@ -24,152 +20,78 @@ public class R<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 响应状态码
+     * 成功
      */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 失败
+     */
+    public static final int FAIL = 500;
+
     private int code;
 
-    /**
-     * 响应提示信息
-     */
     private String msg;
 
-    /**
-     * 响应业务数据
-     */
     private T data;
 
-    /**
-     * 构建成功响应结果
-     *
-     * @param <T> 响应数据的泛型类型
-     * @return 成功响应结果对象
-     */
     public static <T> R<T> ok() {
         return restResult(null, SUCCESS, "操作成功");
     }
 
-    /**
-     * 构建成功响应结果（带业务数据）
-     *
-     * @param data 业务数据
-     * @param <T>  响应数据的泛型类型
-     * @return 成功响应结果对象
-     */
     public static <T> R<T> ok(T data) {
         return restResult(data, SUCCESS, "操作成功");
     }
 
-    /**
-     * 构建成功响应结果（自定义提示信息）
-     *
-     * @param msg 自定义提示信息
-     * @param <T> 响应数据的泛型类型
-     * @return 成功响应结果对象
-     */
     public static <T> R<T> ok(String msg) {
         return restResult(null, SUCCESS, msg);
     }
 
-    /**
-     * 构建成功响应结果（自定义提示信息+业务数据）
-     *
-     * @param msg  自定义提示信息
-     * @param data 业务数据
-     * @param <T>  响应数据的泛型类型
-     * @return 成功响应结果对象
-     */
     public static <T> R<T> ok(String msg, T data) {
         return restResult(data, SUCCESS, msg);
     }
 
-    /**
-     * 构建失败响应结果
-     *
-     * @param <T> 响应数据的泛型类型
-     * @return 失败响应结果对象
-     */
     public static <T> R<T> fail() {
-        return restResult(null, ERROR, "操作失败");
+        return restResult(null, FAIL, "操作失败");
     }
 
-    /**
-     * 构建失败响应结果（自定义提示信息）
-     *
-     * @param msg 自定义提示信息
-     * @param <T> 响应数据的泛型类型
-     * @return 失败响应结果对象
-     */
     public static <T> R<T> fail(String msg) {
-        return restResult(null, ERROR, msg);
+        return restResult(null, FAIL, msg);
     }
 
-    /**
-     * 构建失败响应结果（带业务数据）
-     *
-     * @param data 业务数据
-     * @param <T>  响应数据的泛型类型
-     * @return 失败响应结果对象
-     */
     public static <T> R<T> fail(T data) {
-        return restResult(data, ERROR, "操作失败");
+        return restResult(data, FAIL, "操作失败");
     }
 
-    /**
-     * 构建失败响应结果（自定义提示信息+业务数据）
-     *
-     * @param msg  自定义提示信息
-     * @param data 业务数据
-     * @param <T>  响应数据的泛型类型
-     * @return 失败响应结果对象
-     */
     public static <T> R<T> fail(String msg, T data) {
-        return restResult(data, ERROR, msg);
+        return restResult(data, FAIL, msg);
     }
 
-    /**
-     * 构建失败响应结果（自定义状态码+提示信息）
-     *
-     * @param code 自定义状态码
-     * @param msg  自定义提示信息
-     * @param <T>  响应数据的泛型类型
-     * @return 失败响应结果对象
-     */
     public static <T> R<T> fail(int code, String msg) {
         return restResult(null, code, msg);
     }
 
     /**
-     * 构建警告响应结果
+     * 返回警告消息
      *
-     * @param msg 自定义提示信息
-     * @param <T> 响应数据的泛型类型
-     * @return 警告响应结果对象
+     * @param msg 返回内容
+     * @return 警告消息
      */
     public static <T> R<T> warn(String msg) {
         return restResult(null, HttpStatus.WARN, msg);
     }
 
     /**
-     * 构建警告响应结果（自定义提示信息+业务数据）
+     * 返回警告消息
      *
-     * @param msg  自定义提示信息
-     * @param data 业务数据
-     * @param <T>  响应数据的泛型类型
-     * @return 警告响应结果对象
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
      */
     public static <T> R<T> warn(String msg, T data) {
         return restResult(data, HttpStatus.WARN, msg);
     }
 
-    /**
-     * 核心构建方法
-     *
-     * @param data 业务数据
-     * @param code 响应状态码
-     * @param msg  提示信息
-     * @param <T>  响应数据的泛型类型
-     * @return 响应结果对象
-     */
     private static <T> R<T> restResult(T data, int code, String msg) {
         R<T> r = new R<>();
         r.setCode(code);
@@ -178,26 +100,11 @@ public class R<T> implements Serializable {
         return r;
     }
 
-    /**
-     * 判断响应结果是否为失败
-     *
-     * @param ret 响应结果对象
-     * @param <T> 响应数据的泛型类型
-     * @return true=失败，false=成功
-     */
     public static <T> Boolean isError(R<T> ret) {
         return !isSuccess(ret);
     }
 
-    /**
-     * 判断响应结果是否为成功
-     *
-     * @param ret 响应结果对象
-     * @param <T> 响应数据的泛型类型
-     * @return true=成功，false=失败
-     */
     public static <T> Boolean isSuccess(R<T> ret) {
-        return SUCCESS == ret.getCode();
+        return R.SUCCESS == ret.getCode();
     }
-
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java

@@ -65,11 +65,6 @@ public class CompleteTaskDTO implements Serializable {
      */
     private String ext;
 
-    /**
-     * 获取流程变量并自动剔除空值。
-     *
-     * @return 流程变量
-     */
     public Map<String, Object> getVariables() {
         if (variables == null) {
             variables = new HashMap<>(16);

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java

@@ -1,14 +1,30 @@
 package org.dromara.common.core.domain.dto;
 
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
 /**
  * 抄送
  *
- * @param userId   抄送用户 ID
- * @param nickName 抄送用户昵称
  * @author may
  */
-public record FlowCopyDTO(
-    Long userId,
-    String nickName
-) {
+@Data
+public class FlowCopyDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java

@@ -7,7 +7,7 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * OSS 文件简要信息对象。
+ * OSS对象
  *
  * @author Lion Li
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java

@@ -7,7 +7,7 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 岗位简要信息对象。
+ * 岗位
  *
  * @author AprilWind
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PushPayload.java

@@ -1,76 +0,0 @@
-package org.dromara.common.core.domain.dto;
-
-import lombok.Data;
-import org.dromara.common.core.enums.PushSourceEnum;
-import org.dromara.common.core.enums.PushTypeEnum;
-import org.dromara.common.core.utils.StringUtils;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 推送给前端的统一消息体
- *
- * @author Lion Li
- */
-@Data
-public class PushPayload implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 消息类型
-     */
-    private String type;
-
-    /**
-     * 消息来源
-     */
-    private String source;
-
-    /**
-     * 文本消息
-     */
-    private String message;
-
-    /**
-     * 扩展数据
-     */
-    private Object data;
-
-    /**
-     * 前端跳转路径
-     */
-    private String path;
-
-    /**
-     * 时间戳
-     */
-    private Long timestamp;
-
-    public static PushPayload of(String type, String source, String message, Object data) {
-        PushPayload payload = new PushPayload();
-        payload.setType(StringUtils.defaultIfBlank(type, PushTypeEnum.MESSAGE.getType()));
-        payload.setSource(StringUtils.defaultIfBlank(source, PushSourceEnum.BACKEND.getSource()));
-        payload.setMessage(message);
-        payload.setData(data);
-        payload.setTimestamp(System.currentTimeMillis());
-        return payload;
-    }
-
-    public static PushPayload of(PushTypeEnum type, PushSourceEnum source, String message, Object data) {
-        return of(
-            type == null ? null : type.getType(),
-            source == null ? null : source.getSource(),
-            message,
-            data
-        );
-    }
-
-    public static PushPayload of(PushTypeEnum type, PushSourceEnum source, String message, Object data, String path) {
-        PushPayload payload = of(type, source, message, data);
-        payload.setPath(path);
-        return payload;
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java

@@ -7,10 +7,11 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 角色简要信息对象。
+ * 角色
  *
  * @author Lion Li
  */
+
 @Data
 @NoArgsConstructor
 public class RoleDTO implements Serializable {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java

@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * 启动流程请求对象。
+ * 启动流程对象
  *
  * @author may
  */
@@ -46,11 +46,6 @@ public class StartProcessDTO implements Serializable {
      */
     private FlowInstanceBizExtDTO bizExt;
 
-    /**
-     * 获取流程变量并自动剔除空值。
-     *
-     * @return 流程变量
-     */
     public Map<String, Object> getVariables() {
         if (variables == null) {
             variables = new HashMap<>(16);
@@ -60,11 +55,6 @@ public class StartProcessDTO implements Serializable {
         return variables;
     }
 
-    /**
-     * 获取流程业务扩展信息，为空时返回默认对象。
-     *
-     * @return 业务扩展信息
-     */
     public FlowInstanceBizExtDTO getBizExt() {
         if (ObjectUtil.isNull(bizExt)) {
             bizExt = new FlowInstanceBizExtDTO();

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java

@@ -1,14 +1,30 @@
 package org.dromara.common.core.domain.dto;
 
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
- * 启动流程后的返回结果对象。
+ * 启动流程返回对象
  *
- * @param processInstanceId 流程实例 ID
- * @param taskId            首个任务 ID
  * @author Lion Li
  */
-public record StartProcessReturnDTO(
-    Long processInstanceId,
-    Long taskId
-) {
+@Data
+public class StartProcessReturnDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程实例id
+     */
+    private Long processInstanceId;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.function.Function;
@@ -30,7 +29,7 @@ public class TaskAssigneeDTO implements Serializable {
     private Long total = 0L;
 
     /**
-     * 受让人列表。
+     *
      */
     private List<TaskHandler> list;
 
@@ -43,7 +42,7 @@ public class TaskAssigneeDTO implements Serializable {
      * 将源列表转换为 TaskHandler 列表
      *
      * @param <T>              通用类型
-     * @param sourceCollection 待转换的源列表
+     * @param sourceList       待转换的源列表
      * @param storageId        提取 storageId 的函数
      * @param handlerCode      提取 handlerCode 的函数
      * @param handlerName      提取 handlerName 的函数
@@ -52,13 +51,13 @@ public class TaskAssigneeDTO implements Serializable {
      * @return 转换后的 TaskHandler 列表
      */
     public static <T> List<TaskHandler> convertToHandlerList(
-        Collection<T> sourceCollection,
+        List<T> sourceList,
         Function<T, String> storageId,
         Function<T, String> handlerCode,
         Function<T, String> handlerName,
         Function<T, String> groupName,
         Function<T, Date> createTimeMapper) {
-        return sourceCollection.stream()
+        return sourceList.stream()
             .map(item -> new TaskHandler(
                 storageId.apply(item),
                 handlerCode.apply(item),
@@ -68,9 +67,6 @@ public class TaskAssigneeDTO implements Serializable {
             )).collect(Collectors.toList());
     }
 
-    /**
-     * 任务受让人明细对象。
-     */
     @Data
     @NoArgsConstructor
     @AllArgsConstructor

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java

@@ -53,7 +53,7 @@ public class UserDTO implements Serializable {
     /**
      * 手机号码
      */
-    private String phoneNumber;
+    private String phonenumber;
 
     /**
      * 用户性别（0男 1女 2未知）

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java

@@ -7,10 +7,11 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 当前在线会话信息对象。
+ * 当前在线会话
  *
  * @author ruoyi
  */
+
 @Data
 @NoArgsConstructor
 public class UserOnlineDTO implements Serializable {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java

@@ -16,6 +16,11 @@ public class ProcessDeleteEvent implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 流程定义编码
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java

@@ -17,6 +17,11 @@ public class ProcessEvent implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 流程定义编码
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java

@@ -17,6 +17,11 @@ public class ProcessTaskEvent implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 流程定义编码
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java

@@ -6,10 +6,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 邮箱验证码登录请求对象。
+ * 邮件登录对象
  *
  * @author Lion Li
  */
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class EmailLoginBody extends LoginBody {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java

@@ -7,10 +7,11 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 通用登录请求对象，封装客户端、授权类型和验证码信息。
+ * 用户登录对象
  *
  * @author Lion Li
  */
+
 @Data
 public class LoginBody implements Serializable {
 
@@ -29,13 +30,18 @@ public class LoginBody implements Serializable {
     @NotBlank(message = "{auth.grant.type.not.blank}")
     private String grantType;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 验证码
      */
     private String code;
 
     /**
-     * 验证码唯一标识。
+     * 唯一标识
      */
     private String uuid;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java

@@ -8,11 +8,10 @@ import org.dromara.common.core.domain.dto.RoleDTO;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
- * 登录用户上下文对象，保存当前会话的身份、权限和终端信息。
+ * 登录用户身份权限
  *
  * @author Lion Li
  */
@@ -23,6 +22,11 @@ public class LoginUser implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 用户ID
      */
@@ -108,11 +112,6 @@ public class LoginUser implements Serializable {
      */
     private List<RoleDTO> roles;
 
-    /**
-     * 数据权限角色映射 key 为权限码 value 为可参与数据权限计算的角色ID列表
-     */
-    private Map<String, List<Long>> dataScopeRoleMap;
-
     /**
      * 岗位对象
      */
@@ -134,9 +133,7 @@ public class LoginUser implements Serializable {
     private String deviceType;
 
     /**
-     * 获取 Sa-Token 使用的登录标识。
-     *
-     * @return 登录标识
+     * 获取登录id
      */
     public String getLoginId() {
         if (userType == null) {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java

@@ -5,10 +5,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 短信验证码登录请求对象。
+ * 短信登录对象
  *
  * @author Lion Li
  */
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class SmsLoginBody extends LoginBody {
@@ -17,7 +18,7 @@ public class SmsLoginBody extends LoginBody {
      * 手机号
      */
     @NotBlank(message = "{user.phonenumber.not.blank}")
-    private String phoneNumber;
+    private String phonenumber;
 
     /**
      * 短信code

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java

@@ -5,10 +5,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 第三方平台登录绑定请求对象。
+ * 三方登录对象
  *
  * @author Lion Li
  */
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class SocialLoginBody extends LoginBody {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java

@@ -5,10 +5,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 小程序登录请求对象。
+ * 三方登录对象
  *
  * @author Lion Li
  */
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class XcxLoginBody extends LoginBody {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 
 /**
- * 小程序登录用户上下文对象。
+ * 小程序登录用户身份权限
  *
  * @author Lion Li
  */
@@ -20,7 +20,7 @@ public class XcxLoginUser extends LoginUser {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 小程序 openid。
+     * openid
      */
     private String openid;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java

@@ -13,7 +13,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * 流程业务状态枚举，统一定义单据在审批流转中的状态。
+ * 业务状态枚举
  *
  * @author may
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 登录设备类型枚举。
+ * 设备类型
  *
  * @author Lion Li
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 登录类型枚举，同时维护不同登录方式对应的重试提示配置。
+ * 登录类型
  *
  * @author Lion Li
  */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/PushSourceEnum.java

@@ -1,41 +0,0 @@
-package org.dromara.common.core.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 推送消息来源枚举
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum PushSourceEnum {
-
-    /**
-     * 后端系统消息
-     */
-    BACKEND("backend"),
-
-    /**
-     * 通知公告
-     */
-    NOTICE("notice"),
-
-    /**
-     * 工作流
-     */
-    WORKFLOW("workflow"),
-
-    /**
-     * 大模型
-     */
-    LLM("llm"),
-
-    /**
-     * 客户端消息
-     */
-    CLIENT("client");
-
-    private final String source;
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/PushTypeEnum.java

@@ -1,36 +0,0 @@
-package org.dromara.common.core.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 推送消息类型枚举
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum PushTypeEnum {
-
-    /**
-     * 通用消息
-     */
-    MESSAGE("message"),
-
-    /**
-     * 通知公告
-     */
-    NOTICE("notice"),
-
-    /**
-     * 大模型消息
-     */
-    LLM("llm"),
-
-    /**
-     * 自定义消息
-     */
-    CUSTOM("custom");
-
-    private final String type;
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java

@@ -24,14 +24,7 @@ public enum UserStatus {
      */
     DELETED("2", "删除");
 
-    /**
-     * 状态编码。
-     */
     private final String code;
-
-    /**
-     * 状态说明。
-     */
     private final String info;
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java

@@ -28,12 +28,6 @@ public enum UserType {
      */
     private final String userType;
 
-    /**
-     * 根据字符串内容匹配用户类型。
-     *
-     * @param str 待匹配字符串
-     * @return 用户类型
-     */
     public static UserType getUserType(String str) {
         for (UserType value : values()) {
             if (StringUtils.contains(str, value.getUserType())) {

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 
 /**
- * 通用业务异常，支持使用占位符拼接错误信息。
+ * 业务异常（支持占位符 {} ）
  *
  * @author ruoyi
  */
@@ -37,32 +37,15 @@ public final class ServiceException extends RuntimeException {
      */
     private String detailMessage;
 
-    /**
-     * 使用错误消息构造业务异常。
-     *
-     * @param message 错误消息
-     */
     public ServiceException(String message) {
         this.message = message;
     }
 
-    /**
-     * 使用错误消息和错误码构造业务异常。
-     *
-     * @param message 错误消息
-     * @param code 错误码
-     */
     public ServiceException(String message, Integer code) {
         this.message = message;
         this.code = code;
     }
 
-    /**
-     * 使用占位符参数格式化错误消息。
-     *
-     * @param message 模板消息
-     * @param args 参数
-     */
     public ServiceException(String message, Object... args) {
         this.message = StrFormatter.format(message, args);
     }
@@ -72,23 +55,11 @@ public final class ServiceException extends RuntimeException {
         return message;
     }
 
-    /**
-     * 设置错误消息并返回当前异常对象。
-     *
-     * @param message 错误消息
-     * @return 当前异常对象
-     */
     public ServiceException setMessage(String message) {
         this.message = message;
         return this;
     }
 
-    /**
-     * 设置错误明细并返回当前异常对象。
-     *
-     * @param detailMessage 错误明细
-     * @return 当前异常对象
-     */
     public ServiceException setDetailMessage(String detailMessage) {
         this.detailMessage = detailMessage;
         return this;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 
 /**
- * SSE 场景专用异常。
+ * sse 特制异常
  *
  * @author LionLi
  */
@@ -36,21 +36,10 @@ public final class SseException extends RuntimeException {
      */
     private String detailMessage;
 
-    /**
-     * 使用错误消息构造 SSE 异常。
-     *
-     * @param message 错误消息
-     */
     public SseException(String message) {
         this.message = message;
     }
 
-    /**
-     * 使用错误消息和错误码构造 SSE 异常。
-     *
-     * @param message 错误消息
-     * @param code 错误码
-     */
     public SseException(String message, Integer code) {
         this.message = message;
         this.code = code;
@@ -61,23 +50,11 @@ public final class SseException extends RuntimeException {
         return message;
     }
 
-    /**
-     * 设置错误消息并返回当前异常对象。
-     *
-     * @param message 错误消息
-     * @return 当前异常对象
-     */
     public SseException setMessage(String message) {
         this.message = message;
         return this;
     }
 
-    /**
-     * 设置错误明细并返回当前异常对象。
-     *
-     * @param detailMessage 错误明细
-     * @return 当前异常对象
-     */
     public SseException setDetailMessage(String detailMessage) {
         this.detailMessage = detailMessage;
         return this;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 
 /**
- * 基础国际化异常，支持按错误码解析最终提示信息。
+ * 基础异常
  *
  * @author ruoyi
  */
@@ -43,42 +43,18 @@ public class BaseException extends RuntimeException {
      */
     private String defaultMessage;
 
-    /**
-     * 使用模块、错误码和参数构造异常。
-     *
-     * @param module 所属模块
-     * @param code 错误码
-     * @param args 参数
-     */
     public BaseException(String module, String code, Object[] args) {
         this(module, code, args, null);
     }
 
-    /**
-     * 使用模块和默认消息构造异常。
-     *
-     * @param module 所属模块
-     * @param defaultMessage 默认消息
-     */
     public BaseException(String module, String defaultMessage) {
         this(module, null, null, defaultMessage);
     }
 
-    /**
-     * 使用错误码和参数构造异常。
-     *
-     * @param code 错误码
-     * @param args 参数
-     */
     public BaseException(String code, Object[] args) {
         this(null, code, args, null);
     }
 
-    /**
-     * 使用默认消息构造异常。
-     *
-     * @param defaultMessage 默认消息
-     */
     public BaseException(String defaultMessage) {
         this(null, null, null, defaultMessage);
     }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java

@@ -2,7 +2,6 @@ package org.dromara.common.core.service;
 
 import org.dromara.common.core.domain.dto.DeptDTO;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -42,6 +41,6 @@ public interface DeptService {
      * @param deptIds 部门 ID 列表
      * @return Map，其中 key 为部门 ID，value 为对应的部门名称
      */
-    Map<Long, String> selectDeptNamesByIds(Collection<Long> deptIds);
+    Map<Long, String> selectDeptNamesByIds(List<Long> deptIds);
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java

@@ -1,9 +1,5 @@
 package org.dromara.common.core.service;
 
-import org.dromara.common.core.domain.dto.RoleDTO;
-
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -29,12 +25,4 @@ public interface PermissionService {
      */
     Set<String> getMenuPermission(Long userId);
 
-    /**
-     * 根据角色列表构建数据权限角色映射
-     *
-     * @param roles 角色列表
-     * @return key 为权限码 value 为命中的角色ID列表
-     */
-    Map<String, List<Long>> getDataScopeRoleMap(List<RoleDTO> roles);
-
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java

@@ -1,6 +1,6 @@
 package org.dromara.common.core.service;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,6 +16,6 @@ public interface PostService {
      * @param postIds 岗位 ID 列表
      * @return Map，其中 key 为岗位 ID，value 为对应的岗位名称
      */
-    Map<Long, String> selectPostNamesByIds(Collection<Long> postIds);
+    Map<Long, String> selectPostNamesByIds(List<Long> postIds);
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java

@@ -1,6 +1,6 @@
 package org.dromara.common.core.service;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,6 +16,6 @@ public interface RoleService {
      * @param roleIds 角色 ID 列表
      * @return Map，其中 key 为角色 ID，value 为对应的角色名称
      */
-    Map<Long, String> selectRoleNamesByIds(Collection<Long> roleIds);
+    Map<Long, String> selectRoleNamesByIds(List<Long> roleIds);
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java

@@ -2,7 +2,6 @@ package org.dromara.common.core.service;
 
 import org.dromara.common.core.domain.dto.UserDTO;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +58,7 @@ public interface UserService {
      * @param userIds 用户ids
      * @return 用户列表
      */
-    List<UserDTO> selectListByIds(Collection<Long> userIds);
+    List<UserDTO> selectListByIds(List<Long> userIds);
 
     /**
      * 通过角色ID查询用户ID
@@ -67,7 +66,7 @@ public interface UserService {
      * @param roleIds 角色ids
      * @return 用户ids
      */
-    List<Long> selectUserIdsByRoleIds(Collection<Long> roleIds);
+    List<Long> selectUserIdsByRoleIds(List<Long> roleIds);
 
     /**
      * 通过角色ID查询用户
@@ -75,7 +74,7 @@ public interface UserService {
      * @param roleIds 角色ids
      * @return 用户
      */
-    List<UserDTO> selectUsersByRoleIds(Collection<Long> roleIds);
+    List<UserDTO> selectUsersByRoleIds(List<Long> roleIds);
 
     /**
      * 通过部门ID查询用户
@@ -83,7 +82,7 @@ public interface UserService {
      * @param deptIds 部门ids
      * @return 用户
      */
-    List<UserDTO> selectUsersByDeptIds(Collection<Long> deptIds);
+    List<UserDTO> selectUsersByDeptIds(List<Long> deptIds);
 
     /**
      * 通过岗位ID查询用户
@@ -91,7 +90,7 @@ public interface UserService {
      * @param postIds 岗位ids
      * @return 用户
      */
-    List<UserDTO> selectUsersByPostIds(Collection<Long> postIds);
+    List<UserDTO> selectUsersByPostIds(List<Long> postIds);
 
     /**
      * 根据用户 ID 列表查询用户昵称映射关系
@@ -99,6 +98,6 @@ public interface UserService {
      * @param userIds 用户 ID 列表
      * @return Map，其中 key 为用户 ID，value 为对应的用户昵称
      */
-    Map<Long, String> selectUserNicksByIds(Collection<Long> userIds);
+    Map<Long, String> selectUserNicksByIds(List<Long> userIds);
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java

@@ -50,7 +50,6 @@ public interface WorkflowService {
      * 获取流程变量
      *
      * @param instanceId 流程实例id
-     * @return 流程变量详情
      */
     Map<String, Object> instanceVariable(Long instanceId);
 
@@ -62,11 +61,18 @@ public interface WorkflowService {
      */
     Long getInstanceIdByBusinessId(String businessId);
 
+    /**
+     * 新增租户流程定义
+     *
+     * @param tenantId 租户id
+     */
+    void syncDef(String tenantId);
+
     /**
      * 启动流程
      *
      * @param startProcess 参数
-     * @return 启动后的流程实例与首任务信息
+     * @return 结果
      */
     StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess);
 
@@ -76,7 +82,7 @@ public interface WorkflowService {
      * completeTask.getVariables().put("ignore", true);
      *
      * @param completeTask 参数
-     * @return 办理成功返回 {@code true}
+     * @return 结果
      */
     boolean completeTask(CompleteTaskDTO completeTask);
 
@@ -85,7 +91,7 @@ public interface WorkflowService {
      *
      * @param taskId  任务ID
      * @param message 办理意见
-     * @return 办理成功返回 {@code true}
+     * @return 结果
      */
     boolean completeTask(Long taskId, String message);
 
@@ -93,7 +99,7 @@ public interface WorkflowService {
      * 启动流程并办理第一个任务
      *
      * @param startProcess 参数
-     * @return 首节点办理成功返回 {@code true}
+     * @return 结果
      */
     boolean startCompleteTask(StartProcessDTO startProcess);
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java

@@ -2,7 +2,7 @@ package org.dromara.common.core.utils;
 
 import cn.hutool.extra.spring.SpringUtil;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.boot.thread.Threading;
+import org.springframework.boot.autoconfigure.thread.Threading;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import org.apache.commons.lang3.Strings;
 import org.springframework.util.AntPathMatcher;
 
 import java.nio.charset.Charset;
@@ -334,7 +333,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     public static boolean startWithAnyIgnoreCase(CharSequence str, CharSequence... prefixs) {
         // 判断是否是以指定字符串开头
         for (CharSequence prefix : prefixs) {
-            if (Strings.CI.startsWith(str, prefix)) {
+            if (StringUtils.startsWithIgnoreCase(str, prefix)) {
                 return true;
             }
         }
@@ -382,169 +381,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return StringUtils.join(array, SEPARATOR);
     }
 
-    /**
-     * 判断两个字符串是否相等
-     *
-     * @param cs1 字符串1
-     * @param cs2 字符串2
-     * @return 是否相等
-     */
-    public static boolean equals(final CharSequence cs1, final CharSequence cs2) {
-        return Strings.CS.equals(cs1, cs2);
-    }
-
-    /**
-     * 判断字符串是否在指定的字符串列表中
-     *
-     * @param string       字符串
-     * @param searchStrings 字符串列表
-     * @return 是否在列表中
-     */
-    public static boolean equalsAny(final CharSequence string, final CharSequence... searchStrings) {
-        return Strings.CS.equalsAny(string, searchStrings);
-    }
-
-    /**
-     * 忽略大小写判断字符串是否在指定的字符串列表中
-     *
-     * @param string       字符串
-     * @param searchStrings 字符串列表
-     * @return 是否在列表中
-     */
-    public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharSequence... searchStrings) {
-        return Strings.CI.equalsAny(string, searchStrings);
-    }
-
-    /**
-     * 忽略大小写判断两个字符串是否相等
-     *
-     * @param cs1 字符串1
-     * @param cs2 字符串2
-     * @return 是否相等
-     */
-    public static boolean equalsIgnoreCase(final CharSequence cs1, final CharSequence cs2) {
-        return Strings.CI.equals(cs1, cs2);
-    }
-
-    /**
-     * 检查指定的字符序列中是否包含另一个字符序列。
-     *
-     * @param seq       要检查的字符序列，不能为null
-     * @param searchSeq 要搜索的字符序列，不能为null
-     * @return 如果seq中包含searchSeq，则返回true；否则返回false
-     */
-    public static boolean contains(final CharSequence seq, final CharSequence searchSeq) {
-        return Strings.CS.contains(seq, searchSeq);
-    }
-
-    /**
-     * 忽略大小写检查指定字符序列中是否包含另一个字符序列。
-     *
-     * @param seq       要检查的字符序列
-     * @param searchSeq 要搜索的字符序列
-     * @return 如果包含则返回 true，否则返回 false
-     */
-    public static boolean containsIgnoreCase(final CharSequence seq, final CharSequence searchSeq) {
-        return Strings.CI.contains(seq, searchSeq);
-    }
-
-    /**
-     * 检查 CharSequence 是否以指定前缀开头。
-     *
-     * @param str    要检查的字符序列
-     * @param prefix 要查找的前缀
-     * @return 如果以指定前缀开头则返回 true，否则返回 false
-     */
-    public static boolean startsWith(final CharSequence str, final CharSequence prefix) {
-        return Strings.CS.startsWith(str, prefix);
-    }
-
-    /**
-     * 忽略大小写检查 CharSequence 是否以指定前缀开头。
-     *
-     * @param str    要检查的字符序列
-     * @param prefix 要查找的前缀
-     * @return 如果以指定前缀开头则返回 true，否则返回 false
-     */
-    public static boolean startsWithIgnoreCase(final CharSequence str, final CharSequence prefix) {
-        return Strings.CI.startsWith(str, prefix);
-    }
-
-    /**
-     * 忽略大小写检查 CharSequence 是否以指定后缀结尾。
-     *
-     * @param str    要检查的字符序列
-     * @param suffix 要查找的后缀
-     * @return 如果以指定后缀结尾则返回 true，否则返回 false
-     */
-    public static boolean endsWithIgnoreCase(final CharSequence str, final CharSequence suffix) {
-        return Strings.CI.endsWith(str, suffix);
-    }
-
-    /**
-     * 返回指定字符序列首次出现的位置。
-     *
-     * @param seq       源字符序列
-     * @param searchSeq 待查找字符序列
-     * @return 首次出现的位置，不存在时返回 -1
-     */
-    public static int indexOf(final CharSequence seq, final CharSequence searchSeq) {
-        if (seq == null || searchSeq == null) {
-            return -1;
-        }
-        return seq.toString().indexOf(searchSeq.toString());
-    }
-
-    /**
-     * 移除字符串中的指定字符序列。
-     *
-     * @param str       要处理的字符串，不能为null
-     * @param remove    要移除的字符序列，不能为null
-     * @return 处理后的字符串
-     */
-    public static String remove(final String str, final String remove) {
-        return Strings.CS.remove(str, remove);
-    }
-
-    /**
-     * 如果字符串以指定前缀开头，则移除该前缀。
-     *
-     * @param str    要处理的字符串
-     * @param remove 要移除的前缀
-     * @return 处理后的字符串
-     */
-    public static String removeStart(final String str, final String remove) {
-        if (isEmpty(str) || isEmpty(remove)) {
-            return str;
-        }
-        return startsWith(str, remove) ? str.substring(remove.length()) : str;
-    }
-
-    /**
-     * 替换字符串中的目标子串。
-     *
-     * @param text         原始字符串
-     * @param searchString 需要替换的子串
-     * @param replacement  替换后的子串
-     * @return 替换后的字符串
-     */
-    public static String replace(final String text, final String searchString, final String replacement) {
-        if (text == null || isEmpty(searchString) || replacement == null) {
-            return text;
-        }
-        return text.replace(searchString, replacement);
-    }
-
-
-    /**
-     * 检查字符串是否包含任意一个指定的字符序列
-     *
-     * @param cs                  要检查的字符串
-     * @param searchCharSequences 需要查找的字符序列数组
-     * @return 如果包含任意一个字符序列返回 true，否则返回 false
-     */
-    public static boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences) {
-        return Strings.CS.containsAny(cs, searchCharSequences);
-    }
-
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java

@@ -1,36 +0,0 @@
-package org.dromara.common.core.utils;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.*;
-
-/**
- * 线程工具
- *
- * @author Lion Li
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ThreadUtils {
-
-    /**
-     * 批量执行任务
-     */
-    public static void virtualSubmit(Runnable ...runnableList) {
-        List<Future<?>> callableList = new ArrayList<>();
-        try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor()) {
-            for (Runnable runnable : runnableList) {
-                callableList.add(executor.submit(runnable));
-            }
-            for (Future<?> future : callableList) {
-                future.get();
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java

@@ -10,9 +10,7 @@ import lombok.NoArgsConstructor;
 import org.dromara.common.core.utils.reflect.ReflectUtils;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -30,25 +28,6 @@ public class TreeBuildUtils extends TreeUtil {
      */
     public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
 
-    /**
-     * 使用动态规划构建树形结构
-     *
-     * @param items      节点列表项
-     * @param parentId   父节点ID
-     * @param classifier 动态规划表分类函数
-     * @param action     回溯动作
-     * @param <K>        节点ID的类型
-     * @param <T>        输入节点的类型
-     * @return 构建好的树形结构列表
-     */
-    public static <K, T> List<T> build(List<T> items, K parentId, Function<T, K> classifier, BiConsumer<T,Map<K, List<T>>> action) {
-        // 构建动态规划表 (依据父ID分组)
-        Map<K, List<T>> nodeTreeMaps = items.stream().collect(Collectors.groupingBy(classifier));
-        // 回溯构建各级节点关系
-        items.forEach(item -> action.accept(item, nodeTreeMaps));
-        return nodeTreeMaps.get(parentId);
-    }
-
     /**
      * 构建树形结构
      *

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java

@@ -1,63 +0,0 @@
-package org.dromara.common.core.utils.reflect;
-
-import cn.hutool.core.annotation.AnnotationUtil;
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.lang.Dict;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.util.Map;
-
-/**
- * 注解工具类
- *
- * @author 秋辞未寒
- */
-@Slf4j
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class AnnotationUtils extends AnnotationUtil {
-
-    /**
-     * 获取指定注解
-     *
-     * @param annotationEle  {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission
-     * @param annotationTypeName 注解类型名称
-     * @return 注解对象
-     */
-    @SuppressWarnings("unchecked")
-    public static Annotation getAnnotation(AnnotatedElement annotationEle, String annotationTypeName) {
-        try {
-            return AnnotationUtil.getAnnotation(annotationEle, (Class<? extends Annotation>) Class.forName(annotationTypeName));
-        } catch (final ClassNotFoundException | ClassCastException e) {
-            // ignore
-            log.error("AnnotationUtils.getAnnotation(AnnotatedElement, String) error.", e);
-            return  null;
-        }
-    }
-
-    /**
-     * 获取指定注解中所有属性值<br>
-     * 如果无指定的属性方法返回null
-     *
-     * @param annotationEle  {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission
-     * @param annotationTypeName 注解类型名称
-     * @return 注解对象所有属性键值
-     * @throws UtilException 调用注解中的方法时执行异常
-     */
-    @SuppressWarnings("unchecked")
-    public static Dict getAnnotationValueMap(AnnotatedElement annotationEle, String annotationTypeName) throws UtilException {
-        try {
-            Map<String, Object> annotationValueMap = AnnotationUtil.getAnnotationValueMap(annotationEle, (Class<? extends Annotation>) Class.forName(annotationTypeName));
-            return new Dict(annotationValueMap);
-        } catch (final ClassNotFoundException | ClassCastException e) {
-            // ignore
-            log.error("AnnotationUtils.getAnnotationValueMap(AnnotatedElement, String) error.", e);
-            return  null;
-        }
-    }
-
-
-}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java

@@ -7,7 +7,7 @@ import org.dromara.common.core.constant.RegexConstants;
 /**
  * 正则相关工具类
  *
- * @author AprilWind
+ * @author Feng
  */
 public final class RegexUtils extends ReUtil {
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java

@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
  * 正则字段校验器
  * 主要验证字段非空、是否为满足指定格式等
  *
- * @author AprilWind
+ * @author Feng
  */
 public class RegexValidator extends Validator {
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java

@@ -19,7 +19,7 @@ import java.lang.annotation.Target;
 public @interface DictPattern {
 
     /**
-     * 字典类型，如 "sys_user_gender"
+     * 字典类型，如 "sys_user_sex"
      */
     String dictType();
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java

@@ -1,48 +1,48 @@
-package org.dromara.common.core.validate.enums;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-import java.lang.annotation.*;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * 自定义枚举校验
- *
- * @author 秋辞未寒
- * @date 2024-12-09
- */
-@Documented
-@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
-@Retention(RUNTIME)
-@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解
-@Constraint(validatedBy = {EnumPatternValidator.class})
-public @interface EnumPattern {
-
-    /**
-     * 需要校验的枚举类型
-     */
-    Class<? extends Enum<?>> type();
-
-    /**
-     * 枚举类型校验值字段名称
-     * 需确保该字段实现了 getter 方法
-     */
-    String fieldName();
-
-    String message() default "输入值不在枚举范围内";
-
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-
-    @Documented
-    @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
-    @Retention(RUNTIME)
-    @interface List {
-        EnumPattern[] value();
-    }
-
-}
+package org.dromara.common.core.validate.enumd;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.*;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义枚举校验
+ *
+ * @author 秋辞未寒
+ * @date 2024-12-09
+ */
+@Documented
+@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
+@Retention(RUNTIME)
+@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解
+@Constraint(validatedBy = {EnumPatternValidator.class})
+public @interface EnumPattern {
+
+    /**
+     * 需要校验的枚举类型
+     */
+    Class<? extends Enum<?>> type();
+
+    /**
+     * 枚举类型校验值字段名称
+     * 需确保该字段实现了 getter 方法
+     */
+    String fieldName();
+
+    String message() default "输入值不在枚举范围内";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    @Documented
+    @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
+    @Retention(RUNTIME)
+    @interface List {
+        EnumPattern[] value();
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.validate.enums;
+package org.dromara.common.core.validate.enumd;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;

ruoyi-common/ruoyi-common-doc/pom.xml

@@ -21,11 +21,6 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-web-server</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java

@@ -22,8 +22,8 @@ import org.springdoc.core.utils.PropertyResolverUtils;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.server.autoconfigure.ServerProperties;
 import org.springframework.context.annotation.Bean;
 
 import java.util.ArrayList;
@@ -44,12 +44,6 @@ public class SpringDocConfig {
 
     private final ServerProperties serverProperties;
 
-    /**
-     * 构建基础 OpenAPI 文档对象。
-     *
-     * @param properties SpringDoc 配置
-     * @return OpenAPI 对象
-     */
     @Bean
     @ConditionalOnMissingBean(OpenAPI.class)
     public OpenAPI openApi(SpringDocProperties properties) {
@@ -74,12 +68,6 @@ public class SpringDocConfig {
         return openApi;
     }
 
-    /**
-     * 将自定义文档信息配置转换为 OpenAPI Info。
-     *
-     * @param infoProperties 文档信息配置
-     * @return Info 对象
-     */
     private Info convertInfo(SpringDocProperties.InfoProperties infoProperties) {
         Info info = new Info();
         info.setTitle(infoProperties.getTitle());

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java

@@ -162,7 +162,6 @@ public class SaTokenSecurityMetadata {
 
         /**
          * 重写mode的获取方法，返回符号而非文字
-         *
          * @return AND→&，OR→|，默认→&
          */
         public String getModeSymbol() {

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/JavadocResolver.java

@@ -15,7 +15,6 @@ public interface JavadocResolver extends Comparable<JavadocResolver>, Ordered {
 
     /**
      * 检查解析器是否支持解析 HandlerMethod
-     *
      * @param handlerMethod 处理器方法
      * @return 是否支持解析
      */
@@ -23,7 +22,6 @@ public interface JavadocResolver extends Comparable<JavadocResolver>, Ordered {
 
     /**
      * 执行解析并返回解析到的 Javadoc 内容
-     *
      * @param handlerMethod 处理器方法
      * @param operation Swagger Operation实例
      * @return 解析到的 Javadoc 内容
@@ -31,9 +29,7 @@ public interface JavadocResolver extends Comparable<JavadocResolver>, Ordered {
     String resolve(HandlerMethod handlerMethod, Operation operation);
 
     /**
-     * 获取解析器优先级。
-     *
-     * @return 优先级
+     * 获取解析器优先级
      */
     default int getOrder() {
         return Ordered.LOWEST_PRECEDENCE;
@@ -48,12 +44,6 @@ public interface JavadocResolver extends Comparable<JavadocResolver>, Ordered {
         return this.getClass().getSimpleName();
     }
 
-    /**
-     * 比较解析器执行顺序。
-     *
-     * @param o 其他解析器
-     * @return 比较结果
-     */
     @Override
     default int compareTo(@NotNull JavadocResolver o) {
         return Integer.compare(getOrder(), o.getOrder());

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java

@@ -54,53 +54,23 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa
         this(DEFAULT_METADATA_PROVIDER);
     }
 
-    /**
-     * 使用自定义元数据提供者创建解析器。
-     *
-     * @param metadataProvider 元数据提供者
-     */
     public SaTokenAnnotationMetadataJavadocResolver(Supplier<SaTokenSecurityMetadata> metadataProvider) {
         super(metadataProvider);
     }
 
-    /**
-     * 使用指定顺序创建解析器。
-     *
-     * @param order 顺序值
-     */
     public SaTokenAnnotationMetadataJavadocResolver(int order) {
         this(DEFAULT_METADATA_PROVIDER,order);
     }
 
-    /**
-     * 使用自定义元数据提供者和顺序创建解析器。
-     *
-     * @param metadataProvider 元数据提供者
-     * @param order 顺序值
-     */
     public SaTokenAnnotationMetadataJavadocResolver(Supplier<SaTokenSecurityMetadata> metadataProvider, int order) {
         super(metadataProvider,order);
     }
 
-    /**
-     * 判断当前方法是否需要由该解析器处理。
-     *
-     * @param handlerMethod Handler 方法
-     * @return 是否支持
-     */
     @Override
     public boolean supports(HandlerMethod handlerMethod) {
         return hasAnnotation(handlerMethod, SA_CHECK_ROLE_CLASS) || hasAnnotation(handlerMethod, SA_CHECK_PERMISSION_CLASS) || hasAnnotation(handlerMethod, SA_IGNORE_CLASS);
     }
 
-    /**
-     * 解析 Sa-Token 注解并转换为文档说明。
-     *
-     * @param handlerMethod Handler 方法
-     * @param operation OpenAPI 操作对象
-     * @param metadata 权限元数据
-     * @return Markdown 描述
-     */
     @Override
     public String resolve(HandlerMethod handlerMethod, Operation operation, SaTokenSecurityMetadata metadata) {
         // 检查是否忽略校验

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java

@@ -124,7 +124,6 @@ public class OpenApiHandler extends OpenAPIService {
      * @param openApiBuilderCustomizers the open api builder customisers
      * @param serverBaseUrlCustomizers  the server base url customizers
      * @param javadocProvider           the javadoc provider
-     * @param javadocResolvers          Javadoc 解析器列表
      */
     public OpenApiHandler(Optional<OpenAPI> openAPI, SecurityService securityParser,
                           SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils,
@@ -153,15 +152,6 @@ public class OpenApiHandler extends OpenAPIService {
             TypeNameResolver.std.setUseFqn(true);
     }
 
-    /**
-     * 构建接口标签、权限描述与方法摘要。
-     *
-     * @param handlerMethod Handler 方法
-     * @param operation OpenAPI 操作对象
-     * @param openAPI OpenAPI 文档对象
-     * @param locale 当前语言环境
-     * @return 处理后的操作对象
-     */
     @Override
     public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI, Locale locale) {
 
@@ -257,14 +247,6 @@ public class OpenApiHandler extends OpenAPIService {
         return operation;
     }
 
-    /**
-     * 从方法注解中提取标签信息。
-     *
-     * @param method 方法对象
-     * @param tags 标签集合
-     * @param tagsStr 标签名称集合
-     * @param locale 当前语言环境
-     */
     private void buildTagsFromMethod(Method method, Set<io.swagger.v3.oas.models.tags.Tag> tags, Set<String> tagsStr, Locale locale) {
         // method tags
         Set<Tags> tagsSet = AnnotatedElementUtils
@@ -279,13 +261,6 @@ public class OpenApiHandler extends OpenAPIService {
         }
     }
 
-    /**
-     * 将注解标签转换并合并到 OpenAPI 标签集合。
-     *
-     * @param sourceTags 注解标签列表
-     * @param tags OpenAPI 标签集合
-     * @param locale 当前语言环境
-     */
     private void addTags(List<io.swagger.v3.oas.annotations.tags.Tag> sourceTags, Set<io.swagger.v3.oas.models.tags.Tag> tags, Locale locale) {
         Optional<Set<io.swagger.v3.oas.models.tags.Tag>> optionalTagSet = AnnotationsUtils
             .getTags(sourceTags.toArray(new io.swagger.v3.oas.annotations.tags.Tag[0]), true);

ruoyi-common/ruoyi-common-encrypt/pom.xml

@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <optional>true</optional>
             <exclusions>
                 <exclusion>

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java

@@ -1,7 +1,7 @@
 package org.dromara.common.encrypt.annotation;
 
-import org.dromara.common.encrypt.enums.AlgorithmType;
-import org.dromara.common.encrypt.enums.EncodeType;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java

@@ -1,7 +1,7 @@
 package org.dromara.common.encrypt.core;
 
-import org.dromara.common.encrypt.enums.AlgorithmType;
-import org.dromara.common.encrypt.enums.EncodeType;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
 import lombok.Data;
 
 /**