From 327991834574bbb8bbd78f29382297aa13d001d6 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 30 十二月 2024 14:25:06 +0800
Subject: [PATCH] commit

---
 product-server-web/pom.xml |  126 ++++++++++++++++++++++++++++-------------
 1 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 730c8eb..3b5652e 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -21,29 +21,54 @@
             <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-device</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-patch</artifactId>
+        </dependency>
+        <!--瑗垮畞鎴跨灞�涓氬姟妯″潡-->
+        <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,59 +94,62 @@
             <groupId>com.lx</groupId>
             <artifactId>product-server-mq</artifactId>
         </dependency>
+        <!--闄勪欢绠$悊銆佹枃妗g鐞�-->
         <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-mobile-core</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-announcement</artifactId>
+            <artifactId>product-server-tool-face</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>
@@ -143,11 +171,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>
@@ -157,8 +192,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>
@@ -276,12 +322,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>
@@ -295,15 +341,13 @@
                         <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"/>
                                     </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"/>
@@ -311,16 +355,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