From 1cbe4c0d887f21b697539d86e9add55eda7dd200 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:39:26 +0800
Subject: [PATCH] Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-common/pom.xml | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 5bf7daf..28af304 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -118,10 +118,6 @@
<dependency>
<groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-server</artifactId>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
@@ -146,19 +142,17 @@
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
- </dependencies>
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ </dependency>
- <profiles>
- <profile>
- <id>jdk11</id>
- <dependencies>
- <!--jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+ </dependency>
+
+ </dependencies>
</project>
--
Gitblit v1.9.3