From 360f6378d6e22854663b9a0a5c929aed95f9f4d5 Mon Sep 17 00:00:00 2001 From: thiszhc <2029364173@qq.com> Date: Sat, 1 Jul 2023 16:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8E=88=E6=9D=83=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/web/controller/AuthController.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index ff7c3b1dc..75f481512 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -110,23 +110,8 @@ public class AuthController { * @return 结果 */ @SuppressWarnings("unchecked") - @PostMapping("/social-login") + @PostMapping("/social/callback") public R socialLogin(@RequestBody LoginBody loginBody) { - // 授权类型和客户端id - String clientId = loginBody.getClientId(); - String grantType = loginBody.getGrantType(); - SysClient client = clientService.queryByClientId(clientId); - // 查询不到 client 或 client 内不包含 grantType - if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) { - log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType); - return R.fail(MessageUtils.message("auth.grant.type.error")); - } - // 校验租户 - loginService.checkTenant(loginBody.getTenantId()); - //判断用户登录状态，如果已经登录那么就默认为注册，如果没有登录那么默认登录 - if (!StpUtil.isLogin()) { - return R.ok(IAuthStrategy.login(loginBody, client)); - }else { // 获取第三方登录信息 AuthResponse response = SocialUtils.loginAuth(loginBody, socialProperties); AuthUser authUserData = response.getData(); @@ -135,7 +120,6 @@ public class AuthController { return R.fail(response.getMsg()); } return loginService.sociaRegister(authUserData); - } }