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

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

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

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

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

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 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架)
 

pom.xml

@@ -13,7 +13,7 @@
  <description>RuoYi-Vue-Plus多租户管理系统</description>
 
  <properties>
- <revision>5.1.0</revision>
+ <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>
@@ -64,15 +64,15 @@
  <properties>
  <!-- 环境标识，需要与配置文件的名称相对应 -->
  <profiles.active>local</profiles.active>
- <logging.level>debug</logging.level>
+ <logging.level>info</logging.level>
  </properties>
  </profile>
  <profile>
  <id>dev</id>
  <properties>
  <!-- 环境标识，需要与配置文件的名称相对应 -->
  <profiles.active>dev</profiles.active>
- <logging.level>debug</logging.level>
+ <logging.level>info</logging.level>
  </properties>
  <activation>
  <!-- 默认环境 -->

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

@@ -14,14 +14,15 @@
 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;
@@ -40,6 +41,8 @@
 
 import java.net.URL;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 认证
@@ -61,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();
@@ -85,7 +91,13 @@ public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
  // 校验租户
  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);
  }
 
  /**
@@ -112,9 +124,11 @@ public R<String> authBinding(@PathVariable("source") String source) {
  * @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()) {
@@ -178,7 +192,7 @@ public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception
  }
  // 根据域名进行筛选
  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);

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);
 
 }

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

@@ -8,7 +8,7 @@
 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.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();
@@ -68,7 +65,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  // 例如: 后台用户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);
 
@@ -78,7 +75,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  LoginVo loginVo = new LoginVo();
  loginVo.setAccessToken(StpUtil.getTokenValue());
  loginVo.setExpireIn(StpUtil.getTokenTimeout());
- loginVo.setClientId(clientId);
+ loginVo.setClientId(client.getClientId());
  return loginVo;
  }
 

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

@@ -9,8 +9,8 @@
 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.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();
@@ -78,7 +75,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  // 例如: 后台用户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);
 
@@ -88,7 +85,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  LoginVo loginVo = new LoginVo();
  loginVo.setAccessToken(StpUtil.getTokenValue());
  loginVo.setExpireIn(StpUtil.getTokenTimeout());
- loginVo.setClientId(clientId);
+ loginVo.setClientId(client.getClientId());
  return loginVo;
  }
 

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

@@ -8,16 +8,16 @@
 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;
 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();
@@ -68,7 +65,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  // 例如: 后台用户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);
 
@@ -78,7 +75,7 @@ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
  LoginVo loginVo = new LoginVo();
  loginVo.setAccessToken(StpUtil.getTokenValue());
  loginVo.setExpireIn(StpUtil.getTokenTimeout());
- loginVo.setClientId(clientId);
+ loginVo.setClientId(client.getClientId());
  return loginVo;
  }