From f60cd61615a971818ffb03dd2c6e016d0ac5366c Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 20 十月 2025 15:05:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0 into dev
---
pom.xml | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a28cbc..c4a3624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,35 @@
</profiles>
<dependencies>
+
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-conduct</artifactId>
+ </dependency>
+ <!--琛ヤ竵妯″潡-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-patch</artifactId>
+ </dependency>
+ <!--浜轰簨绠＄悊-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
+ </dependency>
+ <!--璁惧绠＄悊-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-device</artifactId>
+ </dependency>
<!--閫氱敤妯″潡锛坲til)-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-common</artifactId>
+ </dependency>
+ <!-- 鎵嬫満绔�-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-mobile-core</artifactId>
</dependency>
<!--鏁版嵁婧�-->
<dependency>
@@ -80,6 +105,10 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-mq</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
</dependency>
<!--闄勪欢绠＄悊銆佹枃妗ｇ鐞�-->
<dependency>
@@ -129,10 +158,6 @@
<groupId>com.lx</groupId>
<artifactId>product-server-tool-table</artifactId>
</dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-announcement</artifactId>
- </dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -158,21 +183,28 @@
<groupId>com.lx</groupId>
<artifactId>product-server-data-center</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-system-backup</artifactId>
+ </dependency>
<!--椤圭洰绠＄悊妯″潡-->
- <!-- <dependency>-->
- <!-- <groupId>com.lx</groupId>-->
- <!-- <artifactId>product-project-server-base</artifactId>-->
- <!-- <version>1.0.0-SNAPSHOT</version>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>com.lx</groupId>-->
- <!-- <artifactId>product-project-server-contract</artifactId>-->
- <!-- <version>1.0.0-SNAPSHOT</version>-->
- <!-- </dependency>-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-contract</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-customer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-contract</artifactId>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -181,12 +213,6 @@
<dependency>
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sendgrid</groupId>
- <artifactId>sendgrid-java</artifactId>
- <version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -344,11 +370,11 @@
<include name="*.xml"/>
</fileset>
</copy>
- <copy todir="D:/product/workspace/product-server-install/resources/product-server/webapp/web">
- <fileset dir="D:/product/workspace3.0/WEB/V3.0.0/dist">
- <include name="*.*"/>
- </fileset>
- </copy>
+ <!-- <copy todir="D:/product/workspace/product-server-install/resources/product-server/webapp/web">-->
+ <!-- <fileset dir="D:/product/workspace3.0/WEB/V3.0.0/dist">-->
+ <!-- <include name="*.*"/>-->
+ <!-- </fileset>-->
+ <!-- </copy>-->
<copy file="${project.build.directory}/product-server-web-2.0.0-release.jar"
tofile="D:/product/workspace/product-server-install/resources/product-server/product-server-web-2.0.0-release.jar"
overwrite="true"/>
--
Gitblit v1.9.2