From 4ade37283f06a39057992828e13058ef804ae606 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 16:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index d990fc5..c3a9d87 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -53,6 +53,12 @@
<env>xcx</env>
</properties>
</profile>
+ <profile>
+ <id>lhx</id>
+ <properties>
+ <env>lhx</env>
+ </properties>
+ </profile>
</profiles>
<dependencies>
@@ -335,7 +341,37 @@
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>1.0.1</version>
</dependency>
- </dependencies>
+
+ <!-- swagger2 start -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>1.5.23</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ <version>1.5.23</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+ <!-- swagger2 end -->
+
+ <!-- https://mvnrepository.com/artifact/org.mapstruct/mapstruct -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct</artifactId>
+ <version>1.3.0.Final</version>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -350,9 +386,9 @@
<!--
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</exclude>
+ <exclude>config/config.json</exclude>
+ <exclude>config/application.properties</exclude>
+ <exclude>config/system.properties</exclude>
-->
@@ -368,6 +404,7 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
+ <include>**/*.xls</include>
</includes>
</resource>
<resource>
@@ -387,6 +424,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>1.3.0.Final</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
</plugin>
<!-- 热部署插件 -->
--
Gitblit v1.9.1