From 853040cd4267738c92c25ca5befd96e87c62ed86 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 12 Jan 2023 11:42:39 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgateway=E6=B5=81?= =?UTF-8?q?=E6=8E=A7=E8=A7=84=E5=88=99=E7=94=9F=E6=95=88=E4=BD=86=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 5a955b4c..b6dc98ae 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -37,4 +37,4 @@ spring: dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json - rule-type: flow + rule-type: gw-flow From 8eb22e86e0da438b4851b5ff82bcf9252c831ef7 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 12 Jan 2023 11:44:12 +0800 Subject: [PATCH 02/46] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=B8=8B=E5=88=92=E7=BA=BF=E4=B8=8D=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E5=BC=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/utils/StringUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java index f1878deb..d05da574 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java @@ -428,7 +428,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils } /** - * 驼峰式命名法 例如：user_name->userName + * 驼峰式命名法 + * 例如：user_name->userName */ public static String toCamelCase(String s) { @@ -436,6 +437,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return null; } + if (s.indexOf(SEPARATOR) == -1) + { + return s; + } s = s.toLowerCase(); StringBuilder sb = new StringBuilder(s.length()); boolean upperCase = false; From 8b5acaf341fc6dafc3e0a85ecdbcc00a972ebff6 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 12 Jan 2023 11:44:49 +0800 Subject: [PATCH 03/46] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-cloud=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BB=84=E4=BB=B6=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 0f8e3f3d..193393a5 100644 --- a/pom.xml +++ b/pom.xml @@ -17,26 +17,26 @@ UTF-8 UTF-8 1.8 - 2.7.3 - 2021.0.4 + 2.7.7 + 2021.0.5 2021.0.4.0 - 2.7.5 + 2.7.9 3.0.0 1.6.2 1.27.2 2.3.3 1.4.6 1.2.15 - 3.5.2 + 3.6.0 2.11.0 1.4 2.3 - 2.0.20 + 2.0.22 0.9.1 8.2.2 4.1.2 3.2.2 - 2.13.2 + 2.14.2 From 94590a008da84803f705aa7e92b7c1ad500b8936 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 13 Jan 2023 11:44:39 +0800 Subject: [PATCH 04/46] =?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.7.10?= 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 193393a5..42f9b780 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.7.7 2021.0.5 2021.0.4.0 - 2.7.9 + 2.7.10 3.0.0 1.6.2 1.27.2 From 6317e902e327566d07c5d35ae63a75eb4cb37614 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 13 Jan 2023 11:45:09 +0800 Subject: [PATCH 05/46] =?UTF-8?q?=E5=8D=87=E7=BA=A7element-ui=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.15.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 5820ec07..1081c8ed 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -41,7 +41,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "echarts": "5.4.0", - "element-ui": "2.15.10", + "element-ui": "2.15.12", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", From 736b6348bc8a524faba02003c9729bfd311e6397 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 13 Jan 2023 16:26:18 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E7=A7=BB=E9=99=A4commons-collections?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +--------- ruoyi-modules/ruoyi-gen/pom.xml | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 42f9b780..5c3faa98 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 2.3.3 1.4.6 1.2.15 - 3.6.0 + 3.5.2 2.11.0 1.4 2.3 @@ -35,7 +35,6 @@ 0.9.1 8.2.2 4.1.2 - 3.2.2 2.14.2 @@ -131,13 +130,6 @@ ${velocity.version} - - - commons-collections - commons-collections - ${commons-collections.version} - - com.alibaba.fastjson2 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 4456d324..343598f1 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -54,12 +54,6 @@ velocity-engine-core - - - commons-collections - commons-collections - - mysql From 12c51fc8e391056a091b2b98c8198d3d301ca58a Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 16 Jan 2023 11:42:23 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=203.6.2?= 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-seata/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 | 43 +++++++++++++++++++- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 24 files changed, 67 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index f9bfae91..1b151036 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.6.1

+

RuoYi v3.6.2

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

- +

