From b817738a5371e73af4e31f0604b2d688589cd436 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 16 Oct 2023 09:51:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BB=A3=E7=A0=81=20=20=E5=A2=9E=E5=8A=A0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=B4=A6=E5=8F=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/system/feign/IUserClient.java | 21 +++++++++++-------- .../springblade/system/feign/UserClient.java | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java index 4ead4c88..2434b130 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java @@ -79,15 +79,8 @@ public interface IUserClient { @GetMapping(USER_INFO_BY_ACCOUNT) R userByAccount(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account); - /** - * 根据账号获取用户信息 - * - * @param tenantId 租户id - * @param phone 账号 - * @return - */ - @GetMapping(USER_INFO_BY_PHONE) - R userInfoByPhone(@RequestParam("tenantId") String tenantId, @RequestParam("phone") String phone); + + /** * 获取用户信息 @@ -110,6 +103,16 @@ public interface IUserClient { @GetMapping(USER_INFO_BY_TYPE) R userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account, @RequestParam("userType") String userType); + + /** + * 根据账号获取用户信息 + * + * @param tenantId 租户id + * @param phone 账号 + * @return + */ + @GetMapping(USER_INFO_BY_PHONE) + R userInfoByPhone(@RequestParam("tenantId") String tenantId, @RequestParam("phone") String phone); /** * 获取第三方平台信息 * diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java index ffa63afb..925b7415 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java @@ -82,7 +82,7 @@ public class UserClient implements IUserClient { } @Override - @GetMapping(USER_INFO_BY_TYPE) + @GetMapping(USER_INFO_BY_PHONE) public R userInfoByPhone(String tenantId, String phone) { return R.data(service.userInfoByPhone(tenantId, phone)); }