From 674b7a0b04c2b7846a4e6951862527dab82fcb20 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 22 Jan 2022 11:25:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 62c2fdd5..c888cfd8 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 1.8 - 2.6.2 + 2.6.3 2021.0.0 2021.1 2.0.3 @@ -39,7 +39,6 @@ 4.1.2 3.2.2 2.12.2 - 2.17.1 @@ -183,19 +182,6 @@ ${transmittable-thread-local.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j2.version} - - com.ruoyi From 18c0b3dec4cf30ef02c064e6d6e249bb4f5554df Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 22 Jan 2022 14:32:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7nacos=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=882.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c888cfd8..4fd4453c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.6.3 2021.0.0 2021.1 - 2.0.3 + 2.0.4 2.6.1 2.2.0 3.0.0 From 4557ca0ace264f8097ac5af215103286d933f948 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 23 Jan 2022 10:51:01 +0800 Subject: [PATCH 3/5] fix css class name --- ruoyi-ui/src/assets/styles/ruoyi.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index d499fa0b..e3912cec 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -37,7 +37,7 @@ .mb10 { margin-bottom: 10px; } -.ml0 { +.ml10 { margin-left: 10px; } .mt20 { @@ -49,7 +49,7 @@ .mb20 { margin-bottom: 20px; } -.m20 { +.ml20 { margin-left: 20px; } From 0c24d59a2c7fa45e87ef352bfeafc527bce8fbfe Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 23 Jan 2022 10:52:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot-admin?= =?UTF-8?q?=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=882.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4fd4453c..a8698738 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2021.0.0 2021.1 2.0.4 - 2.6.1 + 2.6.2 2.2.0 3.0.0 1.6.2 From bd30f3d53a6d858fcf39b57c3f94ab2c3fa69bf2 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 24 Jan 2022 10:09:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=203.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- pom.xml | 4 +- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 39 +++++++++++++++++++- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 23 files changed, 62 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 827ca5d1..50daf9f8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.3.0

+

RuoYi v3.4.0

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

- +

diff --git a/pom.xml b/pom.xml index a8698738..2b15503c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.3.0 + 3.4.0 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 2eeb4cc5..40806b4d 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index ad926141..0124a3dc 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 933c6ea2..14469b18 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ad5f6177..3b95898a 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 57bb2570..faa871a6 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index cf500507..44c7db26 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index e3e2b516..491cee5b 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 8a0803f9..5dc1f8e4 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 909130c7..fa52ad2f 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 79985838..c855032e 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index bd78362b..df5c28b0 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index bb049553..fc1d58c4 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index e88ccea7..83871150 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 349cfc91..b9dcebfc 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index ad9c7d82..29ecfa60 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index d57c0cee..0888eecc 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 48a662c1..a17fcf3e 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 17c16764..90581f40 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.3.0", + "version": "3.4.0", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index fbf3923f..6110b996 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -146,6 +146,43 @@ 更新日志 + +
    +
  1. 新增Vue3前端代码生成模板
    2. +
  2. 新增图片预览组件
    3. +
  3. 新增压缩插件实现打包Gzip
    4. +
  4. 新增docker一键复制的脚本
    5. +
  5. 自定义xss校验注解实现
    6. +
  6. 路由支持单独配置菜单或角色权限
    7. +
  7. 前端支持设置是否需要防止数据重复提交
    8. +
  8. 预览组件支持多图显示
    9. +
  9. 代码生成列表图片支持预览
    10. +
  10. 代码生成新增Java类型Boolean
    11. +
  11. 定时任务目标字符串过滤特殊字符
    12. +
  12. 定时任务目标字符串验证包名白名单
    13. +
  13. 升级nacos到最新版2.0.4
    14. +
  14. 升级spring-cloud到最新版2021.0.0
    15. +
  15. 升级spring-boot到最新版本2.6.3
    16. +
  16. 升级spring-boot-admin到最新版2.6.1
    17. +
  17. 升级pagehelper到最新版1.4.1
    18. +
  18. 升级fastjson到最新版1.2.79
    19. +
  19. SQL工具类新增检查关键字方法
    20. +
  20. 修复打包后字体图标偶现的乱码问题
    21. +
  21. 修复版本差异导致的懒加载报错问题
    22. +
  22. 修复选项卡点击右键刷新丢失参数问题
    23. +
  23. 修复登录失效后多次请求提示多次弹窗问题
    24. +
  24. 优化加载字典缓存数据
    25. +
  25. 优化代码生成同步更新字段
    26. +
  26. 优化代码生成字典组重复问题
    27. +
  27. 优化空值不进行回显数据字典
    28. +
  28. 优化用户导入提示溢出则显示滚动条
    29. +
  29. 优化定时任务cron表达式小时设置24
    30. +
  30. 优化部门修改缩放后出现的错位问题
    31. +
  31. 优化分页方法设置成通用方便灵活调用
    32. +
  32. 优化用户管理部门查询选择节点后分页参数初始
    33. +
  33. 其他细节优化
    34. +
+
  1. 新增配套并同步的Vue3前端版本
    2. @@ -642,7 +679,7 @@ export default { data() { return { // 版本号 - version: "3.3.0", + version: "3.4.0", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 55599104..cea2ff1a 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.3.0 + 3.4.0 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 81154770..42b662e2 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.3.0 + 3.4.0 4.0.0