From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/pom.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 1d1bd80..283b985 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -47,8 +47,8 @@
<!-- 鑷畾涔夐獙璇佹敞瑙� -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!--甯哥敤宸ュ叿绫� -->
@@ -121,11 +121,13 @@
<artifactId>lombok</artifactId>
</dependency>
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
@@ -166,6 +168,21 @@
<groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-spring-boot-configuration</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-webroot</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-feign</artifactId>
+ </dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
--
Gitblit v1.9.3