diff --git a/README.md b/README.md
index ff9fd8fa..42edf430 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
<p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
</p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.5</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.6</h1>
<h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
<p align="center">
<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.5-brightgreen.svg"></a>
+ <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.6-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p>
@@ -21,7 +21,6 @@
* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。
* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
-* 特别鸣谢：[element](https://github.com/ElemeFE/element)，[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://github.com/elunez/eladmin-web)。
* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)
* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)
diff --git a/pom.xml b/pom.xml
index 2872f295..fb1d612c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.8.5</ruoyi.version>
+ <ruoyi.version>3.8.6</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-admin/pom.xml b/ruoyi-admin/pom.xml
index 9a4cde8f..5b8a4384 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index be2b4b20..4d681515 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.8.5
+ version: 3.8.6
# 版权年份
copyrightYear: 2023
# 实例演示开关
@@ -62,7 +62,6 @@ spring:
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
-
# 服务模块
devtools:
restart:
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index a517e267..35e34b7b 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index f02006bf..90e29185 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
index 20a0dda4..859a7824 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
@@ -14,7 +14,7 @@ public class DynamicDataSourceContextHolder
/**
* 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本，
- * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
+ * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
*/
private static final ThreadLocal<String> CONTEXT_HOLDER = new ThreadLocal<>();
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 094e33d8..cea4f67e 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index 4544c8c2..1aeec14e 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -1,5 +1,5 @@
# 代码生成
-gen:
+gen:
# 作者
author: ruoyi
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 6b8de13e..b1c7b3ea 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 7a5bc23a..c5940f77 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index ad7d78a5..255259db 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.8.5",
+ "version": "3.8.6",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-ui/src/assets/images/pay.png b/ruoyi-ui/src/assets/images/pay.png
new file mode 100644
index 00000000..bb8b9672
Binary files /dev/null and b/ruoyi-ui/src/assets/images/pay.png differ
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index b726f7ba..e53f1da5 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.8.6 - 2023-06-30">
+ <ol>
+ <li>支持登录IP黑名单限制</li>
+ <li>新增监控页面图标显示</li>
+ <li>操作日志新增消耗时间属性</li>
+ <li>屏蔽定时任务bean违规的字符</li>
+ <li>日志管理使用索引提升查询性能</li>
+ <li>日志注解支持排除指定的请求参数</li>
+ <li>支持自定义隐藏属性列过滤子对象</li>
+ <li>升级oshi到最新版本6.4.3</li>
+ <li>升级druid到最新版本1.2.16</li>
+ <li>升级fastjson到最新版2.0.34</li>
+ <li>升级spring-boot到最新版本2.5.15</li>
+ <li>升级element-ui到最新版本2.15.13</li>
+ <li>移除apache/commons-fileupload依赖</li>
+ <li>修复页面切换时布局错乱的问题</li>
+ <li>修复匿名注解Anonymous空指针问题</li>
+ <li>修复路由跳转被阻止时内部产生报错信息问题</li>
+ <li>修复isMatchedIp的参数判断产生空指针的问题</li>
+ <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
+ <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
+ <li>修复DictTag组件value没有匹配的值时则展示value</li>
+ <li>优化文件下载出现的异常</li>
+ <li>优化选择图标组件高亮回显</li>
+ <li>优化弹窗后导航栏偏移的问题</li>
+ <li>优化修改密码日志存储明文问题</li>
+ <li>优化页签栏关闭其他出现的异常问题</li>
+ <li>优化页签关闭左侧选项排除首页选项</li>
+ <li>优化关闭当前tab页跳转最右侧tab页</li>
+ <li>优化缓存列表清除操作提示不变的问题</li>
+ <li>优化字符未使用下划线不进行驼峰式处理</li>
+ <li>优化用户导入更新时需获取用户编号问题</li>
+ <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
+ <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
+ <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
+ <li>其他细节优化</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.8.5 - 2023-01-01">
<ol>
<li>定时任务违规的字符</li>
@@ -888,7 +926,7 @@
</div>
<div class="body">
<img
- src="http://ruoyi.vip/images/pay.png"
+ src="@/assets/images/pay.png"
alt="donate"
width="100%"
/>
@@ -908,7 +946,7 @@ export default {
data() {
return {
// 版本号
- version: "3.8.5"
+ version: "3.8.6"
};
},
methods: {