diff --git a/README.md b/README.md
index 332ce974..3be93187 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0aba0a4a..d40ae29e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -76,7 +76,7 @@ services:
ipv4_address: 172.30.0.48
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -89,7 +89,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -102,7 +102,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.4.0"
+ image: "ruoyi/ruoyi-monitor-admin:2.5.0"
environment:
- TZ=Asia/Shanghai
privileged: true
diff --git a/pom.xml b/pom.xml
index 1e5d75cc..d56898ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi-vue-plus
- 2.4.0
+ 2.5.0
RuoYi-Vue-Plus
https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
RuoYi-Vue-Plus后台管理系统
- 2.4.0
+ 2.5.0
2.4.8
UTF-8
UTF-8
@@ -34,7 +34,7 @@
3.4.0
- 192.168.31.240
+ localhost
http://${docker.registry.url}:2375
ruoyi
1.2.0
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5dc36b15..74502132 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
jar
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 47b9a55f..28af3046 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 756f3d17..d3909a28 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 99a2594e..e71a426c 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
ruoyi-extend
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 2aade59b..e9d48d66 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi-extend
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
jar
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 40c84799..e7ed9918 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 4774cfff..642dfec1 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index a92933f7..522a84e2 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 37b57de8..85576db4 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.4.0
+ 2.5.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index af8db7e8..648b1729 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.4.0",
+ "version": "2.5.0",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index dba6dfe8..671dcde2 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -91,6 +91,32 @@
更新日志
+
+
+ - update springboot 2.4.7 => 2.4.8
+ - update knife4j 3.0.2 => 3.0.3
+ - update hutool 5.7.2 => 5.7.4
+ - update spring-boot-admin 2.4.1 => 2.4.3
+ - update redisson 3.15.2 => 3.16.0
+ - add 增加 docker 编排 与 shell 脚本
+ - add 增加 feign 熔断 自定义结构体解析方法 与 demo 注释
+ - add 用户管理新增分配角色功能
+ - add 角色管理新增分配用户功能
+ - add 增加spring-cache演示案例
+ - update 独立 springboot-admin 监控到扩展模块项目
+ - update springboot-admin 监控 增加用户登录权限管理
+ - update 优化代码生成器 批量导入
+ - update 优化 增加MP注入异常拦截
+ - update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存
+ - update FileUpload ImageUpload组件 支持多图片上传
+ - update 优化中英文语言配置
+ - update 规范maven写法
+ - fix redis获取map属性bug修复。
+ - fix 修复 按钮loading 后端500卡死问题
+ - fix 相对路径下载问题
+ - fix 修复 hutool 工具返回结果不一致问题
+
+
- update springboot 2.3.11 => 2.4.7