From 352fb63a2b30878f19bfa91efd4e378cfe5c78b2 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 10 Jun 2021 10:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E3=80=90c=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/auth/api/pojo/login/LoginUser.java | 6 ++++++ .../kernel/customer/modular/factory/CustomerFactory.java | 7 ++++++- .../customer/modular/service/impl/CustomerServiceImpl.java | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 091f28951..8b8157d75 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -144,6 +144,12 @@ public class LoginUser implements Serializable { */ @ChineseDescription("用户的ws-url") private String wsUrl; + + /** + * 头像url + */ + @ChineseDescription("用户头像url") + private String avatarUrl; /** * 当前用户语种的标识，例如：chinese，english diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java index 0acf318cd..5d69472bd 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java @@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.customer.api.expander.CustomerConfigExpander; import cn.stylefeng.roses.kernel.customer.modular.entity.Customer; import cn.stylefeng.roses.kernel.customer.modular.request.CustomerRequest; import cn.stylefeng.roses.kernel.email.api.pojo.SendMailParam; +import cn.stylefeng.roses.kernel.file.api.FileOperatorApi; import cn.stylefeng.roses.kernel.file.api.constants.FileConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; @@ -89,7 +90,7 @@ public class CustomerFactory { * @author fengshuonan * @date 2021/6/7 17:06 */ - public static LoginUser createLoginUser(Customer customer) { + public static LoginUser createLoginUser(Customer customer, FileOperatorApi fileOperatorApi) { LoginUser loginUser = new LoginUser(); loginUser.setUserId(customer.getCustomerId()); loginUser.setAccount(customer.getAccount()); @@ -102,6 +103,10 @@ public class CustomerFactory { simpleUserInfo.setPhone(customer.getTelephone()); loginUser.setSimpleUserInfo(simpleUserInfo); + // 设置用户头像url + String fileAuthUrl = fileOperatorApi.getFileAuthUrl(CustomerConfigExpander.getCustomerBucket(), customer.getAvatarObjectName(), CustomerConfigExpander.getCustomerBucketExpiredSeconds()); + loginUser.setAvatarUrl(fileAuthUrl); + return loginUser; } diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java index 633bfd528..00df81a62 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java @@ -116,7 +116,7 @@ public class CustomerServiceImpl extends ServiceImpl i wrapper.set(Customer::getVerifiedFlag, YesOrNotEnum.Y.getCode()); wrapper.eq(Customer::getVerifyCode, customerRequest.getVerifyCode()); boolean result = this.update(wrapper); - if(!result){ + if (!result) { throw new CustomerException(CustomerExceptionEnum.ACTIVE_ERROR); } } @@ -155,7 +155,7 @@ public class CustomerServiceImpl extends ServiceImpl i } // 获取LoginUser，用于用户的缓存 - LoginUser loginUser = CustomerFactory.createLoginUser(customer); + LoginUser loginUser = CustomerFactory.createLoginUser(customer, fileOperatorApi); // 生成用户的token DefaultJwtPayload defaultJwtPayload = new DefaultJwtPayload(loginUser.getUserId(), loginUser.getAccount(), loginRequest.getRememberMe(), null); @@ -195,7 +195,7 @@ public class CustomerServiceImpl extends ServiceImpl i customerLambdaQueryWrapper.eq(Customer::getEmail, customerRequest.getEmail()); Customer customer = this.getOne(customerLambdaQueryWrapper, false); if (customer == null) { - throw new CustomerException(CustomerExceptionEnum.CANT_FIND_CUSTOMER,customerRequest.getEmail()); + throw new CustomerException(CustomerExceptionEnum.CANT_FIND_CUSTOMER, customerRequest.getEmail()); } // 邮箱验证码