From c2708f2ba4f3da914580ed2638fa84403b10226d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 30 Sep 2022 11:48:39 +0800
Subject: [PATCH] 若依 3.6.1
---
ruoyi-common/ruoyi-common-swagger/pom.xml | 2
ruoyi-modules/ruoyi-file/pom.xml | 2
ruoyi-common/ruoyi-common-seata/pom.xml | 2
ruoyi-modules/ruoyi-job/pom.xml | 2
ruoyi-ui/src/views/index.vue | 46 ++++++++++++++++++++++
ruoyi-auth/pom.xml | 2
ruoyi-visual/pom.xml | 2
pom.xml | 4 +-
ruoyi-modules/pom.xml | 2
ruoyi-common/pom.xml | 2
README.md | 5 +-
ruoyi-common/ruoyi-common-datascope/pom.xml | 2
ruoyi-common/ruoyi-common-security/pom.xml | 2
ruoyi-modules/ruoyi-gen/pom.xml | 2
ruoyi-ui/package.json | 2
ruoyi-gateway/pom.xml | 2
ruoyi-common/ruoyi-common-log/pom.xml | 2
ruoyi-modules/ruoyi-system/pom.xml | 2
ruoyi-visual/ruoyi-monitor/pom.xml | 2
ruoyi-api/pom.xml | 2
ruoyi-common/ruoyi-common-datasource/pom.xml | 2
ruoyi-api/ruoyi-api-system/pom.xml | 2
ruoyi-common/ruoyi-common-core/pom.xml | 2
ruoyi-common/ruoyi-common-redis/pom.xml | 2
24 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index 7c54893..3165e3f 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
<p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
</p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.1</h1>
<h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
<p align="center">
<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.0-brightgreen.svg"></a>
+ <a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.1-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p>
@@ -39,6 +39,7 @@
│ └── 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 9563d8d..4ed7439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.6.0</ruoyi.version>
+ <ruoyi.version>3.6.1</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index dd7c0f0..1cce943 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 583b63a..95f754e 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index d46e4b4..089c2f4 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 45cb03e..af87db3 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 7d62624..efe0e0c 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml
index 2a6d991..ca9221f 100644
--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
index 6fbfbb3..3fa1bea 100644
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index dc6967d..64db6ac 100644
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index bb7dfb9..ed67850 100644
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index 07efc5a..3137110 100644
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 69fbad1..33e5cdc 100644
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index 7262ee2..c301179 100644
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 2aaa5de..f214aa1 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 8444243..b8b532f 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 2f1abe3..b8943c8 100644
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index a51984b..4456d32 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 97c47c6..9dc6809 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 545e833..6f9451d 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index b5a2acc..fc70328 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 1d04666..1fe0676 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,50 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.6.1 - 2022-10-01">
+ <ol>
+ <li>数据逻辑删除不进行唯一验证</li>
+ <li>支持多权限字符匹配角色数据权限</li>
+ <li>页面内嵌iframe切换tab不刷新数据</li>
+ <li>新增密码最大错误次数/锁定时间</li>
+ <li>登录日志新增解锁账户功能</li>
+ <li>通用下载方法新增config配置选项</li>
+ <li>操作日志记录支持排除敏感属性字段</li>
+ <li>Excel注解支持导出对象的子列表方法</li>
+ <li>Excel注解支持自定义隐藏属性列</li>
+ <li>Excel注解支持backgroundColor属性设置背景色</li>
+ <li>升级spring-cloud-alibaba到最新版2021.0.4.0</li>
+ <li>升级spring-cloud到最新版2021.0.4</li>
+ <li>升级spring-boot到最新版本2.7.3</li>
+ <li>升级spring-boot-admin到最新版2.7.5</li>
+ <li>升级seata到最新版1.5.2</li>
+ <li>升级druid到最新版本1.2.12</li>
+ <li>升级fastjson到最新版2.0.14</li>
+ <li>升级pagehelper到最新版1.4.5</li>
+ <li>升级core-js到最新版本3.25.2</li>
+ <li>升级dynamic-ds到最新版本3.5.2</li>
+ <li>升级element-ui到最新版本2.15.10</li>
+ <li>修复多文件上传报错出现的异常问题</li>
+ <li>修复图片预览组件src属性为null值控制台报错问题</li>
+ <li>修复使用FastDFS上传头像失败提示文件名没有后缀问题</li>
+ <li>优化seata单独依赖模块</li>
+ <li>优化任务过期不执行调度</li>
+ <li>优化字典数据使用store存取</li>
+ <li>优化代码生成同步后值NULL问题</li>
+ <li>优化定时任务支持执行父类方法</li>
+ <li>优化修改资料头像被覆盖的问题</li>
+ <li>优化修改用户登录账号重复验证</li>
+ <li>优化用户个人信息接口防止修改部门</li>
+ <li>优化布局设置使用el-drawer抽屉显示</li>
+ <li>优化日志注解记录限制请求地址的长度</li>
+ <li>优化导入更新用户数据前校验数据权限</li>
+ <li>优化excel/scale属性导出单元格数值类型</li>
+ <li>优化日志操作中重置按钮时重复查询的问题</li>
+ <li>优化多个相同角色数据导致权限SQL重复问题</li>
+ <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
+ <li>其他细节优化</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.6.0 - 2022-07-16">
<ol>
<li>Excel注解支持color字体颜色</li>
@@ -754,7 +798,7 @@
data() {
return {
// 版本号
- version: "3.6.0",
+ version: "3.6.1",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 32c829c..d923a92 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index 7a5bdcb..89525e5 100644
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-visual</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
Gitblit v1.9.3