diff --git a/pom.xml b/pom.xml index 5c3faa98..0dff9dd2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.1 + 3.6.2 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 1cce9433..80ac6c97 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 95f754e2..5d666be9 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 089c2f4e..f34f85e4 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index af87db34..e55d04a0 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index efe0e0cd..fedae396 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index ca9221f7..f2f40fd3 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 3fa1beab..eb58942f 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 64db6acd..05960003 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index ed678502..8d6d8ee4 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 3137110b..412dc088 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 33e5cdcc..1d7002bc 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index c301179f..f48b9d99 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.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index b2f6649d..f4a60375 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index b8b532f8..dd18137e 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index b8943c8a..7e2b6e2d 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 343598f1..2745d7c4 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 9dc68090..f5f068e2 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 6f9451d3..46baaddb 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 1081c8ed..3eeec8af 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.6.1", + "version": "3.6.2", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 5c726919..a6f1630c 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -146,6 +146,47 @@ 更新日志 + +
    +
  1. 重置时取消部门选中
    2. +
  2. 新增返回警告消息提示
    3. +
  3. 忽略不必要的属性数据返回
    4. +
  4. 修改参数键名时移除前缓存配置
    5. +
  5. 开启TopNav没有子菜单隐藏侧边栏
    6. +
  6. 删除fuse无效选项maxPatternLength
    7. +
  7. 兼容Excel下拉框内容过多无法显示的问题
    8. +
  8. 修复文件上传组件格式验证问题
    9. +
  9. 修复回显数据字典数组异常问题
    10. +
  10. 修复sheet超出最大行数异常问题
    11. +
  11. 修复Log注解GET请求记录不到参数问题
    12. +
  12. 修复gateway流控规则生效但不显示问题
    13. +
  13. 修复主题颜色在Drawer组件不会加载问题
    14. +
  14. 修复调度日志点击多次数据不变化的问题
    15. +
  15. 修复用户编辑时角色和部门存在无法修改情况
    16. +
  16. 修复使用透明底png图片时，自动填充黑色背景
    17. +
  17. 修复table中更多按钮切换主题色未生效修复问题
    18. +
  18. 修复某些特性的环境生成代码变乱码TXT文件问题
    19. +
  19. 修复代码生成图片/文件/单选时选择必填无法校验问题
    20. +
  20. 升级spring-cloud到最新版2021.0.5
    21. +
  21. 升级spring-boot到最新版本2.7.7
    22. +
  22. 升级spring-boot-admin到最新版2.7.10
    23. +
  23. 升级kaptcha到最新版2.3.3
    24. +
  24. 升级druid到最新版本1.2.15
    25. +
  25. 升级fastjson到最新版2.0.22
    26. +
  26. 升级pagehelper到最新版1.4.6
    27. +
  27. 升级transmittable-thread-local到最新版本2.14.2
    28. +
  28. 升级echarts到最新版本5.4.0
    29. +
  29. 升级core-js到最新版本3.25.3
    30. +
  30. 升级element-ui到最新版本2.15.12
    31. +
  31. 移除commons-collections多余的依赖
    32. +
  32. 优化弹窗内容过多展示不全问题
    33. +
  33. 优化导出对象的子列表为空会出现[]问题
    34. +
  34. 优化字符未使用下划线不进行驼峰式处理
    35. +
  35. 优化nacos修改xss开关时同步过滤器验证
    36. +
  36. 优化修改头像在小屏幕上页面布局错位的问题
    37. +
  37. 其他细节优化
    38. +
