From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev

---
 README.md |   57 ++++++++++++++++++++++++---------------------------------
 1 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 2779fda..778b901 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 [![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.6.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
-[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]()
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.0.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)]()
 
@@ -21,51 +21,39 @@
 * 鏉冮檺璁よ瘉妗嗘灦 Spring Security銆丣wt锛屾敮鎸佸缁堢璁よ瘉绯荤粺
 * 鍏崇郴鏁版嵁搴� MySQL 閫傞厤 8.X 
 * 缂撳瓨鏁版嵁搴� Redis 閫傞厤 6.X
-* 鏁版嵁搴撳紑鍙戞鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� 鎻掍欢鍖栨敮鎸佸悇绫婚渶姹�
+* 鏁版嵁搴撴鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� 鎻掍欢鍖栨敮鎸佸悇绫婚渶姹�
+* 鏁版嵁搴撴鏋� 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�
+* 鏁版嵁搴撴鏋� Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己
+* 鏁版嵁搴撴鏋� 鎬ц兘鍒嗘瀽鎻掍欢 p6spy 鏇村己鍔茬殑 SQL 鍒嗘瀽
+* 搴忓垪鍖栨鏋� 缁熶竴浣跨敤 jackson 楂樻晥鍙潬
 * 缃戠粶妗嗘灦 Feign銆丱kHttp3 鎺ュ彛鍖栫鐞� HTTP 璇锋眰
-* 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬�
+* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱
+* 鏂囦欢瀛樺偍 OSS 瀵硅薄瀛樺偍妯″潡 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)
 * 鐩戞帶妗嗘灦 spring-boot-admin 鍏ㄦ柟浣嶆湇鍔$洃鎺�
 * 鏍¢獙妗嗘灦 validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬�
+* Excel妗嗘灦 Alibaba EasyExcel 鎬ц兘浼樺紓 鎵╁睍鎬у己
 * 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。
-* 搴忓垪鍖栨鏋� 缁熶竴浣跨敤 jackson 楂樻晥鍙潬
+* 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬�
 * 浠g爜鐢熸垚鍣� 涓�閿敓鎴愬墠鍚庣浠g爜
-* 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�
-* Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己
-* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱
 * 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔¢泦缇�
