From 929715e2485051bee11cecadd5d650eb44df5fdd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:47:47 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/pom.xml | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 111a11a..e080c3f 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -47,24 +47,6 @@
<env>prd</env>
</properties>
</profile>
- <profile>
- <id>xcx</id>
- <properties>
- <env>xcx</env>
- </properties>
- </profile>
- <profile>
- <id>lhx</id>
- <properties>
- <env>lhx</env>
- </properties>
- </profile>
- <profile>
- <id>xcshop</id>
- <properties>
- <env>xcshop</env>
- </properties>
- </profile>
</profiles>
<dependencies>
@@ -116,6 +98,11 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -387,6 +374,16 @@
<artifactId>hutool-all</artifactId>
<version>5.3.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>26.0-jre</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -394,20 +391,6 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
-
- <exclude>config/dev/*</exclude>
- <exclude>config/prd/*</exclude>
- <exclude>config/test/*</exclude>
- <exclude>config/xcx/*</exclude>
- <exclude>config/xcshop/*</exclude>
-
- <!--
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</exclude>
-
--->
-
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ttf</exclude>
@@ -423,10 +406,7 @@
<include>**/*.xls</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources/config/${env}</directory>
- <targetPath>BOOT-INF/classes/config</targetPath>
- </resource>
+
</resources>
<plugins>
<plugin>
--
Gitblit v1.9.1