From 675c5062cb6f9527d70430af370861ab4ec55bdf Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 22 八月 2024 15:08:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java index 9cc01a9..9062a30 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java @@ -58,11 +58,11 @@ if (response.isSuccess()) { // 获取用户信息 // AlipayUserInfoShareResponse userInfo = new AliAppletTools(aliProperties).getUserInfo(response.getAccessToken()); - // 获取用户手机号 - String phoneNumber = new AliAppletTools(aliProperties).getPhoneNumber(appletUserLogin.getToken()); - if(StringUtils.isEmpty(phoneNumber)){ + if(StringUtils.isEmpty(appletUserLogin.getToken())){ return AjaxResult.success(); } + // 获取用户手机号 + String phoneNumber = new AliAppletTools(aliProperties).getPhoneNumber(appletUserLogin.getToken()); log.info("获取支付宝用户信息:{}", phoneNumber); // 用户信息封装 return AjaxResult.success(appUserService.aliLogin(response,phoneNumber)); -- Gitblit v1.7.1