From 334fe11584e961b38ceddb398115587b8beb2a92 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 24 七月 2021 18:23:22 +0800
Subject: [PATCH] fix 修复多数据源druid全局配置缩进错误 引起无效配置问题
---
pom.xml | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 355d59e..426eec2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,30 +6,38 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>2.5.2</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
- <spring-boot.version>2.4.7</spring-boot.version>
+ <ruoyi-vue-plus.version>2.5.2</ruoyi-vue-plus.version>
+ <spring-boot.version>2.4.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
- <knife4j.version>3.0.2</knife4j.version>
+ <knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.7.2</hutool.version>
+ <hutool.version>5.7.4</hutool.version>
<feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
- <redisson.version>3.15.2</redisson.version>
+ <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
+ <redisson.version>3.16.0</redisson.version>
+ <lock4j.version>2.2.1</lock4j.version>
+ <datasource.version>3.4.0</datasource.version>
+
+ <!-- docker 閰嶇疆 -->
+ <docker.registry.url>localhost</docker.registry.url>
+ <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+ <docker.namespace>ruoyi</docker.namespace>
+ <docker.plugin.version>1.2.0</docker.plugin.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -79,6 +87,13 @@
<version>${jwt.version}</version>
</dependency>
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <version>${datasource.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
@@ -89,6 +104,7 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -124,7 +140,11 @@
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+ <version>${lock4j.version}</version>
+ </dependency>
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -178,6 +198,7 @@
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
+ <module>ruoyi-extend</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3