From 346e7555844b14547538097ce7c1c73d7010f9da Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期五, 09 六月 2023 17:55:58 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg
---
pom.xml | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8659d79..0b803ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,11 +15,7 @@
<description>product-server</description>
<modules>
<module>product-server-web</module>
- <module>product-server-admin</module>
- <module>product-server-org-admin</module>
<module>home-server-admin</module>
- <module>product-server-core</module>
- <module>product-server-administrator</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -101,17 +97,17 @@
</dependency>
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-xining</artifactId>
- <version>${product-module-version}</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-table</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>
@@ -234,16 +230,6 @@
<artifactId>product-server-admin</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>
- <groupId>com.lx</groupId>
- <artifactId>product-server-xining</artifactId>
- <version>${product-module-version}</version>
- </dependency>
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
@@ -320,6 +306,42 @@
<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>
@@ -352,17 +374,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 璁块棶鏁版嵁搴� -->
@@ -450,7 +469,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -773,5 +791,10 @@
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>2.2.6</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2