From c92c99c8da92fd9d7dc4af9534419d0679fcc207 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 02 八月 2023 14:21:12 +0800
Subject: [PATCH] update 优化 SysLoginService#socialRegister 判断是否已经绑定用户 ; fix 修正 SysSocialServiceImpl#selectByAuthId 重复数据报错问题 ;

---
 ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 82779b1..3c03e42 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
@@ -109,7 +109,7 @@
      * @return 缁撴灉
      */
     @PostMapping("/social/callback")
-    public R<LoginVo> socialCallback(@RequestBody LoginBody loginBody) {
+    public R<Void> socialCallback(@RequestBody LoginBody loginBody) {
         // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
         AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
         AuthUser authUserData = response.getData();
@@ -117,7 +117,8 @@
         if (!response.ok()) {
             return R.fail(response.getMsg());
         }
-        return loginService.sociaRegister(authUserData);
+        loginService.socialRegister(authUserData);
+        return R.ok();
     }
 
 

--
Gitblit v1.9.3