From 17cf957052fd1affcb88ebf1abae8fcb76a5fef0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 14 十一月 2023 11:01:32 +0800
Subject: [PATCH] !447 发布 5.1.1 大量代码优化与bug修复 建议升级 Merge pull request !447 from 疯狂的狮子Li/dev
---
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git 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
index 85c0bbb..64a9e97 100644
--- 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
@@ -54,12 +54,11 @@
/**
* 鐧诲綍-绗笁鏂规巿鏉冪櫥褰�
*
- * @param clientId 瀹㈡埛绔痠d
* @param body 鐧诲綍淇℃伅
* @param client 瀹㈡埛绔俊鎭�
*/
@Override
- public LoginVo login(String clientId, String body, SysClient client) {
+ public LoginVo login(String body, SysClient client) {
SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
ValidatorUtils.validate(loginBody);
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
@@ -103,7 +102,7 @@
// 渚嬪: 鍚庡彴鐢ㄦ埛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,7 +112,7 @@
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());
loginVo.setExpireIn(StpUtil.getTokenTimeout());
- loginVo.setClientId(clientId);
+ loginVo.setClientId(client.getClientId());
return loginVo;
}
--
Gitblit v1.9.3