From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突

---
 README.md |  628 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 382 insertions(+), 246 deletions(-)

diff --git a/README.md b/README.md
index f618863..c72dc7f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
-JEECG BOOT 浣庝唬鐮佸紑鍙戝钩鍙帮紙Vue3鍓嶇锛�
+
+
+![JEECG](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/logov3.png "JeecgBoot浣庝唬鐮佸紑鍙戝钩鍙�")
+
+
+
+JEECG BOOT 浣庝唬鐮佸紑鍙戝钩鍙�
 ===============
-褰撳墠鏈�鏂扮増鏈細 3.5.0锛堝彂甯冩椂闂达細2023-03-08锛�
+
+褰撳墠鏈�鏂扮増鏈細 3.5.0锛堝彂甯冩棩鏈燂細2023-03-08锛� 
+
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-鍖椾含鏁叉暡浜戠鎶�-orange.svg)](http://www.jeecg.com)
@@ -11,201 +19,306 @@
 
 
 
-## 绠�浠�
-JeecgBoot-Vue3閲囩敤 Vue3.0銆乂ite銆� Ant-Design-Vue3銆乀ypeScript 绛夋柊鎶�鏈柟妗堬紝鍖呮嫭浜屾灏佽缁勪欢銆乽tils銆乭ooks銆佸姩鎬佽彍鍗曘�佹潈闄愭牎楠屻�佹寜閽骇鍒潈闄愭帶鍒剁瓑鍔熻兘銆�
-鏄噰鐢╒ben瀹炵幇鐨� JeecgBoot浣庝唬鐮佸钩鍙扮殑鍏ㄦ柊vue3鐗堟湰銆�
- 
-> 寮哄ぇ鐨勪唬鐮佺敓鎴愬櫒璁╁墠鍚庣浠g爜涓�閿敓鎴�! JeecgBoot寮曢浣庝唬鐮佸紑鍙戞ā寮�(OnlineCoding-> 浠g爜鐢熸垚-> 鎵嬪伐MERGE)锛� 甯姪瑙e喅Java椤圭洰70%鐨勯噸澶嶅伐浣滐紝璁╁紑鍙戞洿澶氬叧娉ㄤ笟鍔°�傛棦鑳藉揩閫熸彁楂樻晥鐜囷紝鑺傜渷鎴愭湰锛屽悓鏃跺張涓嶅け鐏垫椿鎬�
+椤圭洰浠嬬粛
+-----------------------------------
 
-## 鎶�鏈敮鎸�
+<h3 align="center">Java Low Code Platform for Enterprise web applications</h3>
 
-鍏抽棴Gitee鐨刬ssue閫氶亾锛屼娇鐢ㄤ腑閬囧埌闂鎴栬�匓UG鍙互鍦� [Github涓婃彁Issues](https://github.com/jeecgboot/jeecgboot-vue3/issues/new)
+JeecgBoot 鏄竴娆惧熀浜庝唬鐮佺敓鎴愬櫒鐨刞浣庝唬鐮佸紑鍙戝钩鍙癭锛佸墠鍚庣鍒嗙鏋舵瀯 SpringBoot2.x锛孲pringCloud锛孉nt Design&Vue锛孧ybatis-plus锛孲hiro锛孞WT锛屾敮鎸佸井鏈嶅姟銆傚己澶х殑浠g爜鐢熸垚鍣ㄨ鍓嶅悗绔唬鐮佷竴閿敓鎴愶紝瀹炵幇浣庝唬鐮佸紑鍙�!  JeecgBoot 寮曢鏂扮殑浣庝唬鐮佸紑鍙戞ā寮�(OnlineCoding-> 浠g爜鐢熸垚鍣�-> 鎵嬪伐MERGE)锛� 甯姪瑙e喅Java椤圭洰70%鐨勯噸澶嶅伐浣滐紝璁╁紑鍙戞洿澶氬叧娉ㄤ笟鍔°�傛棦鑳藉揩閫熸彁楂樻晥鐜囷紝鑺傜渷鐮斿彂鎴愭湰锛屽悓鏃跺張涓嶅け鐏垫椿鎬э紒
 
-瀹樻柟鏀寔锛� http://jeecg.com/doc/help
+JeecgBoot 鎻愪緵浜嗕竴绯诲垪`浣庝唬鐮佹ā鍧梎锛屽疄鐜板湪绾垮紑鍙慲鐪熸鐨勯浂浠g爜`锛歄nline琛ㄥ崟寮�鍙戙�丱nline鎶ヨ〃銆佹姤琛ㄩ厤缃兘鍔涖�佸湪绾垮浘琛ㄨ璁°�佸ぇ灞忚璁°�佺Щ鍔ㄩ厤缃兘鍔涖�佽〃鍗曡璁″櫒銆佸湪绾胯璁℃祦绋嬨�佹祦绋嬭嚜鍔ㄥ寲閰嶇疆銆佹彃浠惰兘鍔涳紙鍙彃鎷旓級绛夌瓑锛�
 
 
-## 婧愮爜涓嬭浇
+`JEECG瀹楁棬鏄�:` 绠�鍗曞姛鑳界敱OnlineCoding閰嶇疆瀹炵幇锛屽仛鍒癭闆朵唬鐮佸紑鍙慲锛涘鏉傚姛鑳界敱浠g爜鐢熸垚鍣ㄧ敓鎴愯繘琛屾墜宸erge 瀹炵幇`浣庝唬鐮佸紑鍙慲锛屾棦淇濊瘉浜哷鏅鸿兘`鍙堝吋椤綻鐏垫椿`锛涘疄鐜颁簡浣庝唬鐮佸紑鍙戠殑鍚屾椂鍙堟敮鎸佺伒娲荤紪鐮侊紝瑙e喅浜嗗綋鍓嶄綆浠g爜浜у搧鏅亶涓嶇伒娲荤殑寮婄锛�
 
-- 鍚庡彴婧愮爜 锛歨ttps://github.com/jeecgboot/jeecg-boot
-- 鍓嶇婧愮爜 锛歨ttps://github.com/jeecgboot/jeecgboot-vue3
+`JEECG涓氬姟娴佺▼:` 閲囩敤宸ヤ綔娴佹潵瀹炵幇銆佹墿灞曞嚭浠诲姟鎺ュ彛锛屼緵寮�鍙戠紪鍐欎笟鍔¢�昏緫锛岃〃鍗曟彁渚涘绉嶈В鍐虫柟妗堬細 琛ㄥ崟璁捐鍣ㄣ�乷nline閰嶇疆琛ㄥ崟銆佺紪鐮佽〃鍗曘�傚悓鏃跺疄鐜颁簡娴佺▼涓庤〃鍗曠殑鍒嗙璁捐锛堟澗鑰﹀悎锛夈�佸苟鏀寔浠诲姟鑺傜偣鐏垫椿閰嶇疆锛屾棦淇濊瘉浜嗗叕鍙告祦绋嬬殑淇濆瘑鎬э紝鍙堝噺灏戜簡寮�鍙戜汉鍛樼殑宸ヤ綔閲忋��
+
+
+婧愮爜涓嬭浇
+-----------------------------------
+
+| 婧愮爜                | 婧愮爜鍦板潃                     | 
+|--------------------|------------------------|
+| 鍚庡彴婧愮爜 JAVA   | https://github.com/jeecgboot/jeecg-boot        |
+| 鍓嶇婧愮爜 `Vue3鐗坄 | https://github.com/jeecgboot/jeecgboot-vue3 |
+| APP閰嶅妗嗘灦 | https://github.com/jeecgboot/jeecg-uniapp |
+
+#####  蹇�熸惌寤哄紑鍙戠幆澧�
+
+- [閫氳繃IDEA鍚姩鍓嶅悗绔」鐩甝(http://doc.jeecg.com/2043874)
+- [Vue3鍓嶇椤圭洰蹇�熷惎鍔╙(http://vue3.jeecg.com/2398848)
+- [鍗曚綋蹇�熷垏鎹负寰湇鍔$増](http://doc.jeecg.com/3043471)
 
 ##### 椤圭洰璇存槑
 
 | 椤圭洰鍚�                | 璇存槑                     | 
 |--------------------|------------------------|
-| `jeecgboot-vue3` | Vue3鐗堝墠绔唬鐮� | 
-| `jeecg-boot`    | SpringBoot鍚庡彴椤圭洰锛堟敮鎸佸井鏈嶅姟锛�        | 
+| `jeecg-boot`    | SpringBoot鍚庡彴婧愮爜锛堟敮鎸佸井鏈嶅姟锛�        |
+| `jeecgboot-vue3` | Vue3+TS 鏂扮増鍓嶇婧愮爜 |
+| `jeecg-uniapp` | APP寮�鍙戞鏋讹紝涓�浠戒唬鐮佸缁堢閫傞厤锛屽悓鏃舵敮鎸丄PP銆佸皬绋嬪簭銆丠5 |
+| `jeecg-boot-starter` | [Stater渚濊禆椤圭洰鍗曠嫭缁存姢锛岀偣鍑讳笅杞絔(https://gitee.com/jeecg/jeecg-boot-starter) |
+| `鏇村寮�婧愭彃浠禶 | [鏇村婧愮爜涓嬭浇](https://github.com/jeecgboot) |
 
 
-## 鎶�鏈枃妗�
-
--   瀹樻柟鏂囨。锛歔http://vue3.jeecg.com](http://vue3.jeecg.com)
--   瀹樻柟缃戠珯锛� [http://www.jeecg.com](http://www.jeecg.com)
--   鍦ㄧ嚎婕旂ず锛歔浣庝唬鐮佹紨绀篯(http://boot3.jeecg.com) | [鏁叉暡浜戦浂浠g爜](https://www.qiaoqiaoyun.com)
--   蹇�熷叆闂細[甯歌闂](http://vue3.jeecg.com/2426559) | [鍏ラ棬瑙嗛](https://www.bilibili.com/video/BV1V34y187Y9 "鍏ラ棬瑙嗛") |  [ 浠g爜鐢熸垚](http://vue3.jeecg.com/2677352)
--   QQ浜ゆ祦缇わ細683903138
-
-## 瀹夎涓庝娇鐢�
 
 
- > 鐜瑕佹眰: 鐗堟湰瑕佹眰Node 14.18+ / 16+ 鐗堟湰浠ヤ笂锛屼笉鍐嶆敮鎸� Node 12 / 13 / 15銆�
- > 寤鸿浣跨敤pnpm锛屽鏋滀娇鐢▂arn,璇风敤Yarn1.x鐗堟湰锛屽惁鍒欎緷璧栧彲鑳藉畨瑁呬笉涓娿��
 
-  
-- Get the project code
+鎶�鏈枃妗�
+-----------------------------------
 
-```bash
-git clone https://github.com/jeecgboot/jeecgboot-vue3.git
+- 椤圭洰瀹樼綉锛�  [http://www.jeecg.com](http://www.jeecg.com)
+
+- 鍦ㄧ嚎婕旂ず 锛�  [Vue3鐗堟湰](http://boot3.jeecg.com)  |  [鏁叉暡浜�(闆朵唬鐮�)](http://app.qiaoqiaoyun.com)
+
+- 寮�鍙戞枃妗o細  [Vue3鏂囨。](http://vue3.jeecg.com) | [涓婚」鐩枃妗(http://doc.jeecg.com) 
+
+- 鏂版墜鎸囧崡锛� [蹇�熷叆闂╙(http://www.jeecg.com/doc/quickstart)  |   [甯歌闂 ](http://www.jeecg.com/doc/qa) |  [瑙嗛鏁欑▼](https://space.bilibili.com/454617261/channel/series)  |  [1鍒嗛挓浣撻獙浣庝唬鐮乚(https://my.oschina.net/jeecg/blog/3083313) 
+
+- QQ浜ゆ祦缇� 锛� 鈶�730954414銆乂UE3缇�683903138銆佲懁860162132(婊�)銆佲懀774126647(婊�)銆佲憿816531124(婊�)銆佲憽769925425(婊�)銆佲憼284271917(婊�)
+> ` 鎻愰啋锛氥�怮Q缇ゆ槸鑷姪鏈嶅姟缇わ紝寤鸿缁欏府鍔╂偍瑙e喅闂鐨勫悓瀛﹀彂閫佹寚瀹氱孩鍖咃紝琛ㄧず鎰熻阿锛併�� `
+
+
+
+
+
+Docker鍚姩椤圭洰
+-----------------------------------
+
+- [Docker鍚姩鍗曚綋鍚庡彴](http://doc.jeecg.com/2043889)
+- [Docker鍚姩Vue3鍓嶇](http://vue3.jeecg.com/3028878)
+- [Docker鍚姩寰湇鍔″悗鍙癩(http://doc.jeecg.com/3043472)
+
+
+************
+
+VUE2鐗堟湰涓撻璇存槑
+-----------------------------------
+#### 椤圭洰浠嬬粛 
+- 椤圭洰鍚嶇О锛歛nt-design-vue-jeecg
+- 璇存槑锛欽eecgBoot鍓嶇鎻愪緵涓ゅ瑙e喅鏂规锛屼竴濂梀UE2鍜屼竴濂梀UE3鐗堟湰锛岀洰鍓峷ue2鐗堟湰鏈�鏂颁唬鐮佸彧鏀寔鍒癹eecgboot 3.4.3鐗堟湰锛屼竴瀹氭敞鎰忋��
+- 鏇村浠嬬粛锛歔Vue2鐗堟紨绀篯(http://boot.jeecg.com) |[寮�鍙戞枃妗(http://doc.jeecg.com) 
+- [蹇�熷惎鍔ㄢ�斺�擵ue2鍓嶇](http://doc.jeecg.com/2678320)
+- [Docker鍚姩鈥斺�擵ue2鍓嶇](http://doc.jeecg.com/3043612)
+
+
+#### Vue2涓嶸ue3鐗堟湰鍖哄埆
+> - VUE3鐗堟湰褰诲簳鎶涘純IE鍏煎锛屼笉鍏煎IE鍜屼綆鐗堟湰娴忚鍣紝鍙�傞厤楂樼増鏈胺姝屽拰Edge
+ 锛堟斂搴溿�佷簨涓氱被鍗曚綅椤圭洰闇�瑕佽皑鎱庨�夋嫨鈥斺�斿浗浜у寲杩佺Щ鏄竴涓极闀跨殑杩囩▼锛屼竾涓�杩囩▼涓姹侷E鍏煎锛岃繖涓笉鍙�嗭級
+> - 鎵�浠ュ鏋滃娴忚鍣ㄦ湁瑕佹眰鐨勯」鐩紝璇烽�夋嫨VUE2鐗堟湰銆�
+> - VUE3鐗堟槸鍏ㄦ柊鐨勬妧鏈爤锛岀揣璺熶富娴侊紙鍓嶇閲嶅啓锛夛紝鍚勪釜鍔熻兘閮藉仛浜嗕紭鍖栵紝鎷ユ湁鏇村ソ鐨勪綋楠屾晥鏋�
+
+
+#### 婧愮爜涓嬭浇
+| 婧愮爜                | 婧愮爜鍦板潃                     | 
+|--------------------|------------------------|
+| 鍚庣婧愮爜 `Vue2鐗坄  |https://gitee.com/jeecg/jeecg-boot/tree/v3.4.3last    |
+| 鍓嶇婧愮爜 `Vue2鐗坄  |https://gitee.com/jeecg/ant-design-vue-jeecg    |
+
+************
+
+
+閫傜敤椤圭洰
+-----------------------------------
+Jeecg-Boot浣庝唬鐮佸紑鍙戝钩鍙帮紝鍙互搴旂敤鍦ㄤ换浣旿2EE椤圭洰鐨勫紑鍙戜腑锛屽挨鍏堕�傚悎SAAS椤圭洰銆佷紒涓氫俊鎭鐞嗙郴缁燂紙MIS锛夈�佸唴閮ㄥ姙鍏郴缁燂紙OA锛夈�佷紒涓氳祫婧愯鍒掔郴缁燂紙ERP锛夈�佸鎴峰叧绯荤鐞嗙郴缁燂紙CRM锛夌瓑锛屽叾鍗婃櫤鑳芥墜宸erge鐨勫紑鍙戞柟寮忥紝鍙互鏄捐憲鎻愰珮寮�鍙戞晥鐜�70%浠ヤ笂锛屾瀬澶ч檷浣庡紑鍙戞垚鏈��
+
+
+鎶�鏈敮鎸�
+-----------------------------------
+
+鍏抽棴gitee鐨刬ssue閫氶亾锛屼娇鐢ㄤ腑閬囧埌闂鎴栬�匓UG鍙互鍦� [Github涓婃彁Issues](https://github.com/jeecgboot/jeecg-boot/issues/new)
+
+瀹樻柟鏀寔锛� [http://jeecg.com/doc/help](http://jeecg.com/doc/help)
+
+
+##### Star璧板娍鍥�
+
+[![Star History Chart](https://api.star-history.com/svg?repos=jeecgboot/jeecg-boot&type=Date)](https://star-history.com/#jeecgboot/jeecg-boot)
+
+
+
+
+鍚庡彴鐩綍缁撴瀯
+-----------------------------------
 ```
-
-- Installation dependencies
-
-```bash
-cd jeecgboot-vue3
-
-pnpm install
-```
-
-- 閰嶇疆鎺ュ彛鍦板潃 `.env.development`
-
-```bash
-VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot
-```
-
-> 璇存槑锛氭妸`http://localhost:8080/jeecg-boot` 鎹㈡垚鑷繁鍦板潃锛屽叾浠栦笉鐢ㄦ敼銆�
-
-
-- run
-
-```bash
-pnpm serve
-```
-
-
-- build
-
-```bash
-pnpm build
-```
-
-
-## Docker闀滃儚鍚姩鍓嶇(鍗曚綋妯″紡)
-
-- host璁剧疆
-
->娉ㄦ剰锛� 闇�瑕佹妸`127.0.0.1`鏇挎崲鎴愮湡瀹濱P 姣斿`192.`寮�澶�,涓嶇劧鍚庣涓嶉�氥��
-
-```bash
-127.0.0.1 jeecg-boot-system
-127.0.0.1 jeecg-boot-gateway
-```
-
-
-- 涓嬭浇椤圭洰
-
-```bash
-git clone https://github.com/jeecgboot/jeecgboot-vue3.git
-
-cd jeecgboot-vue3
-```
-
-- 閰嶇疆鎺ュ彛鍩熷悕 `.env.production`
-
-```bash
-VITE_GLOB_API_URL=/jeecgboot
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot
-```
-鍚庡彴鍗曚綋鍚姩 [瑙佹鏂囨。](http://doc.jeecg.com/2043889)
-
-- 缂栬瘧椤圭洰
-
-```bash
-pnpm install
-
-pnpm build
-```
-
-- 鍚姩瀹瑰櫒
-```bash
-docker build -t jeecgboot-vue3 .
-docker run --name jeecgboot-vue3-nginx -p 80:80 -d jeecgboot-vue3
-```
-
-- 璁块棶鍓嶅彴
-
-http://localhost
-
-## Docker闀滃儚鍚姩鍓嶇(寰湇鍔℃ā寮�)
-> 杩欓噷鍙啓涓庡崟浣撶殑鍖哄埆姝ラ
-
--  鍖哄埆1. 淇敼鍚庡彴鍩熷悕
-.env.production
-
-```bash
-VITE_GLOB_API_URL=/jeecgboot
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-gateway:9999
-```
-
-鍚庡彴寰湇鍔″惎鍔� [瑙佹鏂囨。](http://doc.jeecg.com/2656147)
-
-- 鍖哄埆2. 淇敼Dockerfile鏂囦欢
-
-```bash
-- 鎶奰http://jeecg-boot-system:8080/jeecg-boot`鏇挎崲鎴� `http://jeecg-boot-gateway:9999`
-- 鎶奰jeecg-boot-system`鏇挎崲鎴� `jeecg-boot-gateway`
-```
-
--  鍏朵粬涓庡崟浣撴ā寮忎竴鏍�
-
-```bash
-闀滃儚闇�瑕侀噸鐜版瀯寤猴紝鏈�濂芥妸鍗曚綋鐨勯暅鍍忓垹鎺夛紝閲嶆柊鏋勫缓docker闀滃儚銆�
+椤圭洰缁撴瀯
+鈹溾攢jeecg-boot-parent锛堢埗POM锛� 椤圭洰渚濊禆銆乵odules缁勭粐锛�
+鈹�  鈹溾攢jeecg-boot-base-core锛堝叡閫氭ā鍧楋細 宸ュ叿绫汇�乧onfig銆佹潈闄愩�佹煡璇㈣繃婊ゅ櫒銆佹敞瑙g瓑锛�
+鈹�  鈹溾攢jeecg-module-demo    绀轰緥浠g爜
+鈹�  鈹溾攢jeecg-module-system  System绯荤粺绠$悊鐩綍
+鈹�  鈹�  鈹溾攢jeecg-system-biz    System绯荤粺绠$悊鏉冮檺绛夊姛鑳�
+鈹�  鈹�  鈹溾攢jeecg-system-start  System鍗曚綋鍚姩椤圭洰(8080锛�
+鈹�  鈹�  鈹溾攢jeecg-system-api    System绯荤粺绠$悊妯″潡瀵瑰api
+鈹�  鈹�  鈹�  鈹溾攢jeecg-system-cloud-api   System妯″潡瀵瑰鎻愪緵鐨勫井鏈嶅姟鎺ュ彛
+鈹�  鈹�  鈹�  鈹溾攢jeecg-system-local-api   System妯″潡瀵瑰鎻愪緵鐨勫崟浣撴帴鍙�
+鈹�  鈹溾攢jeecg-server-cloud           --寰湇鍔℃ā鍧�
+     鈹溾攢jeecg-cloud-gateway       --寰湇鍔$綉鍏虫ā鍧�(9999)
+     鈹溾攢jeecg-cloud-nacos       --Nacos鏈嶅姟妯″潡(8848)
+     鈹溾攢jeecg-system-cloud-start  --System寰湇鍔″惎鍔ㄩ」鐩�(7001)
+     鈹溾攢jeecg-demo-cloud-start    --Demo寰湇鍔″惎鍔ㄩ」鐩�(7002)
+     鈹溾攢jeecg-visual
+        鈹溾攢jeecg-cloud-monitor       --寰湇鍔$洃鎺фā鍧� (9111)
+        鈹溾攢jeecg-cloud-xxljob        --寰湇鍔xljob瀹氭椂浠诲姟鏈嶅姟绔� (9080)
+        鈹溾攢jeecg-cloud-sentinel     --sentinel鏈嶅姟绔� (9000)
+        鈹溾攢jeecg-cloud-test           -- 寰湇鍔℃祴璇曠ず渚嬶紙鍚勭渚嬪瓙锛�
+           鈹溾攢jeecg-cloud-test-more         -- 寰湇鍔℃祴璇曠ず渚嬶紙feign銆佺啍鏂檷绾с�亁xljob銆佸垎甯冨紡閿侊級
+           鈹溾攢jeecg-cloud-test-rabbitmq     -- 寰湇鍔℃祴璇曠ず渚嬶紙rabbitmq锛�
+           鈹溾攢jeecg-cloud-test-seata          -- 寰湇鍔℃祴璇曠ず渚嬶紙seata鍒嗗竷寮忎簨鍔★級
+           鈹溾攢jeecg-cloud-test-shardingsphere    -- 寰湇鍔℃祴璇曠ず渚嬶紙鍒嗗簱鍒嗚〃锛�
 ```
 
 
 
 
+涓轰粈涔堥�夋嫨JeecgBoot?
+-----------------------------------
+* 1.閲囩敤鏈�鏂颁富娴佸墠鍚庡垎绂绘鏋讹紙Springboot+Mybatis+antd锛夛紝瀹规槗涓婃墜; 浠g爜鐢熸垚鍣ㄤ緷璧栨�т綆,鐏垫椿鐨勬墿灞曡兘鍔涳紝鍙揩閫熷疄鐜颁簩娆″紑鍙�;
+* 2.鏀寔寰湇鍔pringCloud Alibaba(Nacos銆丟ateway銆丼entinel銆丼kywalking)锛屾彁渚涘垏鎹㈡満鍒舵敮鎸佸崟浣撳拰寰湇鍔¤嚜鐢卞垏鎹�
+* 3.寮�鍙戞晥鐜囬珮,閲囩敤浠g爜鐢熸垚鍣紝鍗曡〃銆佹爲鍒楄〃銆佷竴瀵瑰銆佷竴瀵逛竴绛夋暟鎹ā鍨嬶紝澧炲垹鏀规煡鍔熻兘涓�閿敓鎴愶紝鑿滃崟閰嶇疆鐩存帴浣跨敤锛�
+* 4.浠g爜鐢熸垚鍣ㄦ彁渚涘己澶фā鏉挎満鍒讹紝鏀寔鑷畾涔夋ā鏉匡紝鐩墠鎻愪緵鍥涘椋庢牸妯℃澘锛堝崟琛ㄤ袱濂椼�佹爲妯″瀷涓�濂椼�佷竴瀵瑰涓夊锛�
+* 5.浠g爜鐢熸垚鍣ㄩ潪甯告櫤鑳斤紝鍦ㄧ嚎涓氬姟寤烘ā銆佸湪绾块厤缃�佹墍瑙佸嵆鎵�寰楁敮鎸�23绉嶇被鎺т欢锛屼竴閿敓鎴愬墠鍚庣浠g爜锛屽ぇ骞呭害鎻愬崌寮�鍙戞晥鐜囷紝涓嶅啀涓洪噸澶嶅伐浣滃彂鎰併��
+* 6.浣庝唬鐮佽兘鍔涳細Online鍦ㄧ嚎琛ㄥ崟锛堟棤闇�缂栫爜锛岄�氳繃鍦ㄧ嚎閰嶇疆琛ㄥ崟锛屽疄鐜拌〃鍗曠殑澧炲垹鏀规煡锛屾敮鎸佸崟琛ㄣ�佹爲銆佷竴瀵瑰銆佷竴瀵逛竴绛夋ā鍨嬶紝瀹炵幇浜轰汉鐨嗗彲缂栫爜锛�
+* 7.浣庝唬鐮佽兘鍔涳細Online鍦ㄧ嚎鎶ヨ〃锛堟棤闇�缂栫爜锛岄�氳繃鍦ㄧ嚎閰嶇疆鏂瑰紡锛屽疄鐜版暟鎹姤琛紝鍙互蹇�熸娊鍙栨暟鎹紝鍑忚交寮�鍙戝帇鍔涳紝瀹炵幇浜轰汉鐨嗗彲缂栫爜锛�
+* 8.浣庝唬鐮佽兘鍔涳細Online鍦ㄧ嚎鍥捐〃锛堟棤闇�缂栫爜锛岄�氳繃鍦ㄧ嚎閰嶇疆鏂瑰紡锛屽疄鐜版洸绾垮浘锛屾煴鐘跺浘锛屾暟鎹姤琛ㄧ瓑锛屾敮鎸佽嚜瀹氫箟鎺掔増甯冨眬锛屽疄鐜颁汉浜虹殕鍙紪鐮侊級
+* 9.灏佽瀹屽杽鐨勭敤鎴枫�佽鑹层�佽彍鍗曘�佺粍缁囨満鏋勩�佹暟鎹瓧鍏搞�佸湪绾垮畾鏃朵换鍔$瓑鍩虹鍔熻兘锛屾敮鎸佽闂巿鏉冦�佹寜閽潈闄愩�佹暟鎹潈闄愮瓑鍔熻兘
+* 10.甯哥敤鍏遍�氬皝瑁咃紝鍚勭宸ュ叿绫�(瀹氭椂浠诲姟,鐭俊鎺ュ彛,閭欢鍙戦��,Excel瀵煎叆瀵煎嚭绛�),鍩烘湰婊¤冻80%椤圭洰闇�姹�
+* 11.绠�鏄揈xcel瀵煎叆瀵煎嚭锛屾敮鎸佸崟琛ㄥ鍑哄拰涓�瀵瑰琛ㄦā寮忓鍑猴紝鐢熸垚鐨勪唬鐮佽嚜甯﹀鍏ュ鍑哄姛鑳�
+* 12.闆嗘垚绠�鏄撴姤琛ㄥ伐鍏凤紝鍥惧儚鎶ヨ〃鍜屾暟鎹鍑洪潪甯告柟渚匡紝鍙瀬鍏舵柟渚跨殑鐢熸垚鍥惧舰鎶ヨ〃銆乸df銆乪xcel銆亀ord绛夋姤琛紱
+* 13.閲囩敤鍓嶅悗鍒嗙鎶�鏈紝椤甸潰UI椋庢牸绮剧編锛岄拡瀵瑰父鐢ㄧ粍浠跺仛浜嗗皝瑁咃細鏃堕棿銆佽琛ㄦ牸鎺т欢銆佹埅鍙栨樉绀烘帶浠躲�佹姤琛ㄧ粍浠讹紝缂栬緫鍣ㄧ瓑绛�
+* 14.鏌ヨ杩囨护鍣細鏌ヨ鍔熻兘鑷姩鐢熸垚锛屽悗鍙板姩鎬佹嫾SQL杩藉姞鏌ヨ鏉′欢锛涙敮鎸佸绉嶅尮閰嶆柟寮忥紙鍏ㄥ尮閰�/妯$硦鏌ヨ/鍖呭惈鏌ヨ/涓嶅尮閰嶆煡璇級锛�
+* 15.鏁版嵁鏉冮檺锛堢簿缁嗗寲鏁版嵁鏉冮檺鎺у埗锛屾帶鍒跺埌琛岀骇锛屽垪琛ㄧ骇锛岃〃鍗曞瓧娈电骇锛屽疄鐜颁笉鍚屼汉鐪嬩笉鍚屾暟鎹紝涓嶅悓浜哄鍚屼竴涓〉闈㈡搷浣滀笉鍚屽瓧娈�
+* 16.椤甸潰鏍¢獙鑷姩鐢熸垚(蹇呴』杈撳叆銆佹暟瀛楁牎楠屻�侀噾棰濇牎楠屻�佹椂闂寸┖闂寸瓑);
+* 17.鏀寔SAAS鏈嶅姟妯″紡锛屾彁渚汼aaS澶氱鎴锋灦鏋勬柟妗堛��
+* 18.鍒嗗竷寮忔枃浠舵湇鍔★紝闆嗘垚minio銆侀樋閲孫SS绛変紭绉�鐨勭涓夋柟锛屾彁渚涗究鎹风殑鏂囦欢涓婁紶涓庣鐞嗭紝鍚屾椂涔熸敮鎸佹湰鍦板瓨鍌ㄣ��
+* 19.涓绘祦鏁版嵁搴撳吋瀹癸紝涓�濂椾唬鐮佸畬鍏ㄥ吋瀹筂ysql銆丳ostgresql銆丱racle銆丼qlserver銆丮ariaDB銆佽揪姊︾瓑涓绘祦鏁版嵁搴撱��
+* 20.闆嗘垚宸ヤ綔娴乤ctiviti銆乫lowable锛屽苟瀹炵幇浜嗗彧闇�鍦ㄩ〉闈㈤厤缃祦绋嬭浆鍚戯紝鍙瀬澶х殑绠�鍖朾pm宸ヤ綔娴佺殑寮�鍙戯紱鐢╞pm鐨勬祦绋嬭璁″櫒鐢诲嚭浜嗘祦绋嬭蛋鍚戯紝涓�涓伐浣滄祦鍩烘湰灏卞畬鎴愪簡锛屽彧闇�鍐欏緢灏戦噺鐨刯ava浠g爜锛�
+* 21.浣庝唬鐮佽兘鍔涳細鍦ㄧ嚎娴佺▼璁捐锛岄噰鐢ㄥ紑婧怉ctiviti娴佺▼寮曟搸锛屽疄鐜板湪绾跨敾娴佺▼,鑷畾涔夎〃鍗�,琛ㄥ崟鎸傞潬,涓氬姟娴佽浆
+* 22.澶氭暟鎹簮锛氬強鍏剁畝鏄撶殑浣跨敤鏂瑰紡锛屽湪绾块厤缃暟鎹簮閰嶇疆锛屼究鎹风殑浠庡叾浠栨暟鎹姄鍙栨暟鎹紱
+* 23.鎻愪緵鍗曠偣鐧诲綍CAS闆嗘垚鏂规锛岄」鐩腑宸茬粡鎻愪緵瀹屽杽鐨勫鎺ヤ唬鐮�
+* 24.浣庝唬鐮佽兘鍔涳細琛ㄥ崟璁捐鍣紝鏀寔鐢ㄦ埛鑷畾涔夎〃鍗曞竷灞�锛屾敮鎸佸崟琛紝涓�瀵瑰琛ㄥ崟銆佹敮鎸乻elect銆乺adio銆乧heckbox銆乼extarea銆乨ate銆乸opup銆佸垪琛ㄣ�佸畯绛夋帶浠�
+* 25.涓撲笟鎺ュ彛瀵规帴鏈哄埗锛岀粺涓�閲囩敤restful鎺ュ彛鏂瑰紡锛岄泦鎴恠wagger-ui鍦ㄧ嚎鎺ュ彛鏂囨。锛孞wt token瀹夊叏楠岃瘉锛屾柟渚垮鎴风瀵规帴
+* 26.鎺ュ彛瀹夊叏鏈哄埗锛屽彲缁嗗寲鎺у埗鎺ュ彛鎺堟潈锛岄潪甯哥畝渚垮疄鐜颁笉鍚屽鎴风鍙湅鑷繁鏁版嵁绛夋帶鍒�
+* 27.楂樼骇缁勫悎鏌ヨ鍔熻兘锛屽湪绾块厤缃敮鎸佷富瀛愯〃鍏宠仈鏌ヨ锛屽彲淇濆瓨鏌ヨ鍘嗗彶
+* 28.鎻愪緵鍚勭绯荤粺鐩戞帶锛屽疄鏃惰窡韪郴缁熻繍琛屾儏鍐碉紙鐩戞帶 Redis銆乀omcat銆乯vm銆佹湇鍔″櫒淇℃伅銆佽姹傝拷韪�丼QL鐩戞帶锛�
+* 29.娑堟伅涓績锛堟敮鎸佺煭淇°�侀偖浠躲�佸井淇℃帹閫佺瓑绛夛級
+* 30.闆嗘垚Websocket娑堟伅閫氱煡鏈哄埗
+* 31.绉诲姩鑷�傚簲鏁堟灉浼樼锛屾彁渚汚PP鍙戝竷鏂规锛�
+* 32.鏀寔澶氳瑷�锛屾彁渚涘浗闄呭寲鏂规锛�
+* 33.鏁版嵁鍙樻洿璁板綍鏃ュ織锛屽彲璁板綍鏁版嵁姣忔鍙樻洿鍐呭锛岄�氳繃鐗堟湰瀵规瘮鍔熻兘鏌ョ湅鍘嗗彶鍙樺寲
+* 34.骞冲彴UI寮哄ぇ锛屽疄鐜颁簡绉诲姩鑷�傚簲
+* 35.骞冲彴棣栭〉椋庢牸锛屾彁渚涘绉嶇粍鍚堟ā寮忥紝鏀寔鑷畾涔夐鏍�
+* 36.鎻愪緵绠�鍗曟槗鐢ㄧ殑鎵撳嵃鎻掍欢锛屾敮鎸佽胺姝屻�佺伀鐙愩�両E11+ 绛夊悇绉嶆祻瑙堝櫒
+* 37.绀轰緥浠g爜涓板瘜锛屾彁渚涘緢澶氬涔犳渚嬪弬鑰�
+* 38.閲囩敤maven鍒嗘ā鍧楀紑鍙戞柟寮�
+* 39.鏀寔鑿滃崟鍔ㄦ�佽矾鐢�
+* 40.鏉冮檺鎺у埗閲囩敤 RBAC锛圧ole-Based Access Control锛屽熀浜庤鑹茬殑璁块棶鎺у埗锛�
+* 41.鎻愪緵鏂拌缂栬緫琛ㄦ牸JVXETable锛岃交鏉炬弧瓒冲悇绉嶅鏉侲RP甯冨眬锛屾嫢鏈夋洿楂樼殑鎬ц兘銆佹洿鐏垫椿鐨勬墿灞曘�佹洿寮哄ぇ鐨勫姛鑳�
+
+ 
+ 
+ 
+鎶�鏈灦鏋勶細
+-----------------------------------
+#### 寮�鍙戠幆澧�
+
+- 璇█锛欽ava 8+ (灏忎簬17)
+
+- IDE(JAVA)锛� IDEA (蹇呴』瀹夎lombok鎻掍欢 )
+
+- IDE(鍓嶇)锛� Vscode銆乄ebStorm銆両DEA
+
+- 渚濊禆绠$悊锛歁aven
+
+- 缂撳瓨锛歊edis
+
+- 鏁版嵁搴撹剼鏈細MySQL5.7+  &  Oracle 11g & Sqlserver2017锛堝叾浠栨暟鎹簱锛孾闇�瑕佽嚜宸辫浆](https://my.oschina.net/jeecg/blog/4905722)锛�
+
+
+#### 鍚庣
+
+- 鍩虹妗嗘灦锛歋pring Boot 2.6.6
+
+- 寰湇鍔℃鏋讹細 Spring Cloud Alibaba 2021.0.1.0
+
+- 鎸佷箙灞傛鏋讹細MybatisPlus 3.5.1
+
+- 鎶ヨ〃宸ュ叿锛� JimuReport 1.5.2
+
+- 瀹夊叏妗嗘灦锛欰pache Shiro 1.8.0锛孞wt 3.11.0
+
+- 寰湇鍔℃妧鏈爤锛歋pring Cloud Alibaba銆丯acos銆丟ateway銆丼entinel銆丼kywalking
+
+- 鏁版嵁搴撹繛鎺ユ睜锛氶樋閲屽反宸碊ruid 1.1.22
+
+- 鏃ュ織鎵撳嵃锛歭ogback
+
+- 鍏朵粬锛歛utopoi, fastjson锛宲oi锛孲wagger-ui锛宷uartz, lombok锛堢畝鍖栦唬鐮侊級绛夈��
+
+
+#### 鍓嶇
+
+- Vue2鐗堟湰锛歚Vue2.6+@vue/cli+AntDesignVue+Viser-vue+Vuex绛塦  [璇︾粏鏌ョ湅](https://github.com/jeecgboot/ant-design-vue-jeecg)
+- Vue3鐗堟湰锛歚Vue3.0+TypeScript+Vite+AntDesignVue+pinia+echarts绛夋柊鏂规` [璇︾粏鏌ョ湅](https://github.com/jeecgboot/jeecgboot-vue3)
+
+#### 鏀寔搴�
+
+|  鏁版嵁搴�   |  鏀寔   |
+| --- | --- |
+|   MySQL   |  鈭�   |
+|  Oracle11g   |  鈭�   |
+|  Sqlserver2017   |  鈭�   |
+|   PostgreSQL   |  鈭�   |
+|   MariaDB   |  鈭�   |
+|   杈炬ⅵ銆佷汉澶ч噾浠�   |  鈭�   |
 
 
 
-## 鍏ラ棬蹇呭
-
-鏈」鐩渶瑕佷竴瀹氬墠绔熀纭�鐭ヨ瘑锛岃纭繚鎺屾彙 Vue 鐨勫熀纭�鐭ヨ瘑锛屼互渚胯兘澶勭悊涓�浜涘父瑙佺殑闂銆� 寤鸿鍦ㄥ紑鍙戝墠鍏堝涓�涓嬩互涓嬪唴瀹癸紝鎻愬墠浜嗚В鍜屽涔犺繖浜涚煡璇嗭紝浼氬椤圭洰鐞嗚В闈炲父鏈夊府鍔�:
-
-*   [JeecgBoot-Vue3鏂囨。](http://vue3.jeecg.com)
-*   [Vue3 鏂囨。](https://cn.vuejs.org/)
-*   [Vben鏂囨。](https://doc.vvbin.cn)
-*   [Ant-Design-Vue](https://www.antdv.com/docs/vue/introduce-cn/)
-*   [TypeScript](https://www.typescriptlang.org/)
-*   [Vue-router](https://router.vuejs.org/zh)
-*   [Es6](https://es6.ruanyifeng.com/)
-*   [Vitejs](https://cn.vitejs.dev/guide/)
-*   [Pinia(vuex鏇夸唬鏂规)](https://pinia.esm.dev/introduction.html)
-*   [Vue-RFCS](https://github.com/vuejs/rfcs)
-*   [Vue2 杩佺Щ鍒� 3](https://v3.vuejs.org/guide/migration/introduction.html)
-*   [vxetable鏂囨。](https://vxetable.cn)
-*   [~~WindiCss~~](https://windicss.netlify.app/)
+## 寰湇鍔¤В鍐虫柟妗�
 
 
-##   娴忚鍣ㄦ敮鎸�
+1銆佹湇鍔℃敞鍐屽拰鍙戠幇 Nacos 鈭�
 
-**鏈湴寮�鍙�**鎺ㄨ崘浣跨敤`Chrome 鏈�鏂扮増`娴忚鍣紝**涓嶆敮鎸�**`Chrome 90`浠ヤ笅鐗堟湰銆�
+2銆佺粺涓�閰嶇疆涓績 Nacos  鈭�
 
-**鐢熶骇鐜**鏀寔鐜颁唬娴忚鍣紝涓嶆敮鎸� IE銆�
+3銆佽矾鐢辩綉鍏� gateway(涓夌鍔犺浇鏂瑰紡) 鈭�
 
-| [![IE](https://raw.githubusercontent.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png)](http://godban.github.io/browsers-support-badges/)IE | [![ Edge](https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png)](http://godban.github.io/browsers-support-badges/)Edge | [![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png)](http://godban.github.io/browsers-support-badges/)Firefox | [![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png)](http://godban.github.io/browsers-support-badges/)Chrome | [![Safari](https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png)](http://godban.github.io/browsers-support-badges/)Safari |
-| --- | --- | --- | --- | --- |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+4銆佸垎甯冨紡 http feign 鈭�
+
+5銆佺啍鏂檷绾ч檺娴� Sentinel 鈭�
+
+6銆佸垎甯冨紡鏂囦欢 Minio銆侀樋閲孫SS 鈭� 
+
+7銆佺粺涓�鏉冮檺鎺у埗 JWT + Shiro 鈭�
+
+8銆佹湇鍔$洃鎺� SpringBootAdmin鈭�
+
+9銆侀摼璺窡韪� Skywalking   [鍙傝�冩枃妗(http://doc.jeecg.com/2350293)
+
+10銆佹秷鎭腑闂翠欢 RabbitMQ  鈭�
+
+11銆佸垎甯冨紡浠诲姟 xxl-job  鈭� 
+
+12銆佸垎甯冨紡浜嬪姟 Seata
+
+13銆佸垎甯冨紡鏃ュ織 elk + kafka
+
+14銆佹敮鎸� docker-compose銆乲8s銆乯enkins
+
+15銆丆AS 鍗曠偣鐧诲綍   鈭�
+
+16銆佽矾鐢遍檺娴�   鈭�
+
+   
+#### 寰湇鍔℃灦鏋勫浘
+![寰湇鍔℃灦鏋勫浘](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+
+### Jeecg Boot 浜у搧鍔熻兘钃濆浘
+![鍔熻兘钃濆浘](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
 
 
 
-## 鍔熻兘妯″潡
-> vue3鐗堟湰宸茬粡瀹炵幇浜嗙郴缁熺鐞嗐�佺郴缁熺洃鎺с�佹姤琛ㄣ�佸悇绉嶇粍浠躲�佸墠绔潈闄愩�丟UI浠g爜鐢熸垚銆丱nline琛ㄥ崟銆丱nline鎶ヨ〃绛夊钩鍙板姛鑳斤紝瀹屽叏鍙互鐢ㄤ簬鐢熶骇鐜銆�
 
+### 鍔熻兘妯″潡
 ```
-鈹溾攢棣栭〉
-鈹�  鈹溾攢棣栭〉锛堝洓濂楅椤垫弧瓒充笉鍚屽満鏅渶姹傦級
-鈹�  鈹溾攢宸ヤ綔鍙�
 鈹溾攢绯荤粺绠$悊
 鈹�  鈹溾攢鐢ㄦ埛绠$悊
 鈹�  鈹溾攢瑙掕壊绠$悊
@@ -219,29 +332,34 @@
 鈹�  鈹斺攢绯荤粺鍏憡
 鈹�  鈹斺攢鑱屽姟绠$悊
 鈹�  鈹斺攢閫氳褰�
-鈹�  鈹斺攢瀵硅薄瀛樺偍
 鈹�  鈹斺攢澶氱鎴风鐞�
+鈹溾攢娑堟伅涓績
+鈹�  鈹溾攢娑堟伅绠$悊
+鈹�  鈹溾攢妯℃澘绠$悊
+鈹溾攢浠g爜鐢熸垚鍣�(浣庝唬鐮�)
+鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄥ姛鑳斤紙涓�閿敓鎴愬墠鍚庣浠g爜锛岀敓鎴愬悗鏃犻渶淇敼鐩存帴鐢紝缁濆鏄悗绔紑鍙戠闊筹級
+鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄦā鏉匡紙鎻愪緵4濂楁ā鏉匡紝鍒嗗埆鏀寔鍗曡〃鍜屼竴瀵瑰妯″瀷锛屼笉鍚岄鏍奸�夋嫨锛�
+鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄦā鏉匡紙鐢熸垚浠g爜锛岃嚜甯xcel瀵煎叆瀵煎嚭锛�
+鈹�  鈹溾攢鏌ヨ杩囨护鍣紙鏌ヨ閫昏緫鏃犻渶缂栫爜锛岀郴缁熸牴鎹〉闈㈤厤缃嚜鍔ㄧ敓鎴愶級
+鈹�  鈹溾攢楂樼骇鏌ヨ鍣紙寮圭獥鑷姩缁勫悎鏌ヨ鏉′欢锛�
+鈹�  鈹溾攢Excel瀵煎叆瀵煎嚭宸ュ叿闆嗘垚锛堟敮鎸佸崟琛紝涓�瀵瑰 瀵煎叆瀵煎嚭锛�
+鈹�  鈹溾攢骞冲彴绉诲姩鑷�傚簲鏀寔
 鈹溾攢绯荤粺鐩戞帶
-鈹�  鈹溾攢缃戝叧璺敱閰嶇疆锛坓ateway锛�
-鈹�  鈹溾攢瀹氭椂浠诲姟
-鈹�  鈹溾攢鏁版嵁婧愮鐞�
-鈹�  鈹溾攢绯荤粺鏃ュ織
-鈹�  鈹溾攢娑堟伅涓績锛堟敮鎸佺煭淇°�侀偖浠躲�佸井淇℃帹閫佺瓑绛夛級
-鈹�  鈹溾攢鏁版嵁鏃ュ織锛堣褰曟暟鎹揩鐓э紝鍙姣斿揩鐓э紝鏌ョ湅鏁版嵁鍙樻洿鎯呭喌锛�
-鈹�  鈹溾攢绯荤粺閫氱煡
-鈹�  鈹溾攢SQL鐩戞帶
-鈹�  鈹溾攢鎬ц兘鐩戞帶
+鈹�  鈹溾攢Gateway璺敱缃戝叧
+鈹�  鈹溾攢鎬ц兘鎵弿鐩戞帶
 鈹�  鈹�  鈹溾攢鐩戞帶 Redis
 鈹�  鈹�  鈹溾攢Tomcat
 鈹�  鈹�  鈹溾攢jvm
 鈹�  鈹�  鈹溾攢鏈嶅姟鍣ㄤ俊鎭�
 鈹�  鈹�  鈹溾攢璇锋眰杩借釜
 鈹�  鈹�  鈹溾攢纾佺洏鐩戞帶
-鈹溾攢娑堟伅涓績
-鈹�  鈹溾攢鎴戠殑娑堟伅
-鈹�  鈹溾攢娑堟伅绠$悊
-鈹�  鈹溾攢妯℃澘绠$悊
-鈹溾攢绉湪鎶ヨ〃璁捐鍣�
+鈹�  鈹溾攢瀹氭椂浠诲姟
+鈹�  鈹溾攢绯荤粺鏃ュ織
+鈹�  鈹溾攢娑堟伅涓績锛堟敮鎸佺煭淇°�侀偖浠躲�佸井淇℃帹閫佺瓑绛夛級
+鈹�  鈹溾攢鏁版嵁鏃ュ織锛堣褰曟暟鎹揩鐓э紝鍙姣斿揩鐓э紝鏌ョ湅鏁版嵁鍙樻洿鎯呭喌锛�
+鈹�  鈹溾攢绯荤粺閫氱煡
+鈹�  鈹溾攢SQL鐩戞帶
+鈹�  鈹溾攢swagger-ui(鍦ㄧ嚎鎺ュ彛鏂囨。)
 鈹傗攢鎶ヨ〃绀轰緥
 鈹�  鈹溾攢鏇茬嚎鍥�
 鈹�  鈹斺攢楗肩姸鍥�
@@ -256,31 +374,32 @@
 鈹傗攢澶у睆妯℃澘
 鈹�  鈹溾攢浣滄垬鎸囨尌涓績澶у睆
 鈹�  鈹斺攢鐗╂祦鏈嶅姟涓績澶у睆
-鈹溾攢浠g爜鐢熸垚鍣紙GUI锛�
-鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄥ姛鑳斤紙涓�閿敓鎴愬墠鍚庣浠g爜锛岀敓鎴愬悗鏃犻渶淇敼鐩存帴鐢紝缁濆鏄悗绔紑鍙戠闊筹級
-鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄦā鏉匡紙鎻愪緵4濂楁ā鏉匡紝鍒嗗埆鏀寔鍗曡〃鍜屼竴瀵瑰妯″瀷锛屼笉鍚岄鏍奸�夋嫨锛�
-鈹�  鈹溾攢浠g爜鐢熸垚鍣ㄦā鏉匡紙鐢熸垚浠g爜锛岃嚜甯xcel瀵煎叆瀵煎嚭锛�
-鈹�  鈹溾攢鏌ヨ杩囨护鍣紙鏌ヨ閫昏緫鏃犻渶缂栫爜锛岀郴缁熸牴鎹〉闈㈤厤缃嚜鍔ㄧ敓鎴愶級
-鈹�  鈹溾攢楂樼骇鏌ヨ鍣紙寮圭獥鑷姩缁勫悎鏌ヨ鏉′欢锛�
-鈹�  鈹溾攢Excel瀵煎叆瀵煎嚭宸ュ叿闆嗘垚锛堟敮鎸佸崟琛紝涓�瀵瑰 瀵煎叆瀵煎嚭锛�
-鈹�  鈹溾攢骞冲彴绉诲姩鑷�傚簲鏀寔
 鈹傗攢甯哥敤绀轰緥
-鈹�  鈹溾攢鑷畾涔夌粍浠剁ず渚�
-鈹�  鈹溾攢JVxeTable绀轰緥(ERP琛屼笟澶嶆潅鎺掔増鏁堟灉)
+鈹�  鈹溾攢鑷畾涔夌粍浠�
+鈹�  鈹溾攢瀵硅薄瀛樺偍(瀵规帴闃块噷浜�)
+鈹�  鈹溾攢JVXETable绀轰緥锛堝悇绉嶅鏉侲RP甯冨眬绀轰緥锛�
 鈹�  鈹溾攢鍗曡〃妯″瀷渚嬪瓙
 鈹�  鈹斺攢涓�瀵瑰妯″瀷渚嬪瓙
 鈹�  鈹斺攢鎵撳嵃渚嬪瓙
-鈹�  鈹斺攢涓�瀵瑰鍐呭祵绀轰緥
-鈹�  鈹斺攢寮傛鏍慣able
+鈹�  鈹斺攢涓�瀵瑰TAB渚嬪瓙
+鈹�  鈹斺攢鍐呭祵table渚嬪瓙
+鈹�  鈹斺攢甯哥敤閫夋嫨缁勪欢
+鈹�  鈹斺攢寮傛鏍憈able
+鈹�  鈹斺攢鎺ュ彛妯℃嫙娴嬭瘯
+鈹�  鈹斺攢琛ㄦ牸鍚堣绀轰緥
+鈹�  鈹斺攢寮傛鏍戝垪琛ㄧず渚�
+鈹�  鈹斺攢涓�瀵瑰JEditable
+鈹�  鈹斺攢JEditable缁勪欢绀轰緥
 鈹�  鈹斺攢鍥剧墖鎷栨嫿鎺掑簭
 鈹�  鈹斺攢鍥剧墖缈婚〉
 鈹�  鈹斺攢鍥剧墖棰勮
 鈹�  鈹斺攢PDF棰勮
-鈹傗攢灏佽閫氱敤缁勪欢 
-鈹�  鈹溾攢琛岀紪杈戣〃鏍糐VxeTable
+鈹�  鈹斺攢鍒嗗睆鍔熻兘
+鈹傗攢灏佽閫氱敤缁勪欢	
+鈹�  鈹溾攢琛岀紪杈戣〃鏍糐EditableTable
 鈹�  鈹斺攢鐪佺暐鏄剧ず缁勪欢
 鈹�  鈹斺攢鏃堕棿鎺т欢
-鈹�  鈹斺攢楂樼骇鏌ヨ (鏈疄鐜�)
+鈹�  鈹斺攢楂樼骇鏌ヨ
 鈹�  鈹斺攢鐢ㄦ埛閫夋嫨缁勪欢
 鈹�  鈹斺攢鎶ヨ〃缁勪欢灏佽
 鈹�  鈹斺攢瀛楀吀缁勪欢
@@ -291,30 +410,39 @@
 鈹�  鈹斺攢灏佽鏇茬嚎銆佹煴鐘跺浘銆侀ゼ鐘跺浘銆佹姌绾垮浘绛夌瓑鎶ヨ〃鐨勭粍浠讹紙缁忚繃灏佽锛屼娇鐢ㄧ畝鍗曪級
 鈹�  鈹斺攢鍦ㄧ嚎code缂栬緫鍣�
 鈹�  鈹斺攢涓婁紶鏂囦欢缁勪欢
+鈹�  鈹斺攢楠岃瘉鐮佺粍浠�
 鈹�  鈹斺攢鏍戝垪琛ㄧ粍浠�
 鈹�  鈹斺攢琛ㄥ崟绂佺敤缁勪欢
 鈹�  鈹斺攢绛夌瓑
 鈹傗攢鏇村椤甸潰妯℃澘
-鈹�  鈹斺攢Mock绀轰緥锛堝瓙鑿滃崟寰堝锛�
-鈹�  鈹斺攢椤甸潰&瀵艰埅锛堝瓙鑿滃崟寰堝锛�
-鈹�  鈹斺攢缁勪欢&鍔熻兘锛堝瓙鑿滃崟寰堝锛�
+鈹�  鈹溾攢鍚勭楂樼骇琛ㄥ崟
+鈹�  鈹溾攢鍚勭鍒楄〃鏁堟灉
+鈹�  鈹斺攢缁撴灉椤甸潰
+鈹�  鈹斺攢寮傚父椤甸潰
+鈹�  鈹斺攢涓汉椤甸潰
 鈹溾攢楂樼骇鍔熻兘
-鈹�  鈹溾攢鏀寔寰墠绔�
-鈹�  鈹溾攢鎻愪緵CAS鍗曠偣鐧诲綍
-鈹�  鈹溾攢闆嗘垚Websocket娑堟伅閫氱煡鏈哄埗
-鈹�  鈹溾攢鏀寔绗笁鏂圭櫥褰曪紙QQ銆侀拤閽夈�佸井淇$瓑锛�
 鈹�  鈹溾攢绯荤粺缂栫爜瑙勫垯
+鈹�  鈹溾攢鎻愪緵鍗曠偣鐧诲綍CAS闆嗘垚鏂规
+鈹�  鈹溾攢鎻愪緵APP鍙戝竷鏂规
+鈹�  鈹溾攢闆嗘垚Websocket娑堟伅閫氱煡鏈哄埗
 鈹溾攢Online鍦ㄧ嚎寮�鍙�(浣庝唬鐮�)
 鈹�  鈹溾攢Online鍦ㄧ嚎琛ㄥ崟 - 鍔熻兘宸插紑鏀�
 鈹�  鈹溾攢Online浠g爜鐢熸垚鍣� - 鍔熻兘宸插紑鏀�
 鈹�  鈹溾攢Online鍦ㄧ嚎鎶ヨ〃 - 鍔熻兘宸插紑鏀�
-鈹�  鈹溾攢Online鍦ㄧ嚎鍥捐〃(鏆傛湭寮�婧�)
-鈹�  鈹溾攢澶氭暟鎹簮绠$悊
-鈹傗攢娴佺▼妯″潡鍔熻兘 (鏆傛湭寮�婧�)
+鈹�  鈹溾攢Online鍦ㄧ嚎鍥捐〃(鏈紑婧�)
+鈹�  鈹溾攢Online鍥捐〃妯℃澘閰嶇疆(鏈紑婧�)
+鈹�  鈹溾攢Online甯冨眬璁捐(鏈紑婧�)
+鈹�  鈹溾攢澶氭暟鎹簮绠$悊 - 鍔熻兘宸插紑鏀�
+鈹溾攢绉湪鎶ヨ〃璁捐鍣�(浣庝唬鐮�)
+鈹�  鈹溾攢鎵撳嵃璁捐鍣�
+鈹�  鈹溾攢鏁版嵁鎶ヨ〃璁捐
+鈹�  鈹溾攢鍥惧舰鎶ヨ〃璁捐锛堟敮鎸乪chart锛�
+鈹�  鈹溾攢澶у睆璁捐鍣�(鏈紑婧�)
+鈹傗攢娴佺▼妯″潡鍔熻兘 (鏈紑婧�)
 鈹�  鈹溾攢娴佺▼璁捐鍣�
 鈹�  鈹溾攢琛ㄥ崟璁捐鍣�
-鈹�  鈹溾攢澶у睆璁捐鍣�
-鈹�  鈹溾攢闂ㄦ埛璁捐/浠〃鐩樿璁″櫒
+   鈹溾攢澶у睆璁捐鍣�
+   鈹溾攢闂ㄦ埛璁捐/浠〃鐩樿璁″櫒
 鈹�  鈹斺攢鎴戠殑浠诲姟
 鈹�  鈹斺攢鍘嗗彶娴佺▼
 鈹�  鈹斺攢鍘嗗彶娴佺▼
@@ -324,58 +452,66 @@
 鈹�  鈹斺攢鎴戝彂璧风殑娴佺▼
 鈹�  鈹斺攢鎴戠殑鎶勯��
 鈹�  鈹斺攢娴佺▼濮旀淳銆佹妱閫併�佽烦杞�
-鈹�  鈹斺攢OA鍔炲叕缁勪欢
-鈹斺攢鍏朵粬妯″潡 
-   鈹斺攢鏇村鍔熻兘寮�鍙戜腑銆傘�� 
+鈹�  鈹斺攢銆傘�傘��
+鈹傗攢OA鍔炲叕缁勪欢 (鏈紑婧�)
+鈹�  鈹溾攢鏇村鍔熻兘
+鈹�  鈹斺攢銆傘�傘��
+鈹斺攢鍏朵粬妯″潡
+   鈹斺攢鏇村鍔熻兘寮�鍙戜腑銆傘��
    
 ```
 
 
-##   绯荤粺鏁堟灉
-绯荤粺鍚庡彴
-
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_20220310142327.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_20220310142354.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_20220310142339.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_20220310142409.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_20220310142401.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-![杈撳叆鍥剧墖璇存槑](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/vue3_11.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
-
-Online琛ㄥ崟&Online鎶ヨ〃&浠g爜鐢熸垚
-![](https://oscimg.oschina.net/oscnet/up-e8862f2c3c14eace9090c20a8fb928234a4.png)
-![](https://oscimg.oschina.net/oscnet/up-e3b3a736236bc66f255a9a32ab3f9b7196b.png)
-![](https://oscimg.oschina.net/oscnet/up-221b8cbdea3c17d31a1365023a73d3d439f.png)
-![](https://oscimg.oschina.net/oscnet/up-14092f6f213b26ab145cf70b2dc6dec5635.png)
-
-鎶ヨ〃鏁堟灉
-
-![](https://static.oschina.net/uploads/img/201904/14160828_pkFr.png "")
-![](https://static.oschina.net/uploads/img/201904/14160834_Lo23.png "")
-![](https://static.oschina.net/uploads/img/201904/14160842_QK7B.png "")
-![](https://static.oschina.net/uploads/img/201904/14160849_GBm5.png "")
-![](https://static.oschina.net/uploads/img/201904/14160858_6RAM.png "")
-
-鎺ュ彛鏂囨。
-
-![](https://oscimg.oschina.net/oscnet/up-e6ea09dbaa01b8458c2e23614077ba9507f.png)
-
-
-娴佺▼璁捐&琛ㄥ崟璁捐
-
-![](https://oscimg.oschina.net/oscnet/up-fe98e9f766e5abb6759f6f13d5f9186f0cf.png)
-![](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "")
-![](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "")
-![](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "")
 
 
 
-澶у睆妯℃澘
+绯荤粺鏁堟灉
+----
+##### 澶у睆妯℃澘
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201912/25133248_Ag1C.jpg "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
 
-![](https://static.oschina.net/uploads/img/201912/25133248_Ag1C.jpg "")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201912/25133301_k9Kc.jpg "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
 
-![](https://static.oschina.net/uploads/img/201912/25133301_k9Kc.jpg "")
-
-![](https://oscimg.oschina.net/oscnet/up-649cb79c01eb95d5c2217a5dad28515da82.png)
+##### PC绔�
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14155402_AmlV.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160657_cHwb.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160813_KmXS.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160935_Nibs.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14161004_bxQ4.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
 
 
+##### 鍦ㄧ嚎鎺ュ彛鏂囨。
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201908/27095258_M2Xq.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160957_hN3X.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
 
+
+##### 鎶ヨ〃
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160828_pkFr.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160834_Lo23.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160842_QK7B.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160849_GBm5.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160858_6RAM.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+
+##### 娴佺▼
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160623_8fwk.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+![杈撳叆鍥剧墖璇存槑](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+
+
+##### 鎵嬫満绔�
+![](https://oscimg.oschina.net/oscnet/da543c5d0d57baab0cecaa4670c8b68c521.jpg)
+![](https://oscimg.oschina.net/oscnet/fda4bd82cab9d682de1c1fbf2060bf14fa6.jpg)
+
+##### PAD绔�
+![](https://oscimg.oschina.net/oscnet/e90fef970a8c33790ab03ffd6c4c7cec225.jpg)
+![](https://oscimg.oschina.net/oscnet/d78218803a9e856a0aa82b45efc49849a0c.jpg)
+![](https://oscimg.oschina.net/oscnet/0404054d9a12647ef6f82cf9cfb80a5ac02.jpg)
+![](https://oscimg.oschina.net/oscnet/59c23b230f52384e588ee16309b44fa20de.jpg)
+
+
+## 鎹愯禒 
+
+濡傛灉瑙夊緱杩樹笉閿欙紝璇蜂綔鑰呭枬鏉挅鍟″惂 鈽�
+
+![](https://static.oschina.net/uploads/img/201903/08155608_0EFX.png)

--
Gitblit v1.9.3