From 346e7555844b14547538097ce7c1c73d7010f9da Mon Sep 17 00:00:00 2001 From: shichongfu <shi_chongfu@163.com> Date: 星期五, 09 六月 2023 17:55:58 +0800 Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg --- product-server-web/pom.xml | 83 ++++++++++++++------------- pom.xml | 60 +++++++++++++------ 2 files changed, 83 insertions(+), 60 deletions(-) diff --git a/pom.xml b/pom.xml index 262be76..0b803ea 100644 --- a/pom.xml +++ b/pom.xml @@ -97,17 +97,17 @@ </dependency> <dependency> <groupId>com.lx</groupId> - <artifactId>product-server-xining</artifactId> - <version>${product-module-version}</version> - </dependency> - <dependency> - <groupId>com.lx</groupId> <artifactId>product-server-util</artifactId> <version>${product-module-version}</version> </dependency> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-tool-table</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-tool-face</artifactId> <version>${product-module-version}</version> </dependency> <dependency> @@ -230,16 +230,6 @@ <artifactId>product-server-admin</artifactId> <version>${product-module-version}</version> </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-tool-face</artifactId> - <version>${product-module-version}</version> - </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-xining</artifactId> - <version>${product-module-version}</version> - </dependency> <!--瀛愭ā鍧楋細end--> <!--绗笁鏂逛緷璧栵細start--> @@ -316,6 +306,42 @@ <version>${twelvemonkeys.version}</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + <!--logo4j--> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.15.0</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.15.0</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>2.15.0</version> + </dependency> + <dependency> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + <version>5.5.13</version> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>2.0.25</version> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-app</artifactId> + <version>2.0.25</version> + </dependency> + <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt</artifactId> <version>0.9.1</version> @@ -348,17 +374,14 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.15.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.15.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-to-slf4j</artifactId> - <version>2.15.0</version> </dependency> <!--鏀寔浣跨敤 JDBC 璁块棶鏁版嵁搴� --> @@ -446,7 +469,6 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml index 94b6a3d..e54950a 100644 --- a/product-server-web/pom.xml +++ b/product-server-web/pom.xml @@ -163,22 +163,23 @@ <dependency> <groupId>com.lx</groupId> <artifactId>product-server-xining</artifactId> + <version>2.0.0-release</version> </dependency> - <dependency> - <groupId>org.aspose</groupId> - <artifactId>cells-line</artifactId> - <version>15.9.0</version> - </dependency> - <dependency> - <groupId>org.aspose</groupId> - <artifactId>slides-line</artifactId> - <version>15.9.0</version> - </dependency> - <dependency> - <groupId>org.aspose</groupId> - <artifactId>words-line</artifactId> - <version>15.9.0</version> - </dependency> + <dependency> + <groupId>org.aspose</groupId> + <artifactId>cells-line</artifactId> + <version>15.9.0</version> + </dependency> + <dependency> + <groupId>org.aspose</groupId> + <artifactId>slides-line</artifactId> + <version>15.9.0</version> + </dependency> + <dependency> + <groupId>org.aspose</groupId> + <artifactId>words-line</artifactId> + <version>15.9.0</version> + </dependency> </dependencies> <build> <plugins> @@ -314,32 +315,32 @@ <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> - --> + <!-- + <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> -- Gitblit v1.9.2