From a6f62ca86f1800216a575235e2d402b4d2c1f362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 25 Sep 2023 10:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=83=20=E5=8F=91=E5=B8=83=204.8.1=20?= =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7=E5=A2=9E=E5=BC=BA=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-monitor-admin.run.xml | 2 +- .run/ruoyi-server.run.xml | 2 +- .run/ruoyi-xxl-job-admin.run.xml | 2 +- README.md | 2 +- pom.xml | 18 ++--- ruoyi-extend/pom.xml | 2 +- ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +- ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 2 +- ruoyi-ui-vue3/package.json | 4 +- .../src/components/DictTag/index.vue | 38 +++++------ ruoyi-ui-vue3/src/components/TopNav/index.vue | 38 ++++++++--- .../src/layout/components/Navbar.vue | 2 +- .../src/layout/components/TagsView/index.vue | 4 +- ruoyi-ui-vue3/src/settings.js | 2 +- ruoyi-ui-vue3/src/views/index.vue | 2 +- ruoyi-ui-vue3/src/views/register.vue | 24 +++---- ruoyi-ui-vue3/src/views/system/dict/data.vue | 8 +-- .../src/views/system/user/profile/index.vue | 2 +- ruoyi-ui-vue3/vite/plugins/setup-extend.js | 4 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/components/DictTag/index.vue | 43 ++++++------ ruoyi-ui/src/components/TopNav/index.vue | 20 +++--- ruoyi-ui/src/store/modules/dict.js | 2 +- ruoyi-ui/src/views/index.vue | 2 +- ruoyi-ui/src/views/system/dict/data.vue | 4 +- .../src/views/system/user/profile/index.vue | 2 +- .../views/system/user/profile/userAvatar.vue | 5 -- ruoyi/pom.xml | 2 +- .../com/ruoyi/common/config/RuoYiConfig.java | 16 ----- .../ruoyi/common/constant/UserConstants.java | 10 +++ .../common/core/mapper/BaseMapperPlus.java | 8 +-- .../encrypt/encryptor/AesEncryptor.java | 26 ++----- .../encrypt/encryptor/Base64Encryptor.java | 6 +- .../encrypt/encryptor/RsaEncryptor.java | 15 ++-- .../encrypt/encryptor/Sm2Encryptor.java | 15 ++-- .../encrypt/encryptor/Sm4Encryptor.java | 24 ++----- .../ruoyi/common/excel/ExcelDownHandler.java | 29 ++++---- .../com/ruoyi/common/utils/EncryptUtils.java | 68 +++++++++++++++++++ .../com/ruoyi/common/utils/StreamUtils.java | 3 - .../com/ruoyi/common/utils/poi/ExcelUtil.java | 6 +- .../ruoyi/common/utils/redis/QueueUtils.java | 52 ++++++++++++++ .../demo/controller/RedisCacheController.java | 2 +- .../queue/BoundedQueueController.java | 6 +- .../queue/PriorityQueueController.java | 6 +- .../com/ruoyi/demo/mapper/TestDemoMapper.java | 2 +- .../ruoyi/framework/config/SaTokenConfig.java | 2 +- ...waggerConfig.java => SpringDocConfig.java} | 21 +++--- ...operties.java => SpringDocProperties.java} | 4 +- .../encrypt/MybatisDecryptInterceptor.java | 3 +- .../encrypt/MybatisEncryptInterceptor.java | 3 +- .../web/exception/GlobalExceptionHandler.java | 22 ++++-- .../ruoyi/system/mapper/SysRoleMapper.java | 6 +- .../ruoyi/system/service/SysLoginService.java | 6 +- .../service/impl/SysDeptServiceImpl.java | 2 + .../service/impl/SysPostServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 5 +- .../controller/system/SysDeptController.java | 9 ++- .../controller/system/SysPostController.java | 7 +- .../system/SysProfileController.java | 4 +- .../controller/system/SysUserController.java | 11 ++- ruoyi/src/main/resources/application-dev.yml | 4 +- ruoyi/src/main/resources/application-prod.yml | 4 +- ruoyi/src/main/resources/application.yml | 25 +++---- .../resources/mapper/system/SysRoleMapper.xml | 1 + ruoyi/src/main/resources/vm/java/vo.java.vm | 4 +- .../main/resources/vm/vue/index-tree.vue.vm | 2 +- .../resources/vm/vue/v3/index-tree.vue.vm | 2 +- script/docker/docker-compose.yml | 8 +-- 68 files changed, 409 insertions(+), 284 deletions(-) rename ruoyi/src/main/java/com/ruoyi/framework/config/{SwaggerConfig.java => SpringDocConfig.java} (86%) rename ruoyi/src/main/java/com/ruoyi/framework/config/properties/{SwaggerProperties.java => SpringDocProperties.java} (95%) diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml index b2bf329bb..fc7e8a34f 100644 --- a/.run/ruoyi-monitor-admin.run.xml +++ b/.run/ruoyi-monitor-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml index 7dc652824..394b23a7e 100644 --- a/.run/ruoyi-server.run.xml +++ b/.run/ruoyi-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml index 47b662a58..2aeab19ed 100644 --- a/.run/ruoyi-xxl-job-admin.run.xml +++ b/.run/ruoyi-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/README.md b/README.md index 7f3782076..2d8cb9677 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/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-4.8.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.8.1-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7-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 cff442a16..26e270bae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,15 +6,15 @@ com.ruoyi ruoyi-vue-plus - 4.8.0 + 4.8.1 RuoYi-Vue-Plus https://gitee.com/dromara/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 4.8.0 - 2.7.13 + 4.8.1 + 2.7.16 UTF-8 UTF-8 1.8 @@ -22,20 +22,20 @@ 2.2.2 1.6.15 5.2.3 - 3.3.1 + 3.3.2 2.3 - 1.35.0.RC - 3.5.3.1 + 1.36.0 + 3.5.3.2 3.9.1 - 5.8.18 + 5.8.20 4.10.0 - 2.7.10 + 2.7.11 3.20.1 2.2.3 3.5.2 2.14.2 2.4.0 - 1.18.26 + 1.18.30 1.72 2.7.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index 3fc1c3722..6f35db8af 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.8.0 + 4.8.1 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 7f614985b..b06929f55 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 - 4.8.0 + 4.8.1 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 558c3b067..85b050b71 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 - 4.8.0 + 4.8.1 ruoyi-xxl-job-admin jar diff --git a/ruoyi-ui-vue3/package.json b/ruoyi-ui-vue3/package.json index b570f1c64..bd03f605b 100644 --- a/ruoyi-ui-vue3/package.json +++ b/ruoyi-ui-vue3/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "4.8.0", + "version": "4.8.1", "description": "RuoYi-Vue-Plus后台管理系统", "author": "LionLi", "license": "MIT", @@ -38,6 +38,6 @@ "vite": "3.2.3", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", - "vite-plugin-vue-setup-extend": "0.4.0" + "unplugin-vue-setup-extend-plus": "0.4.9" } } diff --git a/ruoyi-ui-vue3/src/components/DictTag/index.vue b/ruoyi-ui-vue3/src/components/DictTag/index.vue index 3b9511796..7d0888cf0 100644 --- a/ruoyi-ui-vue3/src/components/DictTag/index.vue +++ b/ruoyi-ui-vue3/src/components/DictTag/index.vue @@ -3,7 +3,7 @@