-* 鏂囦欢瀛樺偍 OSS 瀵硅薄瀛樺偍妯″潡 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)
+* 鍥介檯鍖� Spring 鏍囧噯鍥介檯鍖栨柟瑙e喅鏂规
 
 ## 鍙傝�冩枃妗�
 
 浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」
 <br>
 >[鍒濆鍖栭」鐩� 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117)
 > 
 >[閮ㄧ讲椤圭洰 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬搴旂敤閮ㄧ讲?sort_id=4219382)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬搴旂敤閮ㄧ讲?sort_id=4219382](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬搴旂敤閮ㄧ讲?sort_id=4219382)
 > 
 >[鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
 
-## 鎻愰棶鍥涢儴鏇�
-### 涓�銆佹煡闃厀iki
-浼樺厛鍦╜wiki->閲嶇偣浜嬮」`锛屾煡鎵炬槸鍚︽湁鐩稿叧闂鍙婅В鍐虫柟妗堬紝灏ゅ叾鏄鏋舵洿鏂板悗浜х敓鐨勯棶棰橈紝澶氫細鍦╳iki涓彁鍙�
+## 杞欢鏋舵瀯鍥�
 
-> [鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
-
-### 浜屻�佸�熷姪issues
-灏濊瘯issues涓悳绱㈤棶棰樺叧閿瓧锛堣寰楅�夋嫨宸插畬鎴愶級锛岀湅鐪嬫槸鍚︽湁鍏朵粬浜烘彁鍑虹浉鍚岄棶棰�
-- `濡傛灉鏈塦閭d箞渚濇嵁璇勮涓殑瑙e喅鏂规鑷灏濊瘯瑙e喅
-- `濡傛灉娌℃湁`閭d箞鎻愪氦涓�涓柊鐨刬ssues鎻忚堪娓呮浣犵殑闂锛岄渶瑕佸寘鍚互涓嬪唴瀹癸紙浼樿川鐨刬ssues锛岃兘澶熷府鍔╀綔鑰呮洿楂樻晥鐨勫府浣犺В鍐抽棶棰橈級锛�
-    - 鍑虹幇闂鐨勬ā鍧楁垨鍔熻兘鎴栫被锛屾�讳箣浣犺璇存竻妤氬湪鍝嚭鐨勯棶棰�
-    - 鎻忚堪浜х敓闂鐨勭浉鍏虫搷浣滄祦绋嬶紝浠ヤ究澶嶇幇蹇�熻В鍐�
-    - 鎶ラ敊鐨勬棩蹇楁埅鍥撅紝涓�瀹氭槸鎴浘锛屼笉瑕佸鍒朵竴鍫嗘姤閿欑殑鏂囨湰
-> [issues](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/issues)
-
-### 涓夈�佺櫨搴�
-澶у閮芥噦锛屼笉澶氭弿杩帮紝灏嗗叧閿殑鎶ラ敊淇℃伅CC->CV鍒扮櫨搴︿腑鐪嬬湅澶т浆浠�庝箞瑙e喅鐨�
-> [鐧惧害](http://www.baidu.com)
-
-### 鍥涖�佸姞缇�
-浠ヤ笂涓夌偣宸茬粡鑳借В鍐冲ぇ瀹剁粷澶ч儴鍒嗛棶棰樹簡锛屽鏋滆繕鏈夐棶棰樻病鑳介�氳繃杩欏嚑绉嶆柟寮忚В鍐筹紝閭d箞鍔犵兢锛屽ぇ瀹朵竴璧峰湪缇ら噷鎺㈣涓�涓�
+![Plus閮ㄧ讲鏋舵瀯鍥綸(https://images.gitee.com/uploads/images/2021/0729/112230_4295e5ce_1766278.png "Plus閮ㄧ讲鏋舵瀯鍥�.png")
 
 ## 璐$尞浠g爜
 
@@ -79,7 +67,8 @@
 * ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD (涓嶆敮鎸佷富瀛愯〃)
 * Bean绠�鍖� 浣跨敤 Lombok 绠�鍖� get set toString 绛夌瓑
 * 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
-* 鍒嗛〉绉婚櫎 pagehelper 鏀逛负 Mybatis-Plus 鍒嗛〉
+* 绉婚櫎 pagehelper 鏀逛负 Mybatis-Plus 鍒嗛〉
+* 闆嗘垚 p6spy 鏇村己鍔茬殑 SQL 鍒嗘瀽
 * 鍗囩骇 swagger 涓� knife4j
 * 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘
 * 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑)
@@ -90,7 +79,8 @@
 * 闆嗘垚 dynamic-datasource 澶氭暟鎹簮(榛樿鏀寔MySQL,鍏朵粬绉嶇被闇�鑷閫傞厤)
 * 闆嗘垚 Lock4j 瀹炵幇鍒嗗竷寮� 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱
 * 澧炲姞 Docker 瀹瑰櫒缂栨帓 鎵撳寘鎻掍欢涓庨儴缃茶剼鏈�
-* 绉婚櫎 鏈湴鏂囦欢涓婁紶 鏀逛负 OSS瀵硅薄瀛樺偍 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)
+* 绉婚櫎 閫氱敤涓婁紶涓嬭浇 鏀逛负 OSS瀵硅薄瀛樺偍 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)
+* 绉婚櫎 RuoYi鑷甫 Excel 宸ュ叿 鏀逛负 EasyExcel 宸ュ叿
 
 ### 浠g爜鏀瑰姩
 
@@ -112,8 +102,9 @@
 * 鍗曟ā鍧� 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/)
 
-## 鎵爜鍔犵兢 涓�璧蜂氦娴�
-![杈撳叆鍥剧墖璇存槑](https://images.gitee.com/uploads/images/2021/0625/160026_11d949aa_1766278.jpeg "07f7121fab14e57e03e5f6a35eff6ce.jpg")
+## 鍔犵兢涓庢崘鐚�
+>[鍔犵兢涓庢崘鐚甝(https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍔犵兢涓庢崘鐚�?sort_id=4104598)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍔犵兢涓庢崘鐚�?sort_id=4104598](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍔犵兢涓庢崘鐚�?sort_id=4104598)
 
 ## 鎹愮尞浣滆��
 浣滆�呬负鍏艰亴鍋氬紑婧�,骞虫椂杩橀渶瑕佸伐浣�,濡傛灉甯埌浜嗘偍鍙互璇蜂綔鑰呭悆涓洅楗�  

--
Gitblit v1.9.3