From fab58a4f779bb7adcab132f0e2b370bf364865bc 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: Sat, 29 May 2021 19:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=202.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/api/system/config.js | 6 +-
ruoyi-ui/src/api/system/dict/type.js | 6 +-
ruoyi-ui/src/views/index.vue | 13 +-
ruoyi-ui/src/views/system/config/index.vue | 14 +-
ruoyi-ui/src/views/system/dict/index.vue | 14 +-
.../com/ruoyi/common/utils/DictUtils.java | 10 +
.../framework/aspectj/DataScopeAspect.java | 41 +-
.../system/mapper/SysDictDataMapper.java | 10 +
.../system/service/ISysConfigService.java | 16 +-
.../system/service/ISysDictDataService.java | 2 +-
.../system/service/ISysDictTypeService.java | 16 +-
.../service/impl/SysConfigServiceImpl.java | 337 ++++++++--------
.../service/impl/SysDictDataServiceImpl.java | 184 ++++-----
.../service/impl/SysDictTypeServiceImpl.java | 374 +++++++++---------
.../system/SysConfigController.java | 13 +-
.../system/SysDictDataController.java | 5 +-
.../system/SysDictTypeController.java | 13 +-
ruoyi/src/main/resources/application-dev.yml | 2 +-
.../resources/mapper/system/SysDeptMapper.xml | 13 +-
.../resources/mapper/system/SysRoleMapper.xml | 10 +-
.../resources/mapper/system/SysUserMapper.xml | 10 +-
22 files changed, 609 insertions(+), 502 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 4bdce363d..e951b8d64 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.2.0",
+ "version": "2.2.1",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",
diff --git a/ruoyi-ui/src/api/system/config.js b/ruoyi-ui/src/api/system/config.js
index aff093d43..4c5cb6b8d 100644
--- a/ruoyi-ui/src/api/system/config.js
+++ b/ruoyi-ui/src/api/system/config.js
@@ -51,10 +51,10 @@ export function delConfig(configId) {
})
}
-// 清理参数缓存
-export function clearCache() {
+// 刷新参数缓存
+export function refreshCache() {
return request({
- url: '/system/config/clearCache',
+ url: '/system/config/refreshCache',
method: 'delete'
})
}
diff --git a/ruoyi-ui/src/api/system/dict/type.js b/ruoyi-ui/src/api/system/dict/type.js
index 37034d2fc..2f0532da7 100644
--- a/ruoyi-ui/src/api/system/dict/type.js
+++ b/ruoyi-ui/src/api/system/dict/type.js
@@ -43,10 +43,10 @@ export function delType(dictId) {
})
}
-// 清理参数缓存
-export function clearCache() {
+// 刷新字典缓存
+export function refreshCache() {
return request({
- url: '/system/dict/type/clearCache',
+ url: '/system/dict/type/refreshCache',
method: 'delete'
})
}
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 9e07ee96c..8dc506003 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -80,6 +80,17 @@
更新日志
+
+
+ - add 增加 security 权限框架 @Async 异步注解配置
+ - update 优化数据权限sql 解决MP apply注入附带 AND 语法问题
+ - update 优化dataScope参数防止注入
+ - update 优化参数&字典缓存操作
+ - update 增加修改包名文档
+ - update 文档增加演示图例
+ - fix 修复部门类sql符号错误
+
+
- 同步升级 RuoYi-Vue 3.5.0
@@ -180,7 +191,7 @@ export default {
data() {
return {
// 版本号
- version: "2.2.0",
+ version: "2.2.1",
};
},
methods: {
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index 5198b0033..4d6f7ae62 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -99,9 +99,9 @@
plain
icon="el-icon-refresh"
size="mini"
- @click="handleClearCache"
+ @click="handleRefreshCache"
v-hasPermi="['system:config:remove']"
- >清理缓存
+ >刷新缓存
@@ -181,7 +181,7 @@