From 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 16:58:18 +0800
Subject: [PATCH] Merge branch 'master' into herb-new
---
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
index de0fdba..ae80d8e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
@@ -1,19 +1,23 @@
package org.jeecg.config.jimureport;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
/**
* 鑷畾涔夌Н鏈ㄦ姤琛ㄩ壌鏉�(濡傛灉涓嶈繘琛岃嚜瀹氫箟锛屽垯鎵�鏈夎姹備笉鍋氭潈闄愭帶鍒�)
@@ -48,6 +52,16 @@
}
@Override
+ public String[] getRoles(String token) {
+ String username = JwtUtil.getUsername(token);
+ Set roles = sysBaseApi.getUserRoleSet(username);
+ if(CollectionUtils.isEmpty(roles)){
+ return null;
+ }
+ return (String[]) roles.toArray(new String[roles.size()]);
+ }
+
+ @Override
public Map<String, Object> getUserInfo(String token) {
Map<String, Object> map = new HashMap(5);
String username = JwtUtil.getUsername(token);
@@ -66,4 +80,21 @@
// 灏嗘墍鏈変俊鎭瓨鏀捐嚦map 瑙ｆ瀽sql/api浼氭牴鎹甿ap鐨勯敭鍊艰В鏋�
return map;
}
+
+ /**
+ * 鑾峰彇澶氱鎴穒d
+ * @return tenantId
+ */
+ public String getTenantId() {
+ HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+ String tenantId = request.getHeader("tenantId");
+ if(StringUtils.isNotEmpty(tenantId)){
+ return tenantId;
+ }
+ tenantId = request.getParameter("tenantId");
+ if (StringUtils.isNotEmpty(tenantId)) {
+ return tenantId;
+ }
+ return "";
+ }
}
--
Gitblit v1.9.3