From 55546dfc80bd2ec1be8786b19f53df4e1c1e44e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Tue, 13 Jul 2021 13:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=20v2.5.1=20=E9=92=88?=
=?UTF-8?q?=E5=AF=B9=20v2.5.0=20=E7=89=88=E6=9C=AC=E6=96=B0=E7=89=B9?=
=?UTF-8?q?=E6=80=A7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
docker/docker-compose.yml | 6 +++---
pom.xml | 4 ++--
ruoyi-admin/pom.xml | 2 +-
ruoyi-common/pom.xml | 2 +-
ruoyi-demo/pom.xml | 2 +-
ruoyi-extend/pom.xml | 2 +-
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +-
ruoyi-framework/pom.xml | 2 +-
ruoyi-generator/pom.xml | 2 +-
ruoyi-quartz/pom.xml | 2 +-
ruoyi-system/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/views/index.vue | 12 ++++++++++++
14 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index a56dc6c4..6fb00c16 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.5.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.1-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 b27b61d1..63c46a46 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.5.0"
+ image: "ruoyi/ruoyi-server:2.5.1"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -90,7 +90,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.5.0"
+ image: "ruoyi/ruoyi-server:2.5.1"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -104,7 +104,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.5.0"
+ image: "ruoyi/ruoyi-monitor-admin:2.5.1"
environment:
- TZ=Asia/Shanghai
privileged: true
diff --git a/pom.xml b/pom.xml
index d56898ba..00becec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi-vue-plus
- 2.5.0
+ 2.5.1
RuoYi-Vue-Plus
https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
RuoYi-Vue-Plus后台管理系统
- 2.5.0
+ 2.5.1
2.4.8
UTF-8
UTF-8
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 74502132..7ff67bef 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
jar
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 28af3046..1c2eb3c8 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index d3909a28..99d40dd9 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index e71a426c..dc04bc64 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
ruoyi-extend
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index e9d48d66..7c45549e 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.5.0
+ 2.5.1
4.0.0
jar
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index e7ed9918..d3c27399 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 642dfec1..693a8dc6 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 522a84e2..8d741986 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 85576db4..3f995658 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 2.5.0
+ 2.5.1
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 648b1729..bdd09f43 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.5.0",
+ "version": "2.5.1",
"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 671dcde2..9f8e79fb 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -91,6 +91,18 @@
更新日志
+
+
+ - update 验证码开关 转移到表 参数管理 内
+ - update 使用hutool重构 判断是否url
+ - fix 修复 docker业务集群部署与文件上传的问题
+ - fix 修复代码生成同步表结构id冲突问题
+ - fix 修复代码生成选择字典 无法取消问题
+ - fix 修复代码生成字典为null问题
+ - fix 图片上传 多图时无法删除相应图片修复
+ - remove 删除富文本video事件
+
+
- update springboot 2.4.7 => 2.4.8