+
  1. 数据逻辑删除不进行唯一验证
    2. @@ -798,7 +839,7 @@ export default { data() { return { // 版本号 - version: "3.6.1", + version: "3.6.2", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index d923a923..3376e646 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.1 + 3.6.2 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 89525e5c..16b78217 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.1 + 3.6.2 4.0.0 From da2e5a2d93d6f71dbd15f726862ec4c247f0d9f8 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 4 Feb 2023 22:44:29 +0800 Subject: [PATCH 08/46] update copyright 2023 --- ruoyi-ui/src/views/login.vue | 2 +- ruoyi-ui/src/views/register.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 074fecd3..cdae8dc7 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -56,7 +56,7 @@ diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue index d8ec3c18..e4f2df6f 100644 --- a/ruoyi-ui/src/views/register.vue +++ b/ruoyi-ui/src/views/register.vue @@ -61,7 +61,7 @@
    - Copyright © 2018-2022 ruoyi.vip All Rights Reserved. + Copyright © 2018-2023 ruoyi.vip All Rights Reserved.
    From 6c3e88ee6d40ef77d3f26d2fbe9dec2cf386fe8a Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 4 Feb 2023 22:45:01 +0800 Subject: [PATCH 09/46] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B5=E7=AD=BE?= =?UTF-8?q?=E5=8F=B3=E9=94=AE=E9=80=89=E6=8B=A9=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=B3=E9=97=AD=E5=B7=A6=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/layout/components/TagsView/index.vue | 2 +- ruoyi-ui/src/permission.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue index cbd9a253..d69f7ae2 100644 --- a/ruoyi-ui/src/layout/components/TagsView/index.vue +++ b/ruoyi-ui/src/layout/components/TagsView/index.vue @@ -87,7 +87,7 @@ export default { }, isFirstView() { try { - return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index' + return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath } catch (err) { return false } diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index a25437cc..8f54e995 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] +const whiteList = ['/login', '/register'] router.beforeEach((to, from, next) => { NProgress.start() From 3462c58ce41750633499379f0aa82a3b495a3396 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 16 Feb 2023 11:07:41 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=882.0.23?= 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 0dff9dd2..8d1cc42d 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.11.0 1.4 2.3 - 2.0.22 + 2.0.23 0.9.1 8.2.2 4.1.2 From 8dff14a6ccb9e57e94dcc2ef473acfdafb2f49ae Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 16 Feb 2023 11:10:00 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E8=80=97=E6=97=B6=E9=97=B4=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/domain/SysOperLog.java | 14 + .../ruoyi/common/log/aspect/LogAspect.java | 20 + .../ruoyi/common/security/auth/AuthUtil.java | 7 +- .../mapper/system/SysOperLogMapper.xml | 7 +- ruoyi-ui/src/views/system/operlog/index.vue | 18 +- sql/{ry_20220814.sql => ry_20230216.sql} | 1377 +++++++++-------- 6 files changed, 746 insertions(+), 697 deletions(-) rename sql/{ry_20220814.sql => ry_20230216.sql} (98%) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java index f3b54ff4..d815cb03 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java @@ -79,6 +79,10 @@ public class SysOperLog extends BaseEntity @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime; + /** 消耗时间 */ + @Excel(name = "消耗时间", suffix = "毫秒") + private Long costTime; + public Long getOperId() { return operId; @@ -238,4 +242,14 @@ public class SysOperLog extends BaseEntity { this.operTime = operTime; } + + public Long getCostTime() + { + return costTime; + } + + public void setCostTime(Long costTime) + { + this.costTime = costTime; + } } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index f6b3a328..7e3572fd 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -8,9 +8,11 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.NamedThreadLocal; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; @@ -40,9 +42,21 @@ public class LogAspect /** 排除敏感属性字段 */ public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; + /** 计算操作消耗时间 */ + private static final ThreadLocal TIME_THREADLOCAL = new NamedThreadLocal("Cost Time"); + @Autowired private AsyncLogService asyncLogService; + /** + * 处理请求前执行 + */ + @Before(value = "@annotation(controllerLog)") + public void boBefore(JoinPoint joinPoint, Log controllerLog) + { + TIME_THREADLOCAL.set(System.currentTimeMillis()); + } + /** * 处理完请求后执行 * @@ -96,6 +110,8 @@ public class LogAspect operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); // 处理设置注解上的参数 getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); + // 设置消耗时间 + operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get()); // 保存数据库 asyncLogService.saveSysLog(operLog); } @@ -105,6 +121,10 @@ public class LogAspect log.error("异常信息:{}", exp.getMessage()); exp.printStackTrace(); } + finally + { + TIME_THREADLOCAL.remove(); + } } /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java index f0738dfc..ac712c9e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java @@ -27,7 +27,7 @@ public class AuthUtil /** * 会话注销，根据指定Token * - * @param tokenValue 指定token + * @param token 指定token */ public static void logoutByToken(String token) { @@ -44,6 +44,9 @@ public class AuthUtil /** * 获取当前登录用户信息 + * + * @param token 指定token + * @return 用户信息 */ public static LoginUser getLoginUser(String token) { @@ -52,6 +55,8 @@ public class AuthUtil /** * 验证当前用户有效期 + * + * @param loginUser 用户信息 */ public static void verifyLoginUserExpire(LoginUser loginUser) { diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 1d3d5aab..9c1e374e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -20,16 +20,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time, cost_time from sys_oper_log - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())