From c380b776178ad0e51f6ed183302fe71af76c1059 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 19 八月 2021 17:33:46 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- pom.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 1c32623..cdd1f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-vue-plus</artifactId> - <version>2.6.0</version> + <version>3.0.0</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.6.0</ruoyi-vue-plus.version> + <ruoyi-vue-plus.version>3.0.0</ruoyi-vue-plus.version> <spring-boot.version>2.5.3</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -27,20 +27,20 @@ <jwt.version>0.9.1</jwt.version> <mybatis-plus.version>3.4.3</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> - <hutool.version>5.7.6</hutool.version> + <hutool.version>5.7.7</hutool.version> <feign.version>3.0.3</feign.version> <feign-okhttp.version>11.2</feign-okhttp.version> <okhttp.version>4.9.1</okhttp.version> - <spring-boot-admin.version>2.4.3</spring-boot-admin.version> + <spring-boot-admin.version>2.5.0</spring-boot-admin.version> <redisson.version>3.16.1</redisson.version> <lock4j.version>2.2.1</lock4j.version> - <datasource.version>3.4.1</datasource.version> + <dynamic-ds.version>3.4.1</dynamic-ds.version> <!-- OSS 閰嶇疆 --> <qiniu.version>7.8.0</qiniu.version> <aliyun.oss.version>3.13.0</aliyun.oss.version> <qcloud.cos.version>5.6.47</qcloud.cos.version> - <minio.version>8.3.0</minio.version> + <minio.version>8.2.0</minio.version> <!-- docker 閰嶇疆 --> <docker.registry.url>localhost</docker.registry.url> @@ -106,7 +106,7 @@ <dependency> <groupId>com.baomidou</groupId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId> - <version>${datasource.version}</version> + <version>${dynamic-ds.version}</version> </dependency> <dependency> @@ -269,7 +269,7 @@ <repository> <id>public</id> <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + <url>https://maven.aliyun.com/repository/public/</url> <releases> <enabled>true</enabled> </releases> @@ -280,7 +280,7 @@ <pluginRepository> <id>public</id> <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + <url>https://maven.aliyun.com/repository/public/</url> <releases> <enabled>true</enabled> </releases> -- Gitblit v1.9.3