From 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 12:08:06 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/pom.xml | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 4f2e0b0..ca46822 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,43 @@
<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>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.3.1</version>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -348,12 +390,12 @@
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
- <!--
+ <!---->
+ <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>
- -->
+
<exclude>**/*.woff</exclude>
@@ -388,6 +430,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