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,6 +163,7 @@
        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-xining</artifactId>

            <version>2.0.0-release</version>

        </dependency>

    <dependency>

      <groupId>org.aspose</groupId>