From ff158fd0e45f5c45db1a88d2d0b3c1e92865a967 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 29 Dec 2021 17:45:31 +0800 Subject: [PATCH] =?UTF-8?q?token=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/common/security/AuthUser.java | 11 +++++++++-- .../modules/member/token/MemberTokenGenerate.java | 2 +- .../lili/modules/member/token/StoreTokenGenerate.java | 3 ++- .../modules/system/token/ManagerTokenGenerate.java | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/security/AuthUser.java b/framework/src/main/java/cn/lili/common/security/AuthUser.java index 7364421f..eb170192 100644 --- a/framework/src/main/java/cn/lili/common/security/AuthUser.java +++ b/framework/src/main/java/cn/lili/common/security/AuthUser.java @@ -25,6 +25,11 @@ public class AuthUser implements Serializable { */ private String nickName; + /** + * 头像 + */ + private String face; + /** * id */ @@ -58,16 +63,18 @@ public class AuthUser implements Serializable { */ private Boolean isSuper = false; - public AuthUser(String username, String id, String nickName, UserEnums role) { + public AuthUser(String username, String id, String nickName, String face, UserEnums role) { this.username = username; + this.face = face; this.id = id; this.role = role; this.nickName = nickName; } - public AuthUser(String username, String id, UserEnums manager, String nickName, Boolean isSuper) { + public AuthUser(String username, String id, String face, UserEnums manager, String nickName, Boolean isSuper) { this.username = username; this.id = id; + this.face = face; this.role = manager; this.isSuper = isSuper; this.nickName = nickName; diff --git a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java index 9e2b13da..79528c99 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java @@ -52,7 +52,7 @@ public class MemberTokenGenerate extends AbstractTokenGenerate { member.setClientEnum(clientTypeEnum.name()); memberService.updateById(member); - AuthUser authUser = new AuthUser(member.getUsername(), member.getId(),member.getNickName(), UserEnums.MEMBER); + AuthUser authUser = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), member.getFace(), UserEnums.MEMBER); //登陆成功生成token return tokenUtil.createToken(username, authUser, longTerm, UserEnums.MEMBER); } diff --git a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java index 9d10db60..a1a2c595 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java @@ -38,10 +38,11 @@ public class StoreTokenGenerate extends AbstractTokenGenerate { if (!member.getHaveStore()) { throw new ServiceException(ResultCode.STORE_NOT_OPEN); } - AuthUser user = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), UserEnums.STORE); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Store::getMemberId, member.getId()); Store store = storeService.getOne(queryWrapper); + AuthUser user = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), store.getStoreLogo(), UserEnums.STORE); + user.setStoreId(store.getId()); user.setStoreName(store.getStoreName()); return tokenUtil.createToken(username, user, longTerm, UserEnums.STORE); diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index a8d96caa..f88ff534 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -45,7 +45,7 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { public Token createToken(String username, Boolean longTerm) { //生成token AdminUser adminUser = adminUserService.findByUsername(username); - AuthUser user = new AuthUser(adminUser.getUsername(), adminUser.getId(), UserEnums.MANAGER, adminUser.getNickName(), adminUser.getIsSuper()); + AuthUser user = new AuthUser(adminUser.getUsername(), adminUser.getId(), adminUser.getAvatar(), UserEnums.MANAGER, adminUser.getNickName(), adminUser.getIsSuper()); List userMenuVOList = roleMenuService.findAllMenu(user.getId());