From fd0c7c174d7b7313aa49061df05350405a3c1bf1 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期二, 29 八月 2023 15:56:11 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg
---
product-server-web/pom.xml | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 43 deletions(-)
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 8032b07..6c89e87 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -21,29 +21,46 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+
</profile>
+
<profile>
<id>test</id>
<properties>
<profileActive>test</profileActive>
</properties>
</profile>
+
<profile>
<id>prod</id>
<properties>
<profileActive>prod</profileActive>
</properties>
</profile>
+
</profiles>
<dependencies>
+ <!--瑗垮畞鎴跨灞�涓氬姟妯″潡-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
+ </dependency>
+ <!--閫氱敤妯″潡锛坲til)-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-common</artifactId>
</dependency>
+ <!--鏁版嵁婧�-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-datasource</artifactId>
+ </dependency>
+ <!--鎵撳嵃锛坵ord鏇挎崲锛�-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-print</artifactId>
</dependency>
+ <!--util-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
@@ -69,63 +86,57 @@
<groupId>com.lx</groupId>
<artifactId>product-server-mq</artifactId>
</dependency>
+ <!--闄勪欢绠＄悊銆佹枃妗ｇ鐞�-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-file</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-email</artifactId>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-lucene</artifactId>
</dependency>
- <!-- release -->
+ <!-- releases -->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-core</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.sendgrid</groupId>
- <artifactId>sendgrid-java</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.1</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-report</artifactId>
</dependency>
+ <!--鏁版嵁瀵煎叆瀵煎嚭-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-data-export-import</artifactId>
</dependency>
-
+ <!--寮�鍙戝伐鍏�-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-dev</artifactId>
+ </dependency>
+ <!--娴佺▼寤烘ā-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-flow</artifactId>
</dependency>
+ <!--鍔熻兘寤烘ā-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-mvc</artifactId>
</dependency>
+ <!-- 琛ㄥ崟寤烘ā-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-face</artifactId>
</dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-announcement</artifactId>
- </dependency>
+ <!--鏁版嵁寤烘ā-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-table</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-data-sync</artifactId>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -147,11 +158,18 @@
<groupId>com.lx</groupId>
<artifactId>product-server-data-center</artifactId>
</dependency>
- <dependency>
- <groupId>org.spring</groupId>
- <artifactId>spring-server-master</artifactId>
- <version>1.2.6.6</version>
- </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-server-customer</artifactId>
@@ -161,8 +179,19 @@
<artifactId>product-server-task</artifactId>
</dependency>
<dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-xining</artifactId>
+ <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>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
</dependency>
</dependencies>
<build>
@@ -280,12 +309,12 @@
<goal>run</goal>
</goals>
<configuration>
- <target description="run the bat">
+ <!-- <target description="run the bat">
<echo>寮�濮嬭繍琛宲acked.bat鍛戒护琛�</echo>
- <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
+ <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
<arg line="packed.bat"></arg>
</exec>
- </target>
+ </target> -->
</configuration>
</execution>
</executions>
@@ -299,15 +328,15 @@
<id>copy</id>
<phase>package</phase>
<configuration>
- <!--
<tasks>
- <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/lib">
+ <copy todir="D:/product/workspace/product-server-install/resources/product-server/lib">
<fileset dir="${project.build.directory}/lib">
<include name="*.jar"/>
<exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>
+ <exclude name="product-server-core-2.0.0-SNAPSHOT.jar"/>
</fileset>
</copy>
- <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/resources">
+ <copy todir="D:/product/workspace/product-server-install/resources/product-server/resources">
<fileset dir="${project.build.directory}/resources">
<include name="application-prod.properties"/>
<include name="cache-prod.properties"/>
@@ -315,16 +344,16 @@
<include name="*.xml"/>
</fileset>
</copy>
- <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/web">
- <fileset dir="D:/product/lxworkspaces/product-web/dist">
- <include name="*.*"/>
- </fileset>
- </copy>
- <copy file="${project.build.directory}/product-server-web-1.0.0-SNAPSHOT.jar"
- tofile="D:/product/lxworkspaces/product-server-install/resources/product-server/product-server-web-1.0.0-SNAPSHOT.jar"
+ <!-- <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"/>
</tasks>
- -->
+
</configuration>
<goals>
<goal>run</goal>
--
Gitblit v1.9.2