From 973471c63b1f889c16b12ba89f9102faa17ffd98 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:45:01 +0800
Subject: [PATCH] 发布 v2.6.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 | 33 ++++++++++++++++
ruoyi-generator/pom.xml | 2
pom.xml | 4 +-
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-oss/pom.xml | 2
ruoyi-ui/package.json | 2
15 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 4756dc7..2779fda 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 3e3180f..ac065c3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -107,7 +107,7 @@
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 @@
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 @@
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 cd1a9a7..0454126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.5.2</version>
+ <version>2.6.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.5.2</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
<spring-boot.version>2.5.3</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3f08bbf..ba0ad32 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index dc97609..016c457 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index dcc2684..1066d2f 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 46a8cfc..4df48ba 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.5.2</version>
+ <version>2.6.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 b09375a..9aca296 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 16b46e9..41e8ca4 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 8510c9f..5535bd7 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index e9c3314..6fd1bd7 100644
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>2.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index f1d850c..ef70d32 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 0ec9ba9..3665c80 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.5.2</version>
+ <version>2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 38d9b29..c980bab 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.5.2",
+ "version": "2.6.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 7824855..31f3379 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -22,6 +22,8 @@
* 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�<br/>
* Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己<br/>
* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱<br/>
+ * 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔￠泦缇�<br/>
+ * 鏂囦欢瀛樺偍 OSS 瀵硅薄瀛樺偍妯″潡 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)<br/>
</p>
<p>
<b>褰撳墠鐗堟湰:</b> <span>v{{ version }}</span>
@@ -91,6 +93,37 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v2.6.0 - 2021-7-28">
+ <ol>
+ <li>add [閲嶅ぇ鏂板] 澧炲姞 OSS 瀵硅薄瀛樺偍妯″潡</li>
+ <li>remove [閲嶅ぇ鏀瑰姩] 鍒犻櫎 鑷甫閫氱敤涓婁紶 鎺ュ彛 浣跨敤OSS妯″潡鏇挎崲<li>
+ <li>update [閲嶅ぇ鏀瑰姩] 閲嶅啓VO杞崲 鏀寔娣辨嫹璐� 灏哣O绫绘娊璞″埌 ServicePlus 娉涘瀷澶勭悊<li>
+ <li>update [閲嶅ぇ鏀瑰姩] 澶欱O鍚堝苟 浣跨敤鍒嗙粍鏍￠獙 鐢熸垚BO浠ｇ爜<li>
+ <li>update [閲嶅ぇ鏀瑰姩] 閲嶆瀯 IServicePlus 鍔熻兘 澧炲姞 BeanCopyUtils 娣辨嫹璐濆伐鍏�<li>
+ <li>update springboot 2.4.9 => 2.5.3<li>
+ <li>update hutool 5.7.4 => 5.7.6<li>
+ <li>update minio 8.2.2 => 8.3.0<li>
+ <li>update docker plugin 1.2.0 => 1.2.2<li>
+ <li>update redisson 3.16.0 => 3.16.1<li>
+ <li>update datasource 3.4.0 => 3.4.1<li>
+ <li>update element-ui 2.15.2 => 2.15.3<li>
+ <li>add 婕旂ずDemo澧炲姞鑷畾涔夊垎椤垫帴鍙ｆ渚�</li>
+ <li>add 瑙掕壊&鑿滃崟鏂板瀛楁灞炴�ф彁绀轰俊鎭�</li>
+ <li>update 鏇存柊druid閰嶇疆 鐙珛閰嶇疆鏇存槑鏄�</li>
+ <li>update 椤堕儴鑿滃崟鎺掗櫎闅愯棌鐨勯粯璁よ矾鐢�</li>
+ <li>update 瀵屾枃鏈柊澧炰笂浼犳枃浠跺ぇ灏忛檺鍒�</li>
+ <li>update 瀵煎叆鐢ㄦ埛鏍峰紡璋冩暣</li>
+ <li>update 椤堕儴鑿滃崟鏍峰紡璋冩暣</li>
+ <li>update 瀵嗙爜妗嗘柊澧炴樉绀哄垏鎹㈠瘑鐮佸浘鏍�</li>
+ <li>update 鍐呴摼璁剧疆meta淇℃伅</li>
+ <li>update 璺宠浆璺敱楂樹寒鐩稿搴旂殑鑿滃崟鏍�</li>
+ <li>fix 淇澶氭暟鎹簮druid鍏ㄥ眬閰嶇疆缂╄繘閿欒 寮曡捣鏃犳晥閰嶇疆闂</li>
+ <li>fix 淇瀹氭椂浠诲姟鏃ュ織鎵ц鐘舵�佹樉绀�</li>
+ <li>fix 淇 鎺堟潈瑙掕壊绌烘暟鎹棶棰�</li>
+ <li>fix 淇 DictData 鍒犻櫎閫昏緫闂</li>
+ <li>fix 淇浠绘剰璐︽埛瓒婃潈婕忔礊</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v2.5.2 - 2021-7-19">
<ol>
<li>update 浼樺寲浠ｇ爜鐢熸垚鍣ㄦ敞閲婃牸寮�</li>
--
Gitblit v1.9.3