From cbc1b6b4a7718a58cbe5aecde43f500e58268fef Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 30 May 2022 22:46:15 +0800
Subject: [PATCH] 升级积木报表到最新版、升级springcloud到2021.0.3,解决Spring Cloud Gateway SpEL表达式注入问题
---
jeecg-boot/jeecg-boot-module-system/pom.xml | 7 -------
jeecg-boot/pom.xml | 14 +++++++++++++-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 93df4e4..2fab164 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -52,13 +52,6 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
- <version>1.5.0-beta</version>
- <exclusions>
- <exclusion>
- <artifactId>fastjson</artifactId>
- <groupId>com.alibaba</groupId>
- </exclusion>
- </exclusions>
</dependency>
<!-- DEMO 示例模块 -->
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index b9cea28..0c811c6 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -20,7 +20,7 @@
<!-- 微服务属性 -->
<skip.springboot.maven>false</skip.springboot.maven>
- <spring-cloud.version>2021.0.0</spring-cloud.version>
+ <spring-cloud.version>2021.0.3</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
@@ -336,6 +336,18 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- 积木报表 -->
+ <dependency>
+ <groupId>org.jeecgframework.jimureport</groupId>
+ <artifactId>jimureport-spring-boot-starter</artifactId>
+ <version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
--
libgit2 0.22.2