Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

# Conflicts: # yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
yudaocode · Dec 30, 2023 · 5946bdd · 5946bdd
2 parents cd7da1b + 81c7265
commit 5946bdd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
@@ -17,7 +17,7 @@
  <revision>2.0.0-jdk8-snapshot</revision>
  <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
  <!-- 统一依赖管理 -->
- <spring.boot.version>2.7.17</spring.boot.version>
+ <spring.boot.version>2.7.18</spring.boot.version>
  <!-- Web 相关 -->
  <springdoc.version>1.6.15</springdoc.version>
  <knife4j.version>4.3.0</knife4j.version>
@@ -71,7 +71,7 @@
  <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
  <tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
  <justauth.version>1.0.8</justauth.version>
- <jimureport.version>1.6.1</jimureport.version>
+ <jimureport.version>1.6.6</jimureport.version>
  <xercesImpl.version>2.12.2</xercesImpl.version>
  <weixin-java.version>4.5.7.B</weixin-java.version>
  <ureport2.version>2.2.9</ureport2.version>

diff --git a/...ant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/...ant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.framework.tenant.core.context;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.DocumentEnum;
 import com.alibaba.ttl.TransmittableThreadLocal;
 
@@ -21,14 +22,24 @@ public class TenantContextHolder {
  private static final ThreadLocal<Boolean> IGNORE = new TransmittableThreadLocal<>();
 
  /**
- * 获得租户编号。
+ * 获得租户编号
  *
  * @return 租户编号
  */
  public static Long getTenantId() {
  return TENANT_ID.get();
  }
 
+ /**
+ * 获得租户编号 String
+ *
+ * @return 租户编号
+ */
+ public static String getTenantIdStr() {
+ Long tenantId = getTenantId();
+ return StrUtil.toStringOrNull(tenantId);
+ }
+
  /**
  * 获得租户编号。如果不存在，则抛出 NullPointerException 异常
  *

diff --git a/...arter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java b/...arter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java
@@ -81,7 +81,7 @@ private String buildRegion() {
  }
  // 腾讯云必须有 region，否则会报错
  if (config.getEndpoint().contains(ENDPOINT_TENCENT)) {
- return StrUtil.subAfter(config.getEndpoint(), ".cos.", false)
+ return StrUtil.subAfter(config.getEndpoint(), "cos.", false)
  .replaceAll("." + ENDPOINT_TENCENT, ""); // 去除 Endpoint
  }
  return null;

diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml
@@ -8,7 +8,6 @@ spring:
  autoconfigure:
  exclude:
  - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
- - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置
  datasource:
  druid: # Druid 【监控】相关的全局配置
  web-stat-filter:

diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
@@ -8,7 +8,6 @@ spring:
  autoconfigure:
  exclude:
  - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
- - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置
  - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
  - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
  - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置

diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
@@ -260,9 +260,9 @@ yudao:
 debug: false
 
 # 积木报表配置
-minidao :
- base-package: org.jeecg.modules.jmreport.desreport.dao*
- db-type: mysql
+jeecg:
+ jmreport:
+  saas-mode: tenant
 
 # UReport 配置
 ureport: