From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
pom.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 278c0b1..a34ca37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,13 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>com.github.ulisesbocchio</groupId>
+ <artifactId>jasypt-spring-boot-starter</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
<groupId>com.github.oshi</groupId>
@@ -354,16 +360,15 @@
<version>13.0</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>com.ots</groupId>
<artifactId>tai-ots-framework</artifactId>
<version>1.0</version>
<scope>system</scope>
- <systemPath>${project.basedir}/jar/tai-ots-framework-1.0.jar</systemPath>
+ <systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
</dependency>
- </dependencies>
+ </dependencies>
<!-- <build>-->
<!-- <finalName>${project.artifactId}</finalName>-->
@@ -397,6 +402,7 @@
<mainClass>com.ots.OtsApplication</mainClass>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
+ <includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<plugin>
--
Gitblit v1.9.1