From 0fb8f683c894238c90e776758808dea233dba571 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 27 May 2025 09:33:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20getPhoneNoInfo=20=E5=B7=B2=E8=BF=87?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/social/SocialClientServiceImpl.java | 5 ++--- .../system/service/social/SocialClientServiceImplTest.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java index b5c9d88a71..3d41afda7c 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java @@ -262,9 +262,9 @@ public class SocialClientServiceImpl implements SocialClientService { public WxMaPhoneNumberInfo getWxMaPhoneNumberInfo(Integer userType, String phoneCode) { WxMaService service = getWxMaService(userType); try { - return service.getUserService().getPhoneNoInfo(phoneCode); + return service.getUserService().getPhoneNumber(phoneCode); } catch (WxErrorException e) { - log.error("[getPhoneNoInfo][userType({}) phoneCode({}) 获得手机号失败]", userType, phoneCode, e); + log.error("[getPhoneNumber][userType({}) phoneCode({}) 获得手机号失败]", userType, phoneCode, e); throw exception(SOCIAL_CLIENT_WEIXIN_MINI_APP_PHONE_CODE_ERROR); } } @@ -474,7 +474,6 @@ public class SocialClientServiceImpl implements SocialClientService { /** * 校验社交应用是否重复,需要保证 userType + socialType 唯一 - * * 原因是,不同端(userType)选择某个社交登录(socialType)时,需要通过 {@link #buildAuthRequest(Integer, Integer)} 构建对应的请求 * * @param id 编号 diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java index 02f7a6155f..5d75e8834b 100644 --- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java +++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java @@ -274,7 +274,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest { WxMaUserService userService = mock(WxMaUserService.class); when(wxMaService.getUserService()).thenReturn(userService); WxMaPhoneNumberInfo phoneNumber = randomPojo(WxMaPhoneNumberInfo.class); - when(userService.getPhoneNoInfo(eq(phoneCode))).thenReturn(phoneNumber); + when(userService.getPhoneNumber(eq(phoneCode))).thenReturn(phoneNumber); // 调用 WxMaPhoneNumberInfo result = socialClientService.getWxMaPhoneNumberInfo(userType, phoneCode); @@ -291,7 +291,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest { WxMaUserService userService = mock(WxMaUserService.class); when(wxMaService.getUserService()).thenReturn(userService); WxErrorException wxErrorException = new WxErrorException(new NullPointerException()); - when(userService.getPhoneNoInfo(eq(phoneCode))).thenThrow(wxErrorException); + when(userService.getPhoneNumber(eq(phoneCode))).thenThrow(wxErrorException); // 调用并断言异常 assertServiceException(() -> socialClientService.getWxMaPhoneNumberInfo(userType, phoneCode),