From 939d89f0b84cca9154f3f219b31a880de733d839 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 20 三月 2021 10:14:03 +0800
Subject: [PATCH] !10 [BUG] 解决只能使用circle干扰的bug Merge pull request !10 from wugh/hotfix/captcha

---
 README.md |   78 ++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 646c213..29e305b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,36 @@
+## 閲嶇偣娉ㄦ剰浜嬮」
+
+鑻ヤ緷鏂囨。瀵逛簨鍔℃敞瑙g殑鎻忚堪 [鍏充簬浜嬪姟](https://doc.ruoyi.vip/ruoyi/document/htsc.html#%E4%BA%8B%E5%8A%A1%E7%AE%A1%E7%90%86)  浠ヤ笅瀵瑰鏁版嵁婧愪簨鍔″仛琛ュ厖:
+* 鍚屼竴涓簨鍔′笅鏄棤娉曞垏鎹㈡暟鎹簮鐨�
+* 绂佹 鐖舵柟娉曚娇鐢� @Transactional 鍒涘缓浜嬪姟 瀛愭柟娉曚娇鐢� @DataSource 鍒囨崲鏁版嵁婧�
+* 姝g‘鐢ㄦ硶: 瀛愭柟娉曞崟鐙垱寤轰簨鍔� 鎴� 鐖舵柟娉曚娇鐢� @Transactional(propagation = Propagation.REQUIRES_NEW) 涓烘墍鏈夊瓙鏂规硶鍒涘缓鏂颁簨鍔�
+
+鍏充簬濡備綍浣跨敤Tomcat
+* 鏌ョ湅ruoyi-framework妯″潡鐨刾om.xml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼渚濊禆
+* 鏌ョ湅ruoyi-admin妯″潡涓殑application.yml鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼閰嶇疆
+
+鍏充簬濡備綍鍒涘缓鏂版ā鍧�
+* 鍙傝�價uoyi-demo妯″潡
+* 闇�瑕佹敼鍔�: 鐖秔om 涓� admin妯″潡pom
+
+鍏充簬鏍戣〃鐢熸垚
+* 鐩存帴鍦╩ysql琛ㄤ腑 娣诲姞 parentId orderNum 绛夊瓧娈�(鏍规嵁闇�瑕佸弬鑰� TreeEntity绫�)
+* 浠g爜鐢熸垚閫夋嫨鏍戣〃鐢熸垚鍗冲彲
+
+## 淇敼RuoYi鍔熻兘
+
+* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD (鐩墠鏀寔鍗曡〃鐢熸垚涓庢爲琛� 涓嶆敮鎸佷富瀛愯〃)
+* Bean绠�鍖� 浣跨敤 Lombok 绠�鍖� get set toString 绛夌瓑
+* 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
+* 浠g爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
+* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
+* swagger 淇敼涓� knife4j
+* 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘
+* 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑)
+* 鍗囩骇MybatisPlus 3.4.2
+* 澧炲姞demo妯″潡绀轰緥(缁欎笉浼氬鍔犳ā鍧楃殑灏忎紮浼村仛鍙傝��)
+* 鍚屾鍗囩骇 3.4.0
+
 ## 骞冲彴绠�浠�
 
 鑻ヤ緷鏄竴濂楀叏閮ㄥ紑婧愮殑蹇�熷紑鍙戝钩鍙帮紝姣棤淇濈暀缁欎釜浜哄強浼佷笟鍏嶈垂浣跨敤銆�
@@ -9,9 +42,6 @@
 * 楂樻晥鐜囧紑鍙戯紝浣跨敤浠g爜鐢熸垚鍣ㄥ彲浠ヤ竴閿敓鎴愬墠鍚庣浠g爜銆�
 * 鎻愪緵浜嗗崟搴旂敤鐗堟湰[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)
-* 鐗瑰埆楦h阿锛歔element](https://github.com/ElemeFE/element)锛孾vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)锛孾eladmin-web](https://github.com/elunez/eladmin-web)銆�
-* 闃块噷浜戞姌鎵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;
 
 ## 鍐呯疆鍔熻兘
 
@@ -41,45 +71,3 @@
 
 婕旂ず鍦板潃锛歨ttp://vue.ruoyi.vip  
 鏂囨。鍦板潃锛歨ttp://doc.ruoyi.vip
-
-## 婕旂ず鍥�
-
-<table>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
-    </tr>	 
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
-    </tr>
-</table>
-
-
-## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
-
-QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![鍔犲叆QQ缇(https://img.shields.io/badge/104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) 鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file

--
Gitblit v1.9.3