From 55546dfc80bd2ec1be8786b19f53df4e1c1e44e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:49:47 +0800
Subject: [PATCH] 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复

---
 ruoyi-extend/ruoyi-monitor-admin/pom.xml |    2 +-
 ruoyi-framework/pom.xml                  |    2 +-
 ruoyi-admin/pom.xml                      |    2 +-
 ruoyi-system/pom.xml                     |    2 +-
 ruoyi-ui/src/views/index.vue             |   12 ++++++++++++
 ruoyi-generator/pom.xml                  |    2 +-
 pom.xml                                  |    4 ++--
 ruoyi-common/pom.xml                     |    2 +-
 README.md                                |    2 +-
 docker/docker-compose.yml                |    6 +++---
 ruoyi-extend/pom.xml                     |    2 +-
 ruoyi-quartz/pom.xml                     |    2 +-
 ruoyi-demo/pom.xml                       |    2 +-
 ruoyi-ui/package.json                    |    2 +-
 14 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index a56dc6c..6fb00c1 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)
 <br>
-[![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 b27b61d..63c46a4 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -76,7 +76,7 @@
         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 @@
         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 @@
         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 d56898b..00becec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</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.5.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>2.5.1</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>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 7450213..7ff67be 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 28af304..1c2eb3c 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>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index d3909a2..99d40dd 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index e71a426..dc04bc6 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ruoyi-extend</artifactId>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index e9d48d6..7c45549 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-extend</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index e7ed991..d3c2739 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 642dfec..693a8dc 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 522a84e..8d74198 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 85576db..3f99565 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 648b172..bdd09f4 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 671dcde..9f8e79f 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -91,6 +91,18 @@
             <span>鏇存柊鏃ュ織</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v2.5.1 - 2021-7-13">
+              <ol>
+                <li>update 楠岃瘉鐮佸紑鍏� 杞Щ鍒拌〃 鍙傛暟绠$悊 鍐�</li>
+                <li>update 浣跨敤hutool閲嶆瀯 鍒ゆ柇鏄惁url</li>
+                <li>fix 淇 docker涓氬姟闆嗙兢閮ㄧ讲涓庢枃浠朵笂浼犵殑闂</li>
+                <li>fix 淇浠g爜鐢熸垚鍚屾琛ㄧ粨鏋刬d鍐茬獊闂</li>
+                <li>fix 淇浠g爜鐢熸垚閫夋嫨瀛楀吀 鏃犳硶鍙栨秷闂</li>
+                <li>fix 淇浠g爜鐢熸垚瀛楀吀涓簄ull闂</li>
+                <li>fix 鍥剧墖涓婁紶 澶氬浘鏃舵棤娉曞垹闄ょ浉搴斿浘鐗囦慨澶�</li>
+                <li>remove 鍒犻櫎瀵屾枃鏈瑅ideo浜嬩欢</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v2.5.0 - 2021-7-12">
               <ol>
                 <li>update springboot 2.4.7 => 2.4.8</li>

--
Gitblit v1.9.3