From d14f27e5eb3a804fa1c1f6cb5d471b63ed80f57a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 11 Apr 2022 09:02:50 +0800
Subject: [PATCH] 若依 3.5.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 | 41 +++++++++++++++++++-
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 | 8 +++
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, 69 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index b41921a..662d6e7 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.4.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.5.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.4.0-brightgreen.svg"></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/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 bd31d83..83ea190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.4.0</ruoyi.version>
+ <ruoyi.version>3.5.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 40806b4..2f056f2 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.4.0</version>
+ <version>3.5.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 0124a3d..6628eea 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 14469b1..ee36ebc 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 3b95898..64e7018 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.4.0</version>
+ <version>3.5.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 faa871a..8f30556 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.4.0</version>
+ <version>3.5.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 44c7db2..49e678f 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.4.0</version>
+ <version>3.5.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 491cee5..178c5a6 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.4.0</version>
+ <version>3.5.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 5dc1f8e..5770505 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.4.0</version>
+ <version>3.5.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 fa52ad2..a9b1f2f 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.4.0</version>
+ <version>3.5.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 c855032..61b98a5 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.4.0</version>
+ <version>3.5.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 df5c28b..18f3e7b 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index fc1d58c..c2a308a 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -57,6 +57,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+
+ <!-- SpringCloud Loadbalancer -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-loadbalancer</artifactId>
+ </dependency>
<!--验证码 -->
<dependency>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 8387115..ed1eec0 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.4.0</version>
+ <version>3.5.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 b9dcebf..1250262 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.4.0</version>
+ <version>3.5.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 29ecfa6..4a9bd40 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.4.0</version>
+ <version>3.5.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 0888eec..dfefc57 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.4.0</version>
+ <version>3.5.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 a17fcf3..c3199bb 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 9043a94..9ea0899 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.4.0",
+ "version": "3.5.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index e439bb8..d2194c0 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -41,7 +41,7 @@
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>若依后台管理框架</h2>
<p>
- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+ 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
@@ -146,6 +146,43 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.5.0 - 2022-04-11">
+ <ol>
+ <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
+ <li>侧边栏菜单名称过长悬停显示标题</li>
+ <li>用户访问控制时校验数据权限，防止越权</li>
+ <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
+ <li>组件ImageUpload支持多图同时选择上传</li>
+ <li>组件FileUpload支持多文件同时选择上传</li>
+ <li>代码生成树表新增(展开/折叠)</li>
+ <li>代码生成子表支持日期/字典配置</li>
+ <li>代码生成编辑修改打开新页签</li>
+ <li>添加页签openPage支持传递参数</li>
+ <li>添加清理分页的线程变量方法</li>
+ <li>修改npm即将过期的注册源地址</li>
+ <li>用户缓存信息添加部门ancestors祖级列表</li>
+ <li>升级spring-cloud到最新版2021.0.1</li>
+ <li>升级spring-boot到最新版本2.6.6</li>
+ <li>升级spring-boot-admin到最新版2.6.6</li>
+ <li>升级spring-boot-mybatis到最新版2.2.2</li>
+ <li>降级jsencrypt版本兼容IE浏览器</li>
+ <li>修复分页组件请求两次问题</li>
+ <li>修复表单清除元素位置未垂直居中问题</li>
+ <li>修复Excel注解prompt/combo同时使用不生效问题</li>
+ <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
+ <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
+ <li>修复Xss注解字段值为空时的异常问题</li>
+ <li>优化IP地址获取到多个的问题</li>
+ <li>优化文件上传兼容Weblogic环境</li>
+ <li>代码生成同步保留必填/类型选项</li>
+ <li>优化Excel格式化不同类型的日期对象</li>
+ <li>优化菜单表关键字导致的插件报错问题</li>
+ <li>优化Oracle用户头像列为空时不显示问题</li>
+ <li>优化页面若未匹配到字典标签则返回原字典值</li>
+ <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
+ <li>其他细节优化</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.4.0 - 2022-01-24">
<ol>
<li>新增Vue3前端代码生成模板</li>
@@ -679,7 +716,7 @@
data() {
return {
// 版本号
- version: "3.4.0",
+ version: "3.5.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index cea2ff1..de92bd5 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.4.0</version>
+ <version>3.5.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 42b662e..1fee5ac 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
Gitblit v1.9.3