From af5f00874259fabe75ca510afd147f9d398732ab Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:56:41 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ，合并空调中的报表、数据源模块。
---
pom.xml | 138 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 104 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1bfdac6..a6f2bea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,8 @@
<name>product-server</name>
<description>product-server</description>
<modules>
+ <module>home-server-admin</module>
<module>product-server-web</module>
- <module>product-server-admin</module>
- <module>product-server-org-admin</module>
- <module>product-server-xining</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -40,8 +38,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>
@@ -88,6 +88,11 @@
<dependencies>
<!--瀛愭ā鍧楋細start-->
<dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
<version>1.2.6.6</version>
@@ -97,9 +102,15 @@
<artifactId>product-server-core</artifactId>
<version>2.0.1</version>
</dependency>
+
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-face</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -229,11 +240,11 @@
</dependency>
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-xining</artifactId>
+ <artifactId>product-server-datasource</artifactId>
<version>${product-module-version}</version>
</dependency>
<!--瀛愭ā鍧楋細end-->
-
+
<!--绗笁鏂逛緷璧栵細start-->
<dependency>
<groupId>cn.hutool</groupId>
@@ -308,12 +319,65 @@
<version>${twelvemonkeys.version}</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <!--logo4j-->
+ <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>
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox-app</artifactId>
+ <version>2.0.25</version>
+ </dependency>
+ <dependency>
<groupId>io.jsonwebtoken</groupId>
<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>
</dependencyManagement>
<dependencies>
@@ -333,26 +397,23 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<!--logo4j-->
<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 璁块棶鏁版嵁搴� -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -374,7 +435,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
@@ -392,7 +453,7 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
-
+
<!-- Need this to compile JSP <dependency> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <scope>provided</scope> </dependency> -->
<dependency>
@@ -438,14 +499,13 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
@@ -481,32 +541,32 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
-
+
<!-- XPath xml -->
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
-
+
<!-- Snake YAML -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
-
+
<!-- Apache HTTP -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
+
<!-- Jsoup HTTP -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
-
+
<!-- Email -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -533,7 +593,7 @@
<artifactId>UserAgentUtils</artifactId>
<version>${UserAgentUtils.version}</version>
</dependency>
-
+
<!-- POI Office Tools -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -552,7 +612,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -572,13 +632,13 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<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>
@@ -592,7 +652,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -612,7 +672,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<!-- pinyin4j -->
@@ -621,7 +681,7 @@
<artifactId>pinyin4j</artifactId>
<version>${pinyin4j.version}</version>
</dependency>
-
+
<!-- Logging begin -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -648,7 +708,7 @@
<artifactId>logback-classic</artifactId>
</dependency>
<!-- Logging end -->
-
+
<!-- JUnit Test -->
<dependency>
<groupId>junit</groupId>
@@ -706,13 +766,13 @@
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
-
-
+
+
<dependency>
<groupId>io.logz.logback</groupId>
<artifactId>logzio-logback-appender</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
@@ -722,7 +782,7 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -756,5 +816,15 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource</groupId>
+ <artifactId>sigar</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.2