xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 08:13:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into satoken

Browse Source
This commit is contained in:
疯狂的狮子li
2021-10-29 09:15:31 +08:00
parent f5f16aac96 d6e080d546
commit 24ebc73ee5
18 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -4,7 +4,7 @@
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
<br>
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.3.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()

6
pom.xml
View File

@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<version>3.2.0</version>
<version>3.3.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.2.0</ruoyi-vue-plus.version>
<ruoyi-vue-plus.version>3.3.0</ruoyi-vue-plus.version>
<spring-boot.version>2.5.6</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -46,7 +46,7 @@
<qiniu.version>7.8.0</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version>
<qcloud.cos.version>5.6.58</qcloud.cos.version>
<minio.version>8.3.1</minio.version>
<minio.version>8.3.3</minio.version>
<!-- docker 配置 -->
<docker.registry.url>localhost</docker.registry.url>

2
ruoyi-admin/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
ruoyi-common/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

12
ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
View File

@@ -259,6 +259,18 @@ public class RedisUtils {
return rMap.get(hKey);
}
/**
* 删除Hash中的数据
*
* @param key Redis键
* @param hKey Hash键
* @return Hash中的对象
*/
public static <T> T delCacheMapValue(final String key, final String hKey) {
RMap<String, T> rMap = client.getMap(key);
return rMap.remove(hKey);
}
/**
* 获取多个Hash中的数据
*

2
ruoyi-demo/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-extend/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-extend</artifactId>

2
ruoyi-extend/ruoyi-monitor-admin/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-extend</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>ruoyi-extend</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<artifactId>ruoyi-xxl-job-admin</artifactId>
<packaging>jar</packaging>

2
ruoyi-framework/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-generator/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-job/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
ruoyi-oss/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-quartz/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-system/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.2.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
"version": "3.2.0",
"version": "3.3.0",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",

44
ruoyi-ui/src/views/index.vue
View File

@@ -93,6 +93,48 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.3.0 - 2021-10-29">
<ol>
<li>add [重磅更新] 增加分布式日志框架 TLog</li>
<li>add [重磅更新] 增加分布式任务调度系统 Xxl-Job</li>
<li>add [重大更新] 增加 ruoyi-job 任务调度模块(基于xxl-job)</li>
<li>update [重大更新]全业务 增加 接口文档注解 格式化代码</li>
<li>update springboot 2.5.5 => 2.5.6</li>
<li>update springboot-admin 2.5.1 => 2.5.2</li>
<li>update element-ui 2.15.5 => 2.15.6</li>
<li>update hutool 5.7.13 => 5.7.15</li>
<li>update qcloud.cos 5.6.55 => 5.6.58</li>
<li>update minio 8.3.0 => 8.3.3</li>
<li>update 更新 element 2.15.6 表格样式</li>
<li>update 优化 代码生成常量 关于 BO VO 注释</li>
<li>update 优化代码生成 导入表 列表返回 主键默认选中</li>
<li>update MybatisPlusRedisCache 标记过期 推荐使用 spring-cache</li>
<li>update Quartz 标记过期 推荐迁移至新框架 xxl-job</li>
<li>update Feign 标记过期</li>
<li>update 前端增加默认国际化参数</li>
<li>update 更新 Admin 监控 注释 避免错误使用</li>
<li>update Admin 监控增加日志文件输出</li>
<li>update 优化 xxl-job-admin 增加格式化日志输出与 docker 镜像</li>
<li>update 更新 xxl-job 执行器开关功能</li>
<li>update 代码生成 改为生成抽象实体</li>
<li>update 代码生成 搜索框 更新文本域生成 用于模糊查询</li>
<li>update 通用数据注入改为适配通用实体类</li>
<li>update 使用路由懒加载提升页面响应速度</li>
<li>update 迁移所有脚本文件至 script 目录</li>
<li>update swagger 组顺序配置</li>
<li>update sql 文件更新 xxljob 控制台菜单</li>
<li>update 前端增加 任务调度中心页面与环境及 nginx 配置</li>
<li>update 合并 oss.sql 至主 sql</li>
<li>update 补全国际化文件(英文)</li>
<li>update 更新关于全局路径设置与文档链接</li>
<li>update 删除无用 setUsername 使用自动注入</li>
<li>update RedisUtils 更新删除 hash 数据方法</li>
<li>fix 修复 多数据源 aop 语法错误</li>
<li>fix 修复 子菜单无 query 参数问题</li>
<li>fix 修复 oss 配置删除时删除缓存 bug</li>
<li>fix 修复无权限获取请求头 download-filename 导致文件名为空问题</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2021-9-28">
<ol>
<li>update [重大改动]接口文档 支持分组配置</li>
@@ -483,7 +525,7 @@ export default {
data() {
return {
// 版本号
version: "3.2.0",
version: "3.3.0",
};
},
methods: {

8
script/docker/docker-compose.yml
View File

@@ -103,7 +103,7 @@ services:
ipv4_address: 172.30.0.54
ruoyi-server1:
image: "ruoyi/ruoyi-server:3.2.0"
image: "ruoyi/ruoyi-server:3.3.0"
container_name: ruoyi-server1
environment:
# 时区上海
@@ -118,7 +118,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
image: "ruoyi/ruoyi-server:3.2.0"
image: "ruoyi/ruoyi-server:3.3.0"
container_name: ruoyi-server2
environment:
# 时区上海
@@ -133,7 +133,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
image: "ruoyi/ruoyi-monitor-admin:3.2.0"
image: "ruoyi/ruoyi-monitor-admin:3.3.0"
container_name: ruoyi-monitor-admin
environment:
# 时区上海
@@ -148,7 +148,7 @@ services:
ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin:
image: "ruoyi/ruoyi-xxl-job-admin:3.2.0"
image: "ruoyi/ruoyi-xxl-job-admin:3.3.0"
container_name: ruoyi-xxl-job-admin
environment:
# 时区上海