From 87009e72bf8634c6c4848b6f0ef882be3bddd8cf Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 16 Jul 2022 10:34:02 +0800
Subject: [PATCH] 若依 3.6.0
---
ruoyi-common/ruoyi-common-swagger/pom.xml | 2
ruoyi-modules/ruoyi-file/pom.xml | 2
ruoyi-modules/ruoyi-job/pom.xml | 2
ruoyi-ui/src/views/index.vue | 40 +++++++++++++++++++
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 | 4 +-
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
23 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 5554f5b..7c54893 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.5.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.0</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.5.0-brightgreen.svg"></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/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p>
diff --git a/pom.xml b/pom.xml
index 2a24791..822fe8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.5.0</ruoyi.version>
+ <ruoyi.version>3.6.0</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 2f056f2..dd7c0f0 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.5.0</version>
+ <version>3.6.0</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 6628eea..583b63a 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index ee36ebc..d46e4b4 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 64e7018..7696932 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.5.0</version>
+ <version>3.6.0</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 c37444f..7d62624 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.5.0</version>
+ <version>3.6.0</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 49e678f..2a6d991 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.5.0</version>
+ <version>3.6.0</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 178c5a6..bf25868 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.5.0</version>
+ <version>3.6.0</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 5770505..dc6967d 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.5.0</version>
+ <version>3.6.0</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 a9b1f2f..bb7dfb9 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.5.0</version>
+ <version>3.6.0</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 61b98a5..69fbad1 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.5.0</version>
+ <version>3.6.0</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 18f3e7b..7262ee2 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index c2a308a..2aaa5de 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index ed1eec0..8444243 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 1250262..2f1abe3 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index 4a9bd40..a51984b 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index dfefc57..97c47c6 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index c3199bb..545e833 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 1b3ddfd..3871a51 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.5.0",
+ "version": "3.6.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index d2ff7b5..1d04666 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,44 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.6.0 - 2022-07-16">
+ <ol>
+ <li>Excel注解支持color字体颜色</li>
+ <li>用户头像上传限制只能为图片格式</li>
+ <li>检查定时任务bean所在包名是否为白名单配置</li>
+ <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
+ <li>升级spring-cloud-alibaba到最新版2021.0.1.0</li>
+ <li>升级spring-cloud到最新版2021.0.3</li>
+ <li>升级spring-boot到最新版本2.7.1</li>
+ <li>升级spring-boot-admin到最新版2.7.2</li>
+ <li>升级seata到最新版1.5.1</li>
+ <li>升级pagehelper到最新版1.4.3</li>
+ <li>升级dynamic-ds到最新版本3.5.1</li>
+ <li>升级fastjson到最新版2.0.9</li>
+ <li>升级druid到最新版本1.2.11</li>
+ <li>升级transmittable-thread-local到最新版本2.13.2</li>
+ <li>升级element-ui到最新版本2.15.9</li>
+ <li>修复字典数据显示不全问题</li>
+ <li>修复操作日志查询类型条件为0时会查到所有数据</li>
+ <li>优化验证码开关变量名</li>
+ <li>优化设置分页参数默认值</li>
+ <li>优化对空字符串参数处理的过滤</li>
+ <li>优化Maven使用阿里云镜像站加速</li>
+ <li>优化用户列表查询不显示密码字段</li>
+ <li>优化表单构建按钮不显示正则校验</li>
+ <li>优化字典类型删除多余的mapper注解</li>
+ <li>优化字典数据回显样式下拉框显示值</li>
+ <li>优化用户管理左侧树型组件增加选中高亮保持</li>
+ <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
+ <li>优化数据监控Spring Security权限认证过时代码</li>
+ <li>优化岗位长主键溢出问题将查询返回类型改为Long</li>
+ <li>优化删除无用admin-client依赖声明，避免造成误解</li>
+ <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
+ <li>优化获取body请求数据缓存过滤器CacheRequestFilter</li>
+ <li>优化网关通过注解解决循环引用及Bean重复问题删除allow配置</li>
+ <li>其他细节优化</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.5.0 - 2022-04-11">
<ol>
<li>开启TopNav没有子菜单情况隐藏侧边栏</li>
@@ -716,7 +754,7 @@
data() {
return {
// 版本号
- version: "3.5.0",
+ version: "3.6.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index de92bd5..32c829c 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index 1fee5ac..7a5bdcb 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
Gitblit v1.9.3