diff --git a/README.md b/README.md index 3d69f9db2..a5cae9332 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-3.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.3.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-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/pom.xml b/pom.xml index 055e11f8a..c5da82755 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi-vue-plus - 3.2.0 + 3.3.0 RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 3.2.0 + 3.3.0 2.5.6 UTF-8 UTF-8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 966e0655f..9ec68cdd1 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 jar @@ -120,4 +120,4 @@ - \ No newline at end of file + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index d27607267..12f14a06e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 339cbde44..93b9f9dfc 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index bee911742..e44078a52 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index d63b110b9..33a78516d 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 - 3.2.0 + 3.3.0 4.0.0 jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml index 7be85f987..1c1ba6f37 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ ruoyi-extend com.ruoyi - 3.2.0 + 3.3.0 ruoyi-xxl-job-admin jar diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 8dc0f2589..b31bee368 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index e19cbb293..668489f6e 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index 05a297f90..d3c76d946 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 jar diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index 6c93df8e0..adbb55502 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index ee682f717..1480b8133 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index e7c12ef14..bf0a5c9c2 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.2.0 + 3.3.0 4.0.0 @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 264837b71..89d591b34 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "3.2.0", + "version": "3.3.0", "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 8ecc65901..97671273a 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -93,6 +93,48 @@ 更新日志 + +
    +
  1. add [重磅更新] 增加分布式日志框架 TLog
    2. +
  2. add [重磅更新] 增加分布式任务调度系统 Xxl-Job
    3. +
  3. add [重大更新] 增加 ruoyi-job 任务调度模块(基于xxl-job)
    4. +
  4. update [重大更新]全业务 增加 接口文档注解 格式化代码
    5. +
  5. update springboot 2.5.5 => 2.5.6
    6. +
  6. update springboot-admin 2.5.1 => 2.5.2
    7. +
  7. update element-ui 2.15.5 => 2.15.6
    8. +
  8. update hutool 5.7.13 => 5.7.15
    9. +
  9. update qcloud.cos 5.6.55 => 5.6.58
    10. +
  10. update minio 8.3.0 => 8.3.3
    11. +
  11. update 更新 element 2.15.6 表格样式
    12. +
  12. update 优化 代码生成常量 关于 BO VO 注释
    13. +
  13. update 优化代码生成 导入表 列表返回 主键默认选中
    14. +
  14. update MybatisPlusRedisCache 标记过期 推荐使用 spring-cache
    15. +
  15. update Quartz 标记过期 推荐迁移至新框架 xxl-job
    16. +
  16. update Feign 标记过期
    17. +
  17. update 前端增加默认国际化参数
    18. +
  18. update 更新 Admin 监控 注释 避免错误使用
    19. +
  19. update Admin 监控增加日志文件输出
    20. +
  20. update 优化 xxl-job-admin 增加格式化日志输出与 docker 镜像
    21. +
  21. update 更新 xxl-job 执行器开关功能
    22. +
  22. update 代码生成 改为生成抽象实体
    23. +
  23. update 代码生成 搜索框 更新文本域生成 用于模糊查询
    24. +
  24. update 通用数据注入改为适配通用实体类
    25. +
  25. update 使用路由懒加载提升页面响应速度
    26. +
  26. update 迁移所有脚本文件至 script 目录
    27. +
  27. update swagger 组顺序配置
    28. +
  28. update sql 文件更新 xxljob 控制台菜单
    29. +
  29. update 前端增加 任务调度中心页面与环境及 nginx 配置
    30. +
  30. update 合并 oss.sql 至主 sql
    31. +
  31. update 补全国际化文件(英文)
    32. +
  32. update 更新关于全局路径设置与文档链接
    33. +
  33. update 删除无用 setUsername 使用自动注入
    34. +
  34. update RedisUtils 更新删除 hash 数据方法
    35. +
  35. fix 修复 多数据源 aop 语法错误
    36. +
  36. fix 修复 子菜单无 query 参数问题
    37. +
  37. fix 修复 oss 配置删除时删除缓存 bug
    38. +
  38. fix 修复无权限获取请求头 download-filename 导致文件名为空问题
    39. +
+
  1. update [重大改动]接口文档 支持分组配置
    2. @@ -483,7 +525,7 @@ export default { data() { return { // 版本号 - version: "3.2.0", + version: "3.3.0", }; }, methods: { diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 7e5f32fc0..c73a93c86 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -103,7 +103,7 @@ services: ipv4_address: 172.30.0.54 ruoyi-server1: - image: "ruoyi/ruoyi-server:3.2.0" + image: "ruoyi/ruoyi-server:3.3.0" container_name: ruoyi-server1 environment: # 时区上海 @@ -118,7 +118,7 @@ services: ipv4_address: 172.30.0.60 ruoyi-server2: - image: "ruoyi/ruoyi-server:3.2.0" + image: "ruoyi/ruoyi-server:3.3.0" container_name: ruoyi-server2 environment: # 时区上海 @@ -133,7 +133,7 @@ services: ipv4_address: 172.30.0.61 ruoyi-monitor-admin: - image: "ruoyi/ruoyi-monitor-admin:3.2.0" + image: "ruoyi/ruoyi-monitor-admin:3.3.0" container_name: ruoyi-monitor-admin environment: # 时区上海 @@ -148,7 +148,7 @@ services: ipv4_address: 172.30.0.90 ruoyi-xxl-job-admin: - image: "ruoyi/ruoyi-xxl-job-admin:3.2.0" + image: "ruoyi/ruoyi-xxl-job-admin:3.3.0" container_name: ruoyi-xxl-job-admin environment: # 时区上海