From e085ec94184b29743212ae501d76755a559a4daa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 09:53:46 +0800
Subject: [PATCH] 发布 v2.5.0
---
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +-
ruoyi-framework/pom.xml | 2 +-
ruoyi-admin/pom.xml | 2 +-
ruoyi-system/pom.xml | 2 +-
ruoyi-ui/src/views/index.vue | 26 ++++++++++++++++++++++++++
ruoyi-generator/pom.xml | 2 +-
pom.xml | 6 +++---
ruoyi-common/pom.xml | 2 +-
README.md | 2 +-
docker/docker-compose.yml | 6 +++---
ruoyi-extend/pom.xml | 2 +-
ruoyi-quartz/pom.xml | 2 +-
ruoyi-demo/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
14 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 332ce97..3be9318 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[
<br>
-[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[]()
[]()
[]()
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0aba0a4..d40ae29 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -76,7 +76,7 @@
ipv4_address: 172.30.0.48
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -89,7 +89,7 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -102,7 +102,7 @@
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.4.0"
+ image: "ruoyi/ruoyi-monitor-admin:2.5.0"
environment:
- TZ=Asia/Shanghai
privileged: true
diff --git a/pom.xml b/pom.xml
index 1e5d75c..d56898b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.4.0</version>
+ <version>2.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>2.4.0</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>2.5.0</ruoyi-vue-plus.version>
<spring-boot.version>2.4.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -34,7 +34,7 @@
<datasource.version>3.4.0</datasource.version>
<!-- docker 閰嶇疆 -->
- <docker.registry.url>192.168.31.240</docker.registry.url>
+ <docker.registry.url>localhost</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.0</docker.plugin.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5dc36b1..7450213 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 47b9a55..28af304 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 756f3d1..d3909a2 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 99a2594..e71a426 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-extend</artifactId>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 2aade59..e9d48d6 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-extend</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 40c8479..e7ed991 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 4774cff..642dfec 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index a92933f..522a84e 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 37b57de..85576db 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index af8db7e..648b172 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.4.0",
+ "version": "2.5.0",
"description": "RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺",
"author": "LionLi",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index dba6dfe..671dcde 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -91,6 +91,32 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v2.5.0 - 2021-7-12">
+ <ol>
+ <li>update springboot 2.4.7 => 2.4.8</li>
+ <li>update knife4j 3.0.2 => 3.0.3</li>
+ <li>update hutool 5.7.2 => 5.7.4</li>
+ <li>update spring-boot-admin 2.4.1 => 2.4.3</li>
+ <li>update redisson 3.15.2 => 3.16.0</li>
+ <li>add 澧炲姞 docker 缂栨帓 涓� shell 鑴氭湰</li>
+ <li>add 澧炲姞 feign 鐔旀柇 鑷畾涔夌粨鏋勪綋瑙ｆ瀽鏂规硶 涓� demo 娉ㄩ噴</li>
+ <li>add 鐢ㄦ埛绠＄悊鏂板鍒嗛厤瑙掕壊鍔熻兘</li>
+ <li>add 瑙掕壊绠＄悊鏂板鍒嗛厤鐢ㄦ埛鍔熻兘</li>
+ <li>add 澧炲姞spring-cache婕旂ず妗堜緥</li>
+ <li>update 鐙珛 springboot-admin 鐩戞帶鍒版墿灞曟ā鍧楅」鐩�</li>
+ <li>update springboot-admin 鐩戞帶 澧炲姞鐢ㄦ埛鐧诲綍鏉冮檺绠＄悊</li>
+ <li>update 浼樺寲浠ｇ爜鐢熸垚鍣� 鎵归噺瀵煎叆</li>
+ <li>update 浼樺寲 澧炲姞MP娉ㄥ叆寮傚父鎷︽埅</li>
+ <li>update 鍏抽棴榛樿浜岀骇缂撳瓨 鎺ㄨ崘浣跨敤 spring-cache 娉ㄨВ鎵嬪姩缂撳瓨</li>
+ <li>update FileUpload ImageUpload缁勪欢 鏀寔澶氬浘鐗囦笂浼�</li>
+ <li>update 浼樺寲涓嫳鏂囪瑷�閰嶇疆</li>
+ <li>update 瑙勮寖maven鍐欐硶</li>
+ <li>fix redis鑾峰彇map灞炴�ug淇銆�</li>
+ <li>fix 淇 鎸夐挳loading 鍚庣500鍗℃闂</li>
+ <li>fix 鐩稿璺緞涓嬭浇闂</li>
+ <li>fix 淇 hutool 宸ュ叿杩斿洖缁撴灉涓嶄竴鑷撮棶棰�</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v2.4.0 - 2021-6-24">
<ol>
<li>update springboot 2.3.11 => 2.4.7</li>
--
Gitblit v1.9.3