From 23b7e5f8c70e53d920c0577353ccfde5970ac183 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 25 九月 2023 12:42:55 +0800
Subject: [PATCH] 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
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 abbfae5..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
@@ -99,7 +99,7 @@
}
AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
- return R.ok(authorizeUrl);
+ return R.ok("鎿嶄綔鎴愬姛", authorizeUrl);
}
/**
@@ -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