diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index a82f9b08c..8607d98b5 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -79,7 +79,7 @@ 2.2.1 3.1.853 1.0.8 - 1.6.1 + 1.6.5 2.12.2 4.5.7.B diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index e629df383..6554d1158 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -68,6 +68,12 @@ spring: - Path=/admin-api/report/** filters: - RewritePath=/admin-api/report/v3/api-docs, /v3/api-docs + - id: jmreport-server-api # 路由的编号 + uri: grayLb://report-server + predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组 + - Path=/jmreport/** + filters: + - RewritePath=/admin-api/report/v3/api-docs, /v3/api-docs ## pay-server 服务 - id: pay-admin-api # 路由的编号 uri: grayLb://pay-server diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java index cdc23c9e4..d0ca154d5 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java @@ -128,4 +128,14 @@ public class JmReportTokenServiceImpl implements JmReportTokenServiceI { return user; } + @Override + public String getTenantId() { + return Convert.toStr(TenantContextHolder.getTenantId()); + } + + @Override + public String[] getRoles(String s) { + return null; + } + } diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml index 134a08411..bc7373055 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml +++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml @@ -76,6 +76,7 @@ spring: --- #################### 服务保障相关配置 #################### + # Lock4j 配置项 lock4j: acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml index 1a17926a1..65aac2909 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml +++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml @@ -76,6 +76,12 @@ spring: --- #################### 定时任务相关配置 #################### + +--- #################### 积木报表相关配置 #################### +jeecg: + jmreport: + saasMode: tenant + --- #################### 芋道相关配置 #################### yudao: