发布 v2.5.2 bug修复版

(cherry picked from commit b12bdd1f15)
3 years ago · eea8f33cf9
parent 0a128e454c
commit eea8f33cf9
14 changed files with 28 additions and 16 deletions
--- 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)]()
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -107,7 +107,7 @@ services:
        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 @@ services:
        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 @@ services:
        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
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>

--- 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",
--- 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 优化代码生成器注释格式</li>
+                <li>fix 回滚代码生成 批处理优化</li>
+                <li>fix 代码生成 queryType 重复勾选数据库无默认值问题</li>
+                <li>fix 修复接口单参数校验无效问题</li>
+                <li>fix 代码生成 queryType >= <= 标识符错误问题</li>
+                <li>fix 修复代码生成字典问题</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>