From cd570d97d58ca9de296dc085bfa4e5c6acc6a8e8 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期三, 26 四月 2023 16:19:10 +0800
Subject: [PATCH] 西宁pom
---
product-server-web/pom.xml | 30 --
product-server-org-admin/pom.xml | 1
product-server-org-admin/src/test/java/com/product/org/admin/test/SystemDataPermissionTest.java | 2
product-server-web/src/main/java/com/product/Application.java | 2
home-server-admin/pom.xml | 16 -
pom.xml | 481 +++++++++++++++++++++++++++++++++++++---------------
product-server-admin/pom.xml | 1
7 files changed, 351 insertions(+), 182 deletions(-)
diff --git a/home-server-admin/pom.xml b/home-server-admin/pom.xml
index 1633cd2..3046861 100644
--- a/home-server-admin/pom.xml
+++ b/home-server-admin/pom.xml
@@ -2,12 +2,13 @@
<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">
- <parent>
- <artifactId>product-server</artifactId>
- <groupId>com.lx</groupId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server</artifactId>
+ <version>2.0.0-release</version>
+ </parent>
+
<artifactId>product-server-xining</artifactId>
<packaging>jar</packaging>
<name>product-server-xining</name>
@@ -15,24 +16,19 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-common</artifactId>
- <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
- <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-admin</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index c3678a1..1bfdac6 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,14 +9,15 @@
</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>product-server-web</module>
+ <module>product-server-web</module>
+ <module>product-server-admin</module>
+ <module>product-server-org-admin</module>
+ <module>product-server-xining</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -40,11 +42,280 @@
<twelvemonkeys.version>3.4.1</twelvemonkeys.version>
<poi.version>3.16</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>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.0.1</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-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-task</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-announcement</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-xining</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <!--瀛愭ā鍧楋細end-->
+
+ <!--绗笁鏂逛緷璧栵細start-->
+ <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>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <!--绗笁鏂逛緷璧栵細end-->
+
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -62,10 +333,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</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>
@@ -81,8 +352,12 @@
<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>
@@ -94,16 +369,20 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
-
+
<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>
@@ -113,7 +392,7 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
-
+
<!-- Need this to compile JSP <dependency> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <scope>provided</scope> </dependency> -->
<dependency>
@@ -156,7 +435,6 @@
<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>
@@ -167,31 +445,7 @@
<artifactId>commons-beanutils</artifactId>
<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>
@@ -208,11 +462,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>
@@ -232,32 +481,32 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
-
+
<!-- XPath xml -->
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
-
+
<!-- Snake YAML -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
-
+
<!-- Apache HTTP -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
+
<!-- Jsoup HTTP -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
-
+
<!-- Email -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -284,18 +533,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>
@@ -314,7 +552,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -334,7 +572,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -354,7 +592,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -374,7 +612,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<!-- pinyin4j -->
@@ -383,7 +621,7 @@
<artifactId>pinyin4j</artifactId>
<version>${pinyin4j.version}</version>
</dependency>
-
+
<!-- Logging begin -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -410,7 +648,7 @@
<artifactId>logback-classic</artifactId>
</dependency>
<!-- Logging end -->
-
+
<!-- JUnit Test -->
<dependency>
<groupId>junit</groupId>
@@ -451,113 +689,72 @@
<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>
</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>
+</project>
\ No newline at end of file
diff --git a/product-server-admin/pom.xml b/product-server-admin/pom.xml
index f263c6f..fc8223f 100644
--- a/product-server-admin/pom.xml
+++ b/product-server-admin/pom.xml
@@ -9,7 +9,6 @@
<artifactId>product-server-admin</artifactId>
<name>product-server-admin</name>
<description>product-server-admin</description>
- <version>2.0.0-release</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/product-server-org-admin/pom.xml b/product-server-org-admin/pom.xml
index c639147..8b2f367 100644
--- a/product-server-org-admin/pom.xml
+++ b/product-server-org-admin/pom.xml
@@ -8,7 +8,6 @@
</parent>
<artifactId>product-server-org-admin</artifactId>
<name>product-server-org-admin</name>
- <version>2.0.0-release</version>
<description>product-server-org-admin</description>
<dependencies>
<dependency>
diff --git a/product-server-org-admin/src/test/java/com/product/org/admin/test/SystemDataPermissionTest.java b/product-server-org-admin/src/test/java/com/product/org/admin/test/SystemDataPermissionTest.java
index 267a3d6..acb3cd3 100644
--- a/product-server-org-admin/src/test/java/com/product/org/admin/test/SystemDataPermissionTest.java
+++ b/product-server-org-admin/src/test/java/com/product/org/admin/test/SystemDataPermissionTest.java
@@ -10,7 +10,6 @@
import com.product.core.transfer.Transactional;
import com.product.org.admin.config.CmnConst;
-import net.minidev.json.JSONObject;
/**
* Copyright 漏 2020 LX-BASE
@@ -171,7 +170,6 @@
// subordinate_map.put("status", 1);
subordinate_list.add(subordinate_map);
}*/
- System.out.println(new JSONObject(m).toJSONString());
testPost(m);
}
@Transactional
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 60e68ad..730c8eb 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.lx</groupId>
<artifactId>product-server</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-release</version>
</parent>
<artifactId>product-server-web</artifactId>
<packaging>jar</packaging>
@@ -39,59 +39,48 @@
<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>
@@ -112,58 +101,47 @@
<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>
@@ -173,12 +151,14 @@
<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>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/product-server-web/src/main/java/com/product/Application.java b/product-server-web/src/main/java/com/product/Application.java
index 66767ee..b103b59 100644
--- a/product-server-web/src/main/java/com/product/Application.java
+++ b/product-server-web/src/main/java/com/product/Application.java
@@ -24,7 +24,7 @@
* 鍒濆闆嗙兢瀹㈡埛绔繛鎺ユ睜
* 鎵弿澶氫釜璺緞
*/
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class, scanBasePackages = {"com.product", "org.spring.service.core"})
+@SpringBootApplication(exclude = DataSourceAutoConfiguration.class, scanBasePackages = {"com.product","com.home","org.spring.service.core"})
public class Application extends SpringBootServletInitializer {
@Override
--
Gitblit v1.9.2