Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

shichongfu

2023-06-09 346e7555844b14547538097ce7c1c73d7010f9da

Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

 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>

 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>