From a787f2a0cd17164f6cb72b417ba6dc150657bd3a Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 18:57:12 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel=E6=8A=A5=E9=94=99=EF=BC=88=E5=8C=85?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          | 16 ++++++++--------
 .../yudao-module-report-biz/pom.xml              | 10 ++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a66524bc..8933d64a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,14 +15,14 @@
         <!-- 各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-<!--        <module>yudao-module-member</module>-->
-<!--        <module>yudao-module-bpm</module>-->
-<!--        <module>yudao-module-report</module>-->
-<!--        <module>yudao-module-mp</module>-->
-<!--        <module>yudao-module-pay</module>-->
-<!--        <module>yudao-module-mall</module>-->
-<!--        <module>yudao-module-crm</module>-->
-<!--        <module>yudao-module-erp</module>-->
+        <module>yudao-module-member</module>
+        <module>yudao-module-bpm</module>
+        <module>yudao-module-report</module>
+        <module>yudao-module-mp</module>
+        <module>yudao-module-pay</module>
+        <module>yudao-module-mall</module>
+        <module>yudao-module-crm</module>
+        <module>yudao-module-erp</module>
         <!-- 示例项目 -->
 <!--        <module>yudao-example</module>-->
     </modules>
diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml
index 62aeb3ee0..f38b38e75 100644
--- a/yudao-module-report/yudao-module-report-biz/pom.xml
+++ b/yudao-module-report/yudao-module-report-biz/pom.xml
@@ -77,6 +77,16 @@
         <dependency>
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

From 01695567a1ed9f27357b70b0e61f95a3be533b85 Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 18:59:11 +0800
Subject: [PATCH 2/8] re

---
 pom.xml | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8933d64a1..094dc5433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,16 +15,16 @@
         <!-- 各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-        <module>yudao-module-member</module>
-        <module>yudao-module-bpm</module>
-        <module>yudao-module-report</module>
-        <module>yudao-module-mp</module>
-        <module>yudao-module-pay</module>
-        <module>yudao-module-mall</module>
-        <module>yudao-module-crm</module>
-        <module>yudao-module-erp</module>
+        <!--        <module>yudao-module-member</module>-->
+        <!--        <module>yudao-module-bpm</module>-->
+        <!--        <module>yudao-module-report</module>-->
+        <!--        <module>yudao-module-mp</module>-->
+        <!--        <module>yudao-module-pay</module>-->
+        <!--        <module>yudao-module-mall</module>-->
+        <!--        <module>yudao-module-crm</module>-->
+        <!--        <module>yudao-module-erp</module>-->
         <!-- 示例项目 -->
-<!--        <module>yudao-example</module>-->
+        <!--        <module>yudao-example</module>-->
     </modules>
 
     <name>${project.artifactId}</name>
@@ -32,17 +32,17 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>2.0.1-snapshot</revision>
+        <revision>2.0.1-jdk8-snapshot</revision>
         <!-- Maven 相关 -->
-        <java.version>21</java.version>
+        <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.30</lombok.version>
-        <spring.boot.version>3.2.2</spring.boot.version>
+        <spring.boot.version>2.7.18</spring.boot.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -93,11 +93,6 @@
                                 <version>${mapstruct.version}</version>
                             </path>
                         </annotationProcessorPaths>
-                        <!-- 编译参数写在 arg 内，解决 Spring Boot 3.2 的 Parameter Name Discovery 问题 -->
-                        <debug>false</debug>
-                        <compilerArgs>
-                            <arg>-parameters</arg>
-                        </compilerArgs>
                     </configuration>
                 </plugin>
                 <plugin>

From 6846d429c0c0fab746c588e02769194567cc2fad Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 18:59:49 +0800
Subject: [PATCH 3/8] re

---
 yudao-module-report/yudao-module-report-biz/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml
index f38b38e75..62aeb3ee0 100644
--- a/yudao-module-report/yudao-module-report-biz/pom.xml
+++ b/yudao-module-report/yudao-module-report-biz/pom.xml
@@ -77,16 +77,6 @@
         <dependency>
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

