Merge remote-tracking branch 'origin/dev' into satoken
This commit is contained in:
疯狂的狮子li
commit
948ad86049
@ -4,7 +4,7 @@
|
||||
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
|
||||
[](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
|
||||
<br>
|
||||
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
|
||||
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
|
||||
[]()
|
||||
[]()
|
||||
[]()
|
||||
@ -24,6 +24,7 @@
|
||||
| 后端开发框架 | SpringBoot | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn) | |
|
||||
| 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 XNIO 的高性能容器 |
|
||||
| 权限认证框架 | Spring Security、Jwt | [SpringSecurity官网](https://spring.io/projects/spring-security#learn) | 支持多终端认证系统 |
|
||||
| 权限认证框架 | Sa-Token、Jwt | [Sa-Token官网](https://sa-token.dev33.cn/) | 强解耦、强扩展 |
|
||||
| 关系数据库 | MySQL | [MySQL官网](https://dev.mysql.com/) | 适配 8.X 最低 5.7 |
|
||||
| 缓存数据库 | Redis | [Redis官网](https://redis.io/) | 适配 6.X 最低 4.X |
|
||||
| 数据库框架 | Mybatis-Plus | [Mybatis-Plus文档](https://baomidou.com/guide/) | 快速 CRUD 增加开发效率 |
|
||||
|
||||
8
pom.xml
8
pom.xml
@ -6,14 +6,14 @@
|
||||
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
|
||||
<name>RuoYi-Vue-Plus</name>
|
||||
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
|
||||
<description>RuoYi-Vue-Plus后台管理系统</description>
|
||||
|
||||
<properties>
|
||||
<ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
|
||||
<ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
|
||||
<spring-boot.version>2.5.8</spring-boot.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
@ -29,10 +29,10 @@
|
||||
<satoken.version>1.28.0</satoken.version>
|
||||
<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
|
||||
<p6spy.version>3.9.1</p6spy.version>
|
||||
<hutool.version>5.7.17</hutool.version>
|
||||
<hutool.version>5.7.18</hutool.version>
|
||||
<okhttp.version>4.9.2</okhttp.version>
|
||||
<spring-boot-admin.version>2.5.5</spring-boot-admin.version>
|
||||
<redisson.version>3.16.6</redisson.version>
|
||||
<redisson.version>3.16.7</redisson.version>
|
||||
<lock4j.version>2.2.1</lock4j.version>
|
||||
<dynamic-ds.version>3.5.0</dynamic-ds.version>
|
||||
<tlog.version>1.3.6</tlog.version>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>ruoyi-extend</artifactId>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-extend</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-extend</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<artifactId>ruoyi-xxl-job-admin</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>ruoyi-vue-plus</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.5.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ruoyi-vue-plus",
|
||||
"version": "3.4.0",
|
||||
"version": "3.5.0",
|
||||
"description": "RuoYi-Vue-Plus后台管理系统",
|
||||
"author": "LionLi",
|
||||
"license": "MIT",
|
||||
|
||||
@ -101,6 +101,62 @@
|
||||
<span>更新日志</span>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="v3.5.0 - 2021-12-28">
|
||||
<ol>
|
||||
<li>[重大更新] 重写数据权限实现</li>
|
||||
<li>[重磅更新] 重构分页 简化使用</li>
|
||||
<li>[重磅更新] 用户登录 支持校验错误次数锁定登录</li>
|
||||
<li>[重磅更新] 增加 jdbc 批处理参数 大幅提升批量操作性能 对原生语句与 MP 均有效</li>
|
||||
<li>update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题</li>
|
||||
<li>update springboot-admin 2.5.4 => 2.5.5</li>
|
||||
<li>update hutool 5.7.16 => 5.7.18</li>
|
||||
<li>update redisson 3.16.4 => 3.16.7</li>
|
||||
<li>update dynamic-ds 3.4.1 => 3.5.0</li>
|
||||
<li>update qiniu 7.8.0 => 7.9.0</li>
|
||||
<li>update minio 8.3.3 => 8.3.4</li>
|
||||
<li>update tlog 1.3.4 => 1.3.6 启用 tlog 自动配置</li>
|
||||
<li>update clipboard 2.0.6 => 2.0.8</li>
|
||||
<li>update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解</li>
|
||||
<li>update 通用权限服务 迁移回 ruoyi-framework 模块</li>
|
||||
<li>update 使用 hutool-jwt 替换老旧 jjwt 依赖</li>
|
||||
<li>update 调整 OSS 表字段内容长度</li>
|
||||
<li>update LoginUser 增加角色缓存 优化角色权限代码</li>
|
||||
<li>update 使用 Cglib 重构 BeanCopyUtils 性能优异</li>
|
||||
<li>update 禁止所有工具类实例化 优化代码书写规范</li>
|
||||
<li>update 优化查询用户的角色组、岗位组代码</li>
|
||||
<li>update 更新 RedisUtils 返回客户端实例</li>
|
||||
<li>update 修改 健康检查权限 改为用户放行 提高安全性</li>
|
||||
<li>update hutool 工具 改为单包引入 减少无用依赖</li>
|
||||
<li>update ServicePlusImpl 功能 下沉到 BaseMapperPlus</li>
|
||||
<li>update 去除 jdk17 标签 由于很多组件还未适配 导致一些问题</li>
|
||||
<li>udpate 代码生成预览支持复制内容</li>
|
||||
<li>update 用户导入提示溢出则显示滚动条</li>
|
||||
<li>update 路由支持单独配置菜单或角色权限</li>
|
||||
<li>update 优化web拦截器 使用原生接口处理 默认非生产环境开启</li>
|
||||
<li>update 调整监控依赖 从 common 迁移到 framework</li>
|
||||
<li>add 新增 Vue3 分支 与 代码生成模板(由于组件还未完善 仅供学习)</li>
|
||||
<li>add 增加 RedisUtils 注册监听器方法</li>
|
||||
<li>add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验</li>
|
||||
<li>add oss下载增加 loading 层</li>
|
||||
<li>add 新增图片预览组件</li>
|
||||
<li>add 集成compression-webpack-plugin插件实现打包Gzip压缩</li>
|
||||
<li>add 新增 SqlUtils 检查关键字方法</li>
|
||||
<li>fix 修复 集群雪花id重复问题 使用网卡信息绑定生成</li>
|
||||
<li>fix 修复 count 语法异常</li>
|
||||
<li>fix 修复更改密码问题</li>
|
||||
<li>fix 修复sql关键字处理 防止解析器报错</li>
|
||||
<li>fix 修复 TreeBuildUtils 顶节点不为 0 问题</li>
|
||||
<li>fix 修复 SysOssConfig 主键类型错误</li>
|
||||
<li>fix 修复代码生成 导出注解错误</li>
|
||||
<li>fix 修复 redisson 集群模式 路径未匹配协议头问题</li>
|
||||
<li>fix 修复打包后字体图标偶现的乱码问题</li>
|
||||
<li>fix 修复版本差异导致的懒加载报错问题</li>
|
||||
<li>fix 修复代码生成字典组重复问题</li>
|
||||
<li>remove 删除 jjwt 无用依赖</li>
|
||||
<li>remove 移除过期 用户导入</li>
|
||||
<li>remove 移除过期工具 DictUtils</li>
|
||||
</ol>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="v3.4.0 - 2021-11-29">
|
||||
<ol>
|
||||
<li>update [重磅更新] 重构 Excel 导入 支持 Validator 校验 支持自定义监听器</li>
|
||||
@ -588,7 +644,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
// 版本号
|
||||
version: "3.4.0",
|
||||
version: "3.5.0",
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
|
||||
@ -102,7 +102,7 @@ services:
|
||||
ipv4_address: 172.30.0.54
|
||||
|
||||
ruoyi-server1:
|
||||
image: "ruoyi/ruoyi-server:3.4.0"
|
||||
image: "ruoyi/ruoyi-server:3.5.0"
|
||||
container_name: ruoyi-server1
|
||||
environment:
|
||||
# 时区上海
|
||||
@ -117,7 +117,7 @@ services:
|
||||
ipv4_address: 172.30.0.60
|
||||
|
||||
ruoyi-server2:
|
||||
image: "ruoyi/ruoyi-server:3.4.0"
|
||||
image: "ruoyi/ruoyi-server:3.5.0"
|
||||
container_name: ruoyi-server2
|
||||
environment:
|
||||
# 时区上海
|
||||
@ -132,7 +132,7 @@ services:
|
||||
ipv4_address: 172.30.0.61
|
||||
|
||||
ruoyi-monitor-admin:
|
||||
image: "ruoyi/ruoyi-monitor-admin:3.4.0"
|
||||
image: "ruoyi/ruoyi-monitor-admin:3.5.0"
|
||||
container_name: ruoyi-monitor-admin
|
||||
environment:
|
||||
# 时区上海
|
||||
@ -147,7 +147,7 @@ services:
|
||||
ipv4_address: 172.30.0.90
|
||||
|
||||
ruoyi-xxl-job-admin:
|
||||
image: "ruoyi/ruoyi-xxl-job-admin:3.4.0"
|
||||
image: "ruoyi/ruoyi-xxl-job-admin:3.5.0"
|
||||
container_name: ruoyi-xxl-job-admin
|
||||
environment:
|
||||
# 时区上海
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user