From d50e7a3d178a7f05852207d4525b258c826117ac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 23:39:50 +0800
Subject: [PATCH] !30 同步dev分支 Merge pull request !30 from 疯狂的狮子li/dev

---
 README.md |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1ba6549..0624abe 100644
--- a/README.md
+++ b/README.md
@@ -9,28 +9,47 @@
 * 鏌ョ湅ruoyi-framework妯″潡鐨刾om.xml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼渚濊禆
 * 鏌ョ湅ruoyi-admin妯″潡涓殑application.yml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼閰嶇疆
 
+鍏充簬濡備綍鍒涘缓鏂版ā鍧�
+* 鍙傝�價uoyi-demo妯″潡
+* 闇�瑕佹敼鍔�: 鐖秔om 涓� admin妯″潡pom
+
+鍏充簬鏍戣〃鐢熸垚
+* 鐩存帴鍦╩ysql琛ㄤ腑 娣诲姞 parentId orderNum 绛夊瓧娈�(鏍规嵁闇�瑕佸弬鑰� TreeEntity绫�)
+* 浠g爜鐢熸垚閫夋嫨鏍戣〃鐢熸垚鍗冲彲
+
+鍏充簬鏁版嵁鏉冮檺
+* @DataScope 娉ㄨВ浠g爜鐢熸垚浠呮敮鎸佸湪 Controller list 鏂规硶浣跨敤
+* 鍏朵綑鏂规硶濡傝浣跨敤 闇�鍙傝�� list 鏂规硶瀹炵幇鍦� LambdaQueryWrapper 娉ㄥ叆鏁版嵁鏉冮檺鐢熸垚鐨� SQL 璇彞
+
 ## 淇敼RuoYi鍔熻兘
 
-* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD
+* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD (鐩墠鏀寔鍗曡〃鐢熸垚涓庢爲琛� 涓嶆敮鎸佷富瀛愯〃)
 * Bean绠�鍖� 浣跨敤 Lombok 绠�鍖� get set toString 绛夌瓑
 * 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
+* 鎵�鏈夊師鐢熷姛鑳戒娇鐢� Mybatis-Plus 涓� Lombok 閲嶅啓
 * 浠g爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
+* 浠g爜鐢熸垚妯℃澘 鎷嗗垎鍑篤o,QueryBo,AddBo,EditBo绛夐鍩熷璞�
 * 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
-* 閲嶇鏇存柊 鍗囩骇MybatisPlus 3.4.1 閲嶅啓閰嶇疆鏂囦欢璇︾粏娉ㄩ噴 鏇存柊鎵�鏈夋彃浠�
-* 鍚屾鍗囩骇 3.2.1 淇閲嶅ぇbug 闃绘浠绘剰鏂囦欢涓嬭浇婕忔礊
+* swagger 淇敼涓� knife4j
+* 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘
+* 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑)
+* 闆嗘垚 spring-boot-admin 鍏ㄦ柟浣嶇洃鎺�
+* 鍗囩骇MybatisPlus 3.4.2
+* 澧炲姞demo妯″潡绀轰緥(缁欎笉浼氬鍔犳ā鍧楃殑灏忎紮浼村仛鍙傝��)
+* 鍚屾鍗囩骇 3.4.0
+* 鍗曟ā鍧� fast 鍒嗘敮 https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/
 
 ## 骞冲彴绠�浠�
+
+鑻ヤ緷鏄竴濂楀叏閮ㄥ紑婧愮殑蹇�熷紑鍙戝钩鍙帮紝姣棤淇濈暀缁欎釜浜哄強浼佷笟鍏嶈垂浣跨敤銆�
 
 * 鍓嶇閲囩敤Vue銆丒lement UI銆�
 * 鍚庣閲囩敤Spring Boot銆丼pring Security銆丷edis & Jwt銆�
 * 鏉冮檺璁よ瘉浣跨敤Jwt锛屾敮鎸佸缁堢璁よ瘉绯荤粺銆�
 * 鏀寔鍔犺浇鍔ㄦ�佹潈闄愯彍鍗曪紝澶氭柟寮忚交鏉炬潈闄愭帶鍒躲��
 * 楂樻晥鐜囧紑鍙戯紝浣跨敤浠g爜鐢熸垚鍣ㄥ彲浠ヤ竴閿敓鎴愬墠鍚庣浠g爜銆�
-* 鎻愪緵浜嗕竴涓狾racle鐗堟湰[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)锛屼繚鎸佸悓姝ユ洿鏂般��
+* 鎻愪緵浜嗗崟搴旂敤鐗堟湰[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)锛孫racle鐗堟湰[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)锛屼繚鎸佸悓姝ユ洿鏂般��
 * 涓嶅垎绂荤増鏈紝璇风Щ姝RuoYi](https://gitee.com/y_project/RuoYi)锛屽井鏈嶅姟鐗堟湰锛岃绉绘[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
-* 鎰熻阿[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)锛孾eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)銆�
-* 闃块噷浜戞姌鎵e満锛歔鐐规垜杩涘叆](http://aly.ruoyi.vip)锛岃吘璁簯绉掓潃鍦猴細[鐐规垜杩涘叆](http://txy.ruoyi.vip)&nbsp;&nbsp;
-* 闃块噷浜戜紭鎯犲埜锛歔鐐规垜棰嗗彇](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)锛岃吘璁簯浼樻儬鍒革細[鐐规垜棰嗗彇](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
 
 ## 鍐呯疆鍔熻兘
 
@@ -49,8 +68,9 @@
 13. 浠g爜鐢熸垚锛氬墠鍚庣浠g爜鐨勭敓鎴愶紙java銆乭tml銆亁ml銆乻ql锛夋敮鎸丆RUD涓嬭浇 銆�
 14. 绯荤粺鎺ュ彛锛氭牴鎹笟鍔′唬鐮佽嚜鍔ㄧ敓鎴愮浉鍏崇殑api鎺ュ彛鏂囨。銆�
 15. 鏈嶅姟鐩戞帶锛氱洃瑙嗗綋鍓嶇郴缁烠PU銆佸唴瀛樸�佺鐩樸�佸爢鏍堢瓑鐩稿叧淇℃伅銆�
-16. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠g爜銆�
-17. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆�
+16. 缂撳瓨鐩戞帶锛氬绯荤粺鐨勭紦瀛樹俊鎭煡璇紝鍛戒护缁熻绛夈��
+17. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠g爜銆�
+18. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆�
 
 ## 鍦ㄧ嚎浣撻獙
 

--
Gitblit v1.9.3