diff --git a/README.md b/README.md
index 7c548931..3165e3fc 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-RuoYi v3.6.0
+RuoYi v3.6.1
基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构
-
+
@@ -39,6 +39,7 @@ com.ruoyi
│ └── ruoyi-common-datasource // 多数据源
│ └── ruoyi-common-log // 日志记录
│ └── ruoyi-common-redis // 缓存服务
+│ └── ruoyi-common-seata // 分布式事务
│ └── ruoyi-common-security // 安全模块
│ └── ruoyi-common-swagger // 系统接口
├── ruoyi-modules // 业务模块
diff --git a/pom.xml b/pom.xml
index 9563d8d4..4ed74390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
ruoyi
http://www.ruoyi.vip
若依微服务系统
- 3.6.0
+ 3.6.1
UTF-8
UTF-8
1.8
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index dd7c0f08..1cce9433 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 583b63a7..95f754e2 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index d46e4b4c..089c2f4e 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 45cb03eb..af87db34 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 7d62624a..efe0e0cd 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml
index 2a6d991e..ca9221f7 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
index 6fbfbb3f..3fa1beab 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index dc6967d1..64db6acd 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index bb7dfb93..ed678502 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index 07efc5a6..3137110b 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 69fbad15..33e5cdcc 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index 7262ee2d..c301179f 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 2aaa5dea..f214aa15 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 84442430..b8b532f8 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 2f1abe3a..b8943c8a 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index a51984ba..4456d324 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 97c47c63..9dc68090 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 545e833b..6f9451d3 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.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index b5a2acc9..fc703286 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.6.0",
+ "version": "3.6.1",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 1d046666..1fe06763 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,50 @@
更新日志
+
+
+ - 数据逻辑删除不进行唯一验证
+ - 支持多权限字符匹配角色数据权限
+ - 页面内嵌iframe切换tab不刷新数据
+ - 新增密码最大错误次数/锁定时间
+ - 登录日志新增解锁账户功能
+ - 通用下载方法新增config配置选项
+ - 操作日志记录支持排除敏感属性字段
+ - Excel注解支持导出对象的子列表方法
+ - Excel注解支持自定义隐藏属性列
+ - Excel注解支持backgroundColor属性设置背景色
+ - 升级spring-cloud-alibaba到最新版2021.0.4.0
+ - 升级spring-cloud到最新版2021.0.4
+ - 升级spring-boot到最新版本2.7.3
+ - 升级spring-boot-admin到最新版2.7.5
+ - 升级seata到最新版1.5.2
+ - 升级druid到最新版本1.2.12
+ - 升级fastjson到最新版2.0.14
+ - 升级pagehelper到最新版1.4.5
+ - 升级core-js到最新版本3.25.2
+ - 升级dynamic-ds到最新版本3.5.2
+ - 升级element-ui到最新版本2.15.10
+ - 修复多文件上传报错出现的异常问题
+ - 修复图片预览组件src属性为null值控制台报错问题
+ - 修复使用FastDFS上传头像失败提示文件名没有后缀问题
+ - 优化seata单独依赖模块
+ - 优化任务过期不执行调度
+ - 优化字典数据使用store存取
+ - 优化代码生成同步后值NULL问题
+ - 优化定时任务支持执行父类方法
+ - 优化修改资料头像被覆盖的问题
+ - 优化修改用户登录账号重复验证
+ - 优化用户个人信息接口防止修改部门
+ - 优化布局设置使用el-drawer抽屉显示
+ - 优化日志注解记录限制请求地址的长度
+ - 优化导入更新用户数据前校验数据权限
+ - 优化excel/scale属性导出单元格数值类型
+ - 优化日志操作中重置按钮时重复查询的问题
+ - 优化多个相同角色数据导致权限SQL重复问题
+ - 优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出)
+ - 其他细节优化
+
+
- Excel注解支持color字体颜色
@@ -754,7 +798,7 @@ export default {
data() {
return {
// 版本号
- version: "3.6.0",
+ version: "3.6.1",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 32c829c5..d923a923 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 3.6.0
+ 3.6.1
4.0.0
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index 7a5bdcb4..89525e5c 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.0
+ 3.6.1
4.0.0