From eaad3c9d48cf9641726818c90741942b193484e2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:08:18 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/pom.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index fb23461..4049589 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -48,6 +48,12 @@
</properties>
</profile>
<profile>
+ <id>mdprd</id>
+ <properties>
+ <env>mdprd</env>
+ </properties>
+ </profile>
+ <profile>
<id>xcx</id>
<properties>
<env>xcx</env>
@@ -387,6 +393,11 @@
<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>
</dependencies>
<build>
<resources>
@@ -397,16 +408,15 @@
<exclude>config/dev/*</exclude>
<exclude>config/prd/*</exclude>
+ <exclude>config/mdprd/*</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>
@@ -421,6 +431,7 @@
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.xls</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
@@ -489,11 +500,7 @@
</repository>
- <repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
+
</repositories>
--
Gitblit v1.9.1