From 973471c63b1f889c16b12ba89f9102faa17ffd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Wed, 28 Jul 2021 10:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=20v2.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
docker/docker-compose.yml | 6 ++---
pom.xml | 4 +--
ruoyi-admin/pom.xml | 2 +-
ruoyi-common/pom.xml | 2 +-
ruoyi-demo/pom.xml | 2 +-
ruoyi-extend/pom.xml | 2 +-
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +-
ruoyi-framework/pom.xml | 2 +-
ruoyi-generator/pom.xml | 2 +-
ruoyi-oss/pom.xml | 2 +-
ruoyi-quartz/pom.xml | 2 +-
ruoyi-system/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/views/index.vue | 33 ++++++++++++++++++++++++
15 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 4756dc7b..2779fda9 100644
--- a/README.md
+++ b/README.md
@@ -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)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.2-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.6.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3e3180f1..ac065c35 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -107,7 +107,7 @@ services:
ipv4_address: 172.30.0.54
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.5.2"
+ image: "ruoyi/ruoyi-server:2.6.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -121,7 +121,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.5.2"
+ image: "ruoyi/ruoyi-server:2.6.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -135,7 +135,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.5.2"
+ image: "ruoyi/ruoyi-monitor-admin:2.6.0"
environment:
- TZ=Asia/Shanghai
privileged: true
diff --git a/pom.xml b/pom.xml
index cd1a9a7c..0454126e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
* Redis客户端 采用 Redisson 性能更强
* 分布式锁 Lock4j 注解锁、工具锁 多种多样
+ * 部署方式 Docker 容器编排 一键部署业务集群
+ * 文件存储 OSS 对象存储模块 支持(Minio、七牛、阿里、腾讯)
当前版本: v{{ version }}
@@ -91,6 +93,37 @@
更新日志
+
+