Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -98,6 +98,9 @@
      param.put(TokenConstant.NICK_NAME, user.getRealName());
      param.put(TokenConstant.ROLE_NAME, Func.join(userInfo.getRoles()));
      param.put(TokenConstant.DETAIL, userInfo.getDetail());
      param.put(TokenConstant.REAL_NAME, user.getRealName());
      param.put("phone", user.getPhone());
      param.put("status", user.getStatus());

      //拼装accessToken
      try {
@@ -119,6 +122,9 @@
            .set(TokenConstant.TOKEN_TYPE, TokenConstant.BEARER)
            .set(TokenConstant.EXPIRES_IN, accessToken.getExpire())
            .set(TokenConstant.DETAIL, userInfo.getDetail())
            .set("phone", user.getPhone())
            .set("status", user.getStatus())
            .set(TokenConstant.REAL_NAME, user.getRealName())
            .set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME);
      } catch (Exception ex) {
         return authInfo.set("error_code", HttpServletResponse.SC_UNAUTHORIZED).set("error_description", ex.getMessage());