From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001 From: DYL0109 <dn18191638832@163.com> Date: 星期三, 16 四月 2025 19:20:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev --- README.md | 173 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 204f42c..7f5b4ec 100644 --- a/README.md +++ b/README.md @@ -1,80 +1,115 @@ +<div align="center"> + <img src="readme/logo-chinese.png" alt="杈撳叆鍥剧墖璇存槑" height="150" width="150"> +</div> <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">鏅虹⒊鑳芥簮绠＄悊绯荤粺</h1> -<h4 align="center">鍩轰簬SpringBoot鍜岃嫢渚濇鏋跺紑鍙�</h4> +<p align="center">鍩轰簬SpringBoot鍜岃嫢渚濇鏋跺紑鍙�</p> +<p align="center">鑳界⒊骞冲彴鍚庡彴灞曠ず&鎺ュ彛宸插畬鍏ㄥ紑婧愶紝浠ｇ爜瀹屽锛屽姛鑳介綈鍏紝杩愯姝ｅ父</p> +<p align="center"><span style="color: red;">閫氳繃鏈」鐩紝瀛︿範鑰呭彲浠ユ帉鎻¤兘婧愮鐞嗚涓氱殑鍔熻兘鍜屼笟鍔★紝浠ュ強鎶�鏈灦鏋勩��</span></p> + <p align="center"> - <a href='https://gitee.com/ustcyc/zhitan-ems/stargazers'><img src='https://gitee.com/ustcyc/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a> - <a href='https://gitee.com/ustcyc/zhitan-ems/members'><img src='https://gitee.com/ustcyc/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a> - <a href="https://gitee.com/y_project/RuoYi/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a> + <a href='https://gitee.com/liulingling1993/zhitan-ems/stargazers'><img src='https://gitee.com/liulingling1993/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a> + <a href='https://gitee.com/liulingling1993/zhitan-ems/members'><img src='https://gitee.com/liulingling1993/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a> </p> ## 浠嬬粛 -閫氳繃鐗╄仈缃戞妧鏈紝閲囬泦浼佷笟姘淬�佺數銆佹皵銆佺儹绛夎兘鑰楁暟鎹紝甯紒涓氬缓绔嬭兘婧愮鐞嗕綋绯伙紝鎵惧埌璺戝啋婊存紡锛屼粠鑰屼负浼佷笟鑺傝兘鎻愪緵渚濇嵁銆� -杩涗竴姝ヤ负浼佷笟瀹炵幇纰宠窡韪�佺⒊鐩樻煡銆佺⒊浜ゆ槗銆佽皥姹囨姤鐨勫叏鐢熷懡杩囩▼銆� 涓轰腑鍥界⒊杈惧嘲-纰充腑鍜屽仛鍑鸿础鐚�� +鑳芥簮绠＄悊绯荤粺锛岄噰闆嗕紒涓氭按銆佺數銆佹皵銆佺儹绛夎兘鑰楁暟鎹紝甯紒涓氬缓绔嬭兘婧愮鐞嗕綋绯伙紝鎵惧埌璺戝啋婊存紡锛屼粠鑰屼负浼佷笟鑺傝兘鎻愪緵渚濇嵁銆� +杩涗竴姝ヤ负浼佷笟瀹炵幇纰宠窡韪�佺⒊鐩樻煡銆佺⒊浜ゆ槗銆佺⒊姹囨姤鐨勫叏鐢熷懡杩囩▼銆� 涓轰腑鍥界⒊杈惧嘲-纰充腑鍜屽仛鍑鸿础鐚�� + 閽堝瀹㈡埛鍦烘櫙锛氭斂搴溿�佸洯鍖恒�佷紒涓氥�佸伐鐭裤�佸叕鍏卞缓绛戠瓑銆� +## 銆愭敞鎰忋�戝畬鏁磋兘纰崇鐞嗗钩鍙板寘鍚笁涓儴鍒嗭紝<span style="color: red;">鏈粨搴撳彧鍖呭惈鑳界⒊骞冲彴鍚庡彴绠＄悊绔�</span> +##### 1. 鑳界⒊骞冲彴鍚庡彴绠＄悊绔細<span style="color: red;">涔熷嵆鏈」鐩兘纰冲钩鍙板悗鍙板睍绀洪儴鍒嗭紝浠ｇ爜瀹屽锛岃繍琛屾甯搞�傞�氳繃鏈」鐩紝瀛︿範鑰呭彲浠ユ帉鎻¤兘婧愮鐞嗚涓氱殑鍔熻兘鍜屼笟鍔★紝浠ュ強鎶�鏈灦鏋勩��</span> +##### 2. 鏁版嵁閲囬泦绋嬪簭锛氫篃鍗砿qtt鉃★笍鏃跺簭搴撳姛鑳斤紝璇峰弬鑰僛鎴戜滑鍙︿竴涓粨搴擄紙鐐瑰嚮瓒呴摼鎺ワ級锛孧QTT閲囬泦缃戝叧](https://github.com/zhitan-cloud/zhitan-gateway)锛涙垨鑰呭彲鍙傝�僼hingsjs绛夌煡鍚嶉」鐩紝鎴栬�呰嚜宸辩敤netty鑷繁瀹炵幇銆� +##### 3. 鏁版嵁娓呮礂鏈嶅姟锛氫篃鍗虫椂搴忓簱鉃★笍鍏崇郴搴擄紝瀛︿範鑰呭彲浠ヤ娇鐢╦ava鑷甫鐨刋XL job绛夎鍒掍换鍔″伐鍏疯嚜宸辨寜鐓т笟鍔″姛鑳斤紝鏉ュ疄鐜版暟鎹竻娲楁湇鍔°�� -澧欏唴浠撳簱鍦板潃锛堢爜浜戯級锛歨ttps://gitee.com/ustcyc/zhitan-ems +## 鏂囨。--鍧囧湪wiki鐩綍 +### github wiki鍦板潃锛歨ttps://github.com/zhitan-cloud/zhitan-ems/wiki +### gitee wiki鍦板潃锛歨ttps://gitee.com/liulingling1993/zhitan-ems/wikis/ - -宸插悓姝ユ洿鏂板埌github浠撳簱锛歨ttps://github.com/Andy-Yin/zhitan-ems - -## 妗嗘灦锛� - -鍩轰簬SpringBoot鐨勮嫢渚濇鏋� 鏄撹鏄撴噦銆佺晫闈㈢畝娲佺編瑙傘�� -鍏崇郴鏁版嵁搴擄細mysql 鎴栬�� postgredb -鏃跺簭鏁版嵁搴擄細influxdb 2.7+ -涓棿浠讹細redis锛宮q -VUE鐗堟湰锛歏UE 3 - -## 鏁版嵁椹卞姩鐨勮绠楁ā鍨嬪拰涓氬姟妯″瀷閰嶇疆 -鏀寔鍔ㄦ�佺偣浣嶉厤缃�佹暟鎹ā鍨嬨�佷笟鍔℃ā鍨嬬瓑銆� ## 鍦ㄧ嚎浣撻獙 -- guestUser/guestUser +#### guestUser/guest@123456 +#### 婕旂ず鍦板潃锛歨ttps://demo-ems.zhitancloud.com/ -婕旂ず鍦板潃锛歨ttps://demo-ems.zhitancloud.com/ + +## 绀惧尯鐗�-鍔熻兘鍒楄〃 +1. 棣栭〉鐪嬫澘 **宸插畬鎴�** +2. 瀹炴椂鏁版嵁鐩戞祴 **宸插畬鎴�** + 2.1. 瀹炴椂鏁版嵁鏌ョ湅 **宸插畬鎴�** + 2.2. 缁勬�佸浘鍒嗘瀽锛坰vg 鍥剧粦瀹氾級**宸插畬鎴�** +3. 鍘嗗彶鐐逛綅鍒嗘瀽 **宸插畬鎴�** +4. 缁煎悎鎸囨爣鍒嗘瀽 **宸插畬鎴�** + 4.1. 缁煎悎鎸囨爣鍒嗘瀽锛堟棩锛�**宸插畬鎴�** + 4.2. 缁煎悎鎸囨爣鍒嗘瀽锛堟湀锛�**宸插畬鎴�** + 4.3. 缁煎悎鎸囨爣鍒嗘瀽锛堝勾锛�**宸插畬鎴�** +5. 閲嶇偣璁惧鍒嗘瀽 **宸插畬鎴�** + 5.1. 閲嶇偣璁惧鍒嗘瀽锛堟棩锛�**宸插畬鎴�** + 5.2. 閲嶇偣璁惧鍒嗘瀽锛堟湀锛�**宸插畬鎴�** + 5.3. 閲嶇偣璁惧鍒嗘瀽锛堝勾锛�**宸插畬鎴�** +6. 宸ュ簭鑳借�楀垎鏋� **宸插畬鎴�** + 6.1. 宸ュ簭鑳借�楀垎鏋愶紙鏃ワ級**宸插畬鎴�** + 6.2. 宸ュ簭鑳借�楀垎鏋愶紙鏈堬級**宸插畬鎴�** + 6.3. 宸ュ簭鑳借�楀垎鏋愶紙骞达級**宸插畬鎴�** +7. 灏栧嘲骞宠胺鍒嗘瀽 **宸插畬鎴�** + 7.1. 灏栧嘲骞宠胺閰嶇疆 **宸插畬鎴�** + 7.2. 灏栧嘲骞宠胺鏁版嵁 **宸插畬鎴�** +8. 鑳借�楀姣斿垎鏋愶紙鍚勮兘婧愬搧绉嶏級**宸插畬鎴�** + 8.1. 鐢靛悓鐜瘮鍒嗘瀽 **宸插畬鎴�** + 8.2. 姘村悓鐜瘮鍒嗘瀽 **宸插畬鎴�** + 8.3. 鍏朵粬鑳芥簮鍝佺鍒嗘瀽 **宸插畬鎴�** +9. 鏅鸿兘鎶ヨ **宸插畬鎴�** + 9.1. 鎶ヨ鍒嗘瀽 **宸插畬鎴�** + 9.2. 鎶ヨ閰嶇疆 **宸插畬鎴�** +10. 鏁版嵁琛ュ綍 **宸插畬鎴�** +11. 鑺傝兘椤圭洰绠＄悊 **宸插畬鎴�** +12. 鐭ヨ瘑搴� **宸插畬鎴�** +13. 璁惧妗ｆ绠＄悊 **宸插畬鎴�** +14. 妯″瀷閰嶇疆绠＄悊锛堣绠楁ā鍨嬬瓑锛� **宸插畬鎴�** +15. 鍩虹鏁版嵁绠＄悊锛堝瓧鍏搞�佽兘婧愮被鍨嬬瓑锛� **宸插畬鎴�** +16. 绯荤粺绠＄悊锛堢敤鎴枫�佽鑹层�佹潈闄愮瓑锛� **宸插畬鎴�** +17. 寤虹瓚鑳借�楀垎鏋愶紙鏀矾銆佸垎椤癸級 **宸插畬鎴�** + +## 澧炲己鐗�-鍔熻兘鍒楄〃 +1. 鍗曡�楀垎鏋� +2. 璁″垝涓庡疄缁� +3. 鐢ㄨ兘鑰冩牳 +4. 鐢ㄨ兘瀵规爣 +5. 寤虹瓚鑳借�楃┖璋冭妭鑳� +6. 鑳芥簮骞宠 鍒嗘瀽 +7. 鑳芥簮瀵规爣鍒嗘瀽 +8. 绌哄帇鏈洪噸鐐硅澶囪妭鑳藉唴瀹� +9. 纰崇洏鏌ャ�佺⒊璺緞銆佺⒊鎺掓斁鍥犲瓙鍥犲瓙鐩稿叧鍐呭 +10. 婧愮綉鑽峰偍锛堝井鐢电綉锛夌浉鍏冲姛鑳� +11. 浣庣⒊鍥尯鐩稿叧 +12. 鑷畾涔夋姤琛� +13. 鑳芥簮鎴愭湰鍒嗘瀽 +14. 鍏変紡杩愮淮鐩戞帶 +15. 鍏呯數杩愯惀骞冲彴 + + + +## 妗嗘灦锛� + +鍩轰簬SpringBoot鐨勮嫢渚濇鏋� 鏄撹鏄撴噦銆佺晫闈㈢畝娲佺編瑙傘�傛敮鎸佹繁鑹�&娴呰壊涓ょ椋庢牸鍒囨崲锛堟紨绀虹郴缁熷彸涓婅锛� +鍏崇郴鏁版嵁搴擄細postgresql锛坢ysql闇�鑷閫傞厤锛宮ysql鎬ц兘澶樊浜嗭級 +鏃跺簭鏁版嵁搴擄細influxdb 2.7+ +涓棿浠讹細redis +VUE鐗堟湰锛歏UE 3 + +## 鐗硅壊锛氭暟鎹┍鍔ㄧ殑璁＄畻妯″瀷鍜屼笟鍔℃ā鍨嬮厤缃� +1. 鏀寔鍔ㄦ�佺偣浣嶉厤缃�� + +2. 鏀寔璁＄畻鍏紡銆� + +3. 鏀寔妯″瀷閰嶇疆銆佸寘鎷暟鎹ā鍨嬨�佷笟鍔℃ā鍨嬨�� + +4. 澶嶆潅椤圭洰搴曞眰浠ｇ爜&鏁版嵁缁撴瀯瀹屽叏涓嶉渶瑕佸彉鍖栵紝鍙揩閫熶氦浠樺疄鏂姐�� +5. 宸插畬鎴愭爣鍑嗗寲鐨勭綉鍏�&鐢佃〃绛夐噰闆嗚澶囧鎺ワ紝蹇�熶负瀹㈡埛杞‖浠朵竴浣撳寲浜や粯銆� + ## 浜偣鍔熻兘  - -## 鍔熻兘鍒楄〃 -1. 棣栭〉鐪嬫澘 -2. 瀹炴椂鏁版嵁鐩戞祴 - 2.1. 瀹炴椂鏁版嵁鏌ョ湅 - 2.2. 缁勬�佸浘鍒嗘瀽锛坰vg 鍥剧粦瀹氾級 -3. 鍘嗗彶鏁版嵁鍒嗘瀽 -4. 缁煎悎鎸囨爣鍒嗘瀽 - 4.1. 缁煎悎鎸囨爣鍒嗘瀽锛堟棩锛� - 4.2. 缁煎悎鎸囨爣鍒嗘瀽锛堟湀锛� - 4.3. 缁煎悎鎸囨爣鍒嗘瀽锛堝勾锛� -5. 閲嶇偣璁惧鍒嗘瀽 - 5.1. 閲嶇偣璁惧鍒嗘瀽锛堟棩锛� - 5.2. 閲嶇偣璁惧鍒嗘瀽锛堟湀锛� - 5.3. 閲嶇偣璁惧鍒嗘瀽锛堝勾锛� -6. 宸ュ簭鑳借�楀垎鏋� - 6.1. 宸ュ簭鑳借�楀垎鏋愶紙鏃ワ級 - 6.2. 宸ュ簭鑳借�楀垎鏋愶紙鏈堬級 - 6.3. 宸ュ簭鑳借�楀垎鏋愶紙骞达級 -7. 灏栧嘲骞宠胺鍒嗘瀽 - 7.1. 灏栧嘲骞宠胺閰嶇疆 - 7.2. 灏栧嘲骞宠胺鏁版嵁 -8. 鑳借�楀姣斿垎鏋愶紙鍚勮兘婧愬搧绉嶏級 - 8.1. 鐢靛悓鐜瘮鍒嗘瀽 - 8.2. 姘村悓鐜瘮鍒嗘瀽 -9. 鏅鸿兘鎶ヨ - 9.1. 鎶ヨ鍒嗘瀽 - 9.2. 鎶ヨ閰嶇疆 -10. 鍗曡�楀垎鏋� -11. 璁″垝涓庡疄缁� -12. 鐢ㄨ兘鑰冩牳 -13. 鐢ㄨ兘瀵规爣 -14. 鏁版嵁琛ュ綍 -15. 鑺傝兘椤圭洰绠＄悊 -16. 鑳芥簮骞宠 鍒嗘瀽 -17. 鑳芥簮瀵规爣鍒嗘瀽 -18. 妯″瀷閰嶇疆绠＄悊锛堣绠楁ā鍨嬬瓑锛� -19. 鍩虹鏁版嵁绠＄悊锛堝瓧鍏搞�佽兘婧愮被鍨嬬瓑锛� -20. 绯荤粺绠＄悊锛堢敤鎴枫�佽鑹层�佹潈闄愮瓑锛� ## UI灞曠ず锛堝钩鍙板垎娣辫壊鍜屾祬鑹蹭袱绉嶉鏍煎垏鎹級 @@ -107,13 +142,27 @@ ## 涓氬姟鏋舵瀯  + ## 鎶�鏈灦鏋�   + +## 娌熼�氫氦娴� + +搴斿緢澶氬紑鍙戣�呯淇★紝鎴戝垱寤轰簡QQ缇や氦娴侊紝缇ゅ彿锛氾紝璇峰娉細ems+濮撳悕銆� +<p align="center"> + <img src="readme/img/qq.png" width=50% height=50%> +</p> + +鎵爜娣诲姞寰俊浜ゆ祦锛屽姞寰俊璇峰娉細ems+濮撳悕銆� + +<p align="center"> + <img src="readme/img/image-wxm.png" width=50% height=50%> +</p> ## 鍙備笌璐＄尞 1. Fork 鏈粨搴� 2. 鏂板缓 Feat_xxx 鍒嗘敮 3. 鎻愪氦浠ｇ爜 -4. 鏂板缓 Pull Request \ No newline at end of file +4. 鏂板缓 Pull Request -- Gitblit v1.9.3