From 7841fba59bb70071ead10de00bc413a409d9fea2 Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 19:00:10 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel=E6=8A=A5=E9=94=99=EF=BC=88=E5=8C=85?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-module-report/yudao-module-report-biz/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml
index 62aeb3ee0..f38b38e75 100644
--- a/yudao-module-report/yudao-module-report-biz/pom.xml
+++ b/yudao-module-report/yudao-module-report-biz/pom.xml
@@ -77,6 +77,16 @@
         <dependency>
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

From 0bd7d310a18d66df2d1b24bf7414ef2d65313262 Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 19:05:54 +0800
Subject: [PATCH 5/8] pom

---
 pom.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 094dc5433..439120219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,17 +32,17 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>2.0.1-jdk8-snapshot</revision>
+        <revision>2.0.1-snapshot</revision>
         <!-- Maven 相关 -->
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.30</lombok.version>
-        <spring.boot.version>2.7.18</spring.boot.version>
+        <spring.boot.version>3.2.2</spring.boot.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -93,6 +93,11 @@
                                 <version>${mapstruct.version}</version>
                             </path>
                         </annotationProcessorPaths>
+                        <!-- 编译参数写在 arg 内，解决 Spring Boot 3.2 的 Parameter Name Discovery 问题 -->
+                        <debug>false</debug>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
                 <plugin>

From ca7b19c40b3f2723678c005745cde611b2e8112a Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Fri, 1 Mar 2024 19:06:24 +0800
Subject: [PATCH 6/8] pom

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 439120219..3a66524bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,16 +15,16 @@
         <!-- 各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-        <!--        <module>yudao-module-member</module>-->
-        <!--        <module>yudao-module-bpm</module>-->
-        <!--        <module>yudao-module-report</module>-->
-        <!--        <module>yudao-module-mp</module>-->
-        <!--        <module>yudao-module-pay</module>-->
-        <!--        <module>yudao-module-mall</module>-->
-        <!--        <module>yudao-module-crm</module>-->
-        <!--        <module>yudao-module-erp</module>-->
+<!--        <module>yudao-module-member</module>-->
+<!--        <module>yudao-module-bpm</module>-->
+<!--        <module>yudao-module-report</module>-->
+<!--        <module>yudao-module-mp</module>-->
+<!--        <module>yudao-module-pay</module>-->
+<!--        <module>yudao-module-mall</module>-->
+<!--        <module>yudao-module-crm</module>-->
+<!--        <module>yudao-module-erp</module>-->
         <!-- 示例项目 -->
-        <!--        <module>yudao-example</module>-->
+<!--        <module>yudao-example</module>-->
     </modules>
 
     <name>${project.artifactId}</name>

From 1e13365ef4fee023ff119b92b7b5e2defa6f5158 Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Sat, 2 Mar 2024 13:23:54 +0800
Subject: [PATCH 7/8] pom

---
 yudao-module-report/yudao-module-report-biz/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml
index f38b38e75..62aeb3ee0 100644
--- a/yudao-module-report/yudao-module-report-biz/pom.xml
+++ b/yudao-module-report/yudao-module-report-biz/pom.xml
@@ -77,16 +77,6 @@
         <dependency>
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

From 29b7106985719aa727364236eff6a1185c9680fb Mon Sep 17 00:00:00 2001
From: zhanhong <283456800@qq.com>
Date: Sat, 2 Mar 2024 13:26:05 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=E5=8C=85=E5=86=B2=E7=AA=81=20=E7=A7=AF?=
 =?UTF-8?q?=E6=9C=A8=E6=8A=A5=E8=A1=A8=20=E5=AF=BC=E5=87=BAExcel=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 7c7ca609b..c9667aea2 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -626,6 +626,16 @@
                 <groupId>com.bstek.ureport</groupId>
                 <artifactId>ureport2-console</artifactId>
                 <version>${ureport2.version}</version>
+                <exclusions>
+                    <exclusion><!-- 包冲突 积木报表 导出Excel报错 -->
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>poi</artifactId>
+                    </exclusion>
+                    <exclusion><!-- 包冲突 积木报表 导出Excel报错 -->
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>poi-ooxml</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
         </dependencies>