Merge branch 'master' into herb-new

baoshiwei

2024-10-25 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9

 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java

@@ -1,9 +1,11 @@
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;
@@ -78,4 +80,21 @@
        // 将所有信息存放至map 解析sql/api会根据map的键值解析
        return map;
    }

    /**
     * 获取多租户id
     * @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 "";
    }
}