From aec0e227479de49213185ff6bb98d4e99b35eb8b Mon Sep 17 00:00:00 2001 From: thiszhc <2029364173@qq.com> Date: 星期五, 16 六月 2023 20:34:23 +0800 Subject: [PATCH] Merge branch '5.X' of https://gitee.com/dromara/RuoYi-Vue-Plus into JustAuth --- README.md | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b6531e3..6696573 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## 骞冲彴绠�浠� [](https://gitee.com/dromara/RuoYi-Vue-Plus) -[](https://github.com/dromara/RuoYi-Vue-Plus) +[](https://github.com/dromara/RuoYi-Vue-Plus) [](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE) [ <br> @@ -19,15 +19,17 @@ > 椤圭洰浠ｇ爜銆佹枃妗� 鍧囧紑婧愬厤璐瑰彲鍟嗙敤 閬靛惊寮�婧愬崗璁湪椤圭洰涓繚鐣欏紑婧愬崗璁枃浠跺嵆鍙�<br> 娲诲埌鑰佸啓鍒拌�� 涓哄叴瓒ｈ�屽紑婧� 涓哄涔犺�屽紑婧� 涓鸿澶у鐪熸鍙互瀛﹀埌鎶�鏈�屽紑婧� -> 绯荤粺婕旂ず: [浼犻�侀棬](https://javalionli.gitee.io/plus-doc/#/common/demo_system) +> 绯荤粺婕旂ず: [浼犻�侀棬](https://plus-doc.dromara.org/#/common/demo_system) > 鍓嶇椤圭洰鍦板潃: [plus-ui](https://gitee.com/JavaLionLi/plus-ui) + +> 鏂囨。鍦板潃: [plus-doc](https://plus-doc.dromara.org) - [plus-doc(鍥藉唴澶囩敤)](https://dromara.gitee.io/plus-doc) # 鏈鏋朵笌RuoYi鐨勫姛鑳藉樊寮� | 鍔熻兘 | 鏈鏋� | RuoYi | |-------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------| -| 鍓嶇椤圭洰 | 鍩轰簬vue3-element-admin寮�婧愰」鐩噸鍐�<br/>Vue3 + TS + ElementPlus | 鍩轰簬Vue2/Vue3 + JS | +| 鍓嶇椤圭洰 | 閲囩敤 Vue3 + TS + ElementPlus 閲嶅啓 | 鍩轰簬Vue2/Vue3 + JS | | 鍚庣椤圭洰缁撴瀯 | 閲囩敤鎻掍欢鍖� + 鎵╁睍鍖呭舰寮� 缁撴瀯瑙ｈ�� 鏄撲簬鎵╁睍 | 妯″潡鐩镐簰娉ㄥ叆鑰﹀悎涓ラ噸闅句互鎵╁睍 | | 鍚庣浠ｇ爜椋庢牸 | 涓ユ牸閬靛畧Alibaba瑙勮寖涓庨」鐩粺涓�閰嶇疆鐨勪唬鐮佹牸寮忓寲 | 浠ｇ爜涔﹀啓涓庡父瑙勭粨鏋勪笉鍚岄槄璇婚殰纰嶅ぇ | | Web瀹瑰櫒 | 閲囩敤 Undertow 鍩轰簬 XNIO 鐨勯珮鎬ц兘瀹瑰櫒 | 閲囩敤 Tomcat | @@ -43,7 +45,7 @@ | 鏁版嵁鏉冮檺 | 閲囩敤 Mybatis-Plus 鎻掍欢 鑷鍒嗘瀽鎷兼帴SQL 鏃犳劅寮忚繃婊�<br/>鍙渶涓篗apper璁剧疆濂芥敞瑙ｆ潯浠� 鏀寔澶氱鑷畾涔� 涓嶉檺浜庨儴闂ㄨ鑹� | 閲囩敤 娉ㄨВ+aop 瀹炵幇 鍩轰簬閮ㄩ棬瑙掕壊 鐢熸垚鐨剆ql鍏煎鎬у樊 涓嶆敮鎸佸叾浠栦笟鍔℃墿灞�<br/>鐢熸垚sql鍚庨渶鎵嬪姩鎷兼帴鍒板叿浣撲笟鍔ql涓� 瀵逛簬澶氫釜Mapper鏌ヨ涓嶈捣浣滅敤 | | 鏁版嵁鑴辨晱 | 閲囩敤 娉ㄨВ + jackson 搴忓垪鍖栨湡闂磋劚鏁� 鏀寔涓嶅悓妯″潡涓嶅悓鐨勮劚鏁忔潯浠�<br/>鏀寔澶氱绛栫暐 濡傝韩浠借瘉銆佹墜鏈哄彿銆佸湴鍧�銆侀偖绠便�侀摱琛屽崱绛� 鍙嚜琛屾墿灞� | 鏃� | | 鏁版嵁鍔犺В瀵� | 閲囩敤 娉ㄨВ + mybatis 鎷︽埅鍣� 瀵瑰瓨鍙栨暟鎹湡闂磋嚜鍔ㄥ姞瑙ｅ瘑<br/>鏀寔澶氱绛栫暐 濡侭ASE64銆丄ES銆丷SA銆丼M2銆丼M4绛� | 鏃� | -| 鏁版嵁缈昏瘧 | 閲囩敤 娉ㄨВ + jackson 搴忓垪鍖栨湡闂村姩鎬佷慨鏀规暟鎹� 鏁版嵁杩涜缈昏瘧<br/>鏀寔澶氱妯″紡: `鏄犲皠缈昏瘧``鐩存帴缈昏瘧``鍏朵粬鎵╁睍鏉′欢缈昏瘧` 鎺ュ彛鍖栦袱姝ュ嵆鍙畬鎴愯嚜瀹氫箟鎵╁睍 鍐呯疆澶氱缈昏瘧瀹炵幇 | 鏃� | +| 鏁版嵁缈昏瘧 | 閲囩敤 娉ㄨВ + jackson 搴忓垪鍖栨湡闂村姩鎬佷慨鏀规暟鎹� 鏁版嵁杩涜缈昏瘧<br/>鏀寔澶氱妯″紡: `鏄犲皠缈昏瘧` `鐩存帴缈昏瘧` `鍏朵粬鎵╁睍鏉′欢缈昏瘧` 鎺ュ彛鍖栦袱姝ュ嵆鍙畬鎴愯嚜瀹氫箟鎵╁睍 鍐呯疆澶氱缈昏瘧瀹炵幇 | 鏃� | | 澶氭暟鎹簮妗嗘灦 | 閲囩敤 dynamic-datasource 鏀寔涓栭潰澶ч儴鍒嗘暟鎹簱<br/>閫氳繃yml閰嶇疆鍗冲彲鍔ㄦ�佺鐞嗗紓鏋勪笉鍚岀绫荤殑鏁版嵁搴� 涔熷彲閫氳繃鍓嶇椤甸潰娣诲姞鏁版嵁婧�<br/>鏀寔spel琛ㄨ揪寮忎粠璇锋眰澶村弬鏁扮瓑鏉′欢鍒囨崲鏁版嵁婧� | 鍩轰簬 druid 鎵嬪姩缂栧啓浠ｇ爜閰嶇疆鏁版嵁婧� 閰嶇疆绻佺悙 鏀寔鎬у樊 | | 澶氭暟鎹簮浜嬪姟 | 閲囩敤 dynamic-datasource 鏀寔澶氭暟鎹簮涓嶅悓绉嶇被鐨勬暟鎹簱浜嬪姟鍥炴粴 | 涓嶆敮鎸� | | 鏁版嵁搴撹繛鎺ユ睜 | 閲囩敤 HikariCP Spring瀹樻柟鍐呯疆杩炴帴姹� 閰嶇疆绠�鍗� 浠ユ�ц兘涓庣ǔ瀹氭�ч椈鍚嶅ぉ涓� | 閲囩敤 druid bug浼楀 绀惧尯缁存姢宸� 娲昏穬搴︿綆 閰嶇疆浼楀绻佺悙鎬ц兘涓�鑸� | @@ -51,10 +53,11 @@ | WebSocket鍗忚 | 鍩轰簬 Spring 灏佽鐨� WebSocket 鍗忚 鎵╁睍浜員oken閴存潈涓庡垎甯冨紡浼氳瘽鍚屾 涓嶅啀鍙槸鍩轰簬鍗曟満鐨勫簾鐗� | 鏃� | | 搴忓垪鍖� | 閲囩敤 Jackson Spring瀹樻柟鍐呯疆搴忓垪鍖� 闈犺氨!!! | 閲囩敤 fastjson bugjson 杩滆繎闂诲悕 | | 鍒嗗竷寮忓箓绛� | 鍙傝�冪編鍥TIS闃查噸绯荤粺绠�鍖栧疄鐜�(缁嗚妭鍙湅鏂囨。) | 鎵嬪姩缂栧啓娉ㄨВ鍩轰簬aop瀹炵幇 | +| 鍒嗗竷寮忛攣 | 閲囩敤 Lock4j 搴曞眰鍩轰簬 Redisson | 鏃� | | 鍒嗗竷寮忎换鍔¤皟搴� | 閲囩敤 Xxl-Job 澶╃敓鏀寔鍒嗗竷寮� 缁熶竴鐨勭鐞嗕腑蹇� | 閲囩敤 Quartz 鍩轰簬鏁版嵁搴撻攣鎬ц兘宸� 闆嗙兢闇�瑕佸仛寰堝閰嶇疆涓庢敼閫� | | 鏂囦欢瀛樺偍 | 閲囩敤 Minio 鍒嗗竷寮忔枃浠跺瓨鍌� 澶╃敓鏀寔澶氭満銆佸纭洏銆佸鍒嗙墖銆佸鍓湰瀛樺偍<br/>鏀寔鏉冮檺绠＄悊 瀹夊叏鍙潬 鏂囦欢鍙姞瀵嗗瓨鍌� | 閲囩敤 鏈満鏂囦欢瀛樺偍 鏂囦欢瑁告紡 鏄撲涪澶辨硠婕� 涓嶆敮鎸侀泦缇ゆ湁鍗曠偣鏁堝簲 | | 浜戝瓨鍌� | 閲囩敤 AWS S3 鍗忚瀹㈡埛绔� 鏀寔 涓冪墰銆侀樋閲屻�佽吘璁� 绛変竴鍒囨敮鎸丼3鍗忚鐨勫巶瀹� | 涓嶆敮鎸� | -| 鐭俊 | 鏀寔 闃块噷銆佽吘璁� 鍙渶鍦▂ml閰嶇疆濂藉巶瀹跺瘑閽ュ嵆鍙娇鐢� 鎺ュ彛鍖栨敮鎸佹墿灞曞叾浠栧巶瀹� | 涓嶆敮鎸� | +| 鐭俊 | 閲囩敤 sms4j 鐭俊铻嶅悎鍖� 鏀寔鏁板崄绉嶇煭淇″巶瀹� 鍙渶鍦▂ml閰嶇疆濂藉巶瀹跺瘑閽ュ嵆鍙娇鐢� 鍙鍘傚鍏辩敤 | 涓嶆敮鎸� | | 閭欢 | 閲囩敤 mail-api 閫氱敤鍗忚鏀寔澶ч儴鍒嗛偖浠跺巶鍟� | 涓嶆敮鎸� | | 鎺ュ彛鏂囨。 | 閲囩敤 SpringDoc銆乯avadoc 鏃犳敞瑙ｉ浂鍏ヤ镜鍩轰簬java娉ㄩ噴<br/>鍙渶鎶婃敞閲婂啓濂� 鏃犻渶鍐嶅啓涓�澶у爢鐨勬枃妗ｆ敞瑙ｄ簡 | 閲囩敤 Springfox 宸插仠姝㈢淮鎶� 闇�瑕佺紪鍐欏ぇ閲忕殑娉ㄨВ鏉ユ敮鎸佹枃妗ｇ敓鎴� | | 鏍￠獙妗嗘灦 | 閲囩敤 Validation 鏀寔娉ㄨВ涓庡伐鍏风被鏍￠獙 娉ㄨВ鏀寔鍥介檯鍖� | 浠呮敮鎸佹敞瑙� 涓旀敞瑙ｄ笉鏀寔鍥介檯鍖� | @@ -101,17 +104,21 @@ 浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」 <br> ->[鍒濆鍖栭」鐩� 蹇呯湅](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init) ->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init) +>[鍒濆鍖栭」鐩� 蹇呯湅](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init) +>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init) > ->[涓撴爮涓庤棰� 鍏ラ棬蹇呯湅](https://javalionli.gitee.io/plus-doc/#/common/column) ->>[https://javalionli.gitee.io/plus-doc/#/common/column](https://javalionli.gitee.io/plus-doc/#/common/column) +>[涓撴爮涓庤棰� 鍏ラ棬蹇呯湅](https://plus-doc.dromara.org/#/common/column) +>>[https://plus-doc.dromara.org/#/common/column](https://plus-doc.dromara.org/#/common/column) > ->[閮ㄧ讲椤圭洰 蹇呯湅](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy) ->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy) +>[閮ㄧ讲椤圭洰 蹇呯湅](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy) +>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy) > ->[鍙傝�冩枃妗� Wiki](https://javalionli.gitee.io/plus-doc) ->>[https://javalionli.gitee.io/plus-doc](https://javalionli.gitee.io/plus-doc) +>[鍙傝�冩枃妗� Wiki](https://plus-doc.dromara.org) +>>[https://plus-doc.dromara.org](https://plus-doc.dromara.org) +> +>[鍙傝�冩枃妗�(鍥藉唴澶囦唤)](https://dromara.gitee.io/plus-doc) +>>[https://dromara.gitee.io/plus-doc](https://dromara.gitee.io/plus-doc) + ## 杞欢鏋舵瀯鍥� @@ -119,7 +126,7 @@ ## 濡備綍鍙備笌璐＄尞 -[鍙備笌璐＄尞鐨勬柟寮� https://javalionli.gitee.io/plus-doc/#/common/contribution](https://javalionli.gitee.io/plus-doc/#/common/contribution) +[鍙備笌璐＄尞鐨勬柟寮� https://plus-doc.dromara.org/#/common/contribution](https://plus-doc.dromara.org/#/common/contribution) ### 鍏朵粬 @@ -127,16 +134,16 @@ * GitHub 鍦板潃 [RuoYi-Vue-Plus](https://github.com/dromara/RuoYi-Vue-Plus) * 寰湇鍔� 鍒嗘敮 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus) * 鍓嶇椤圭洰 鍦板潃 [plus-ui](https://gitee.com/JavaLionLi/plus-ui) -* 鐢ㄦ埛鎵╁睍椤圭洰 [鎵╁睍椤圭洰鍒楄〃](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/extend-project/list) +* 鐢ㄦ埛鎵╁睍椤圭洰 [鎵╁睍椤圭洰鍒楄〃](https://plus-doc.dromara.org/#/ruoyi-vue-plus/extend-project/list) ## 鍔犵兢涓庢崘鐚� ->[鍔犵兢涓庢崘鐚甝(https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat) ->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat) +>[鍔犵兢涓庢崘鐚甝(https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat) +>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat](https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat) ## 鎹愮尞浣滆�� 浣滆�呬负鍏艰亴鍋氬紑婧�,骞虫椂杩橀渶瑕佸伐浣�,濡傛灉甯埌浜嗘偍鍙互璇蜂綔鑰呭悆涓洅楗� -<img src="https://images.gitee.com/uploads/images/2022/0218/213734_b1b8197f_1766278.jpeg" width="300px" height="450px" /> -<img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" /> +<img src="https://foruda.gitee.com/images/1678975784848381069/d8661ed9_1766278.png" width="300px" height="450px" /> +<img src="https://foruda.gitee.com/images/1678975801230205215/6f96229d_1766278.png" width="300px" height="450px" /> ## 婕旂ず鍥句緥 -- Gitblit v1.9.3