diff --git a/README.md b/README.md index 6fb00c16..1483d2f8 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.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 b08c32d2..3e3180f1 100644 --- 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 diff --git a/pom.xml b/pom.xml index b5907209..aa930eac 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi-vue-plus - 2.5.1 + 2.5.2 RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 2.5.1 + 2.5.2 2.4.8 UTF-8 UTF-8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 5c895a8c..3f08bbf9 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 jar diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 1c2eb3c8..dc97609a 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 99d40dd9..dcc2684d 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index dc04bc64..46a8cfc7 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 7c45549e..b09375a0 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.1 + 2.5.2 4.0.0 jar diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index d3c27399..16b46e9a 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 693a8dc6..8510c9fa 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 8d741986..f1d850c1 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 3f995658..0ec9ba9b 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index bdd09f43..c9ca44bf 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 9f8e79fb..78248557 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -91,6 +91,18 @@ 更新日志 + +
    +
  1. update 优化代码生成器注释格式
  2. +
  3. fix 回滚代码生成 批处理优化
  4. +
  5. fix 代码生成 queryType 重复勾选数据库无默认值问题
  6. +
  7. fix 修复接口单参数校验无效问题
  8. +
  9. fix 代码生成 queryType >= <= 标识符错误问题
  10. +
  11. fix 修复代码生成字典问题
  12. +
  13. fix 修复 thread-pool: enabled 配置不生效问题
  14. +
  15. remove 删除无用文档与脚本
  16. +
+
  1. update 验证码开关 转移到表 参数管理 内