!447 发布 5.1.1 大量代码优化与bug修复建议升级

Merge pull request !447 from 疯狂的狮子Li/dev
😴发布 5.1.1 大量代码优化与bug修复建议升级
2025-10-12 04:53:46 +08:00 · 2023-11-14 03:01:32 +00:00 · 2023-11-14 10:49:08 +08:00 · 2023-11-13 10:46:38 +08:00 · 2023-11-10 16:31:14 +08:00 · 2023-11-10 16:29:47 +08:00
118 changed files with 826 additions and 573 deletions
--- a/.run/ruoyi-monitor-admin.run.xml
+++ b/.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.1.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.1.1" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
      </settings>
--- a/.run/ruoyi-powerjob-server.run.xml
+++ b/.run/ruoyi-powerjob-server.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.1.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.1.1" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-powerjob-server/Dockerfile" />
      </settings>
--- a/.run/ruoyi-server.run.xml
+++ b/.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.1.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-server:5.1.1" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
      </settings>
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.1.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
-[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.0-blue.svg)]()
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.1.1-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.1-blue.svg)]()
 [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
-[![JDK-19](https://img.shields.io/badge/JDK-19-green.svg)]()
+[![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()

 > RuoYi-Vue-Plus 是重写 RuoYi-Vue 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架)

--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
    <description>RuoYi-Vue-Plus多租户管理系统</description>

    <properties>
-        <revision>5.1.0</revision>
-        <spring-boot.version>3.1.3</spring-boot.version>
+        <revision>5.1.1</revision>
+        <spring-boot.version>3.1.5</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
@@ -24,32 +24,31 @@
        <poi.version>5.2.3</poi.version>
        <easyexcel.version>3.3.2</easyexcel.version>
        <velocity.version>2.3</velocity.version>
-        <satoken.version>1.35.0.RC</satoken.version>
-        <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
+        <satoken.version>1.37.0</satoken.version>
+        <mybatis-plus.version>3.5.4</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.8.20</hutool.version>
+        <hutool.version>5.8.22</hutool.version>
        <okhttp.version>4.10.0</okhttp.version>
-        <spring-boot-admin.version>3.1.5</spring-boot-admin.version>
-        <redisson.version>3.23.4</redisson.version>
+        <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
+        <redisson.version>3.24.1</redisson.version>
        <lock4j.version>2.2.5</lock4j.version>
-        <dynamic-ds.version>4.1.3</dynamic-ds.version>
+        <dynamic-ds.version>4.2.0</dynamic-ds.version>
        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
        <powerjob.version>4.3.3</powerjob.version>
        <mapstruct-plus.version>1.3.5</mapstruct-plus.version>
        <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
-        <lombok.version>1.18.28</lombok.version>
-        <bouncycastle.version>1.72</bouncycastle.version>
+        <lombok.version>1.18.30</lombok.version>
+        <bouncycastle.version>1.76</bouncycastle.version>
        <justauth.version>1.16.5</justauth.version>
        <!-- 离线IP地址定位库 -->
        <ip2region.version>2.7.0</ip2region.version>

-        <!-- 临时修复 snakeyaml 漏洞 -->
-        <snakeyaml.version>1.33</snakeyaml.version>
-
        <!-- OSS 配置 -->
        <aws-java-sdk-s3.version>1.12.540</aws-java-sdk-s3.version>
        <!-- SMS 配置 -->
        <sms4j.version>2.2.0</sms4j.version>
+        <!-- 限制框架中的fastjson版本 -->
+        <fastjson.version>1.2.83</fastjson.version>

        <!-- 插件版本 -->
        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -65,7 +64,7 @@
            <properties>
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>local</profiles.active>
-                <logging.level>debug</logging.level>
+                <logging.level>info</logging.level>
            </properties>
        </profile>
        <profile>
@@ -73,7 +72,7 @@
            <properties>
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>dev</profiles.active>
-                <logging.level>debug</logging.level>
+                <logging.level>info</logging.level>
            </properties>
            <activation>
                <!-- 默认环境 -->
@@ -290,13 +289,6 @@
                <version>${alibaba-ttl.version}</version>
            </dependency>

-            <!-- 临时修复 snakeyaml 漏洞 -->
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
-
            <!-- 加密包引入 -->
            <dependency>
                <groupId>org.bouncycastle</groupId>
@@ -317,6 +309,12 @@
                <version>${ip2region.version}</version>
            </dependency>

+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
            <dependency>
                <groupId>org.dromara</groupId>
                <artifactId>ruoyi-system</artifactId>
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -1,4 +1,5 @@
-FROM findepi/graalvm:java17-native
+#FROM findepi/graalvm:java17-native
+FROM openjdk:17.0.2-oraclelinux8

 MAINTAINER Lion Li

--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -10,17 +10,19 @@ import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.StreamUtils;
-import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.json.utils.JsonUtils;
+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.tenant.helper.TenantHelper;
+import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.system.domain.SysClient;
 import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.vo.SysTenantVo;
@@ -39,6 +41,8 @@ import org.springframework.web.bind.annotation.*;

 import java.net.URL;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;

 /**
 * 认证
@@ -60,16 +64,19 @@ public class AuthController {
    private final ISysTenantService tenantService;
    private final ISysSocialService socialUserService;
    private final ISysClientService clientService;
+    private final ScheduledExecutorService scheduledExecutorService;


    /**
     * 登录方法
     *
-     * @param loginBody 登录信息
+     * @param body 登录信息
     * @return 结果
     */
    @PostMapping("/login")
-    public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
+    public R<LoginVo> login(@Validated @RequestBody String body) {
+        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+        ValidatorUtils.validate(loginBody);
        // 授权类型和客户端id
        String clientId = loginBody.getClientId();
        String grantType = loginBody.getGrantType();
@@ -78,11 +85,19 @@ public class AuthController {
        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
            return R.fail(MessageUtils.message("auth.grant.type.error"));
+        } else if (!UserConstants.NORMAL.equals(client.getStatus())) {
+            return R.fail(MessageUtils.message("auth.grant.type.blocked"));
        }
        // 校验租户
        loginService.checkTenant(loginBody.getTenantId());
        // 登录
-        return R.ok(IAuthStrategy.login(loginBody, client));
+        LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+
+        Long userId = LoginHelper.getUserId();
+        scheduledExecutorService.schedule(() -> {
+            WebSocketUtils.sendMessage(userId, "欢迎登录RuoYi-Vue-Plus后台管理系统");
+        }, 3, TimeUnit.SECONDS);
+        return R.ok(loginVo);
    }

    /**
@@ -109,9 +124,11 @@ public class AuthController {
     * @return 结果
     */
    @PostMapping("/social/callback")
-    public R<Void> socialCallback(@RequestBody LoginBody loginBody) {
+    public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
        // 获取第三方登录信息
-        AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
        AuthUser authUserData = response.getData();
        // 判断授权响应是否成功
        if (!response.ok()) {
@@ -175,7 +192,7 @@ public class AuthController {
        }
        // 根据域名进行筛选
        List<TenantListVo> list = StreamUtils.filter(voList, vo ->
-            StringUtils.equals(vo.getDomain(), host));
+                StringUtils.equals(vo.getDomain(), host));
        // 返回对象
        LoginTenantVo vo = new LoginTenantVo();
        vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
@@ -1,7 +1,6 @@
 package org.dromara.web.service;


-import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.system.domain.SysClient;
@@ -19,27 +18,19 @@ public interface IAuthStrategy {
    /**
     * 登录
     */
-    static LoginVo login(LoginBody loginBody, SysClient client) {
+    static LoginVo login(String body, SysClient client, String grantType) {
        // 授权类型和客户端id
-        String clientId = loginBody.getClientId();
-        String grantType = loginBody.getGrantType();
        String beanName = grantType + BASE_NAME;
        if (!SpringUtils.containsBean(beanName)) {
            throw new ServiceException("授权类型不正确!");
        }
        IAuthStrategy instance = SpringUtils.getBean(beanName);
-        instance.validate(loginBody);
-        return instance.login(clientId, loginBody, client);
+        return instance.login(body, client);
    }

-    /**
-     * 参数校验
-     */
-    void validate(LoginBody loginBody);
-
    /**
     * 登录
     */
-    LoginVo login(String clientId, LoginBody loginBody, SysClient client);
+    LoginVo login(String body, SysClient client);

 }
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -15,10 +15,7 @@ import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.enums.TenantStatus;
 import org.dromara.common.core.exception.user.UserException;
-import org.dromara.common.core.utils.DateUtils;
-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.*;
 import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -210,6 +207,9 @@ public class SysLoginService {
        if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
            return;
        }
+        if (StringUtils.isBlank(tenantId)) {
+            throw new TenantException("tenant.number.not.blank");
+        }
        SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
        if (ObjectUtil.isNull(tenant)) {
            log.info("登录租户：{} 不存在.", tenantId);
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -1,6 +1,8 @@
 package org.dromara.web.service;

 import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.domain.model.RegisterBody;
@@ -14,8 +16,11 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 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;
+import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -30,6 +35,7 @@ import org.springframework.stereotype.Service;
 public class SysRegisterService {

    private final ISysUserService userService;
+    private final SysUserMapper userMapper;
    private final CaptchaProperties captchaProperties;

    /**
@@ -53,7 +59,11 @@ public class SysRegisterService {
        sysUser.setPassword(BCrypt.hashpw(password));
        sysUser.setUserType(userType);

-        if (!userService.checkUserNameUnique(sysUser)) {
+        boolean exist = userMapper.exists(new LambdaQueryWrapper<SysUser>()
+            .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
+            .eq(SysUser::getUserName, sysUser.getUserName())
+            .ne(ObjectUtil.isNotNull(sysUser.getUserId()), SysUser::getUserId, sysUser.getUserId()));
+        if (exist) {
            throw new UserException("user.register.save.error", username);
        }
        boolean regFlag = userService.registerUser(sysUser, tenantId);
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java
@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.EmailLoginBody;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.enums.UserStatus;
@@ -17,7 +17,7 @@ import org.dromara.common.core.exception.user.UserException;
 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.validate.auth.EmailGroup;
+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;
@@ -44,12 +44,9 @@ public class EmailAuthStrategy implements IAuthStrategy {
    private final SysUserMapper userMapper;

    @Override
-    public void validate(LoginBody loginBody) {
-        ValidatorUtils.validate(loginBody, EmailGroup.class);
-    }
-
-    @Override
-    public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
+    public LoginVo login(String body, SysClient client) {
+        EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
+        ValidatorUtils.validate(loginBody);
        String tenantId = loginBody.getTenantId();
        String email = loginBody.getEmail();
        String emailCode = loginBody.getEmailCode();
@@ -60,13 +57,15 @@ public class EmailAuthStrategy implements IAuthStrategy {
        loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode));
        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
        LoginUser loginUser = loginService.buildLoginUser(user);
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
        SaLoginModel model = new SaLoginModel();
        model.setDevice(client.getDeviceType());
        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
        // 例如: 后台用户30分钟过期 app用户1天过期
        model.setTimeout(client.getTimeout());
        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
        // 生成token
        LoginHelper.login(loginUser, model);

@@ -76,7 +75,7 @@ public class EmailAuthStrategy implements IAuthStrategy {
        LoginVo loginVo = new LoginVo();
        loginVo.setAccessToken(StpUtil.getTokenValue());
        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-        loginVo.setClientId(clientId);
+        loginVo.setClientId(client.getClientId());
        return loginVo;
    }

--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java
@@ -9,8 +9,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.user.CaptchaException;
@@ -19,7 +19,7 @@ import org.dromara.common.core.exception.user.UserException;
 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.validate.auth.PasswordGroup;
+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;
@@ -48,12 +48,9 @@ public class PasswordAuthStrategy implements IAuthStrategy {
    private final SysUserMapper userMapper;

    @Override
-    public void validate(LoginBody loginBody) {
-        ValidatorUtils.validate(loginBody, PasswordGroup.class);
-    }
-
-    @Override
-    public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
+    public LoginVo login(String body, SysClient client) {
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
        String tenantId = loginBody.getTenantId();
        String username = loginBody.getUsername();
        String password = loginBody.getPassword();
@@ -70,13 +67,15 @@ public class PasswordAuthStrategy implements IAuthStrategy {
        loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword()));
        // 此处可根据登录用户的数据不同 自行创建 loginUser
        LoginUser loginUser = loginService.buildLoginUser(user);
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
        SaLoginModel model = new SaLoginModel();
        model.setDevice(client.getDeviceType());
        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
        // 例如: 后台用户30分钟过期 app用户1天过期
        model.setTimeout(client.getTimeout());
        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
        // 生成token
        LoginHelper.login(loginUser, model);

@@ -86,7 +85,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
        LoginVo loginVo = new LoginVo();
        loginVo.setAccessToken(StpUtil.getTokenValue());
        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-        loginVo.setClientId(clientId);
+        loginVo.setClientId(client.getClientId());
        return loginVo;
    }

--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java
@@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SmsLoginBody;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.user.CaptchaExpireException;
@@ -17,7 +17,7 @@ import org.dromara.common.core.exception.user.UserException;
 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.validate.auth.SmsGroup;
+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;
@@ -44,12 +44,9 @@ public class SmsAuthStrategy implements IAuthStrategy {
    private final SysUserMapper userMapper;

    @Override
-    public void validate(LoginBody loginBody) {
-        ValidatorUtils.validate(loginBody, SmsGroup.class);
-    }
-
-    @Override
-    public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
+    public LoginVo login(String body, SysClient client) {
+        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
+        ValidatorUtils.validate(loginBody);
        String tenantId = loginBody.getTenantId();
        String phonenumber = loginBody.getPhonenumber();
        String smsCode = loginBody.getSmsCode();
@@ -60,13 +57,15 @@ public class SmsAuthStrategy implements IAuthStrategy {
        loginService.checkLogin(LoginType.SMS, tenantId, user.getUserName(), () -> !validateSmsCode(tenantId, phonenumber, smsCode));
        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
        LoginUser loginUser = loginService.buildLoginUser(user);
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
        SaLoginModel model = new SaLoginModel();
        model.setDevice(client.getDeviceType());
        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
        // 例如: 后台用户30分钟过期 app用户1天过期
        model.setTimeout(client.getTimeout());
        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
        // 生成token
        LoginHelper.login(loginUser, model);

@@ -76,7 +75,7 @@ public class SmsAuthStrategy implements IAuthStrategy {
        LoginVo loginVo = new LoginVo();
        loginVo.setAccessToken(StpUtil.getTokenValue());
        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-        loginVo.setClientId(clientId);
+        loginVo.setClientId(client.getClientId());
        return loginVo;
    }

--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
@@ -13,14 +13,14 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import org.dromara.common.core.constant.Constants;
-import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SocialLoginBody;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.core.validate.auth.SocialGroup;
+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;
@@ -51,22 +51,19 @@ public class SocialAuthStrategy implements IAuthStrategy {
    private final SysUserMapper userMapper;
    private final SysLoginService loginService;

-
-    @Override
-    public void validate(LoginBody loginBody) {
-        ValidatorUtils.validate(loginBody, SocialGroup.class);
-    }
-
    /**
     * 登录-第三方授权登录
     *
-     * @param clientId  客户端id
-     * @param loginBody 登录信息
-     * @param client    客户端信息
+     * @param body     登录信息
+     * @param client   客户端信息
     */
    @Override
-    public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
-        AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
+    public LoginVo login(String body, SysClient client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
        if (!response.ok()) {
            throw new ServiceException(response.getMsg());
        }
@@ -74,11 +71,11 @@ public class SocialAuthStrategy implements IAuthStrategy {
        if ("GITEE".equals(authUserData.getSource())) {
            // 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖
            HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus")
-                .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
-                .executeAsync();
+                    .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
+                    .executeAsync();
            HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus")
-                .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
-                .executeAsync();
+                    .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
+                    .executeAsync();
        }

        SysSocialVo social = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
@@ -88,7 +85,7 @@ public class SocialAuthStrategy implements IAuthStrategy {
        // 验证授权表里面的租户id是否包含当前租户id
        String tenantId = social.getTenantId();
        if (ObjectUtil.isNotNull(social) && StrUtil.isNotBlank(tenantId)
-            && !tenantId.contains(loginBody.getTenantId())) {
+                && !tenantId.contains(loginBody.getTenantId())) {
            throw new ServiceException("对不起，你没有权限登录当前租户！");
        }

@@ -97,13 +94,15 @@ public class SocialAuthStrategy implements IAuthStrategy {

        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
        LoginUser loginUser = loginService.buildLoginUser(user);
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
        SaLoginModel model = new SaLoginModel();
        model.setDevice(client.getDeviceType());
        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
        // 例如: 后台用户30分钟过期 app用户1天过期
        model.setTimeout(client.getTimeout());
        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
        // 生成token
        LoginHelper.login(loginUser, model);

@@ -113,15 +112,15 @@ public class SocialAuthStrategy implements IAuthStrategy {
        LoginVo loginVo = new LoginVo();
        loginVo.setAccessToken(StpUtil.getTokenValue());
        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-        loginVo.setClientId(clientId);
+        loginVo.setClientId(client.getClientId());
        return loginVo;
    }

    private SysUserVo loadUser(String tenantId, Long userId) {
        SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserName, SysUser::getStatus)
-            .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
-            .eq(SysUser::getUserId, userId));
+                .select(SysUser::getUserName, SysUser::getStatus)
+                .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
+                .eq(SysUser::getUserId, userId));
        if (ObjectUtil.isNull(user)) {
            log.info("登录用户：{} 不存在.", "");
            throw new UserException("user.not.exists", "");
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java
@@ -6,12 +6,12 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
-import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.XcxLoginBody;
 import org.dromara.common.core.domain.model.XcxLoginUser;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.core.validate.auth.WechatGroup;
+import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysClient;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -33,14 +33,14 @@ public class XcxAuthStrategy implements IAuthStrategy {
    private final SysLoginService loginService;

    @Override
-    public void validate(LoginBody loginBody) {
-        ValidatorUtils.validate(loginBody, WechatGroup.class);
-    }
-
-    @Override
-    public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
+    public LoginVo login(String body, SysClient client) {
+        XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class);
+        ValidatorUtils.validate(loginBody);
        // xcxCode 为 小程序调用 wx.login 授权后获取
        String xcxCode = loginBody.getXcxCode();
+        // 多个小程序识别使用
+        String appid = loginBody.getAppid();
+
        // todo 以下自行实现
        // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
        String openid = "";
@@ -54,6 +54,8 @@ public class XcxAuthStrategy implements IAuthStrategy {
        loginUser.setUsername(user.getUserName());
        loginUser.setNickname(user.getNickName());
        loginUser.setUserType(user.getUserType());
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
        loginUser.setOpenid(openid);

        SaLoginModel model = new SaLoginModel();
@@ -62,7 +64,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
        // 例如: 后台用户30分钟过期 app用户1天过期
        model.setTimeout(client.getTimeout());
        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
        // 生成token
        LoginHelper.login(loginUser, model);

@@ -72,7 +74,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
        LoginVo loginVo = new LoginVo();
        loginVo.setAccessToken(StpUtil.getTokenValue());
        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-        loginVo.setClientId(clientId);
+        loginVo.setClientId(client.getClientId());
        loginVo.setOpenid(openid);
        return loginVo;
    }
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -227,10 +227,10 @@ justauth:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
      redirect-uri: ${justauth.address}/social-callback?source=oschina
-    alipay:
+    alipay_wallet:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
-      redirect-uri: ${justauth.address}/social-callback?source=alipay
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
      alipay-public-key: MIIB**************DAQAB
    wechat_open:
      client-id: 10**********6
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -229,10 +229,10 @@ justauth:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
      redirect-uri: ${justauth.address}/social-callback?source=oschina
-    alipay:
+    alipay_wallet:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
-      redirect-uri: ${justauth.address}/social-callback?source=alipay
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
      alipay-public-key: MIIB**************DAQAB
    wechat_open:
      client-id: 10**********6
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -93,11 +93,6 @@ spring:
 sa-token:
  # token名称 (同时也是cookie名称)
  token-name: Authorization
-  # token固定超时 设为七天 (必定过期) 单位: 秒
-  timeout: 604800
-  # 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义
-  # token最低活跃时间 (指定时间无操作就过期) 单位: 秒
-  active-timeout: 1800
  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
  is-concurrent: true
  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
@@ -256,6 +251,7 @@ management:

 --- # websocket
 websocket:
+  # 如果关闭 需要和前端开关一起关闭
  enabled: true
  # 路径
  path: /resource/websocket
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -29,6 +29,7 @@ user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
 auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
 auth.grant.type.not.blank=认证权限类型不能为空
 auth.clientid.not.blank=认证客户端id不能为空
 ##文件上传消息
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -29,6 +29,7 @@ user.notfound=Please login again
 user.forcelogout=The administrator is forced to exit，please login again
 user.unknown.error=Unknown error, please login again
 auth.grant.type.error=Auth grant type error
+auth.grant.type.blocked=Auth grant type disabled
 auth.grant.type.not.blank=Auth grant type cannot be blank
 auth.clientid.not.blank=Auth clientid cannot be blank
 ##文件上传消息
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -29,6 +29,7 @@ user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
 auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
 auth.grant.type.not.blank=认证权限类型不能为空
 auth.clientid.not.blank=认证客户端id不能为空
 ##文件上传消息
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
    </description>

    <properties>
-        <revision>5.1.0</revision>
+        <revision>5.1.1</revision>
    </properties>

    <dependencyManagement>
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java
@@ -34,6 +34,16 @@ public class UserOnlineDTO implements Serializable {
     */
    private String userName;

+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
    /**
     * 登录IP地址
     */
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java
@@ -3,6 +3,7 @@ package org.dromara.common.core.domain.model;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;

 /**
 * 邮件登录对象
@@ -11,13 +12,8 @@ import lombok.Data;
 */

@Data
-public class EmailLoginBody {
-
-    /**
-     * 租户ID
-     */
-    @NotBlank(message = "{tenant.number.not.blank}")
-    private String tenantId;
+@EqualsAndHashCode(callSuper = true)
+public class EmailLoginBody extends LoginBody {

    /**
     * 邮箱
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -1,12 +1,10 @@
 package org.dromara.common.core.domain.model;

-import jakarta.validation.constraints.Email;
-import org.dromara.common.core.constant.UserConstants;
-import lombok.Data;
-import org.dromara.common.core.validate.auth.*;
-import org.hibernate.validator.constraints.Length;
-
 import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;

 /**
 * 用户登录对象
@@ -15,7 +13,10 @@ import jakarta.validation.constraints.NotBlank;
 */

@Data
-public class LoginBody {
+public class LoginBody implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;

    /**
     * 客户端id
@@ -23,16 +24,6 @@ public class LoginBody {
    @NotBlank(message = "{auth.clientid.not.blank}")
    private String clientId;

-    /**
-     * 客户端key
-     */
-    private String clientKey;
-
-    /**
-     * 客户端秘钥
-     */
-    private String clientSecret;
-
    /**
     * 授权类型
     */
@@ -42,23 +33,8 @@ public class LoginBody {
    /**
     * 租户ID
     */
-    @NotBlank(message = "{tenant.number.not.blank}")
    private String tenantId;

-    /**
-     * 用户名
-     */
-    @NotBlank(message = "{user.username.not.blank}", groups = {PasswordGroup.class})
-    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}", groups = {PasswordGroup.class})
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    @NotBlank(message = "{user.password.not.blank}", groups = {PasswordGroup.class})
-    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}", groups = {PasswordGroup.class})
-    private String password;
-
    /**
     * 验证码
     */
@@ -69,52 +45,4 @@ public class LoginBody {
     */
    private String uuid;

-    /**
-     * 手机号
-     */
-    @NotBlank(message = "{user.phonenumber.not.blank}", groups = {SmsGroup.class})
-    private String phonenumber;
-
-    /**
-     * 短信code
-     */
-    @NotBlank(message = "{sms.code.not.blank}", groups = {SmsGroup.class})
-    private String smsCode;
-
-    /**
-     * 邮箱
-     */
-    @NotBlank(message = "{user.email.not.blank}", groups = {EmailGroup.class})
-    @Email(message = "{user.email.not.valid}")
-    private String email;
-
-    /**
-     * 邮箱code
-     */
-    @NotBlank(message = "{email.code.not.blank}", groups = {EmailGroup.class})
-    private String emailCode;
-
-    /**
-     * 小程序code
-     */
-    @NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
-    private String xcxCode;
-
-    /**
-     * 第三方登录平台
-     */
-    @NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
-    private String source;
-
-    /**
-     * 第三方登录code
-     */
-    @NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
-    private String socialCode;
-
-    /**
-     * 第三方登录socialState
-     */
-    @NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
-    private String socialState;
 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java
@@ -112,6 +112,16 @@ public class LoginUser implements Serializable {
     */
    private Long roleId;

+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
    /**
     * 获取登录id
     */
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
@@ -0,0 +1,33 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import static org.dromara.common.core.constant.UserConstants.*;
+
+/**
+ * 密码登录对象
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PasswordLoginBody extends LoginBody {
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "{user.username.not.blank}")
+    @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+    private String password;
+
+}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java
@@ -1,7 +1,11 @@
 package org.dromara.common.core.domain.model;

+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import static org.dromara.common.core.constant.UserConstants.*;

 /**
 * 用户注册对象
@@ -12,6 +16,20 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
 public class RegisterBody extends LoginBody {

+    /**
+     * 用户名
+     */
+    @NotBlank(message = "{user.username.not.blank}")
+    @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+    private String password;
+
    private String userType;

 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java
@@ -1,8 +1,8 @@
 package org.dromara.common.core.domain.model;

-import lombok.Data;
-
 import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;

 /**
 * 短信登录对象
@@ -11,13 +11,8 @@ import jakarta.validation.constraints.NotBlank;
 */

@Data
-public class SmsLoginBody {
-
-    /**
-     * 租户ID
-     */
-    @NotBlank(message = "{tenant.number.not.blank}")
-    private String tenantId;
+@EqualsAndHashCode(callSuper = true)
+public class SmsLoginBody extends LoginBody {

    /**
     * 手机号
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java
@@ -1,21 +0,0 @@
-package org.dromara.common.core.domain.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 第三方登录用户身份权限
- *
- * @author thiszhc is 三三
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class SocialLogin extends LoginUser{
-
-    /**
-     * openid
-     */
-    private String openid;
-}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java
@@ -0,0 +1,35 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 三方登录对象
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SocialLoginBody extends LoginBody {
+
+    /**
+     * 第三方登录平台
+     */
+    @NotBlank(message = "{social.source.not.blank}")
+    private String source;
+
+    /**
+     * 第三方登录code
+     */
+    @NotBlank(message = "{social.code.not.blank}")
+    private String socialCode;
+
+    /**
+     * 第三方登录socialState
+     */
+    @NotBlank(message = "{social.state.not.blank}")
+    private String socialState;
+
+}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java
@@ -0,0 +1,28 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 三方登录对象
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class XcxLoginBody extends LoginBody {
+
+    /**
+     * 小程序id(多个小程序时使用)
+     */
+    private String appid;
+
+    /**
+     * 小程序code
+     */
+    @NotBlank(message = "{xcx.code.not.blank}")
+    private String xcxCode;
+
+}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java
@@ -24,7 +24,7 @@ public class AddressUtils {
            return UNKNOWN;
        }
        // 内网不查询
-        ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
+        ip = StringUtils.contains(ip, "0:0:0:0:0:0:0:1") ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
        if (NetUtil.isInnerIP(ip)) {
            return "内网IP";
        }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/EmailGroup.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/EmailGroup.java
@@ -1,7 +0,0 @@
-package org.dromara.common.core.validate.auth;
-
-/**
- * @Author Michelle.Chung
- */
-public interface EmailGroup {
-}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/PasswordGroup.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/PasswordGroup.java
@@ -1,7 +0,0 @@
-package org.dromara.common.core.validate.auth;
-
-/**
- * @Author Michelle.Chung
- */
-public interface PasswordGroup {
-}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SmsGroup.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SmsGroup.java
@@ -1,7 +0,0 @@
-package org.dromara.common.core.validate.auth;
-
-/**
- * @Author Michelle.Chung
- */
-public interface SmsGroup {
-}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java
@@ -1,4 +0,0 @@
-package org.dromara.common.core.validate.auth;
-
-public interface SocialGroup {
-}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/WechatGroup.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/WechatGroup.java
@@ -1,7 +0,0 @@
-package org.dromara.common.core.validate.auth;
-
-/**
- * @Author Michelle.Chung
- */
-public interface WechatGroup {
-}
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -1,11 +1,12 @@
 package org.dromara.common.encrypt.core;

 import cn.hutool.core.util.ReflectUtil;
-import org.dromara.common.encrypt.annotation.EncryptField;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.encrypt.annotation.EncryptField;

 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -35,8 +36,13 @@ public class EncryptorManager {
     */
    public Set<Field> getFieldCache(Class<?> sourceClazz) {
        return fieldCache.computeIfAbsent(sourceClazz, clazz -> {
-            Field[] declaredFields = clazz.getDeclaredFields();
-            Set<Field> fieldSet = Arrays.stream(declaredFields).filter(field ->
+            Set<Field> fieldSet = new HashSet<>();
+            while (clazz != null) {
+                Field[] fields = clazz.getDeclaredFields();
+                fieldSet.addAll(Arrays.asList(fields));
+                clazz = clazz.getSuperclass();
+            }
+            fieldSet = fieldSet.stream().filter(field ->
                    field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
                .collect(Collectors.toSet());
            for (Field field : fieldSet) {
--- a/ruoyi-common/ruoyi-common-job/pom.xml
+++ b/ruoyi-common/ruoyi-common-job/pom.xml
@@ -26,6 +26,12 @@
        <dependency>
            <groupId>tech.powerjob</groupId>
            <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>powerjob-remote-impl-akka</artifactId>
+                    <groupId>tech.powerjob</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>tech.powerjob</groupId>
--- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.ttl.TransmittableThreadLocal;
+import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -94,7 +95,9 @@ public class LogAspect {
            String ip = ServletUtils.getClientIP();
            operLog.setOperIp(ip);
            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
-            operLog.setOperName(LoginHelper.getUsername());
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            operLog.setOperName(loginUser.getUsername());
+            operLog.setDeptName(loginUser.getDeptName());

            if (e != null) {
                operLog.setStatus(BusinessStatus.FAIL.ordinal());
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
+import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
-import org.dromara.common.core.utils.MapstructUtils;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
+import org.dromara.common.core.utils.MapstructUtils;

 import java.io.Serializable;
 import java.util.Collection;
@@ -35,11 +35,12 @@ public interface BaseMapperPlus<T, V> extends BaseMapper<T> {
    Log log = LogFactory.getLog(BaseMapperPlus.class);

    default Class<V> currentVoClass() {
-        return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 1);
+        GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class);
+        return (Class<V>) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[1];
    }

    default Class<T> currentModelClass() {
-        return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 0);
+        return (Class<T>) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[0];
    }

    default List<T> selectList() {
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java
@@ -30,17 +30,17 @@ public enum DataScopeType {
    /**
     * 自定数据权限
     */
-    CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", ""),
+    CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", " 1 = 0 "),

    /**
     * 部门数据权限
     */
-    DEPT("3", " #{#deptName} = #{#user.deptId} ", ""),
+    DEPT("3", " #{#deptName} = #{#user.deptId} ", " 1 = 0 "),

    /**
     * 部门及以下数据权限
     */
-    DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", ""),
+    DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", " 1 = 0 "),

    /**
     * 仅本人数据权限
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
@@ -2,10 +2,14 @@ package org.dromara.common.mybatis.handler;

 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ConcurrentHashSet;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.Parenthesis;
+import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
@@ -17,12 +21,6 @@ import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.enums.DataScopeType;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.common.satoken.utils.LoginHelper;
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.Parenthesis;
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.expression.BeanResolver;
 import org.springframework.expression.ExpressionParser;
@@ -50,11 +48,6 @@ public class PlusDataPermissionHandler {
     */
    private final Map<String, DataPermission> dataPermissionCacheMap = new ConcurrentHashMap<>();

-    /**
-     * 无效注解方法缓存用于快速返回
-     */
-    private final Set<String> invalidCacheSet = new ConcurrentHashSet<>();
-
    /**
     * spel 解析器
     */
@@ -68,10 +61,6 @@ public class PlusDataPermissionHandler {

    public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) {
        DataColumn[] dataColumns = findAnnotation(mappedStatementId);
-        if (ArrayUtil.isEmpty(dataColumns)) {
-            invalidCacheSet.add(mappedStatementId);
-            return where;
-        }
        LoginUser currentUser = DataPermissionHelper.getVariable("user");
        if (ObjectUtil.isNull(currentUser)) {
            currentUser = LoginHelper.getLoginUser();
@@ -155,7 +144,7 @@ public class PlusDataPermissionHandler {
        return "";
    }

-    private DataColumn[] findAnnotation(String mappedStatementId) {
+    public DataColumn[] findAnnotation(String mappedStatementId) {
        StringBuilder sb = new StringBuilder(mappedStatementId);
        int index = sb.lastIndexOf(".");
        String clazzName = sb.substring(0, index);
@@ -189,10 +178,4 @@ public class PlusDataPermissionHandler {
        return null;
    }

-    /**
-     * 是否为无效方法 无数据权限
-     */
-    public boolean isInvalid(String mappedStatementId) {
-        return invalidCacheSet.contains(mappedStatementId);
-    }
 }
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
@@ -1,9 +1,12 @@
 package org.dromara.common.mybatis.interceptor;

+import cn.hutool.core.collection.ConcurrentHashSet;
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.handler.PlusDataPermissionHandler;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.delete.Delete;
@@ -23,6 +26,7 @@ import org.apache.ibatis.session.RowBounds;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Set;

 /**
 * 数据权限拦截器
@@ -33,6 +37,10 @@ import java.util.List;
 public class PlusDataPermissionInterceptor extends JsqlParserSupport implements InnerInterceptor {

    private final PlusDataPermissionHandler dataPermissionHandler = new PlusDataPermissionHandler();
+    /**
+     * 无效注解方法缓存用于快速返回
+     */
+    private final Set<String> invalidCacheSet = new ConcurrentHashSet<>();

    @Override
    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
@@ -41,7 +49,12 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
            return;
        }
        // 检查是否无效 无数据权限注解
-        if (dataPermissionHandler.isInvalid(ms.getId())) {
+        if (invalidCacheSet.contains(ms.getId())) {
+            return;
+        }
+        DataColumn[] dataColumns = dataPermissionHandler.findAnnotation(ms.getId());
+        if (ArrayUtil.isEmpty(dataColumns)) {
+            invalidCacheSet.add(ms.getId());
            return;
        }
        // 解析 sql 分配对应方法
@@ -58,6 +71,15 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
            if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) {
                return;
            }
+            // 检查是否无效 无数据权限注解
+            if (invalidCacheSet.contains(ms.getId())) {
+                return;
+            }
+            DataColumn[] dataColumns = dataPermissionHandler.findAnnotation(ms.getId());
+            if (ArrayUtil.isEmpty(dataColumns)) {
+                invalidCacheSet.add(ms.getId());
+                return;
+            }
            PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
            mpBs.sql(parserMulti(mpBs.sql(), ms.getId()));
        }
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
@@ -96,7 +96,7 @@ public class RedisConfig {
     * redis集群配置 yml
     *
     * --- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
-     * spring:
+     * spring.data:
     *   redis:
     *     cluster:
     *       nodes:
@@ -108,7 +108,7 @@ public class RedisConfig {
     *     # 连接超时时间
     *     timeout: 10s
     *     # 是否开启ssl
-     *     ssl: false
+     *     ssl.enabled: false
     *
     * redisson:
     *   # 线程池数量
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/listener/UserActionListener.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/listener/UserActionListener.java
@@ -49,6 +49,8 @@ public class UserActionListener implements SaTokenListener {
            dto.setLoginTime(System.currentTimeMillis());
            dto.setTokenId(tokenValue);
            dto.setUserName(user.getUsername());
+            dto.setClientKey(user.getClientKey());
+            dto.setDeviceType(user.getDeviceType());
            dto.setDeptName(user.getDeptName());
            if(tokenConfig.getTimeout() == -1) {
                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -34,6 +34,7 @@ public class LoginHelper {
    public static final String LOGIN_USER_KEY = "loginUser";
    public static final String TENANT_KEY = "tenantId";
    public static final String USER_KEY = "userId";
+    public static final String DEPT_KEY = "deptId";
    public static final String CLIENT_KEY = "clientid";

    /**
@@ -48,10 +49,12 @@ public class LoginHelper {
        storage.set(LOGIN_USER_KEY, loginUser);
        storage.set(TENANT_KEY, loginUser.getTenantId());
        storage.set(USER_KEY, loginUser.getUserId());
+        storage.set(DEPT_KEY, loginUser.getDeptId());
        model = ObjectUtil.defaultIfNull(model, new SaLoginModel());
        StpUtil.login(loginUser.getLoginId(),
            model.setExtra(TENANT_KEY, loginUser.getTenantId())
-                .setExtra(USER_KEY, loginUser.getUserId()));
+                .setExtra(USER_KEY, loginUser.getUserId())
+                .setExtra(DEPT_KEY, loginUser.getDeptId()));
        StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
    }

@@ -88,41 +91,35 @@ public class LoginHelper {
     * 获取用户id
     */
    public static Long getUserId() {
-        Long userId;
-        try {
-            userId = Convert.toLong(SaHolder.getStorage().get(USER_KEY));
-            if (ObjectUtil.isNull(userId)) {
-                userId = Convert.toLong(StpUtil.getExtra(USER_KEY));
-                SaHolder.getStorage().set(USER_KEY, userId);
-            }
-        } catch (Exception e) {
-            return null;
-        }
-        return userId;
+        return  Convert.toLong(getExtra(USER_KEY));
    }

    /**
     * 获取租户ID
     */
    public static String getTenantId() {
-        String tenantId;
-        try {
-            tenantId = (String) SaHolder.getStorage().get(TENANT_KEY);
-            if (ObjectUtil.isNull(tenantId)) {
-                tenantId = (String) StpUtil.getExtra(TENANT_KEY);
-                SaHolder.getStorage().set(TENANT_KEY, tenantId);
-            }
-        } catch (Exception e) {
-            return null;
-        }
-        return tenantId;
+        return Convert.toStr(getExtra(TENANT_KEY));
    }

    /**
     * 获取部门ID
     */
    public static Long getDeptId() {
-        return getLoginUser().getDeptId();
+        return Convert.toLong(getExtra(DEPT_KEY));
+    }
+
+    private static Object getExtra(String key) {
+        Object obj;
+        try {
+            obj = SaHolder.getStorage().get(key);
+            if (ObjectUtil.isNull(obj)) {
+                obj = StpUtil.getExtra(key);
+                SaHolder.getStorage().set(key, obj);
+            }
+        } catch (Exception e) {
+            return null;
+        }
+        return obj;
    }

    /**
--- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
@@ -61,8 +61,8 @@ public class SecurityConfig implements WebMvcConfigurer {

                    // 有效率影响 用于临时测试
                    // if (log.isDebugEnabled()) {
-                    //     log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout());
-                    //     log.debug("临时有效时间: {}", StpUtil.getTokenActivityTimeout());
+                    //     log.info("剩余有效时间: {}", StpUtil.getTokenTimeout());
+                    //     log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout());
                    // }

                });
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
@@ -21,4 +21,8 @@ import java.lang.annotation.Target;
@JsonSerialize(using = SensitiveHandler.class)
 public @interface Sensitive {
    SensitiveStrategy strategy();
+
+    String roleKey() default "";
+
+    String perms() default "";
 }
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
@@ -13,6 +13,6 @@ public interface SensitiveService {
    /**
     * 是否脱敏
     */
-    boolean isSensitive();
+    boolean isSensitive(String roleKey, String perms);

 }
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java
@@ -26,12 +26,14 @@ import java.util.Objects;
 public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer {

    private SensitiveStrategy strategy;
+    private String roleKey;
+    private String perms;

    @Override
    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
        try {
            SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
-            if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive()) {
+            if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive(roleKey, perms)) {
                gen.writeString(strategy.desensitizer().apply(value));
            } else {
                gen.writeString(value);
@@ -47,6 +49,8 @@ public class SensitiveHandler extends JsonSerializer<String> implements Contextu
        Sensitive annotation = property.getAnnotation(Sensitive.class);
        if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
            this.strategy = annotation.strategy();
+            this.roleKey = annotation.roleKey();
+            this.perms = annotation.perms();
            return this;
        }
        return prov.findValueSerializer(property.getType(), property);
--- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java
@@ -63,9 +63,9 @@ public class AuthMaxKeyRequest extends AuthDefaultRequest {
            throw new AuthException(object.getStr("message"));
        }
        return AuthUser.builder()
-            .uuid(object.getStr("id"))
+            .uuid(object.getStr("userId"))
            .username(object.getStr("username"))
-            .nickname(object.getStr("name"))
+            .nickname(object.getStr("displayName"))
            .avatar(object.getStr("avatar_url"))
            .blog(object.getStr("web_url"))
            .company(object.getStr("organization"))
--- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
@@ -7,7 +7,6 @@ import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.*;
-import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
 import org.dromara.common.social.config.properties.SocialProperties;
@@ -23,11 +22,11 @@ public class SocialUtils  {
    private static final AuthRedisStateCache STATE_CACHE = SpringUtils.getBean(AuthRedisStateCache.class);

    @SuppressWarnings("unchecked")
-    public static AuthResponse<AuthUser> loginAuth(LoginBody loginBody, SocialProperties socialProperties) throws AuthException {
-        AuthRequest authRequest = getAuthRequest(loginBody.getSource(), socialProperties);
+    public static AuthResponse<AuthUser> loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException {
+        AuthRequest authRequest = getAuthRequest(source, socialProperties);
        AuthCallback callback = new AuthCallback();
-        callback.setCode(loginBody.getSocialCode());
-        callback.setState(loginBody.getSocialState());
+        callback.setCode(code);
+        callback.setState(state);
        return authRequest.login(callback);
    }

@@ -48,7 +47,7 @@ public class SocialUtils  {
            case "coding" -> new AuthCodingRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), STATE_CACHE);
            case "oschina" -> new AuthOschinaRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), STATE_CACHE);
            // 支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip
-            case "alipay" -> new AuthAlipayRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), socialProperties.getType().get("alipay").getAlipayPublicKey(), STATE_CACHE);
+            case "alipay_wallet" -> new AuthAlipayRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE);
            case "qq" -> new AuthQqRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), STATE_CACHE);
            case "wechat_open" -> new AuthWeChatOpenRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), STATE_CACHE);
            case "taobao" -> new AuthTaobaoRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret).redirectUri(redirectUri).build(), STATE_CACHE);
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
@@ -2,6 +2,7 @@ package org.dromara.common.tenant.handle;

 import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -18,6 +19,7 @@ import java.util.List;
 *
 * @author Lion Li
 */
+@Slf4j
@AllArgsConstructor
 public class PlusTenantLineHandler implements TenantLineHandler {

@@ -25,15 +27,11 @@ public class PlusTenantLineHandler implements TenantLineHandler {

    @Override
    public Expression getTenantId() {
-        String tenantId = LoginHelper.getTenantId();
+        String tenantId = TenantHelper.getTenantId();
        if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
            return new NullValue();
        }
-        String dynamicTenantId = TenantHelper.getDynamic();
-        if (StringUtils.isNotBlank(dynamicTenantId)) {
-            // 返回动态租户
-            return new StringValue(dynamicTenantId);
-        }
        // 返回固定租户
        return new StringValue(tenantId);
    }
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
@@ -1,5 +1,6 @@
 package org.dromara.common.tenant.handle;

+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.redis.handler.KeyPrefixHandler;
@@ -10,6 +11,7 @@ import org.dromara.common.tenant.helper.TenantHelper;
 *
 * @author Lion Li
 */
+@Slf4j
 public class TenantKeyPrefixHandler extends KeyPrefixHandler {

    public TenantKeyPrefixHandler(String keyPrefix) {
@@ -28,7 +30,10 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
            return super.map(name);
        }
        String tenantId = TenantHelper.getTenantId();
-        if (StringUtils.startsWith(name, tenantId)) {
+        if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
+        }
+        if (StringUtils.startsWith(name, tenantId + "")) {
            // 如果存在则直接返回
            return super.map(name);
        }
@@ -48,7 +53,10 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
            return super.unmap(name);
        }
        String tenantId = TenantHelper.getTenantId();
-        if (StringUtils.startsWith(unmap, tenantId)) {
+        if (StringUtils.isBlank(tenantId)) {
+            log.error("无法获取有效的租户id -> Null");
+        }
+        if (StringUtils.startsWith(unmap, tenantId + "")) {
            // 如果存在则删除
            return unmap.substring((tenantId + ":").length());
        }
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -44,14 +44,14 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
                    BufferedReader reader = request.getReader();
                    jsonParam = IoUtil.read(reader);
                }
-                log.debug("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+                log.info("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
            } else {
                Map<String, String[]> parameterMap = request.getParameterMap();
                if (MapUtil.isNotEmpty(parameterMap)) {
                    String parameters = JsonUtils.toJsonString(parameterMap);
-                    log.debug("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+                    log.info("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
                } else {
-                    log.debug("[PLUS]开始请求 => URL[{}],无参数", url);
+                    log.info("[PLUS]开始请求 => URL[{}],无参数", url);
                }
            }

@@ -72,7 +72,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
        if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
            StopWatch stopWatch = invokeTimeTL.get();
            stopWatch.stop();
-            log.debug("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
+            log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
            invokeTimeTL.remove();
        }
    }
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
@@ -1,10 +1,10 @@
 package org.dromara.common.websocket.handler;

+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.websocket.dto.WebSocketMessageDto;
 import org.dromara.common.websocket.holder.WebSocketSessionHolder;
 import org.dromara.common.websocket.utils.WebSocketUtils;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.socket.*;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;

@@ -40,7 +40,6 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
    @Override
    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
-        log.info("PlusWebSocketHandler, 连接：" + session.getId() + "，已收到消息:" + message.getPayload());
        List<Long> userIds = List.of(loginUser.getUserId());
        WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
        webSocketMessageDto.setSessionKeys(userIds);
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java
@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.web.socket.WebSocketSession;

 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 /**
@@ -31,6 +32,10 @@ public class WebSocketSessionHolder {
        return USER_SESSION_MAP.get(sessionKey);
    }

+    public static Set<Long> getSessionsAll() {
+        return USER_SESSION_MAP.keySet();
+    }
+
    public static Boolean existSession(Long sessionKey) {
        return USER_SESSION_MAP.containsKey(sessionKey);
    }
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java
@@ -19,13 +19,18 @@ public class WebSocketTopicListener implements ApplicationRunner, Ordered {
    @Override
    public void run(ApplicationArguments args) throws Exception {
        WebSocketUtils.subscribeMessage((message) -> {
-            log.info("WebSocket主题订阅收到消息session keys={}  message={}！", message.getSessionKeys(), message.getMessage());
+            log.info("WebSocket主题订阅收到消息session keys={} message={}", message.getSessionKeys(), message.getMessage());
+            // 如果key不为空就按照key发消息 如果为空就群发
            if (CollUtil.isNotEmpty(message.getSessionKeys())) {
                message.getSessionKeys().forEach(key -> {
                    if (WebSocketSessionHolder.existSession(key)) {
                        WebSocketUtils.sendMessage(key, message.getMessage());
                    }
                });
+            } else {
+                WebSocketSessionHolder.getSessionsAll().forEach(key -> {
+                    WebSocketUtils.sendMessage(key, message.getMessage());
+                });
            }
        });
        log.info("初始化WebSocket主题订阅监听器成功");
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
@@ -1,13 +1,12 @@
 package org.dromara.common.websocket.utils;

 import cn.hutool.core.collection.CollUtil;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.redis.utils.RedisUtils;
-import org.dromara.common.websocket.dto.WebSocketMessageDto;
-import org.dromara.common.websocket.holder.WebSocketSessionHolder;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.holder.WebSocketSessionHolder;
 import org.springframework.web.socket.PongMessage;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketMessage;
@@ -18,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;

-import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY;
 import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC;

 /**
@@ -77,6 +75,19 @@ public class WebSocketUtils {
        }
    }

+    /**
+     * 发布订阅的消息(群发)
+     *
+     * @param message 消息内容
+     */
+    public static void publishAll(String message) {
+        WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
+        broadcastMessage.setMessage(message);
+        RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
+            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
+        });
+    }
+
    public static void sendPongMessage(WebSocketSession session) {
        sendMessage(session, new PongMessage());
    }
@@ -90,10 +101,7 @@ public class WebSocketUtils {
            log.error("[send] session会话已经关闭");
        } else {
            try {
-                // 获取当前会话中的用户
-                LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
                session.sendMessage(message);
-                log.info("[send] sessionId: {},userId:{},userType:{},message:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType(), message);
            } catch (IOException e) {
                log.error("[send] session({}) 发送消息({}) 异常", session, message, e);
            }
--- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -1,4 +1,5 @@
-FROM findepi/graalvm:java17-native
+#FROM findepi/graalvm:java17-native
+FROM openjdk:17.0.2-oraclelinux8

 MAINTAINER Lion Li

--- a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
+++ b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
@@ -1,4 +1,5 @@
-FROM findepi/graalvm:java17-native
+#FROM findepi/graalvm:java17-native
+FROM openjdk:17.0.2-oraclelinux8

 MAINTAINER Lion Li

--- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
@@ -10,8 +10,8 @@
    <artifactId>ruoyi-powerjob-server</artifactId>

    <properties>
-        <spring-boot.version>2.7.14</spring-boot.version>
-        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
+        <spring-boot.version>2.7.17</spring-boot.version>
+        <spring-boot-admin.version>2.7.11</spring-boot-admin.version>
    </properties>
    <dependencyManagement>
        <dependencies>
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java
@@ -50,25 +50,25 @@ public class TestSensitiveController extends BaseController {
        /**
         * 电话
         */
-        @Sensitive(strategy = SensitiveStrategy.PHONE)
+        @Sensitive(strategy = SensitiveStrategy.PHONE, roleKey = "common")
        private String phone;

        /**
         * 地址
         */
-        @Sensitive(strategy = SensitiveStrategy.ADDRESS)
+        @Sensitive(strategy = SensitiveStrategy.ADDRESS, perms = "system:user:query")
        private String address;

        /**
         * 邮箱
         */
-        @Sensitive(strategy = SensitiveStrategy.EMAIL)
+        @Sensitive(strategy = SensitiveStrategy.EMAIL, roleKey = "common", perms = "system:user:query1")
        private String email;

        /**
         * 银行卡
         */
-        @Sensitive(strategy = SensitiveStrategy.BANK_CARD)
+        @Sensitive(strategy = SensitiveStrategy.BANK_CARD, roleKey = "common1", perms = "system:user:query")
        private String bankCard;

    }
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java
@@ -65,6 +65,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
        lqw.eq(StringUtils.isNotBlank(bo.getValue()), TestDemo::getValue, bo.getValue());
        lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
            TestDemo::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+        lqw.orderByAsc(TestDemo::getId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java
@@ -47,6 +47,7 @@ public class TestTreeServiceImpl implements ITestTreeService {
        lqw.like(StringUtils.isNotBlank(bo.getTreeName()), TestTree::getTreeName, bo.getTreeName());
        lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
            TestTree::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+        lqw.orderByAsc(TestTree::getId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java
@@ -79,7 +79,7 @@ public class GenController extends BaseController {
     */
    @SaCheckPermission("tool:gen:list")
    @GetMapping(value = "/column/{tableId}")
-    public TableDataInfo<GenTableColumn> columnList(Long tableId) {
+    public TableDataInfo<GenTableColumn> columnList(@PathVariable("tableId") Long tableId) {
        TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
        dataInfo.setRows(list);
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isMySql()">
            select column_name,
-                   (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required,
+                   (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required,
                   (case when column_key = 'PRI' then '1' else '0' end) as is_pk,
                   ordinal_position as sort,
                   column_comment,
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </if>
        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isOracle()">
            select lower(temp.column_name) as column_name,
-                    (case when (temp.nullable = 'N'  and  temp.constraint_type != 'P') then '1' else null end) as is_required,
+                    (case when (temp.nullable = 'N'  and  temp.constraint_type != 'P') then '1' else '0' end) as is_required,
                    (case when temp.constraint_type = 'P' then '1' else '0' end) as is_pk,
                    temp.column_id as sort,
                    temp.comments as column_comment,
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -15,7 +15,7 @@
 #end
 #if($column.htmlType == "input" || $column.htmlType == "textarea")
          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
          </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
          <el-form-item label="${comment}" prop="${column.javaField}">
@@ -453,7 +453,7 @@ const handleUpdate = async (row: ${BusinessName}VO) => {
  if (row != null) {
    form.value.${treeParentCode} = row.${treeParentCode};
  }
-  const res = await get${BusinessName}(row.${treeCode});
+  const res = await get${BusinessName}(row.${pkColumn.javaField});
  Object.assign(form.value, res.data);
 #foreach ($column in $columns)
  #if($column.htmlType == "checkbox")
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -15,7 +15,7 @@
 #end
 #if($column.htmlType == "input" || $column.htmlType == "textarea")
          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
          </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
          <el-form-item label="${comment}" prop="${column.javaField}">
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -90,6 +90,11 @@
            <artifactId>ruoyi-common-encrypt</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
    </dependencies>

 </project>
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java
@@ -68,8 +68,8 @@ public class SysConfigController extends BaseController {
     * @param configKey 参数Key
     */
    @GetMapping(value = "/configKey/{configKey}")
-    public R<Void> getConfigKey(@PathVariable String configKey) {
-        return R.ok(configService.selectConfigByKey(configKey));
+    public R<String> getConfigKey(@PathVariable String configKey) {
+        return R.ok("操作成功", configService.selectConfigByKey(configKey));
    }

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
@@ -1,16 +1,18 @@
 package org.dromara.system.controller.system;

 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.system.domain.bo.SysNoticeBo;
 import org.dromara.system.domain.vo.SysNoticeVo;
 import org.dromara.system.service.ISysNoticeService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 public class SysNoticeController extends BaseController {

    private final ISysNoticeService noticeService;
+    private final DictService dictService;

    /**
     * 获取通知公告列表
@@ -54,7 +57,13 @@ public class SysNoticeController extends BaseController {
    @Log(title = "通知公告", businessType = BusinessType.INSERT)
    @PostMapping
    public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
-        return toAjax(noticeService.insertNotice(notice));
+        int rows = noticeService.insertNotice(notice);
+        if (rows <= 0) {
+            return R.fail();
+        }
+        String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType());
+        WebSocketUtils.publishAll("[" + type + "] " + notice.getNoticeTitle());
+        return R.ok();
    }

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
@@ -11,6 +11,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.bo.SysUserPasswordBo;
 import org.dromara.system.domain.bo.SysUserProfileBo;
 import org.dromara.system.domain.vo.AvatarVo;
 import org.dromara.system.domain.vo.ProfileVo;
@@ -76,22 +77,21 @@ public class SysProfileController extends BaseController {
    /**
     * 重置密码
     *
-     * @param newPassword 旧密码
-     * @param oldPassword 新密码
+     * @param bo 新旧密码
     */
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
-    public R<Void> updatePwd(String oldPassword, String newPassword) {
+    public R<Void> updatePwd(@Validated @RequestBody SysUserPasswordBo bo) {
        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
        String password = user.getPassword();
-        if (!BCrypt.checkpw(oldPassword, password)) {
+        if (!BCrypt.checkpw(bo.getOldPassword(), password)) {
            return R.fail("修改密码失败，旧密码错误");
        }
-        if (BCrypt.checkpw(newPassword, password)) {
+        if (BCrypt.checkpw(bo.getNewPassword(), password)) {
            return R.fail("新密码不能与旧密码相同");
        }

-        if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(newPassword)) > 0) {
+        if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())) > 0) {
            return R.ok();
        }
        return R.fail("修改密码异常，请联系管理员");
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -112,6 +112,9 @@ public class SysUserController extends BaseController {
            TenantHelper.clearDynamic();
        }
        SysUserVo user = userService.selectUserById(loginUser.getUserId());
+        if (ObjectUtil.isNull(user)) {
+            return R.fail("没有权限访问用户数据!");
+        }
        userInfoVo.setUser(user);
        userInfoVo.setPermissions(loginUser.getMenuPermission());
        userInfoVo.setRoles(loginUser.getRolePermission());
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java
@@ -37,6 +37,16 @@ public class SysLogininfor implements Serializable {
     */
    private String userName;

+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
    /**
     * 登录状态 0成功 1失败
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java
@@ -185,7 +185,7 @@ public class SysMenu extends BaseEntity {
     * 内链域名特殊字符替换
     */
    public static String innerLinkReplaceEach(String path) {
-        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."},
-            new String[]{"", "", "", "/"});
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"},
+            new String[]{"", "", "", "/", "/"});
    }
 }
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java
@@ -26,6 +26,16 @@ public class SysUserOnline {
     */
    private String userName;

+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
    /**
     * 登录IP地址
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java
@@ -1,14 +1,12 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.system.domain.SysConfig;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysConfig;

 /**
 * 参数配置业务对象 sys_config
@@ -24,27 +22,26 @@ public class SysConfigBo extends BaseEntity {
    /**
     * 参数主键
     */
-    @NotNull(message = "参数主键不能为空", groups = { EditGroup.class })
    private Long configId;

    /**
     * 参数名称
     */
-    @NotBlank(message = "参数名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "参数名称不能为空")
    @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符")
    private String configName;

    /**
     * 参数键名
     */
-    @NotBlank(message = "参数键名不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "参数键名不能为空")
    @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符")
    private String configKey;

    /**
     * 参数键值
     */
-    @NotBlank(message = "参数键值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "参数键值不能为空")
    @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符")
    private String configValue;

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java
@@ -1,9 +1,5 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysDept;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
@@ -11,6 +7,8 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDept;

 /**
 * 部门业务对象 sys_dept
@@ -26,7 +24,6 @@ public class SysDeptBo extends BaseEntity {
    /**
     * 部门id
     */
-    @NotNull(message = "部门id不能为空", groups = { EditGroup.class })
    private Long deptId;

    /**
@@ -37,7 +34,7 @@ public class SysDeptBo extends BaseEntity {
    /**
     * 部门名称
     */
-    @NotBlank(message = "部门名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "部门名称不能为空")
    @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符")
    private String deptName;

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java
@@ -1,15 +1,13 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysDictData;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDictData;

 /**
 * 字典数据业务对象 sys_dict_data
@@ -25,7 +23,6 @@ public class SysDictDataBo extends BaseEntity {
    /**
     * 字典编码
     */
-    @NotNull(message = "字典编码不能为空", groups = { EditGroup.class })
    private Long dictCode;

    /**
@@ -36,21 +33,21 @@ public class SysDictDataBo extends BaseEntity {
    /**
     * 字典标签
     */
-    @NotBlank(message = "字典标签不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "字典标签不能为空")
    @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符")
    private String dictLabel;

    /**
     * 字典键值
     */
-    @NotBlank(message = "字典键值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "字典键值不能为空")
    @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符")
    private String dictValue;

    /**
     * 字典类型
     */
-    @NotBlank(message = "字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "字典类型不能为空")
    @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符")
    private String dictType;

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java
@@ -1,16 +1,13 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysDictType;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDictType;

 /**
 * 字典类型业务对象 sys_dict_type
@@ -26,20 +23,19 @@ public class SysDictTypeBo extends BaseEntity {
    /**
     * 字典主键
     */
-    @NotNull(message = "字典主键不能为空", groups = { EditGroup.class })
    private Long dictId;

    /**
     * 字典名称
     */
-    @NotBlank(message = "字典名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "字典名称不能为空")
    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符")
    private String dictName;

    /**
     * 字典类型
     */
-    @NotBlank(message = "字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "字典类型不能为空")
    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符")
    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
    private String dictType;
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java
@@ -33,6 +33,16 @@ public class SysLogininforBo {
     */
    private String userName;

+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
    /**
     * 登录IP地址
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java
@@ -1,16 +1,14 @@
 package org.dromara.system.domain.bo;

 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysMenu;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysMenu;

 /**
 * 菜单权限业务对象 sys_menu
@@ -26,7 +24,6 @@ public class SysMenuBo extends BaseEntity {
    /**
     * 菜单ID
     */
-    @NotNull(message = "菜单ID不能为空", groups = { EditGroup.class })
    private Long menuId;

    /**
@@ -37,14 +34,14 @@ public class SysMenuBo extends BaseEntity {
    /**
     * 菜单名称
     */
-    @NotBlank(message = "菜单名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "菜单名称不能为空")
    @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符")
    private String menuName;

    /**
     * 显示顺序
     */
-    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "显示顺序不能为空")
    private Integer orderNum;

    /**
@@ -77,7 +74,7 @@ public class SysMenuBo extends BaseEntity {
    /**
     * 菜单类型（M目录 C菜单 F按钮）
     */
-    @NotBlank(message = "菜单类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "菜单类型不能为空")
    private String menuType;

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
@@ -1,16 +1,13 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.core.xss.Xss;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysNotice;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.xss.Xss;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysNotice;

 /**
 * 通知公告业务对象 sys_notice
@@ -26,14 +23,13 @@ public class SysNoticeBo extends BaseEntity {
    /**
     * 公告ID
     */
-    @NotNull(message = "公告ID不能为空", groups = { EditGroup.class })
    private Long noticeId;

    /**
     * 公告标题
     */
    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "公告标题不能为空")
    @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符")
    private String noticeTitle;

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java
@@ -1,15 +1,13 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysPost;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysPost;

 /**
 * 岗位信息业务对象 sys_post
@@ -25,27 +23,26 @@ public class SysPostBo extends BaseEntity {
    /**
     * 岗位ID
     */
-    @NotNull(message = "岗位ID不能为空", groups = { EditGroup.class })
    private Long postId;

    /**
     * 岗位编码
     */
-    @NotBlank(message = "岗位编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "岗位编码不能为空")
    @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符")
    private String postCode;

    /**
     * 岗位名称
     */
-    @NotBlank(message = "岗位名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "岗位名称不能为空")
    @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符")
    private String postName;

    /**
     * 显示顺序
     */
-    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "显示顺序不能为空")
    private Integer postSort;

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
@@ -1,10 +1,5 @@
 package org.dromara.system.domain.bo;

-import org.dromara.common.core.constant.UserConstants;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysRole;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -12,6 +7,9 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysRole;

 /**
 * 角色信息业务对象 sys_role
@@ -28,27 +26,26 @@ public class SysRoleBo extends BaseEntity {
    /**
     * 角色ID
     */
-    @NotNull(message = "角色ID不能为空", groups = { EditGroup.class })
    private Long roleId;

    /**
     * 角色名称
     */
-    @NotBlank(message = "角色名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "角色名称不能为空")
    @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符")
    private String roleName;

    /**
     * 角色权限字符串
     */
-    @NotBlank(message = "角色权限字符串不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "角色权限字符串不能为空")
    @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符")
    private String roleKey;

    /**
     * 显示顺序
     */
-    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "显示顺序不能为空")
    private Integer roleSort;

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain.bo;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 用户密码修改bo
+ */
+@Data
+public class SysUserPasswordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 旧密码
+     */
+    @NotBlank(message = "旧密码不能为空")
+    private String oldPassword;
+
+    /**
+     * 新密码
+     */
+    @NotBlank(message = "新密码不能为空")
+    private String newPassword;
+}
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
@@ -45,6 +45,19 @@ public class SysLogininforVo implements Serializable {
    @ExcelProperty(value = "用户账号")
    private String userName;

+    /**
+     * 客户端
+     */
+    @ExcelProperty(value = "客户端")
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_device_type")
+    private String deviceType;
+
    /**
     * 登录状态（0成功 1失败）
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;

 import java.util.Collection;
 import java.util.List;
-import java.util.Map;

 /**
 * 客户端管理Service业务层处理
@@ -75,12 +74,12 @@ public class SysClientServiceImpl implements ISysClientService {
    }

    private LambdaQueryWrapper<SysClient> buildQueryWrapper(SysClientBo bo) {
-        Map<String, Object> params = bo.getParams();
        LambdaQueryWrapper<SysClient> lqw = Wrappers.lambdaQuery();
        lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysClient::getClientId, bo.getClientId());
        lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysClient::getClientKey, bo.getClientKey());
        lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysClient::getClientSecret, bo.getClientSecret());
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysClient::getStatus, bo.getStatus());
+        lqw.orderByAsc(SysClient::getId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
@@ -114,6 +114,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
        lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey());
        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
            SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByAsc(SysConfig::getConfigId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
@@ -49,11 +49,8 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
            .apply(DataBaseHelper.findInSet(deptId, "ancestors")));
        List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
        ids.add(deptId);
-        List<SysDept> list = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-            .select(SysDept::getDeptId)
-            .in(SysDept::getDeptId, ids));
-        if (CollUtil.isNotEmpty(list)) {
-            return StreamUtils.join(list, d -> Convert.toStr(d.getDeptId()));
+        if (CollUtil.isNotEmpty(ids)) {
+            return StreamUtils.join(ids, Convert::toStr);
        }
        return null;
    }
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -85,6 +85,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
        lqw.orderByAsc(SysDept::getParentId);
        lqw.orderByAsc(SysDept::getOrderNum);
+        lqw.orderByAsc(SysDept::getDeptId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -76,6 +76,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
        lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType());
        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
            SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByAsc(SysDictType::getDictId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;

+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +13,14 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.SysClient;
 import org.dromara.system.domain.SysLogininfor;
 import org.dromara.system.domain.bo.SysLogininforBo;
 import org.dromara.system.domain.vo.SysLogininforVo;
+import org.dromara.system.mapper.SysClientMapper;
 import org.dromara.system.mapper.SysLogininforMapper;
+import org.dromara.system.service.ISysClientService;
 import org.dromara.system.service.ISysLogininforService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +46,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService {

    private final SysLogininforMapper baseMapper;

+    private final ISysClientService clientService;
+
    /**
     * 记录登录信息
     *
@@ -52,6 +59,12 @@ public class SysLogininforServiceImpl implements ISysLogininforService {
        HttpServletRequest request = logininforEvent.getRequest();
        final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
        final String ip = ServletUtils.getClientIP(request);
+        // 客户端信息
+        String clientid = request.getHeader(LoginHelper.CLIENT_KEY);
+        SysClient client = null;
+        if (StringUtils.isNotBlank(clientid)) {
+            client = clientService.queryByClientId(clientid);
+        }

        String address = AddressUtils.getRealAddressByIP(ip);
        StringBuilder s = new StringBuilder();
@@ -70,6 +83,10 @@ public class SysLogininforServiceImpl implements ISysLogininforService {
        SysLogininforBo logininfor = new SysLogininforBo();
        logininfor.setTenantId(logininforEvent.getTenantId());
        logininfor.setUserName(logininforEvent.getUsername());
+        if (ObjectUtil.isNotNull(client)) {
+            logininfor.setClientKey(client.getClientKey());
+            logininfor.setDeviceType(client.getDeviceType());
+        }
        logininfor.setIpaddr(ip);
        logininfor.setLoginLocation(address);
        logininfor.setBrowser(browser);
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
@@ -26,7 +27,6 @@ import org.dromara.system.mapper.SysRoleMapper;
 import org.dromara.system.mapper.SysRoleMenuMapper;
 import org.dromara.system.mapper.SysTenantPackageMapper;
 import org.dromara.system.service.ISysMenuService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

 import java.util.*;
@@ -169,11 +169,11 @@ public class SysMenuServiceImpl implements ISysMenuService {
        if (tenantPackage.getMenuCheckStrictly()) {
            parentIds = baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
                .select(SysMenu::getParentId)
-                .in(SysMenu::getMenuId, menuIds), Convert::toLong);
+                .in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);});
        }
        return baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
            .in(SysMenu::getMenuId, menuIds)
-            .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), Convert::toLong);
+            .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);});
    }

    /**
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
@@ -71,6 +71,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
            SysUserVo sysUser = userMapper.selectUserByUserName(bo.getCreateByName());
            lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null);
        }
+        lqw.orderByAsc(SysNotice::getNoticeId);
        return lqw;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
@@ -53,6 +53,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
    public TableDataInfo<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) {
        Map<String, Object> params = operLog.getParams();
        LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
+            .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp())
            .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
            .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
                SysOperLog::getBusinessType, operLog.getBusinessType())
@@ -96,6 +97,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
    public List<SysOperLogVo> selectOperLogList(SysOperLogBo operLog) {
        Map<String, Object> params = operLog.getParams();
        return baseMapper.selectVoList(new LambdaQueryWrapper<SysOperLog>()
+            .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp())
            .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
            .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
                SysOperLog::getBusinessType, operLog.getBusinessType())
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
@@ -92,6 +92,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
        lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey());
        lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName());
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus());
+        lqw.orderByAsc(SysOssConfig::getOssConfigId);
        return lqw;
    }

@@ -101,6 +102,8 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
        validEntityBeforeSave(config);
        boolean flag = baseMapper.insert(config) > 0;
        if (flag) {
+            // 从数据库查询完整的数据做缓存
+            config = baseMapper.selectById(config.getOssConfigId());
            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
        }
        return flag;
@@ -118,6 +121,8 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
        luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
        boolean flag = baseMapper.update(config, luw) > 0;
        if (flag) {
+            // 从数据库查询完整的数据做缓存
+            config = baseMapper.selectById(config.getOssConfigId());
            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
        }
        return flag;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
疯狂的狮子Li	17cf957052	!447 发布 5.1.1 大量代码优化与bug修复建议升级 Merge pull request !447 from 疯狂的狮子Li/dev	2023-11-14 03:01:32 +00:00
疯狂的狮子Li	624a14d2de	😴发布 5.1.1 大量代码优化与bug修复建议升级	2023-11-14 10:49:08 +08:00
疯狂的狮子Li	0682efb472	fix 修复数据权限优化后 update delete 报null问题	2023-11-13 10:46:38 +08:00
疯狂的狮子Li	abc3acf489	fix 修复 oss服务无法连接导致业务异常问题查询不应该影响业务	2023-11-10 16:31:14 +08:00
疯狂的狮子Li	f9ba1df798	fix 修复 oss服务无法连接导致业务异常问题查询不应该影响业务	2023-11-10 16:29:47 +08:00
疯狂的狮子Li	9c7274b776	fix 修复租户id为null 无法匹配字符串导致的嵌套key问题	2023-11-10 15:52:46 +08:00
疯狂的狮子Li	bf9f54c021	update 优化数据权限拦截器优先判断方法是否有效提高性能减少无用sql解析	2023-11-09 18:35:52 +08:00
疯狂的狮子Li	26369657e3	update 优化适配 maxkey 新版本	2023-11-09 18:21:53 +08:00
疯狂的狮子Li	3d9b05a61a	fix 修复 !pr444 代码判断错误	2023-11-09 17:49:11 +08:00
盘古给你一斧	c93b666140	!444 @Sensitive脱敏增加角色和权限校验 * update 优化脱敏增加角色及权限校验	2023-11-09 09:37:56 +00:00
疯狂的狮子Li	0f16051024	update 优化部门数据权限使用默认兜底方案	2023-11-09 12:23:57 +08:00
疯狂的狮子Li	81f7a59caa	update 优化更改默认日志等级为info 避免日志过多(按需开启debug)	2023-11-08 16:00:06 +08:00
疯狂的狮子Li	2c4306b436	fix 修复部门管理orderNum排序失效问题	2023-11-08 15:40:34 +08:00
疯狂的狮子Li	3a9379555e	!442 update 优化登录策略代码 Merge pull request !442 from David Wei/update/login_strategy-dev	2023-11-08 03:02:51 +00:00
David Wei	e7ed4afe79	update 登录策略代码优化	2023-11-08 10:29:35 +08:00
疯狂的狮子Li	213cc8a3aa	fix 修复外链带端口出现的异常	2023-11-07 12:57:29 +08:00
疯狂的狮子Li	323c290ee9	update 优化补全代码生成 columnList 接口参数注解缺失	2023-11-06 09:35:32 +08:00
疯狂的狮子Li	5602976ee1	update 优化 nginx 配置支持 websocket	2023-11-03 18:39:20 +08:00
疯狂的狮子Li	c709b44786	update 优化 notice 新增通知公告发送ws推送	2023-11-03 12:59:42 +08:00
疯狂的狮子Li	f34740ad03	fix 修复 ws群发重复推送问题	2023-11-03 12:59:03 +08:00
疯狂的狮子Li	51feaf7b99	update 优化 websocket 模块减少日志输出增加登录推送	2023-11-02 13:56:39 +08:00
疯狂的狮子Li	c5bc6a97c9	remove 删除无用对象	2023-11-02 12:35:09 +08:00
疯狂的狮子Li	864e5d695f	update 优化重构登录策略增加扩展性降低复杂度	2023-11-02 12:25:54 +08:00
疯狂的狮子Li	635e36a882	fix 修复普通角色编辑使用内置管理员code越权问题	2023-11-01 16:33:57 +08:00
疯狂的狮子Li	002a880e8b	update 优化 AddressUtils 兼容linux系统本地ip	2023-10-27 22:52:25 +08:00
疯狂的狮子Li	5d58c27720	update 优化补全操作日志部门数据	2023-10-27 22:43:55 +08:00
疯狂的狮子Li	2709690f81	fix 修复代码生成是否必填与数据库不匹配问题	2023-10-27 17:25:11 +08:00
疯狂的狮子Li	5f84ab968b	update 优化支持数据库操作在非web环境下切换租户	2023-10-27 10:15:53 +08:00
疯狂的狮子Li	cf1c18184e	update 优化排除powerjob无用的依赖减少打包30M体积	2023-10-26 19:41:11 +08:00
疯狂的狮子Li	8d681eda21	fix 修复用户注册接口校验用户名不区分租户问题	2023-10-25 22:20:53 +08:00
疯狂的狮子Li	e2b169e07a	fix 修复用户注册接口校验用户名不区分租户问题	2023-10-25 22:18:21 +08:00
疯狂的狮子Li	e58b010f4a	update 更新删除 satoken yml 时间配置此功能已迁移至客户端管理	2023-10-25 16:29:12 +08:00
疯狂的狮子Li	23e85c5b9c	update 更新 redis 集群模式注释说明	2023-10-25 16:24:40 +08:00
疯狂的狮子Li	4198dce4f0	fix 修复新增校验主键id问题	2023-10-25 15:37:41 +08:00
疯狂的狮子Li	b537b1ecd2	update 优化客户端禁用限制	2023-10-25 15:31:41 +08:00
疯狂的狮子Li	22a8057ea4	update 优化客户端禁用限制	2023-10-25 15:29:41 +08:00
疯狂的狮子Li	f1232a60f3	fix 修复 update sql 编写错误	2023-10-25 11:54:33 +08:00
疯狂的狮子Li	e2e7cee58b	update mybatis-plus 3.5.3.2 => 3.5.4 适配mp新版本改动 update dynamic-ds 4.1.3 => 4.2.0 update bouncycastle 1.72 => 1.76	2023-10-25 10:29:49 +08:00
疯狂的狮子Li	7abd419d8c	fix 修复 commmons-io 的版本限制导致的各种问题回滚 poi 版本	2023-10-25 10:27:50 +08:00
疯狂的狮子Li	3774d71bac	fix 修复错误增加组导致的校验不生效问题	2023-10-23 15:54:25 +08:00
MichelleChung	29118ae78c	!433 更新登录日志以及在线用户展示信息 * update 更新登录日志, 在线用户展示信息(增加客户端, 设备类型)	2023-10-23 01:28:11 +00:00
疯狂的狮子Li	f708492681	update 限制框架中的fastjson版本	2023-10-20 12:25:51 +08:00
疯狂的狮子Li	bf34781f04	fix 修复 commons-io 依赖冲突	2023-10-20 12:10:53 +08:00
疯狂的狮子Li	0e6464d344	update springboot 3.1.4 => 3.1.5 update springboot 2.7.14 => 2.7.17(扩展服务) update poi 5.2.3 => 5.2.4 update satoken 1.36.0 => 1.37.0 update springboot-admin 3.1.6 => 3.1.7 update redisson 3.23.5 => 3.24.1	2023-10-20 10:10:11 +08:00
疯狂的狮子Li	de3adb2230	fix 修复 powerjob 使用 nginx 部署无法访问的问题	2023-10-19 14:14:23 +08:00
疯狂的狮子Li	653bf84929	update 优化数据权限减少二次校验查询	2023-10-13 10:48:58 +08:00
疯狂的狮子Li	9e796943b8	update redisson 3.23.4 => 3.23.5 修复集群报错问题	2023-10-10 14:38:55 +08:00
疯狂的狮子Li	c4daabafbe	fix 修复删除字段后 update sql 未更新问题	2023-10-10 12:49:34 +08:00
疯狂的狮子Li	8b45cb1963	update 优化将部门id存入token避免过度查询redis	2023-10-10 12:49:20 +08:00
疯狂的狮子Li	ee5fc9507a	update 优化增加租户ID为Null错误日志	2023-10-10 10:20:42 +08:00
疯狂的狮子Li	905637d70f	fix 修复删除字段后 update sql 未更新问题	2023-10-09 22:29:06 +08:00
疯狂的狮子Li	cb3ead140b	update 优化操作日志列表新增IP地址查询	2023-10-09 12:25:51 +08:00
疯狂的狮子Li	aabd3990a0	!429 update 优化通过参数键名获取键值接口的返回体 Merge pull request !429 from David Wei/update/config_response	2023-10-08 08:55:33 +00:00
David Wei	937de85647	update 优化通过参数键名获取键值接口的返回体	2023-10-08 15:44:28 +08:00
疯狂的狮子Li	be700f7ddc	fix 修复 SysUserMapper 内标签使用错误(不影响使用)	2023-10-08 15:39:26 +08:00
疯狂的狮子Li	b2eceed943	fix 修复新增或编辑 SysOssConfig 数据后推送到 redis 数据不完整	2023-10-07 15:48:30 +08:00
疯狂的狮子Li	40d652ab82	update 优化错误注释	2023-10-07 15:20:44 +08:00
疯狂的狮子Li	b24e6348c3	fix 修复树表生成查询变量使用错误 Signed-off-by: 疯狂的狮子Li <15040126243@163.com>	2023-09-30 14:41:34 +00:00
疯狂的狮子Li	2c64c66ed1	!424 fix 个人信息修改密码接口，隐藏新旧密码参数明文 Merge pull request !424 from Bleachtred/5.X	2023-09-26 08:06:06 +00:00
bleachtred	977e9a119c	update 去除groups	2023-09-26 11:10:46 +08:00
bleachtred	bfe1b2ae50	fix 个人信息修改密码接口隐藏新旧密码参数明文	2023-09-25 15:21:29 +08:00
疯狂的狮子Li	23b7e5f8c7	update springboot 3.1.3 =. 3.1.4 update springboot-admin 3.1.5 => 3.1.6 update satoken 1.35.0.RC => 1.36.0 update hutool 5.8.20 => 5.8.22 update lombok 1.18.26 => 1.18.30	2023-09-25 12:42:55 +08:00
疯狂的狮子Li	de0fe48a72	update 优化为 sys_grant_type 字典增加样式	2023-09-25 12:38:41 +08:00
疯狂的狮子Li	6bc2bac957	update 优化页面输入框样式	2023-09-17 15:53:47 +08:00
疯狂的狮子Li	0cd6712b2a	fix 修复三方登录支付宝source与实际支付宝业务code不匹配问题	2023-09-15 18:07:10 +08:00
疯狂的狮子Li	7e62401bac	update 优化全业务分页查询增加排序规则避免因where条件导致乱序问题	2023-09-15 18:06:34 +08:00
疯狂的狮子Li	3a67a6599f	add 新增 websocket 群发功能	2023-09-13 12:56:47 +08:00
疯狂的狮子Li	6381034b1f	update 优化登录接口租户id被强制校验问题	2023-09-12 10:45:27 +08:00
疯狂的狮子Li	eb9e4b5eef	update 优化加密模块支持父类统一使用加密注解(感谢 Tyler Ge)	2023-09-12 10:32:07 +08:00
疯狂的狮子Li	052a8f71a3	update 优化将graalvm镜像更新为openjdk镜像需要的人自行切换即可	2023-09-12 10:25:37 +08:00
疯狂的狮子Li	58b4df7bb5	update 优化部分使用者乱设权限导致无法获取用户信息增加权限提示	2023-09-08 12:27:36 +08:00