From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index a8b2eeb..162067e 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -26,6 +26,7 @@
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
+import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.Tenant;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserInfo;
@@ -94,8 +95,11 @@
param.put(TokenConstant.NICK_NAME, user.getRealName());
param.put(TokenConstant.ROLE_NAME, Func.join(userInfo.getRoles()));
param.put(TokenConstant.DETAIL, userInfo.getDetail());
- param.put("jurisdiction", user.getJurisdiction());
- param.put("cardid", user.getCardid());
+// param.put("jurisdiction", user.getJurisdiction());
+// param.put("cardid", user.getCardid());
+// param.put("Id", user.getId());
+// param.put("rname", userInfo.getRoles());
+// param.put("list", user);
//拼装accessToken
try {
@@ -108,6 +112,9 @@
.set(TokenConstant.ROLE_ID, user.getRoleId())
.set("jurisdiction", user.getJurisdiction())
.set("cardid", user.getCardid())
+ .set("Id", user.getId())
+ .set("rname", userInfo.getRoles())
+ .set("list", user)
.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
.set(TokenConstant.ACCOUNT, user.getAccount())
.set(TokenConstant.USER_NAME, user.getAccount())
--
Gitblit v1.9.3