diff --git a/pom.xml b/pom.xml
index b9d170b7..d8411e49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi
- 3.2.1
+ 3.3.0
ruoyi
http://www.ruoyi.vip
若依管理系统
- 3.2.1
+ 3.3.0
UTF-8
UTF-8
1.8
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3257d8cf..febca040 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
jar
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 31b95c6c..8c4b983c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
- version: 3.2.1
+ version: 3.3.0
# 版权年份
copyrightYear: 2020
# 实例演示开关
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 35adaa31..8d4f57b4 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index ed91f2ec..22a610db 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -1,11 +1,13 @@
package com.ruoyi.common.core.redis;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -136,10 +138,15 @@ public class RedisCache
* @param dataSet 缓存的数据
* @return 缓存数据的对象
*/
- public long setCacheSet(final String key, final Set dataSet)
+ public BoundSetOperations setCacheSet(final String key, final Set dataSet)
{
- Long count = redisTemplate.opsForSet().add(key, dataSet);
- return count == null ? 0 : count;
+ BoundSetOperations setOperation = redisTemplate.boundSetOps(key);
+ Iterator it = dataSet.iterator();
+ while (it.hasNext())
+ {
+ setOperation.add(it.next());
+ }
+ return setOperation;
}
/**
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 9be2f341..969197a6 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 58abab13..8a768f25 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 15a5bc20..a6068a62 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index ef2cd722..cddc6a3a 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.2.1
+ 3.3.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 14b1df8b..cb10a631 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.2.1",
+ "version": "3.3.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
@@ -44,6 +44,7 @@
"element-ui": "2.14.1",
"file-saver": "2.0.4",
"fuse.js": "6.4.3",
+ "highlight.js": "10.4.1",
"js-beautify": "1.13.0",
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 71bab79e..678431ff 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -18,8 +18,11 @@ import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
-//自定义表格工具扩展
+// 自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar"
+// 代码高亮插件
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github-gist.css'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
@@ -49,6 +52,7 @@ Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
Vue.use(permission)
+Vue.use(hljs.vuePlugin);
/**
* If you don't want to use mock-server
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 55f34391..91667f54 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,64 @@
更新日志
+
+
+ - 新增缓存监控功能
+ - 支持主题风格配置
+ - 修复多级菜单之间切换无法缓存的问题
+ - 多级菜单自动配置组件
+ - 代码生成预览支持高亮显示
+ - 支持Get请求映射Params参数
+ - 删除用户和角色解绑关联
+ - 去除用户手机邮箱部门必填验证
+ - Excel支持注解align对齐方式
+ - Excel支持导入Boolean型数据
+ - 优化头像样式,鼠标移入悬停遮罩
+ - 代码生成预览提供滚动机制
+ - 代码生成删除多余的数字float类型
+ - 修正转换字符串的目标字符集属性
+ - 回显数据字典防止空值报错
+ - 日志记录增加过滤多文件场景
+ - 修改缓存Set方法可能导致嵌套的问题
+ - 移除前端一些多余的依赖
+ - 防止安全扫描YUI出现的风险提示
+ - 修改node-sass为dart-sass
+ - 升级SpringBoot到最新版本2.1.18
+ - 升级poi到最新版本4.1.2
+ - 升级oshi到最新版本v5.3.6
+ - 升级bitwalker到最新版本1.21
+ - 升级axios到最新版本0.21.0
+ - 升级element-ui到最新版本2.14.1
+ - 升级vue到最新版本2.6.12
+ - 升级vuex到最新版本3.6.0
+ - 升级vue-cli到版本4.5.9
+ - 升级vue-router到最新版本3.4.9
+ - 升级vue-cli到最新版本4.4.6
+ - 升级vue-cropper到最新版本0.5.5
+ - 升级clipboard到最新版本2.0.6
+ - 升级core-js到最新版本3.8.1
+ - 升级echarts到最新版本4.9.0
+ - 升级file-saver到最新版本2.0.4
+ - 升级fuse.js到最新版本6.4.3
+ - 升级js-beautify到最新版本1.13.0
+ - 升级js-cookie到最新版本2.2.1
+ - 升级path-to-regexp到最新版本6.2.0
+ - 升级quill到最新版本1.3.7
+ - 升级screenfull到最新版本5.0.2
+ - 升级sortablejs到最新版本1.10.2
+ - 升级vuedraggable到最新版本2.24.3
+ - 升级chalk到最新版本4.1.0
+ - 升级eslint到最新版本7.15.0
+ - 升级eslint-plugin-vue到最新版本7.2.0
+ - 升级lint-staged到最新版本10.5.3
+ - 升级runjs到最新版本4.4.2
+ - 升级sass-loader到最新版本10.1.0
+ - 升级script-ext-html-webpack-plugin到最新版本2.1.5
+ - 升级svg-sprite-loader到最新版本5.1.1
+ - 升级vue-template-compiler到最新版本2.6.12
+ - 其他细节优化
+
+
- 阻止任意文件下载漏洞
@@ -435,7 +493,7 @@ export default {
data() {
return {
// 版本号
- version: "3.2.1",
+ version: "3.3.0",
};
},
methods: {
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 828bb1fb..a5792bfa 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -91,21 +91,21 @@
align="center"
prop="tableName"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
@@ -159,13 +159,13 @@
-
- {{ value }}
+
@@ -177,6 +177,7 @@
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import importTable from "./importTable";
import { downLoadZip } from "@/utils/zipdownload";
+
export default {
name: "Gen",
components: { importTable },