From 56322786887f99604450cde07c9cab6fb5ea5135 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:39:43 +0800
Subject: [PATCH] !67 同步dev分支 Merge pull request !67 from 疯狂的狮子Li/dev

---
 README.md |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5fc29ab..a56dc6c 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,17 @@
 [![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-2.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.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)]()
 
-鍩轰簬 RuoYi-Vue 闆嗘垚 Mybatis-Plus Lombok Hutool 绛変究鎹峰紑鍙戝伐鍏� 閫傞厤閲嶅啓鐩稿叧涓氬姟 渚夸簬寮�鍙� 瀹氭湡涓� RuoYi-Vue 鍚屾
+RuoYi-Vue-Plus 鏄熀浜� RuoYi-Vue 閽堝 `鍒嗗竷寮忛泦缇 鍦烘櫙鍗囩骇 瀹氭湡涓� RuoYi-Vue 鍚屾
+
+闆嗘垚 Lock4j dynamic-datasource 绛夊垎甯冨紡鍦烘櫙瑙ｅ喅鏂规
+
+闆嗘垚 Mybatis-Plus Lombok Hutool 绛変究鎹峰紑鍙戝伐鍏� 閫傞厤閲嶅啓鐩稿叧涓氬姟 渚夸簬寮�鍙� 
+
 * 鍓嶇寮�鍙戞鏋� Vue銆丒lement UI
 * 鍚庣寮�鍙戞鏋� Spring Boot銆丷edis
 * 瀹瑰櫒妗嗘灦 Undertow 鍩轰簬 Netty 鐨勯珮鎬ц兘瀹瑰櫒
@@ -27,12 +32,15 @@
 * 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�
 * Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己
 * 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱
+* 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔￠泦缇�
 
 ## 鍙傝�冩枃妗�
 
 浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」
 <br>
 >[鍒濆鍖栭」鐩� 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117)
+> 
+>[閮ㄧ讲椤圭洰 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬搴旂敤閮ㄧ讲?sort_id=4219382)
 > 
 >[鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
 
@@ -58,6 +66,12 @@
 ### 鍥涖�佸姞缇�
 浠ヤ笂涓夌偣宸茬粡鑳借В鍐冲ぇ瀹剁粷澶ч儴鍒嗛棶棰樹簡锛屽鏋滆繕鏈夐棶棰樻病鑳介�氳繃杩欏嚑绉嶆柟寮忚В鍐筹紝閭ｄ箞鍔犵兢锛屽ぇ瀹朵竴璧峰湪缇ら噷鎺㈣涓�涓�
 
+## 璐＄尞浠ｇ爜
+
+娆㈣繋鍚勮矾鑻遍泟璞澃 `PR` 浠ｇ爜 璇锋彁浜ゅ埌 `dev` 寮�鍙戝垎鏀� 缁熶竴娴嬭瘯鍙戠増
+
+妗嗘灦瀹氫綅涓� `閫氱敤鍚庡彴绠＄悊绯荤粺(鍒嗗竷寮忛泦缇ゅ己鍖�)` 鍘熷垯涓婁笉鎺ュ彈涓氬姟 `PR` 
+
 ## 淇敼RuoYi鍔熻兘
 ### 渚濊禆鏀瑰姩
 
@@ -74,6 +88,7 @@
 * 绉婚櫎 fastjson 缁熶竴浣跨敤 jackson 搴忓垪鍖�
 * 闆嗘垚 dynamic-datasource 澶氭暟鎹簮(榛樿鏀寔MySQL,鍏朵粬绉嶇被闇�鑷閫傞厤)
 * 闆嗘垚 Lock4j 瀹炵幇鍒嗗竷寮� 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱
+* 澧炲姞 Docker 瀹瑰櫒缂栨帓 鎵撳寘鎻掍欢涓庨儴缃茶剼鏈�
 
 ### 浠ｇ爜鏀瑰姩
 
@@ -90,7 +105,7 @@
 
 ### 鍏朵粬
 
-* 鍚屾鍗囩骇 RuoYi-Vue 3.5.0
+* 鍚屾鍗囩骇 RuoYi-Vue
 * GitHub 鍦板潃 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
 * 鍗曟ā鍧� fast 鍒嗘敮 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
 * Oracle 妯″潡 oracle 鍒嗘敮 [RuoYi-Vue-Plus-oracle](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/oracle/)

--
Gitblit v1.9.3