From 13ae71b985ad95d3953e14f6e7cc1564b2fdd78e Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 20 五月 2025 10:15:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 144 +++++++++++++++++++++++++++++-------------------
1 files changed, 87 insertions(+), 57 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5845887..5a6279a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
<name>product-server</name>
<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>
@@ -23,7 +24,6 @@
<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>
@@ -36,14 +36,16 @@
<module>product-server-task</module>
<module>product-server-text-message</module>
<module>product-server-tool-dev</module>
- <module>product-server-tool-face</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-device</module>
- <module>product-server-web</module>
+ <module>product-server-hr</module>
+ <module>product-server-project-base</module>
+ <module>product-server-project-contract</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -68,12 +70,13 @@
<twelvemonkeys.version>3.4.1</twelvemonkeys.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.0-release</product-core-version>
- <product-device-version>2.1.0-release</product-device-version>
+ <product-core-version>2.1.2-release</product-core-version>
</properties>
<repositories>
<repository>
@@ -115,19 +118,51 @@
<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>${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-system-backup</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-system-backup</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-conduct</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -162,13 +197,13 @@
</dependency>
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-text-message</artifactId>
+ <artifactId>product-server-tool-conduct</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-task</artifactId>
- <version>${product-device-version}</version>
+ <artifactId>product-server-text-message</artifactId>
+ <version>${product-module-version}</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -272,44 +307,27 @@
</dependency>
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-mobile-core</artifactId>
+ <artifactId>product-server-hr</artifactId>
<version>${product-module-version}</version>
</dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-device</artifactId>
- <version>2.1.0-release</version>
- </dependency>
- <!--椤圭洰绠＄悊-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-contract</artifactId>
- <version>2.0.0-release</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-base</artifactId>
- <version>2.0.0-release</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-project-managment</artifactId>
- <version>2.0.0-release</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-customer</artifactId>
- <version>2.0.0-release</version>
- </dependency>
-
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
- <dependency>
- <groupId>com.deepoove</groupId>
- <artifactId>poi-tl</artifactId>
- <version>1.10.5</version>
- </dependency>
+ <dependency>
+ <groupId>khzx-tzsb</groupId>
+ <artifactId>khzx-tzsb-maintenance-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <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>
@@ -376,6 +394,12 @@
<artifactId>thumbnailator</artifactId>
<version>${thumbnailator.version}</version>
</dependency>
+ <!-- 鏀寔CMYK鍥剧墖 -->
+ <dependency>
+ <groupId>com.twelvemonkeys.imageio</groupId>
+ <artifactId>imageio-jpeg</artifactId>
+ <version>${twelvemonkeys.version}</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -428,17 +452,21 @@
<artifactId>ojdbc8</artifactId>
<version>21.1.0.0</version>
</dependency>
- <!-- 鍗庝负楂樻柉鏁版嵁搴� -->
- <dependency>
- <groupId>com.huaweicloud.dws</groupId>
- <artifactId>huaweicloud-dws-jdbc</artifactId>
- <version>8.3.0</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.2.25</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.9.0</version>
</dependency>
<!--绗笁鏂逛緷璧栵細end-->
@@ -886,15 +914,17 @@
<version>1.6.4</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
</dependency>
- <!-- 鏂囦欢缂栫爜璇嗗埆宸ュ叿 -->
- <dependency>
- <groupId>com.github.albfernandez</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>2.3.1</version>
- </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2