From 12f34f2b311ca0ff1a165679cf54b10775c180fb Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期四, 02 一月 2025 16:45:26 +0800 Subject: [PATCH] fix:添加tomcat配置 --- pom.xml | 536 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 412 insertions(+), 124 deletions(-) diff --git a/pom.xml b/pom.xml index af8cd4e..78f0cde 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ <?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"> +<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>org.springframework.boot</groupId> @@ -8,13 +9,14 @@ </parent> <groupId>com.lx</groupId> <artifactId>product-server</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-release</version> <packaging>pom</packaging> <name>product-server</name> <description>product-server</description> <modules> - <module>product-server-admin</module> - <module>product-server-org-admin</module> + <module>home-server-admin</module> + <module>product-server-web</module> + <module>product-server-admin</module> </modules> <properties> <skipTests>true</skipTests> @@ -37,13 +39,367 @@ <UserAgentUtils.version>1.21</UserAgentUtils.version> <thumbnailator.version>0.4.8</thumbnailator.version> <twelvemonkeys.version>3.4.1</twelvemonkeys.version> - <poi.version>3.16</poi.version> + <poi.version>4.1.2</poi.version> <pinyin4j.version>2.5.1</pinyin4j.version> <mybatis.version>3.4.6</mybatis.version> <mybatis-spring.version>1.3.2</mybatis-spring.version> <commons-fileupload.version>1.3.3</commons-fileupload.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.build.version>2.0.0-release</project.build.version> + <product-module-version>2.0.0-release</product-module-version> </properties> + <repositories> + <repository> + <id>aliyun</id> + <name>aliyun</name> + <url>https://maven.aliyun.com/repository/public</url> + </repository> + <repository> + <id>nexus</id> + <name>Team Nexus Repository</name> + <url>http://nonxin.cn:8088/repository/LX-PRODUCT-PUBLIC/</url> + </repository> + </repositories> + <distributionManagement> + <repository> + <!--娉ㄦ剰ID閰嶇疆涓巗ettings.xml涓璼erver閰嶇疆ID淇濇寔涓�鑷�--> + <id>nexus-releases</id> + <name>Artifactory-releases</name> + <url>http://nonxin.cn:8088/repository/LX-PRODUCT-RELEASE/</url> + </repository> + <snapshotRepository> + <id>nexus-snapshots</id> + <name>Artifactory-snapshots</name> + <url>http://nonxin.cn:8088/repository/LX-PRODUCT-SNAPSHOT/</url> + </snapshotRepository> + </distributionManagement> + <pluginRepositories> + <pluginRepository> + <id>aliyun</id> + <name>aliyun</name> + <url>https://maven.aliyun.com/repository/public</url> + </pluginRepository> + <pluginRepository> + <id>nexus</id> + <name>Team Nexus Repository</name> + <url>http://nonxin.cn:8088/repository/LX-PRODUCT-PUBLIC/</url> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> + <dependencies> + <!--瀛愭ā鍧楋細start--> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-task</artifactId> + <version>2.1.0-release</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-device</artifactId> + <version>2.1.0-release</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-mobile-core</artifactId> + <version>2.1.0-release</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-patch</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-xining</artifactId> + <version>${product-module-version}</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-core</artifactId> + <version>2.1.2-release</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-face</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-flow</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-tool-dev</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-tool-mvc</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-text-message</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-report</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-quartz</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-print</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-patch</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-org-admin</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-mq</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-lucene</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-file</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-email</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-data-sync</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-data-export-import</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-data-center</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-customer</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-common</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-badge</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-auth</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-administration</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-admin</artifactId> + <version>${product-module-version}</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-datasource</artifactId> + <version>${product-module-version}</version> + </dependency> + <!--瀛愭ā鍧楋細end--> + + <!--绗笁鏂逛緷璧栵細start--> + <dependency> + <groupId>e-iceblue</groupId> + <artifactId>spire.doc.free</artifactId> + <version>5.2.0</version> + </dependency> + <dependency> + <groupId>com.deepoove</groupId> + <artifactId>poi-tl</artifactId> + <version>1.10.5</version> + </dependency> + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-all</artifactId> + <version>5.8.11</version> + </dependency> + <!-- mailgun smtp --> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>1.19.4</version> + </dependency> + <dependency> + <groupId>com.mashape.unirest</groupId> + <artifactId>unirest-java</artifactId> + <version>1.4.9</version> + </dependency> + <dependency> + <groupId>io.logz.logback</groupId> + <artifactId>logzio-logback-appender</artifactId> + <version>1.0.24</version> + </dependency> + <dependency> + <groupId>redis.clients</groupId> + <artifactId>jedis</artifactId> + <version>2.9.0</version> + </dependency> + <dependency> + <groupId>com.alibaba</groupId> + <artifactId>druid</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>8.0.20</version> + </dependency> + <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> + <dependency> + <groupId>com.bladejava</groupId> + <artifactId>blade-patchca</artifactId> + <version>${blade-patchca.version}</version> + </dependency> + <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> + <dependency> + <groupId>com.github.penggle</groupId> + <artifactId>kaptcha</artifactId> + <version>2.3.2</version> + </dependency> + <!-- 鍥剧墖Meta鑾峰彇 --> + <dependency> + <groupId>com.drewnoakes</groupId> + <artifactId>metadata-extractor</artifactId> + <version>${metadata-extractor.version}</version> + </dependency> + <!-- 鏉″舰鐮併�佷簩缁寸爜鐢熸垚 --> + <dependency> + <groupId>com.google.zxing</groupId> + <artifactId>core</artifactId> + <version>${zxing.version}</version> + </dependency> + <!-- 缂╃暐鍥惧伐鍏� --> + <dependency> + <groupId>net.coobird</groupId> + <artifactId>thumbnailator</artifactId> + <version>${thumbnailator.version}</version> + </dependency> + <!-- 鏀寔CMYK鍥剧墖 --> + <dependency> + <groupId>com.twelvemonkeys.imageio</groupId> + <artifactId>imageio-jpeg</artifactId> + <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> + </dependency> + <!-- oracle jdbc --> + <dependency> + <groupId>com.oracle.database.nls</groupId> + <artifactId>orai18n</artifactId> + <version>19.7.0.0</version> + </dependency> + <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + <version>21.1.0.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <!--绗笁鏂逛緷璧栵細end--> + + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -64,24 +420,25 @@ </exclusions> </dependency> - <!-- 鍥燼pache鍏竷鐨勬紡娲炲崌绾у埌2.15.0-rc1 log4j 2.0 > <2.15.0 鐨勯兘鏈夊畨鍏ㄩ殣鎮� --> + <!--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> <!--鏀寔浣跨敤 JDBC 璁块棶鏁版嵁搴� --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> @@ -93,7 +450,6 @@ <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> - <version>2.9.0</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -103,6 +459,11 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -155,11 +516,9 @@ <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> </dependency> - <!-- https://mvnrepository.com/artifact/commons-collections/commons-collections --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -167,30 +526,6 @@ <version>${commons-beanutils.version}</version> </dependency> - <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> - <dependency> - <groupId>com.bladejava</groupId> - <artifactId>blade-patchca</artifactId> - <version>${blade-patchca.version}</version> - </dependency> - <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> - <dependency> - <groupId>com.github.penggle</groupId> - <artifactId>kaptcha</artifactId> - <version>2.3.2</version> - </dependency> - <!-- 鍥剧墖Meta鑾峰彇 --> - <dependency> - <groupId>com.drewnoakes</groupId> - <artifactId>metadata-extractor</artifactId> - <version>${metadata-extractor.version}</version> - </dependency> - <!-- 鏉″舰鐮併�佷簩缁寸爜鐢熸垚 --> - <dependency> - <groupId>com.google.zxing</groupId> - <artifactId>core</artifactId> - <version>${zxing.version}</version> - </dependency> <dependency> <groupId>com.google.zxing</groupId> <artifactId>javase</artifactId> @@ -207,11 +542,6 @@ <groupId>net.sf.jmimemagic</groupId> <artifactId>jmimemagic</artifactId> <version>${jmimemagic.version}</version> - <!--<exclusions> <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> - </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> - </exclusion> <exclusion> <artifactId>log4j</artifactId> <groupId>log4j</groupId> - </exclusion> </exclusions> --> </dependency> <!-- Jackson json --> <dependency> @@ -283,18 +613,7 @@ <artifactId>UserAgentUtils</artifactId> <version>${UserAgentUtils.version}</version> </dependency> - <!-- 缂╃暐鍥惧伐鍏� --> - <dependency> - <groupId>net.coobird</groupId> - <artifactId>thumbnailator</artifactId> - <version>${thumbnailator.version}</version> - </dependency> - <!-- 鏀寔CMYK鍥剧墖 --> - <dependency> - <groupId>com.twelvemonkeys.imageio</groupId> - <artifactId>imageio-jpeg</artifactId> - <version>${twelvemonkeys.version}</version> - </dependency> + <!-- POI Office Tools --> <dependency> <groupId>org.apache.poi</groupId> @@ -339,7 +658,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml-schemas</artifactId> - <version>3.16</version> + <version>${poi.version}</version> <exclusions> <exclusion> <groupId>org.apache.logging.log4j</groupId> @@ -450,113 +769,82 @@ <groupId>org.thymeleaf</groupId> <artifactId>thymeleaf</artifactId> </dependency> - <dependency> - <groupId>com.github.theborakompanioni</groupId> - <artifactId>thymeleaf-extras-shiro</artifactId> - <version>1.2.1</version> - </dependency> - <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt --> - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt</artifactId> - <version>0.9.1</version> - </dependency> <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15 --> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15</artifactId> <version>1.46</version> </dependency> - <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 --> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>2.9.2</version> - </dependency> <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java --> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <!-- <version>6.0.6</version>--> - <version>8.0.20</version> </dependency> <!-- 闃块噷绯荤殑Druid渚濊禆鍖� --> <!-- https://mvnrepository.com/artifact/com.alibaba/druid --> <dependency> <groupId>com.alibaba</groupId> <artifactId>druid</artifactId> - <version>1.2.2</version> - </dependency> - - <!-- https://mvnrepository.com/artifact/org.fusesource/sigar --> - <dependency> - <groupId>org.fusesource</groupId> - <artifactId>sigar</artifactId> - <version>1.6.4</version> - </dependency> - <!--rabbitmq--> - <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> - <version>5.6.0</version> - </dependency> - <!--mybatis--> - <dependency> - <groupId>org.mybatis.spring.boot</groupId> - <artifactId>mybatis-spring-boot-starter</artifactId> - <version>1.3.0</version> </dependency> - <!-- 閫氱敤mapper --> - <dependency> - <groupId>tk.mybatis</groupId> - <artifactId>mapper-spring-boot-starter</artifactId> - <version>2.0.2</version> - </dependency> <dependency> <groupId>io.logz.logback</groupId> <artifactId>logzio-logback-appender</artifactId> - <version>1.0.24</version> </dependency> - <!-- 瀹樻柟鎻愪緵 --> - <!-- https://mvnrepository.com/artifact/com.mashape.unirest/unirest-java --> <dependency> <groupId>com.mashape.unirest</groupId> <artifactId>unirest-java</artifactId> - <version>1.4.9</version> </dependency> <!-- mailgun smtp --> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>1.19.4</version> </dependency> <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> - <version>5.7.9</version> </dependency> - + <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> + <dependency> + <groupId>com.bladejava</groupId> + <artifactId>blade-patchca</artifactId> + </dependency> + <!-- 鍥剧墖楠岃瘉鐮佺敓鎴� --> + <dependency> + <groupId>com.github.penggle</groupId> + <artifactId>kaptcha</artifactId> + </dependency> + <!-- 鍥剧墖Meta鑾峰彇 --> + <dependency> + <groupId>com.drewnoakes</groupId> + <artifactId>metadata-extractor</artifactId> + </dependency> + <!-- 鏉″舰鐮併�佷簩缁寸爜鐢熸垚 --> + <dependency> + <groupId>com.google.zxing</groupId> + <artifactId>core</artifactId> + </dependency> + <!-- 缂╃暐鍥惧伐鍏� --> + <dependency> + <groupId>net.coobird</groupId> + <artifactId>thumbnailator</artifactId> + </dependency> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt</artifactId> + </dependency> + <dependency> + <groupId>org.fusesource</groupId> + <artifactId>sigar</artifactId> + <version>1.6.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> - - <distributionManagement> - <snapshotRepository> - <id>nexus-snapshots</id> - <name>product snapshots</name> - <url>http://211.149.162.168:8088/repository/LX-PRODUCT-SNAPSHOT/</url> - </snapshotRepository> - <repository> - <id>nexus-releases</id> - <name>product releases</name> - <url>http://211.149.162.168:8088/repository/LX-PRODUCT-RELEASE/</url> - </repository> - </distributionManagement> </project> -- Gitblit v1.9.2