From 8c9c52417e69af15638768704b0b53ba98482069 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-framework/pom.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index b31bee3..e28511c 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.3.0</version>
+ <version>4.3.0-beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -46,23 +46,33 @@
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
- <!-- dynamic-datasource 澶氭暟鎹簮-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- </dependency>
<!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
+ </dependency>
+
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-web-spring-boot-starter</artifactId>
+ </dependency>
+
</dependencies>
</project>
--
Gitblit v1.9.3