update 优化 !pr382 修复一些问题 完事流程逻辑

疯狂的狮子Li

2023-07-02 bb2836b6f1789a60c30537444a3bd331f16b45e1

 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);
    }