From f02ffe1f30badc6710a2dc13955ea21017db408b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 14 二月 2025 14:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 157 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5635cb3..49564eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,36 @@
<description>product-server</description>
<modules>
<module>product-server-web</module>
+ <module>product-server-admin</module>
+ <module>product-server-administration</module>
+ <module>product-server-auth</module>
+ <module>product-server-badge</module>
+ <module>product-server-common</module>
+ <module>product-server-customer</module>
+ <module>product-server-data-center</module>
+ <module>product-server-data-export-import</module>
+ <module>product-server-data-sync</module>
+ <module>product-server-email</module>
+ <module>product-server-file</module>
+ <module>product-server-lucene</module>
+ <module>product-server-mq</module>
+ <module>product-server-org-admin</module>
+ <module>product-server-patch</module>
+ <module>product-server-print</module>
+ <module>product-server-quartz</module>
+ <module>product-server-report</module>
+ <module>product-server-task</module>
+ <module>product-server-text-message</module>
+ <module>product-server-tool-dev</module>
+ <module>product-server-tool-flow</module>
+ <module>product-server-tool-mvc</module>
+ <module>product-server-tool-table</module>
+ <module>product-server-util</module>
+ <module>product-server-device</module>
+ <module>product-server-tool-face</module>
+ <module>product-server-mobile-core</module>
+ <module>product-server-hr</module>
+ <module>product-server-tool-conduct</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -37,12 +67,15 @@
<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>
<product-module-version>2.0.0-release</product-module-version>
+ <product-core-version>2.1.2-release</product-core-version>
</properties>
<repositories>
<repository>
@@ -84,17 +117,42 @@
<dependencyManagement>
<dependencies>
<!--瀛愭ā鍧楋細start-->
+
<dependency>
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
<version>1.2.6.6</version>
</dependency>
+
+ <!--core-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-core</artifactId>
- <version>2.0.1</version>
+ <version>${product-core-version}</version>
</dependency>
+ <!--2.1.0-release -->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-device</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-mobile-core</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-task</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-conduct</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
@@ -128,11 +186,6 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-text-message</artifactId>
- <version>${product-module-version}</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-task</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -230,9 +283,29 @@
<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>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
+ <dependency>
+ <groupId>e-iceblue</groupId>
+ <artifactId>spire.doc.free</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
+ <version>1.10.5</version>
+ </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -306,9 +379,62 @@
<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-->
@@ -338,17 +464,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 璁块棶鏁版嵁搴� -->
@@ -436,7 +559,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -576,7 +698,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>
@@ -754,5 +876,16 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource</groupId>
+ <artifactId>sigar</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2