diff --git a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java index 0c6d14c5..a3e314be 100644 --- a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java +++ b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java @@ -41,7 +41,8 @@ public class BladeJwtTokenEnhancer implements TokenEnhancer { info.put(TokenUtil.ROLE_ID, principal.getRoleId()); info.put(TokenUtil.TENANT_CODE, principal.getTenantCode()); info.put(TokenUtil.ACCOUNT, principal.getAccount()); - info.put(TokenUtil.USER_NAME, principal.getName()); + info.put(TokenUtil.USER_NAME, principal.getUsername()); + info.put(TokenUtil.NICK_NAME, principal.getName()); info.put(TokenUtil.ROLE_NAME, principal.getRoleName()); info.put(TokenUtil.AVATAR, principal.getAvatar()); info.put(TokenUtil.LICENSE, TokenUtil.LICENSE_NAME); diff --git a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java index e3677da3..94a0918c 100644 --- a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java +++ b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java @@ -36,9 +36,10 @@ public class TokenUtil { public final static String AVATAR = TokenConstant.AVATAR; public final static String ACCOUNT = TokenConstant.ACCOUNT; + public final static String USER_NAME = TokenConstant.USER_NAME; + public final static String NICK_NAME = TokenConstant.NICK_NAME; public final static String USER_ID = TokenConstant.USER_ID; public final static String ROLE_ID = TokenConstant.ROLE_ID; - public final static String USER_NAME = TokenConstant.USER_NAME; public final static String ROLE_NAME = TokenConstant.ROLE_NAME; public final static String TENANT_CODE = TokenConstant.TENANT_CODE; public final static String CLIENT_ID = TokenConstant.CLIENT_ID;