From bb2836b6f1789a60c30537444a3bd331f16b45e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 02 七月 2023 16:48:16 +0800
Subject: [PATCH] update 优化 !pr382 修复一些问题 完事流程逻辑
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 2ed4ed4..82779b1 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,26 +99,25 @@
}
AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
- return R.ok(authorizeUrl);
+ return R.ok("鎿嶄綔鎴愬姛", authorizeUrl);
}
/**
- * 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞�
- * 缁戝畾鎺堟潈
- * @param loginBody
+ * 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞� 缁戝畾鎺堟潈
+ *
+ * @param loginBody 璇锋眰浣�
* @return 缁撴灉
*/
- @SuppressWarnings("unchecked")
@PostMapping("/social/callback")
- public R<LoginVo> socialLogin(@RequestBody LoginBody loginBody) {
- // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
- AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
- AuthUser authUserData = response.getData();
- // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
- if (!response.ok()) {
- return R.fail(response.getMsg());
- }
- return loginService.sociaRegister(authUserData);
+ public R<LoginVo> socialCallback(@RequestBody LoginBody loginBody) {
+ // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
+ AuthUser authUserData = response.getData();
+ // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
+ if (!response.ok()) {
+ return R.fail(response.getMsg());
+ }
+ return loginService.sociaRegister(authUserData);
}
--
Gitblit v1.9.3