From bb37588fd39aa19c6276f8487947ac9ed598e4b6 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:36:19 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ，合并空调中的报表、数据源模块
---
pom.xml | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c3124a3..3c8349c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,10 +24,10 @@
<module>product-server-data-center</module>
<module>product-server-data-export-import</module>
<module>product-server-data-sync</module>
+ <module>product-server-datasource</module>
<module>product-server-email</module>
<module>product-server-file</module>
<module>product-server-lucene</module>
- <module>product-server-mobile-core</module>
<module>product-server-mq</module>
<module>product-server-org-admin</module>
<module>product-server-patch</module>
@@ -65,8 +65,10 @@
<UserAgentUtils.version>1.21</UserAgentUtils.version>
<thumbnailator.version>0.4.8</thumbnailator.version>
<twelvemonkeys.version>3.4.1</twelvemonkeys.version>
- <poi.version>3.16</poi.version>
+ <poi.version>4.1.2</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version>
+ <mybatis.version>3.4.6</mybatis.version>
+ <mybatis-spring.version>1.3.2</mybatis-spring.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.version>2.0.0-release</project.build.version>
@@ -258,6 +260,11 @@
<artifactId>product-server-admin</artifactId>
<version>${product-module-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-datasource</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
@@ -374,6 +381,23 @@
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
+ <!-- oracle jdbc -->
+ <dependency>
+ <groupId>com.oracle.database.nls</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>19.7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>21.1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
<!--绗笁鏂逛緷璧栵細end-->
</dependencies>
@@ -402,17 +426,14 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
- <version>2.15.0</version>
</dependency>
<!--鏀寔浣跨敤 JDBC 璁块棶鏁版嵁搴� -->
@@ -500,7 +521,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -640,7 +660,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
- <version>3.16</version>
+ <version>${poi.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -823,5 +843,10 @@
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2