From f44ff8477fa90fdc64ac2afbf9aa1e35bfd10081 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 十二月 2020 12:44:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 README.md |   86 ++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 3d24601..56d175f 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,35 @@
+## 閲嶇偣娉ㄦ剰浜嬮」
+
+鑻ヤ緷鏂囨。瀵逛簨鍔℃敞瑙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鏂囦欢,鏍规嵁娉ㄩ噴鏇存敼閰嶇疆
+
+## 淇敼RuoYi鍔熻兘
+
+* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD
+* Bean绠�鍖� 浣跨敤 Lombok 绠�鍖� get set toString 绛夌瓑
+* 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
+* 浠g爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
+* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
+* 閲嶇鏇存柊 鍗囩骇MybatisPlus 3.4.1 閲嶅啓閰嶇疆鏂囦欢璇︾粏娉ㄩ噴 鏇存柊鎵�鏈夋彃浠�
+* 鍚屾鍗囩骇 3.3
+
 ## 骞冲彴绠�浠�
 
-涓�鐩存兂鍋氫竴娆惧悗鍙扮鐞嗙郴缁燂紝鐪嬩簡寰堝浼樼鐨勫紑婧愰」鐩絾鏄彂鐜版病鏈夊悎閫傜殑銆備簬鏄埄鐢ㄧ┖闂蹭紤鎭椂闂村紑濮嬭嚜宸卞啓浜嗕竴濂楀悗鍙扮郴缁熴�傚姝ゆ湁浜嗚嫢渚濄�傚ス鍙互鐢ㄤ簬鎵�鏈夌殑Web搴旂敤绋嬪簭锛屽缃戠珯绠$悊鍚庡彴锛岀綉绔欎細鍛樹腑蹇冿紝CMS锛孋RM锛孫A銆傛墍鏈夊墠绔悗鍙颁唬鐮佸皝瑁呰繃鍚庡崄鍒嗙簿绠�鏄撲笂鎵嬶紝鍑洪敊姒傜巼浣庛�傚悓鏃舵敮鎸佺Щ鍔ㄥ鎴风璁块棶銆傜郴缁熶細闄嗙画鏇存柊涓�浜涘疄鐢ㄥ姛鑳姐��
+鑻ヤ緷鏄竴濂楀叏閮ㄥ紑婧愮殑蹇�熷紑鍙戝钩鍙帮紝姣棤淇濈暀缁欎釜浜哄強浼佷笟鍏嶈垂浣跨敤銆�
 
-鎬у埆鐢凤紝鑻ヤ緷鏄粰杩樻病鏈夊嚭鐢熷コ鍎垮彇鐨勫悕瀛楋紙瀵撴剰锛氫綘鑻ヤ笉绂讳笉寮冿紝鎴戝繀鐢熸鐩镐緷锛�
-
-鍙傝�冨悗鍙版ā鏉縖vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-
-> 闃块噷浜戞湇鍔″櫒86鍏�/骞达紝鍙�11鍐扮偣搴曚环锛岄敊杩囧啀绛�1骞� 锛歔鐐规垜杩涘叆](https://www.aliyun.com/1111/2019/group-buying-share?ptCode=79B1148C588D554F3E87264DB80E6C90647C88CF896EF535&userCode=brki8iof&share_source=copy_link)
-
-> 濡傞渶涓嶅垎绂诲簲鐢紝璇风Щ姝� [RuoYi](https://gitee.com/y_project/RuoYi)  `(淇濇寔鍚屾鏇存柊)`锛屽闇�鍏朵粬鐗堟湰锛岃绉绘 [椤圭洰鎵╁睍](http://doc.ruoyi.vip/ruoyi/document/xmkz.html)  `(涓嶅畾鏃舵洿鏂�)`
-
-> 闃块噷浜戦�氱敤浜戜骇鍝�1888浼樻儬鍒� 锛歔鐐规垜棰嗗彇](https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof)&nbsp;&nbsp;&nbsp;&nbsp;鑵捐浜戦�氱敤浜戜骇鍝�2860浼樻儬鍒� 锛歔鐐规垜棰嗗彇](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;`(浠呴檺鏂扮敤鎴�)`
-
-> 闃块噷浜慔i鎷艰喘 闄愰噺鐖嗘 浣庤嚦199鍏�/骞� [鐐规垜杩涘叆](https://www.aliyun.com/acts/hi-group-buying?userCode=brki8iof)&nbsp;&nbsp;`(浠呴檺鏂扮敤鎴�)`
+* 鍓嶇閲囩敤Vue銆丒lement UI銆�
+* 鍚庣閲囩敤Spring Boot銆丼pring Security銆丷edis & Jwt銆�
+* 鏉冮檺璁よ瘉浣跨敤Jwt锛屾敮鎸佸缁堢璁よ瘉绯荤粺銆�
+* 鏀寔鍔犺浇鍔ㄦ�佹潈闄愯彍鍗曪紝澶氭柟寮忚交鏉炬潈闄愭帶鍒躲��
+* 楂樻晥鐜囧紑鍙戯紝浣跨敤浠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)
 
 ## 鍐呯疆鍔熻兘
 
@@ -33,48 +50,11 @@
 15. 鏈嶅姟鐩戞帶锛氱洃瑙嗗綋鍓嶇郴缁烠PU銆佸唴瀛樸�佺鐩樸�佸爢鏍堢瓑鐩稿叧淇℃伅銆�
 16. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠g爜銆�
 17. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆�
+
 ## 鍦ㄧ嚎浣撻獙
-> admin/admin123  
-> 闄嗛檰缁画鏀跺埌涓�浜涙墦璧忥紝涓轰簡鏇村ソ鐨勪綋楠屽凡鐢ㄤ簬婕旂ず鏈嶅姟鍣ㄥ崌绾с�傝阿璋㈠悇浣嶅皬浼欎即銆�
+
+- admin/admin123  
+- 闄嗛檰缁画鏀跺埌涓�浜涙墦璧忥紝涓轰簡鏇村ソ鐨勪綋楠屽凡鐢ㄤ簬婕旂ず鏈嶅姟鍣ㄥ崌绾с�傝阿璋㈠悇浣嶅皬浼欎即銆�
 
 婕旂ず鍦板潃锛歨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/97fcdc766fa04c03722aef4b3d77f71e8d2.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/642858372da91853c39e2d4746f036ea171.jpg"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/8678d5204148e2610c9d02822274a961dcf.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/feb2b25a08bf9dd121b8f51274ae935ead6.jpg"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/71c2d48905221a09a728df4aff4160b8607.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/c14c1ee9a64a6a9c2c22f67d43198767dbe.jpg"/></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/c162686bf3a39e3cd6b4fd6b5919f515ebf.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/412fb931faa8b3e3de6f9cbbc5b7979cf36.jpg"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/5f3d39a141f21f81b90536f391b8408f1fa.jpg"/></td>
-    </tr>
-</table>
-
-
-## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
-
-QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og)  鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file

--
Gitblit v1.9.3