升级积木报表版本，上传最新数据库备份

baoshiwei

2024-03-18 3a66cfe89e0b93bc6015d72169f5c491578f03e6

升级积木报表版本，上传最新数据库备份

 db/herb-20240318.sql

¶Ô±ÈÐÂÎļþ
ÎļþÌ«´ó

 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);

 pom.xml

@@ -56,7 +56,7 @@
        <minidao.version>1.9.0</minidao.version>

        <!-- ç§¯æœ¨æŠ¥è¡¨-->
        <jimureport-spring-boot-starter.version>1.5.8</jimureport-spring-boot-starter.version>
        <jimureport-spring-boot-starter.version>1.7.2-beta</jimureport-spring-boot-starter.version>
        <commons.version>2.6</commons.version>
        <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
        <aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -347,7 +347,7 @@
            <dependency>
                <groupId>org.jeecgframework.jimureport</groupId>
                <artifactId>jimureport-nosql-starter</artifactId>
                <version>1.5.6</version>
                <version>1.6.0</version>
            </dependency>
        </dependencies>
    </dependencyManagement>