From d46715cef48f0d343b5ac303be6fdeb62a50042a Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 14:54:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java |   12 ++++++++++++
 1 files changed, 12 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..88c4922 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
@@ -10,10 +10,12 @@
 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 +50,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);

--
Gitblit v1.9.3