From 8e76fba031022a2bb99795a2678c62db33a5ebfd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tai-ots-master-20210316' into Dev
---
pom.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6896115..6988c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>
-
+
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
<groupId>com.github.oshi</groupId>
@@ -365,6 +365,8 @@
<groupId>com.ots</groupId>
<artifactId>tai-ots-framework</artifactId>
<version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
</dependency>
</dependencies>
@@ -401,8 +403,28 @@
<mainClass>com.ots.OtsApplication</mainClass>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
+ <includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>${project.artifactId}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.1