From 1798016bd8eff3e793b17bdd7e535667e2fd0abc Mon Sep 17 00:00:00 2001
From: 1821349743@qq.com <1821349743@qq.com>
Date: 星期三, 26 四月 2023 10:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 product-server-web/pom.xml |  354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml                    |    1 
 2 files changed, 355 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index af8cd4e..c3678a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
     <modules>
        <module>product-server-admin</module>
        <module>product-server-org-admin</module>
+       <module>product-server-web</module>
     </modules>
     <properties>
         <skipTests>true</skipTests>
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
new file mode 100644
index 0000000..60e68ad
--- /dev/null
+++ b/product-server-web/pom.xml
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.lx</groupId>
+        <artifactId>product-server</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>product-server-web</artifactId>
+    <packaging>jar</packaging>
+    <name>product-server-web</name>
+    <description>product-server-web</description>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>dev</profileActive>
+            </properties>
+            <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-common</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-print</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-util</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-admin</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-quartz</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-org-admin</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-administration</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-mq</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-file</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-email</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-lucene</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <!-- release -->
+        <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>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-data-export-import</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-tool-flow</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-tool-mvc</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-announcement</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-tool-table</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-badge</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-email</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-text-message</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-auth</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-data-center</artifactId>
+            <version>2.0.0-release</version>
+        </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-server-customer</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-task</artifactId>
+            <version>2.0.0-release</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <!-- 鎵揓AR鍖� -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!-- 涓嶆墦鍖呰祫婧愭枃浠讹紙閰嶇疆鏂囦欢鍜屼緷璧栧寘鍒嗗紑锛� -->
+                    <excludes>
+                        <exclude>*.properties</exclude>
+                        <exclude>*.xml</exclude>
+                    </excludes>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <!-- MANIFEST.MF 涓� Class-Path 鍔犲叆鍓嶇紑 -->
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <!-- jar鍖呬笉鍖呭惈鍞竴鐗堟湰鏍囪瘑 -->
+                            <useUniqueVersions>true</useUniqueVersions>
+                            <!--鎸囧畾鍏ュ彛绫� -->
+                            <mainClass>com.product.Application</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <!--MANIFEST.MF 涓� Class-Path 鍔犲叆璧勬簮鏂囦欢鐩綍 -->
+                            <Class-Path>./resources/</Class-Path>
+                        </manifestEntries>
+
+                    </archive>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+            </plugin>
+
+            <!-- 璇ユ彃浠剁殑浣滅敤鏄敤浜庡鍒朵緷璧栫殑jar鍖呭埌鎸囧畾鐨勬枃浠跺す閲� -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib/</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- 璇ユ彃浠剁殑浣滅敤鏄敤浜庡鍒舵寚瀹氱殑鏂囦欢 -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 澶嶅埗閰嶇疆鏂囦欢 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.properties</include>
+                                        <include>*.yml</include>
+                                        <include>*.xml</include>
+                                        <include>*.txt</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- SpringBoot 鎵撳寘鎻掍欢锛屾妸 maven-jar-plugin 鎵撴垚鐨刯ar鍖呴噸鏂版墦鎴愬彲杩愯jar鍖� -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 閲嶅啓鍖呭惈渚濊禆锛屽寘鍚笉瀛樺湪鐨勪緷璧栵紝jar閲屾病鏈塸om閲岀殑渚濊禆 -->
+                    <includes>
+                        <include>
+                            <groupId>null</groupId>
+                            <artifactId>null</artifactId>
+                        </include>
+                    </includes>
+                    <includeSystemScope>true</includeSystemScope>
+                    <layout>ZIP</layout>
+                    <!-- 浣跨敤澶栭儴閰嶇疆鏂囦欢锛宩ar鍖呴噷娌℃湁璧勬簮鏂囦欢 -->
+                    <addResources>true</addResources>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 鎵цbat 鍓嶇缂栬瘧 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target description="run the bat">
+                                <echo>寮�濮嬭繍琛宲acked.bat鍛戒护琛�</echo>
+                                <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
+                                    <arg line="packed.bat"></arg>
+                                </exec>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- 鎷疯礉鏂囦欢 -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <configuration>
+                        <!--
+                            <tasks>
+                                <copy todir="D:/product/lxworkspaces/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">
+                                    <fileset dir="${project.build.directory}/resources">
+                                        <include name="application-prod.properties"/>
+                                        <include name="cache-prod.properties"/>
+                                        <include name="*.txt"/>
+                                        <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"
+                                      overwrite="true"/>
+                            </tasks>
+							-->
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

--
Gitblit v1.9.2