From eea8f33cf98f58026e93b209432553e5b1c03da2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 19:44:18 +0800
Subject: [PATCH] 发布 v2.5.2 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 6fb00c1..1483d2f 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.1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.2-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 b08c32d..3e3180f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -107,7 +107,7 @@
         ipv4_address: 172.30.0.54
 
   ruoyi-server1:
-    image: "ruoyi/ruoyi-server:2.5.1"
+    image: "ruoyi/ruoyi-server:2.5.2"
     environment:
       - TZ=Asia/Shanghai
     volumes:
@@ -121,7 +121,7 @@
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:2.5.1"
+    image: "ruoyi/ruoyi-server:2.5.2"
     environment:
       - TZ=Asia/Shanghai
     volumes:
@@ -135,7 +135,7 @@
         ipv4_address: 172.30.0.61
 
   ruoyi-monitor-admin:
-    image: "ruoyi/ruoyi-monitor-admin:2.5.1"
+    image: "ruoyi/ruoyi-monitor-admin:2.5.2"
     environment:
       - TZ=Asia/Shanghai
     privileged: true
diff --git a/pom.xml b/pom.xml
index b590720..aa930ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>2.5.1</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.5.1</ruoyi-vue-plus.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>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5c895a8..3f08bbf 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 1c2eb3c..dc97609 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 99d40dd..dcc2684 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index dc04bc6..46a8cfc 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.1</version>
+        <version>2.5.2</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 7c45549..b09375a 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index d3c2739..16b46e9 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 693a8dc..8510c9f 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 8d74198..f1d850c 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 3f99565..0ec9ba9 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.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index bdd09f4..c9ca44b 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "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 9f8e79f..7824855 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.2 - 2021-7-19">
+              <ol>
+                <li>update 浼樺寲浠g爜鐢熸垚鍣ㄦ敞閲婃牸寮�</li>
+                <li>fix 鍥炴粴浠g爜鐢熸垚 鎵瑰鐞嗕紭鍖�</li>
+                <li>fix 浠g爜鐢熸垚 queryType 閲嶅鍕鹃�夋暟鎹簱鏃犻粯璁ゅ�奸棶棰�</li>
+                <li>fix 淇鎺ュ彛鍗曞弬鏁版牎楠屾棤鏁堥棶棰�</li>
+                <li>fix 浠g爜鐢熸垚 queryType >= <= 鏍囪瘑绗﹂敊璇棶棰�</li>
+                <li>fix 淇浠g爜鐢熸垚瀛楀吀闂</li>
+                <li>fix 淇 thread-pool: enabled 閰嶇疆涓嶇敓鏁堥棶棰�</li>
+                <li>remove 鍒犻櫎鏃犵敤鏂囨。涓庤剼鏈�</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v2.5.1 - 2021-7-13">
               <ol>
                 <li>update 楠岃瘉鐮佸紑鍏� 杞Щ鍒拌〃 鍙傛暟绠$悊 鍐�</li>

--
Gitblit v1.9.3