Major Changes: - Add StreamingService with OpenAI Compatible format - Upgrade Chat component V2 with Ant Design X integration - Implement AIA module with 12 intelligent agents - Update API routes to unified /api/v1 prefix - Update system documentation Backend (~1300 lines): - common/streaming: OpenAI Compatible adapter - modules/aia: 12 agents, conversation service, streaming integration - Update route versions (RVW, PKB to v1) Frontend (~3500 lines): - modules/aia: AgentHub + ChatWorkspace (100% prototype restoration) - shared/Chat: AIStreamChat, ThinkingBlock, useAIStream Hook - Update API endpoints to v1 Documentation: - AIA module status guide - Universal capabilities catalog - System overview updates - All module documentation sync Tested: Stream response verified, authentication working Status: AIA V2.0 core completed (85%)
1276 lines
37 KiB
Markdown
1276 lines
37 KiB
Markdown
# Git 鎻愪氦瑙勮寖
|
||
|
||
> **鐗堟湰锛?* v1.1
|
||
> **鍒涘缓鏃ユ湡锛?* 2025-11-16
|
||
> **鏇存柊鏃ユ湡锛?* 2025-11-28
|
||
> **閫傜敤鑼冨洿锛?* 鍏ㄩ」鐩<E3808D>紙鍓嶇<E98D93> + 鍚庣<E98D9A> + 鏂囨。锛?
|
||
> **浼樺厛绾э細** 猸愨瓙猸愨瓙猸?P0 蹇呴』閬靛畧
|
||
|
||
---
|
||
|
||
## 馃毃 绱ф€ヨ<E282AC>鍛婏細蹇呴』姣忔棩鎻愪氦锛?
|
||
> **馃敶馃敶馃敶 琛€娉<E282AC>暀璁<E69A80>細DC妯″潡浠g爜鍏ㄩ儴涓㈠け浜嬩欢锛?025-11-28锛夝煍答煍答煍?*
|
||
|
||
### 浜嬩欢鍥為【
|
||
|
||
**鏃堕棿**锛?025-11-27 - 2025-11-28
|
||
**涓㈠け鍐呭<E98D90>**锛欴C妯″潡瀹屾暣浠g爜锛堢害2澶╁紑鍙戦噺锛?- 鉂?4涓狿risma鏁版嵁琛ㄥ畾涔?- 鉂?4涓猄ervice绫伙紙HealthCheckService銆乀emplateService绛夛級
|
||
- 鉂?Controller鍜孯outes
|
||
- 鉂?鎵€鏈塗ypeScript浠g爜鏂囦欢
|
||
|
||
**淇濈暀鍐呭<E98D90>**锛?- 鉁?璁捐<E79281>鏂囨。锛堟暟鎹<E69A9F>簱璁捐<E79281>銆丄PI璁捐<E79281>锛?- 鉁?寮€鍙戣<E98D99>褰曪紙Day2銆丏ay3瀹屾垚鎬荤粨锛?- 鉁?绌虹洰褰曠粨鏋?
|
||
**涓㈠け鍘熷洜**锛?- 鉂?**浠g爜鍐欏畬鍚庢湭鎻愪氦鍒癎it**
|
||
- 鉂?**浠g爜浠呭瓨鍦ㄤ簬Cursor涓存椂缂撳瓨涓?*
|
||
- 鉂?**Cursor缂撳瓨娓呯悊鍚庯紝浠g爜姘镐箙涓㈠け**
|
||
- 鉂?**Git涓<74>棤浠讳綍鎻愪氦璁板綍锛屾棤娉曟仮澶?*
|
||
|
||
### 馃敟 寮哄埗瑙勫垯锛堢珛鍗崇敓鏁堬級
|
||
|
||
```bash
|
||
# 猸愨瓙猸愨瓙猸?姣忓ぉ涓嬬彮鍓嶅繀椤绘墽琛岋紙鏃犱緥澶栵紒锛?git status
|
||
git add .
|
||
git commit -m "feat(module): Complete Day X development"
|
||
git push origin master
|
||
|
||
# 鈿狅笍 涓嶆彁浜?= 浠g爜闅忔椂鍙<E6A482>兘涓㈠け锛?```
|
||
|
||
**鎻愪氦鏃舵満锛堜换閫夊叾涓€锛屽彂鐢熸椂蹇呴』鎻愪氦锛夛細**
|
||
1. 鉁?**姣忓ぉ涓嬬彮鍓?*锛堟渶閲嶈<E996B2>锛佹棤璁轰唬鐮佹槸鍚﹀畬缇庯級
|
||
2. 鉁?**姣忔<E5A7A3>闀挎椂闂寸<E99782>寮€鐢佃剳鍓?*锛堝崍浼戙€佷細璁<E7B4B0>€佸<E282AC>鍑猴級
|
||
3. 鉁?**瀹屾垚閲嶈<E996B2>鍔熻兘鍚?*
|
||
4. 鉁?**鍑嗗<E98D91>鍏抽棴Cursor鍓?*
|
||
5. 鉁?**鐢佃剳鍑虹幇寮傚父鍓?*锛堝<E9949B>鍗¢】銆佹<E98A86>鏈哄緛鍏嗭級
|
||
|
||
**缁濆<E7BC81>绂佹<E7BB82>锛?*
|
||
- 馃敶 **绂佹<E7BB82>**渚濊禆Cursor鑷<72>姩淇濆瓨锛圕ursor涓嶄繚璇佹寔涔呭寲锛?- 馃敶 **绂佹<E7BB82>**"绋嶅悗鍐嶆彁浜?锛堢◢鍚庡彲鑳藉氨蹇樿<E8B987>浜嗭級
|
||
- 馃敶 **绂佹<E7BB82>**浠g爜杩囧<E69DA9>涓嶆彁浜わ紙涓€澶滀箣闂村彲鑳戒涪澶憋級
|
||
- 馃敶 **绂佹<E7BB82>**"浠g爜杩樻病瀹屽杽涓嶆兂鎻愪氦"锛堜笉瀹屽杽涔熻<E6B694>鎻愪氦锛屾€绘瘮涓㈠け寮猴級
|
||
|
||
### 馃挕 鏈€浣冲疄璺?
|
||
**姣忔棩宸ヤ綔娴侊紙鎺ㄨ崘锛夛細**
|
||
|
||
```bash
|
||
# 鏃╀笂寮€濮嬪伐浣?git pull origin master # 鎷夊彇鏈€鏂颁唬鐮?
|
||
# 寮€鍙戣繃绋嬩腑...
|
||
# [缂栧啓浠g爜銆佹祴璇曞姛鑳絔
|
||
|
||
# 馃敟 姣忓ぉ涓嬬彮鍓嶏紙寮哄埗鎵ц<E98EB5>锛侊級
|
||
git status # 鏌ョ湅淇<E6B985>敼
|
||
git add . # 娣诲姞鎵€鏈変慨鏀?git commit -m "feat(dc): Complete Day 2 - HealthCheck and Template services
|
||
|
||
Summary:
|
||
- Implement HealthCheckService with Excel parsing
|
||
- Implement TemplateService with 3 preset templates
|
||
- Add 4 Prisma models (dc_health_checks, dc_templates, etc.)
|
||
- Update documentation
|
||
|
||
Status: Basic functionality verified, ready for testing"
|
||
|
||
git push origin master # 鎺ㄩ€佸埌杩滅▼
|
||
|
||
# 鐜板湪鍙<E6B9AA>互瀹夊績涓嬬彮锛佷唬鐮佸凡瀹夊叏澶囦唤 鉁?```
|
||
|
||
**馃幆 璁颁綇锛欸it鏄<74>唬鐮佺殑鍞<E6AE91>竴鍙<E7ABB4>潬澶囦唤锛佹湭鎻愪氦鐨勪唬鐮?= 涓嶅瓨鍦ㄧ殑浠g爜锛?*
|
||
|
||
---
|
||
|
||
## 馃搵 鐩<>綍
|
||
|
||
1. [杩滅▼浠撳簱閰嶇疆](#杩滅▼浠撳簱閰嶇疆)
|
||
2. [Commit Message 瑙勮寖](#commit-message-瑙勮寖)
|
||
3. [鎻愪氦棰戠巼涓庢椂鏈篯(#鎻愪氦棰戠巼涓庢椂鏈? 猸?閲嶈<E996B2>鍘熷垯
|
||
4. [鍒嗘敮绠$悊绛栫暐](#鍒嗘敮绠$悊绛栫暐)
|
||
5. [涓<>枃缂栫爜闂<E7889C><E99782>瑙e喅](#涓<>枃缂栫爜闂<E7889C><E99782>瑙e喅)
|
||
6. [Git 鍘嗗彶閲嶅啓涓庣淮鎶<E6B7AE>(#git-鍘嗗彶閲嶅啓涓庣淮鎶?
|
||
7. [浠g爜瀹℃煡娴佺▼](#浠g爜瀹℃煡娴佺▼)
|
||
8. [甯歌<E794AF>闂<EFBFBD><E99782>涓庢渶浣冲疄璺礭(#甯歌<E794AF>闂<EFBFBD><E99782>涓庢渶浣冲疄璺?
|
||
|
||
---
|
||
|
||
## 杩滅▼浠撳簱閰嶇疆
|
||
|
||
### 馃寪 Gitee 浠撳簱淇℃伅
|
||
|
||
**浠撳簱鍦板潃锛?*
|
||
```
|
||
https://gitee.com/hahafeng117/AIclinicalresearch.git
|
||
```
|
||
|
||
**鍏ㄥ眬閰嶇疆锛?*
|
||
```bash
|
||
git config --global user.name "HaHafeng"
|
||
git config --global user.email "gofeng117@163.com"
|
||
```
|
||
|
||
**涓<>枃缂栫爜閰嶇疆锛?* 猸?閲嶈<E996B2>
|
||
```bash
|
||
# 纭<>繚 Git 姝g‘澶勭悊涓<E6828A>枃鏂囦欢鍚嶅拰鎻愪氦淇℃伅
|
||
git config --global core.quotepath false
|
||
git config --global gui.encoding utf-8
|
||
git config --global i18n.commit.encoding utf-8
|
||
git config --global i18n.logoutputencoding utf-8
|
||
```
|
||
|
||
**PowerShell 閰嶇疆锛?*
|
||
```powershell
|
||
# 鍦?PowerShell Profile 涓<>坊鍔狅紙$PROFILE 鏂囦欢锛?[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
|
||
$env:LESSCHARSET = 'utf-8'
|
||
```
|
||
|
||
### 鍏嬮殕浠撳簱
|
||
|
||
```bash
|
||
# 鍒濇<E98D92>鍏嬮殕
|
||
git clone https://gitee.com/hahafeng117/AIclinicalresearch.git
|
||
|
||
# 鏌ョ湅杩滅▼浠撳簱
|
||
git remote -v
|
||
```
|
||
|
||
---
|
||
|
||
## Commit Message 瑙勮寖
|
||
|
||
### 鈿狅笍 閲嶈<E996B2>鎻愮ず锛氶伩鍏嶄腑鏂囦贡鐮?
|
||
**寮哄埗瑕佹眰锛欳ommit Message 蹇呴』浣跨敤鑻辨枃** 猸愨瓙猸?
|
||
**鍘熷洜**锛?- Windows PowerShell 鐜<><E9909C>涓嬶紝Git commit message 涓<>殑涓<E6AE91>枃浼氬嚭鐜颁贡鐮?- 涓<>枃涔辩爜浼氬<E6B5BC>鑷存彁浜ゅ巻鍙查毦浠ラ槄璇伙紝褰卞搷鍥㈤槦鍗忎綔
|
||
- 鑻辨枃 commit message 鏄<>浗闄呭紑婧愰」鐩<E3808D>殑鏍囧噯瀹炶返
|
||
|
||
**鉁?姝g‘绀轰緥锛?*
|
||
```bash
|
||
git commit -m "feat(asl): Implement full-text screening core service"
|
||
git commit -m "fix(frontend): Fix dropdown menu click issue"
|
||
git commit -m "docs: Add development guide for Day 2-3"
|
||
```
|
||
|
||
**鉂?閿欒<E996BF>绀轰緥锛?*
|
||
```bash
|
||
git commit -m "feat(asl): 瀹炵幇鍏ㄦ枃澶嶇瓫鏍稿績鏈嶅姟" # 浼氬嚭鐜颁贡鐮?git commit -m "淇<><E6B787>涓嬫媺鑿滃崟闂<E5B49F><E99782>" # 浼氬嚭鐜颁贡鐮?```
|
||
|
||
**渚嬪<E6B89A>鎯呭喌**锛?- 鏂囦欢鍚嶅拰鏂囦欢鍐呭<E98D90>鍙<EFBFBD>互浣跨敤涓<E695A4>枃锛圙it 鑳芥<E991B3>纭<EFBFBD><E7BAAD>鐞?UTF-8 缂栫爜鐨勬枃浠讹級
|
||
- 浠?commit message 蹇呴』浣跨敤鑻辨枃
|
||
|
||
---
|
||
|
||
### 馃摑 鏍煎紡瑙勮寖
|
||
|
||
**鏍囧噯鏍煎紡锛?*
|
||
```
|
||
<type>(<scope>): <subject>
|
||
|
||
<body>
|
||
|
||
<footer>
|
||
```
|
||
|
||
### Type 绫诲瀷
|
||
|
||
| Type | 璇存槑 | 绀轰緥 |
|
||
|------|------|------|
|
||
| `feat` | 鏂板姛鑳?| `feat(asl): 娣诲姞鏍囬<E98F8D>鎽樿<E98EBD>鍒濈瓫鍔熻兘` |
|
||
| `fix` | Bug 淇<><E6B787> | `fix(frontend): 淇<><E6B787>涓嬫媺鑿滃崟鐐瑰嚮闂<E59AAE><E99782>` |
|
||
| `docs` | 鏂囨。鏇存柊 | `docs: 娣诲姞 Git 鎻愪氦瑙勮寖鏂囨。` |
|
||
| `style` | 浠g爜鏍煎紡锛堜笉褰卞搷閫昏緫锛?| `style: 鏍煎紡鍖栦唬鐮侊紝缁熶竴缂╄繘` |
|
||
| `refactor` | 閲嶆瀯锛堜笉鏀瑰彉鍔熻兘锛?| `refactor(backend): 閲嶆瀯鐢ㄦ埛璁よ瘉閫昏緫` |
|
||
| `perf` | 鎬ц兘浼樺寲 | `perf: 浼樺寲鏌ヨ<E98F8C>鎬ц兘锛屾坊鍔犵储寮昤 |
|
||
| `test` | 娴嬭瘯鐩稿叧 | `test(asl): 娣诲姞鍒濈瓫鍔熻兘鍗曞厓娴嬭瘯` |
|
||
| `chore` | 鏋勫缓/宸ュ叿鐩稿叧 | `chore: 鏇存柊渚濊禆鍖呯増鏈琡 |
|
||
| `build` | 鏋勫缓绯荤粺 | `build: 閰嶇疆 Docker 闀滃儚` |
|
||
| `ci` | CI/CD 閰嶇疆 | `ci: 娣诲姞 GitHub Actions 閰嶇疆` |
|
||
| `revert` | 鍥炴粴鎻愪氦 | `revert: 鍥炴粴鎻愪氦 abc123` |
|
||
|
||
### Scope 鑼冨洿
|
||
|
||
**妯″潡绾у埆锛?*
|
||
- `platform` - 骞冲彴鍩虹<E98DA9>灞?- `uam` - 鐢ㄦ埛涓庢潈闄愪腑蹇?- `llm` - LLM 澶фā鍨嬬綉鍏?- `asl` - AI 鏅鸿兘鏂囩尞
|
||
- `aia` - AI 鏅鸿兘闂<E58598>瓟
|
||
- `pkb` - 涓<>汉鐭ヨ瘑搴?- `rvw` - 绋夸欢瀹℃煡绯荤粺
|
||
- `ssa` - 鏅鸿兘缁熻<E7BC81>鍒嗘瀽
|
||
- `admin` - 杩愯惀绠$悊绔?- `frontend` - 鍓嶇<E98D93>閫氱敤
|
||
- `backend` - 鍚庣<E98D9A>閫氱敤
|
||
- `docs` - 鏂囨。
|
||
|
||
**鍔熻兘绾у埆锛?*
|
||
- `(asl/screening)` - 鏂囩尞鍒濈瓫
|
||
- `(asl/extraction)` - 鏁版嵁鎻愬彇
|
||
- `(backend/auth)` - 鐢ㄦ埛璁よ瘉
|
||
- `(frontend/layout)` - 椤甸潰甯冨眬
|
||
|
||
### Subject 涓婚<E6B693>
|
||
|
||
**鉁?鎺ㄨ崘锛堣嫳鏂囷級锛?*
|
||
```
|
||
feat(asl): Implement title and abstract screening
|
||
fix(frontend): Fix AgentChatPage conversation data extraction issue
|
||
docs: Add Day 23-24 work summary
|
||
refactor(backend): Optimize database connection pool configuration
|
||
```
|
||
|
||
**鉂?閬垮厤锛?*
|
||
```
|
||
鏇存柊浠g爜 # 涓<>枃锛堜細涔辩爜锛?fix bug # 娌℃湁璇存槑鍏蜂綋闂<E7B68B><E99782>
|
||
淇<EFBFBD><EFBFBD>浜嗕竴浜涢棶棰? # 涓<>枃锛堜細涔辩爜锛? 淇℃伅涓嶈冻
|
||
feat: add feature # 娌℃湁鎸囨槑妯″潡鍜屽叿浣撳姛鑳?update code # 澶<><E6BEB6>缁?```
|
||
|
||
**瑙勫垯锛?*
|
||
- 猸?**蹇呴』浣跨敤鑻辨枃**锛堥伩鍏嶄腑鏂囦贡鐮侊級
|
||
- 鉁?浣跨敤绁堜娇鍙ワ紙"Add" 鑰屼笉鏄?"Added"锛?- 鉁?棣栧瓧姣嶅皬鍐?- 鉁?涓嶈<E6B693>浠ュ彞鍙风粨灏?- 鉁?绠€娲佹槑浜嗭紙鈮?0瀛楃<E7809B>锛?
|
||
### Body 璇︾粏鎻忚堪
|
||
|
||
**鍙<>€夛紝鐢ㄤ簬璇存槑锛?*
|
||
- Why: 涓轰粈涔堝仛杩欎釜淇<E9879C>敼锛?- What: 淇<>敼浜嗕粈涔堬紵
|
||
- Impact: 鏈変粈涔堝奖鍝嶏紵
|
||
|
||
**绀轰緥锛堝繀椤讳娇鐢ㄨ嫳鏂囷級锛?*
|
||
```
|
||
feat(asl): Implement title and abstract screening
|
||
|
||
Completed features:
|
||
- Add CSV file import
|
||
- Implement dual-model AI judgment (Qwen + DeepSeek)
|
||
- Add PICO configuration
|
||
- Implement batch processing and progress display
|
||
|
||
Technical details:
|
||
- Use Papa Parse for CSV parsing
|
||
- Integrate Dify API for AI judgment
|
||
- Use Ant Design Upload component
|
||
```
|
||
|
||
### Footer 鑴氭敞
|
||
|
||
**鍙<>€夛紝鐢ㄤ簬锛?*
|
||
- 鍏抽棴 Issue锛歚Closes #123`
|
||
- 涓嶅吋瀹瑰彉鏇达細`BREAKING CHANGE: Description`
|
||
- 鍏宠仈 Issue锛歚Refs #456`
|
||
|
||
**绀轰緥锛堝繀椤讳娇鐢ㄨ嫳鏂囷級锛?*
|
||
```
|
||
feat(backend): Refactor API routing structure
|
||
|
||
BREAKING CHANGE: API routes changed from /api/xxx to /api/v1/xxx
|
||
All frontend API calls need to be updated
|
||
|
||
Closes #123
|
||
Refs #456
|
||
```
|
||
|
||
### 瀹屾暣绀轰緥
|
||
|
||
**绀轰緥 1锛氭柊鍔熻兘锛堝繀椤讳娇鐢ㄨ嫳鏂囷級**
|
||
```
|
||
feat(asl): Implement title and abstract screening
|
||
|
||
Features:
|
||
- Add CSV file import
|
||
- Implement dual-model AI judgment
|
||
- Add PICO configuration
|
||
|
||
Closes #123
|
||
```
|
||
|
||
**绀轰緥 2锛欱ug 淇<><E6B787>锛堝繀椤讳娇鐢ㄨ嫳鏂囷級**
|
||
```
|
||
fix(frontend): Fix AgentChatPage conversation data extraction issue
|
||
|
||
Problem: Conversation data not correctly extracted from response
|
||
Solution: Modify data parsing logic to handle nested structures
|
||
|
||
Fixes #234
|
||
```
|
||
|
||
**绀轰緥 3锛氭枃妗f洿鏂帮紙蹇呴』浣跨敤鑻辨枃锛?*
|
||
```
|
||
docs: Add Day 23-24 work summary
|
||
|
||
Contents:
|
||
- Knowledge base development summary
|
||
- Issues encountered and solutions
|
||
- Next steps
|
||
```
|
||
|
||
---
|
||
|
||
## 鎻愪氦棰戠巼涓庢椂鏈?
|
||
> **猸愨瓙猸愨瓙猸?鏍稿績鍘熷垯锛氭瘡澶╁紑鍙戝畬鎴愬悗蹇呴』绔嬪嵆鎻愪氦锛?*
|
||
> **鈿狅笍 Cursor鐜<72><E9909C>鐗瑰埆鎻愰啋锛氭湭鎻愪氦鐨勪唬鐮佸彲鑳藉湪缂撳瓨娓呯悊鏃舵案涔呬涪澶憋紒**
|
||
|
||
### 馃幆 鍩烘湰鍘熷垯
|
||
|
||
#### **鍘熷垯 0锛氭瘡鏃ュ繀鎻愪氦鍘熷垯锛堟渶楂樹紭鍏堢骇锛夆瓙猸愨瓙猸愨瓙**
|
||
|
||
**涓轰粈涔堝繀椤绘瘡鏃ユ彁浜わ紵**
|
||
|
||
1. **闃叉<E99783>Cursor缂撳瓨涓㈠け**
|
||
- Cursor IDE鍙<45>兘鍦ㄧ紦瀛樻竻鐞嗐€佸穿婧冦€侀噸鍚<E599B8>悗涓㈠け鏈<E38191>繚瀛樼殑浠g爜
|
||
- 鏈<>彁浜ゅ埌Git鐨勪唬鐮佸彧瀛樺湪浜庝复鏃跺伐浣滃尯锛岄<E9949B>闄╂瀬楂? - 鐪熷疄妗堜緥锛欴C妯″潡寮€鍙戝畬鎴愶紝浣嗗洜鏈<E6B49C>彁浜わ紝浠g爜鍏ㄩ儴涓㈠け
|
||
|
||
2. **淇濇姢寮€鍙戞垚鏋?*
|
||
- 姣忓ぉ鐨勫紑鍙戝伐浣滈兘鏈変环鍊硷紝涓嶅簲鍥犳剰澶栦涪澶? - Git鏄<74>唬鐮佺殑鍞<E6AE91>竴鍙<E7ABB4>潬澶囦唤
|
||
- 鎻愪氦鍚庡嵆浣挎湰鍦颁涪澶憋紝涔熷彲浠ヤ粠杩滅▼浠撳簱鎭㈠<E98EAD>
|
||
|
||
3. **渚夸簬闂<E7B0AC><E99782>杩芥函**
|
||
- 姣忔棩鎻愪氦鍙<E6B0A6>互娓呮櫚璁板綍寮€鍙戣繘搴? - 鍑虹幇闂<E5B987><E99782>鏃跺彲浠ュ揩閫熷洖閫€鍒板墠涓€澶╃殑绋冲畾鐗堟湰
|
||
|
||
**猸愨瓙猸愨瓙猸?寮哄埗瑙勫垯锛?*
|
||
|
||
```bash
|
||
# 姣忓ぉ涓嬬彮鍓嶏紙鎴栨瘡澶╁紑鍙戠粨鏉熸椂锛夊繀椤绘墽琛?git status # 鏌ョ湅淇<E6B985>敼鐨勬枃浠?git add . # 娣诲姞鎵€鏈変慨鏀?git commit -m "feat(module): Complete Day X development
|
||
|
||
Summary:
|
||
- [鍒楀嚭浠婂ぉ瀹屾垚鐨勪富瑕佸伐浣淽
|
||
- [鍒楀嚭瀹炵幇鐨勬牳蹇冨姛鑳絔
|
||
- [鍒楀嚭鏇存柊鐨勬枃妗<EFBFBD>
|
||
|
||
Tested: Basic functionality verified"
|
||
|
||
git push origin master # 鎺ㄩ€佸埌杩滅▼浠撳簱
|
||
```
|
||
|
||
**鎵ц<E98EB5>鏃舵満锛?*
|
||
- 鉁?**姣忓ぉ涓嬬彮鍓?*锛堟渶閲嶈<E996B2>锛侊級
|
||
- 鉁?**姣忔<E5A7A3>闀挎椂闂寸<E99782>寮€鐢佃剳鍓?*锛堝<E9949B>鍗堜紤銆佷細璁<E7B4B0>級
|
||
- 鉁?**閲嶈<E996B2>鍔熻兘瀹屾垚鍚?*
|
||
- 鉁?**鍑嗗<E98D91>鍏抽棴Cursor鍓?*
|
||
|
||
**鐗瑰埆鎻愰啋锛?*
|
||
- 馃敶 **缁濆<E7BC81>涓嶈<E6B693>**渚濊禆Cursor鐨勮嚜鍔ㄤ繚瀛?- 馃敶 **缁濆<E7BC81>涓嶈<E6B693>**璁や负"绋嶅悗鍐嶆彁浜?
|
||
- 馃敶 **缁濆<E7BC81>涓嶈<E6B693>**璁╀唬鐮佽繃澶滀笉鎻愪氦
|
||
|
||
---
|
||
|
||
#### **鍘熷垯 1锛氭壒閲忔彁浜わ紝閬垮厤纰庣墖鍖栨彁浜?*
|
||
|
||
**鉂?閿欒<E996BF>鍋氭硶锛?*
|
||
```bash
|
||
# 姣忔敼涓€涓<E282AC>枃浠跺氨鎻愪氦涓€娆★紙杩囦簬棰戠箒锛?git commit -m "fix: Fix file A"
|
||
git commit -m "fix: Fix file B"
|
||
git commit -m "fix: Fix file C"
|
||
git commit -m "docs: Update docs"
|
||
# 缁撴灉锛氫骇鐢熷ぇ閲忕<E996B2>鐗囧寲鎻愪氦锛屾薄鏌?Git 鍘嗗彶
|
||
```
|
||
|
||
**鉁?姝g‘鍋氭硶锛堝繀椤讳娇鐢ㄨ嫳鏂囷級锛?*
|
||
```bash
|
||
# 涓€澶╁伐浣滅粨鏉熷悗锛岀粺涓€鎻愪氦锛堟帹鑽愶級
|
||
git add .
|
||
git commit -m "feat(asl): Implement title and abstract screening
|
||
|
||
Features:
|
||
- Implement Excel parsing logic
|
||
- Add LLM async task processing
|
||
- Complete storage service integration
|
||
- Update related documentation
|
||
|
||
Tested: Local verification passed"
|
||
```
|
||
|
||
**鎺ㄨ崘鎻愪氦棰戠巼锛?*
|
||
- 鉁?**姣忓ぉ鑷冲皯涓€娆?*锛堝己鍒惰<E98D92>姹傦紝淇濇姢浠g爜瀹夊叏锛?- 鉁?**瀹屾垚涓€涓<E282AC>畬鏁村姛鑳芥椂**锛氬姛鑳藉紑鍙?娴嬭瘯楠岃瘉+鏂囨。鏇存柊涓€璧锋彁浜?- 鉁?**閲嶈<E996B2>閲岀▼纰戣妭鐐?*锛氬<E9949B>妯″潡寮€鍙戝畬鎴愩€佹灦鏋勫崌绾у畬鎴?- 鈿狅笍 **閬垮厤姣忔<E5A7A3>灏忔敼鍔ㄥ氨鎻愪氦**锛氫細浜х敓澶ч噺鏃犳剰涔夌殑鎻愪氦璁板綍锛堜絾姣忔棩鑷冲皯鎻愪氦涓€娆★級
|
||
|
||
---
|
||
|
||
#### **鍘熷垯 2锛氬繀椤婚獙璇佹祴璇曞悗鎵嶈兘鎻愪氦**
|
||
|
||
**鈿狅笍 涓ョ<E6B693>鎻愪氦鏈<E6B0A6>粡楠岃瘉鐨勪唬鐮侊紒**
|
||
|
||
| 鎯呭喌 | 鏄<>惁鍙<E68381>互鎻愪氦 | 璇存槑 |
|
||
|------|------------|------|
|
||
| 鉂?浠g爜鍐欏畬锛屾湭娴嬭瘯 | **绂佹<E7BB82>鎻愪氦** | 鍙<>兘鍖呭惈璇<E68388>硶閿欒<E996BF>銆侀€昏緫閿欒<E996BF> |
|
||
| 鉂?娴嬭瘯涓<E798AF>彂鐜伴棶棰橈紝鏈<E7B49D>慨澶?| **绂佹<E7BB82>鎻愪氦** | 浼氭贩涔变唬鐮佸簱锛屽奖鍝嶅叾浠栦汉 |
|
||
| 鉂?鍔熻兘鏈<E58598>畬鎴愶紝鍙<E7B49D>畬鎴愪竴鍗?| **绂佹<E7BB82>鎻愪氦** | 鐮村潖浠g爜瀹屾暣鎬?|
|
||
| 鉁?鏈<>湴娴嬭瘯閫氳繃 | **鍙<>互鎻愪氦** | 鍩烘湰鍔熻兘楠岃瘉閫氳繃 |
|
||
| 鉁?鍔熻兘娴嬭瘯+鏂囨。瀹屽杽 | **鎺ㄨ崘鎻愪氦** | 瀹屾暣鐨勫姛鑳戒氦浠?|
|
||
| 鉁?瀹屾暣楠屾敹閫氳繃 | **鏈€浣虫彁浜?* | 鍖呭惈娴嬭瘯銆佹枃妗c€侀獙鏀?|
|
||
|
||
**姝g‘鐨勫伐浣滄祦绋嬶細**
|
||
```
|
||
1. 寮€鍙戝姛鑳?
|
||
鈫?2. 鏈<>湴娴嬭瘯锛堢‘淇濇棤璇<E6A3A4>硶閿欒<E996BF>銆侀€昏緫閿欒<E996BF>锛? 鈫?3. 鍔熻兘楠岃瘉锛堢‘淇濆姛鑳芥<E991B3>甯稿伐浣滐級
|
||
鈫?4. 浠g爜妫€鏌ワ紙Linter銆佹牸寮忓寲锛? 鈫?5. 鏇存柊鏂囨。锛堝<E9949B>鏈夊繀瑕侊級
|
||
鈫?6. 绛夊緟鏄庣‘鎸囦护
|
||
鈫?7. 缁熶竴鎻愪氦 鉁?```
|
||
|
||
---
|
||
|
||
#### **鍘熷垯 3锛氬彧鍦ㄦ槑纭<E6A791>巿鏉冩椂鎻愪氦**
|
||
|
||
**鈿狅笍 AI 鍔╂墜瑙勫垯锛堥€傜敤浜?Cursor銆丟itHub Copilot 绛夛級锛?*
|
||
|
||
| 鍦烘櫙 | AI 琛屼负 | 璇存槑 |
|
||
|------|--------|------|
|
||
| 鉂?鐢ㄦ埛鏈<E59F9B>槑纭<E6A791><E7BAAD>姹?| **涓嶆彁浜?* | 绛夊緟鐢ㄦ埛鎸囦护 |
|
||
| 鉂?浠g爜鏈<E7889C>粡娴嬭瘯楠岃瘉 | **涓嶆彁浜?* | 閬垮厤娣蜂贡浠g爜搴?|
|
||
| 鉁?鐢ㄦ埛鏄庣‘璇?鎻愪氦git" | **鍙<>互鎻愪氦** | 閬靛惊鐢ㄦ埛鎸囦护 |
|
||
| 鉁?鐢ㄦ埛璇?鎺ㄩ€佸埌杩滅▼" | **鍙<>互鎻愪氦骞舵帹閫?* | 瀹屾垚鏁翠釜娴佺▼ |
|
||
|
||
**绀轰緥瀵硅瘽锛?*
|
||
|
||
**鉂?閿欒<E996BF>锛?*
|
||
```
|
||
AI: 鎴戝凡缁忓畬鎴愬姛鑳藉紑鍙戯紝鐜板湪鎻愪氦鍒?git...
|
||
[鑷<>姩鎵ц<E98EB5> git commit && git push]
|
||
```
|
||
|
||
**鉁?姝g‘锛?*
|
||
```
|
||
AI: 鎴戝凡缁忓畬鎴愬姛鑳藉紑鍙戝拰鏈<E68BB0>湴娴嬭瘯楠岃瘉銆? 浠g爜宸插噯澶囧ソ鎻愪氦锛岀瓑寰呮偍鐨勬寚浠ゃ€?
|
||
鐢ㄦ埛: 濂界殑锛屾彁浜<E5BD81>it骞舵帹閫佸埌杩滅▼
|
||
AI: 鏀跺埌锛佺幇鍦ㄦ彁浜?..
|
||
[鎵ц<E98EB5> git commit && git push]
|
||
```
|
||
|
||
---
|
||
|
||
### 馃搵 鎻愪氦妫€鏌ユ竻鍗?
|
||
**鍦ㄦ墽琛?`git commit` 涔嬪墠锛岃<E9949B>纭<EFBFBD><E7BAAD>锛?*
|
||
|
||
- [ ] 鉁?**浠g爜宸插畬鎴?*锛氬姛鑳?淇<><E6B787>/鏂囨。瀹屾暣瀹炵幇
|
||
- [ ] 鉁?**鏈<>湴娴嬭瘯閫氳繃**锛氭棤璇<E6A3A4>硶閿欒<E996BF>銆侀€昏緫閿欒<E996BF>
|
||
- [ ] 鉁?**鍔熻兘楠岃瘉閫氳繃**锛氬疄闄呰繍琛屾祴璇曪紝纭<E7B49D>繚鍔熻兘姝e父
|
||
- [ ] 鉁?**浠g爜椋庢牸妫€鏌?*锛氶€氳繃 Linter 妫€鏌?- [ ] 鉁?**鏂囨。宸叉洿鏂?*锛氱浉鍏虫枃妗e悓姝ユ洿鏂帮紙濡傛湁蹇呰<E8B987>锛?- [ ] 鉁?**Commit 淇℃伅瑙勮寖**锛氱<E9949B>鍚?Conventional Commits 瑙勮寖
|
||
- [ ] 鉁?**鐢ㄦ埛宸叉巿鏉?*锛氱敤鎴锋槑纭<E6A791><E7BAAD>姹傛彁浜?
|
||
**鍙<>湁浠ヤ笂鎵€鏈夐」鐩<E3808D>兘鎵撳嬀锛屾墠鑳芥墽琛?`git commit`锛?*
|
||
|
||
---
|
||
|
||
### 馃毇 绂佹<E7BB82>鐨勮<E990A8>涓?
|
||
| 琛屼负 | 鍚庢灉 | 姝g‘鍋氭硶 |
|
||
|------|------|---------|
|
||
| 姣忔<E5A7A3>灏忔敼鍔ㄥ氨鎻愪氦 | Git 鍘嗗彶娣蜂贡锛岄毦浠ヨ拷韪?| 涓€澶╁伐浣滅粨鏉熷悗缁熶竴鎻愪氦 |
|
||
| 鎻愪氦鏈<E6B0A6>祴璇曠殑浠g爜 | 寮曞叆 Bug锛屽奖鍝嶅洟闃?| 娴嬭瘯楠岃瘉鍚庡啀鎻愪氦 |
|
||
| 鎻愪氦涓€鍗婄殑鍔熻兘 | 鐮村潖浠g爜瀹屾暣鎬?| 瀹屾垚瀹屾暣鍔熻兘鍚庢彁浜?|
|
||
| AI 鑷<>姩鎻愪氦 | 鏈<>粡鐢ㄦ埛纭<E59F9B><E7BAAD>锛屽彲鑳芥贩涔?| 绛夊緟鐢ㄦ埛鏄庣‘鎸囦护 |
|
||
| 鎻愪氦鍚庣珛鍗冲己鍒舵帹閫?| 瑕嗙洊杩滅▼鍘嗗彶锛屽嵄闄?| 纭<><E7BAAD>鏃犲啿绐佸悗鍐嶆帹閫?|
|
||
|
||
---
|
||
|
||
### 鉁?鎺ㄨ崘鐨勬彁浜ゅ満鏅?
|
||
**鍦烘櫙 1锛氬姛鑳藉紑鍙戝畬鎴愶紙蹇呴』浣跨敤鑻辨枃锛?*
|
||
```bash
|
||
# Completed ASL module title and abstract screening at end of day
|
||
git add backend/src/modules/asl/
|
||
git add docs/03-涓氬姟妯″潡/ASL-AI鏅鸿兘鏂囩尞/
|
||
git commit -m "feat(asl): Implement title and abstract screening
|
||
|
||
Features:
|
||
- Implement Excel parsing and validation
|
||
- Add LLM async task processing
|
||
- Integrate platform infrastructure (storage/logger/jobQueue)
|
||
- Complete API and database schema
|
||
- Update development documentation
|
||
|
||
Tested: Local tests passed, functionality verified"
|
||
```
|
||
|
||
**鍦烘櫙 2锛欱ug 淇<><E6B787>锛堝繀椤讳娇鐢ㄨ嫳鏂囷級**
|
||
```bash
|
||
# Fixed health check route conflict and verified
|
||
git add backend/src/index.ts backend/src/common/health/
|
||
git commit -m "fix(backend): Fix duplicate health check route registration
|
||
|
||
Problem: /health route registered in multiple places causing conflicts
|
||
Solution: Unified registration in registerHealthRoutes
|
||
|
||
Fixes: FastifyError Method 'GET' already declared for route '/health'
|
||
Tested: Service started successfully, all three endpoints accessible"
|
||
```
|
||
|
||
**鍦烘櫙 3锛氭灦鏋勫崌绾э紙蹇呴』浣跨敤鑻辨枃锛?*
|
||
```bash
|
||
# Completed platform infrastructure implementation and verification
|
||
git add backend/src/common/ backend/src/config/
|
||
git add docs/
|
||
git commit -m "feat(platform): Implement platform infrastructure (8 core modules)
|
||
|
||
Completed:
|
||
- Storage service (LocalAdapter + OSSAdapter reserved)
|
||
- Logging system (Winston + JSON format)
|
||
- Cache service (Memory + Redis reserved)
|
||
- Async tasks (MemoryQueue + DatabaseQueue reserved)
|
||
- Health checks (liveness + readiness)
|
||
- Monitoring metrics (DB/memory/API)
|
||
- Database connection pool (prevent Serverless limit)
|
||
- Environment configuration
|
||
|
||
Design principle: Adapter pattern for zero-code env switching
|
||
Implementation: 2.5 days (20 hours)
|
||
Status: Local dev environment verified
|
||
|
||
Related: #Platform-Infrastructure"
|
||
```
|
||
|
||
---
|
||
|
||
### 馃挕 鏈€浣冲疄璺?
|
||
1. **姣忓ぉ涓嬬彮鍓嶆彁浜や竴娆?*
|
||
- 姹囨€诲綋澶╂墍鏈夊伐浣? - 纭<>繚浠g爜宸叉祴璇曢獙璇? - 鍐欐竻妤氭彁浜や俊鎭?
|
||
2. **鎻愪氦鍓嶈繍琛屾<E7909B>鏌?*
|
||
```bash
|
||
# 浠g爜椋庢牸妫€鏌? npm run lint
|
||
|
||
# 绫诲瀷妫€鏌? npm run type-check
|
||
|
||
# 娴嬭瘯锛堝<E9949B>鏈夛級
|
||
npm run test
|
||
```
|
||
|
||
3. **鎻愪氦淇℃伅瑕佸畬鏁?*
|
||
- 鍐欐竻妤氬仛浜嗕粈涔? - 涓轰粈涔堣繖鏍峰仛
|
||
- 娴嬭瘯楠岃瘉鎯呭喌
|
||
- 鐩稿叧鐨?Issue 鎴栨枃妗?
|
||
4. **閲嶈<E996B2>鏀瑰姩瑕佸<E79195>浠?*
|
||
```bash
|
||
# 閲嶅ぇ鏋舵瀯璋冩暣鍓嶏紝鍒涘缓澶囦唤鍒嗘敮
|
||
git checkout -b backup/before-refactor
|
||
git checkout develop
|
||
```
|
||
|
||
---
|
||
|
||
## 鍒嗘敮绠$悊绛栫暐
|
||
|
||
### 馃尶 鍒嗘敮绫诲瀷
|
||
|
||
```
|
||
master (main)
|
||
鈹溾攢鈹€ develop
|
||
鈹溾攢鈹€ feature/xxx
|
||
鈹溾攢鈹€ fix/xxx
|
||
鈹溾攢鈹€ hotfix/xxx
|
||
鈹斺攢鈹€ release/xxx
|
||
```
|
||
|
||
### 涓诲垎鏀?
|
||
**master / main**
|
||
- 鐢熶骇鐜<E9AA87><E9909C>鍒嗘敮
|
||
- 姘歌繙淇濇寔鍙<E5AF94>儴缃茬姸鎬?- 鍙<>帴鍙楁潵鑷?`release` 鎴?`hotfix` 鐨勫悎骞?- 姣忔<E5A7A3>鍚堝苟閮芥墦 tag锛堝<E9949B> `v1.0.0`锛?
|
||
**develop**
|
||
- 寮€鍙戜富鍒嗘敮
|
||
- 鏈€鏂扮殑寮€鍙戣繘搴?- 鎺ュ彈鏉ヨ嚜 `feature` 鍜?`fix` 鐨勫悎骞?
|
||
### 杈呭姪鍒嗘敮
|
||
|
||
**feature/xxx - 鍔熻兘鍒嗘敮**
|
||
```bash
|
||
# 鍒涘缓鍔熻兘鍒嗘敮
|
||
git checkout -b feature/asl-screening develop
|
||
|
||
# 寮€鍙戝畬鎴愬悗鍚堝苟鍒?develop
|
||
git checkout develop
|
||
git merge --no-ff feature/asl-screening
|
||
git branch -d feature/asl-screening
|
||
git push origin develop
|
||
```
|
||
|
||
**fix/xxx - Bug 淇<><E6B787>鍒嗘敮**
|
||
```bash
|
||
# 浠?develop 鍒涘缓淇<E7BC93><E6B787>鍒嗘敮
|
||
git checkout -b fix/dropdown-click develop
|
||
|
||
# 淇<><E6B787>瀹屾垚鍚庡悎骞跺埌 develop
|
||
git checkout develop
|
||
git merge --no-ff fix/dropdown-click
|
||
git branch -d fix/dropdown-click
|
||
```
|
||
|
||
**hotfix/xxx - 绱ф€ヤ慨澶嶅垎鏀?*
|
||
```bash
|
||
# 浠?master 鍒涘缓绱ф€ヤ慨澶嶅垎鏀?git checkout -b hotfix/critical-bug master
|
||
|
||
# 淇<><E6B787>瀹屾垚鍚庡悓鏃跺悎骞跺埌 master 鍜?develop
|
||
git checkout master
|
||
git merge --no-ff hotfix/critical-bug
|
||
git tag -a v1.0.1 -m "Hotfix: 淇<><E6B787>涓ラ噸 bug"
|
||
|
||
git checkout develop
|
||
git merge --no-ff hotfix/critical-bug
|
||
|
||
git branch -d hotfix/critical-bug
|
||
```
|
||
|
||
**release/xxx - 鍙戝竷鍒嗘敮**
|
||
```bash
|
||
# 浠?develop 鍒涘缓鍙戝竷鍒嗘敮
|
||
git checkout -b release/v1.0.0 develop
|
||
|
||
# 鍙戝竷鍑嗗<E98D91>瀹屾垚鍚庡悎骞跺埌 master 鍜?develop
|
||
git checkout master
|
||
git merge --no-ff release/v1.0.0
|
||
git tag -a v1.0.0 -m "Release v1.0.0"
|
||
|
||
git checkout develop
|
||
git merge --no-ff release/v1.0.0
|
||
|
||
git branch -d release/v1.0.0
|
||
```
|
||
|
||
### 鍒嗘敮鍛藉悕瑙勮寖
|
||
|
||
**鉁?鎺ㄨ崘锛?*
|
||
```
|
||
feature/asl-screening # 鍔熻兘锛欰I 鏅鸿兘鏂囩尞鍒濈瓫
|
||
feature/user-authentication # 鍔熻兘锛氱敤鎴疯<E98EB4>璇?fix/dropdown-click # 淇<><E6B787>锛氫笅鎷夎彍鍗曠偣鍑?fix/api-timeout # 淇<><E6B787>锛欰PI 瓒呮椂
|
||
hotfix/security-vulnerability # 绱ф€ヤ慨澶嶏細瀹夊叏婕忔礊
|
||
release/v1.0.0 # 鍙戝竷锛歷1.0.0
|
||
```
|
||
|
||
**鉂?閬垮厤锛?*
|
||
```
|
||
feature/new-feature # 澶<><E6BEB6>缁?fix/bug # 娌℃湁璇存槑鍏蜂綋闂<E7B68B><E99782>
|
||
test # 涓存椂鍒嗘敮锛屽簲璇ユ湁鏄庣‘鐩<E28098>殑
|
||
my-branch # 涓<>汉鍒嗘敮锛屽簲璇ヨ<E79287>鏄庣敤閫?```
|
||
|
||
---
|
||
|
||
## 涓<>枃缂栫爜闂<E7889C><E99782>瑙e喅
|
||
|
||
### 鈿狅笍 闂<><E99782>鎻忚堪
|
||
|
||
鍦?Windows PowerShell 鐜<><E9909C>涓嬶紝Git 鎻愪氦淇℃伅涓<E4BC85>殑涓<E6AE91>枃鍙<E69E83>兘浼氬嚭鐜颁贡鐮侊紝濡傦細
|
||
|
||
```
|
||
124dc35 feat: 濞h<E6BF9E>濮為弲楦垮厴闂傜摕閸旂喕鍏橀敍鍫熸¥妞ゅ湱娲?閺呴缚鍏樻担鎾磋箛鐢垫畱缁剧拠婵撶礆
|
||
```
|
||
|
||
瀹為檯搴旇<EFBFBD>鏄<EFBFBD>細
|
||
```
|
||
124dc35 feat: 娣诲姞鏅鸿兘闂<E58598>瓟鍔熻兘锛堟棤椤圭洰/鏅鸿兘浣撴<E6B5A3>蹇电殑绾<E6AE91><E7BBBE>璇濓級
|
||
```
|
||
|
||
### 鉁?棰勯槻鎺<E6A7BB>柦
|
||
|
||
**1. Git 鍏ㄥ眬閰嶇疆**
|
||
```bash
|
||
git config --global core.quotepath false
|
||
git config --global gui.encoding utf-8
|
||
git config --global i18n.commit.encoding utf-8
|
||
git config --global i18n.logoutputencoding utf-8
|
||
```
|
||
|
||
**2. PowerShell 閰嶇疆**
|
||
|
||
缂栬緫 PowerShell Profile锛?```powershell
|
||
# 鎵撳紑 Profile
|
||
notepad $PROFILE
|
||
|
||
# 娣诲姞浠ヤ笅鍐呭<E98D90>
|
||
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
|
||
$env:LESSCHARSET = 'utf-8'
|
||
```
|
||
|
||
**3. 椤圭洰閰嶇疆鏂囦欢**
|
||
|
||
椤圭洰鏍圭洰褰曞凡鍖呭惈锛?- `.editorconfig` - 缁熶竴缂栬緫鍣ㄧ紪鐮侀厤缃<E58EA4>紙UTF-8锛?- `.gitattributes` - 缁熶竴 Git 鏂囦欢缂栫爜澶勭悊
|
||
|
||
**4. 寮哄埗瑕佹眰锛氬繀椤讳娇鐢ㄨ嫳鏂囨彁浜や俊鎭?* 猸愨瓙猸?蹇呴』
|
||
|
||
```bash
|
||
# 鉁?姝g‘锛氬繀椤讳娇鐢ㄨ嫳鏂?git commit -m "feat(asl): Add screening feature"
|
||
|
||
# 鉂?閿欒<E996BF>锛氱<E9949B>姝<EFBFBD>娇鐢ㄤ腑鏂囷紙浼氬嚭鐜颁贡鐮侊級
|
||
git commit -m "feat(asl): 娣诲姞鍒濈瓫鍔熻兘" # 浼氬嚭鐜颁贡鐮侊紒
|
||
```
|
||
|
||
**鍘熷洜**锛?- Windows PowerShell 鐜<><E9909C>涓嬩腑鏂囦細涔辩爜
|
||
- 鏃犺<E98F83>濡備綍閰嶇疆缂栫爜閮芥棤娉曞畬鍏ㄩ伩鍏嶄贡鐮侀棶棰?- **鍞<>竴瑙e喅鏂规<E98F82>锛氫娇鐢ㄨ嫳鏂?*
|
||
|
||
### 馃敡 淇<><E6B787>鍘嗗彶鎻愪氦涓<E6B0A6>殑涓<E6AE91>枃涔辩爜
|
||
|
||
**浣跨敤淇<E695A4><E6B787>鑴氭湰锛?*
|
||
|
||
椤圭洰鏍圭洰褰曟彁渚涗簡 `fix-git-commit-messages.ps1` 鑴氭湰锛?
|
||
```powershell
|
||
# 1. 鏌ョ湅鑴氭湰璇存槑
|
||
Get-Help .\fix-git-commit-messages.ps1
|
||
|
||
# 2. 杩愯<E69DA9>鑴氭湰锛堜氦浜掑紡锛?.\fix-git-commit-messages.ps1
|
||
|
||
# 3. 杩愯<E69DA9>鑴氭湰锛堣烦杩囩‘璁わ級
|
||
.\fix-git-commit-messages.ps1 -SkipConfirm
|
||
```
|
||
|
||
**鎵嬪姩淇<E5A7A9><E6B787>娴佺▼锛?*
|
||
|
||
1. **鍒涘缓澶囦唤鍒嗘敮**
|
||
```bash
|
||
git branch backup-before-fix
|
||
```
|
||
|
||
2. **鍑嗗<E98D91>鎻愪氦鏄犲皠琛?*
|
||
|
||
缂栬緫 `fix-git-commit-messages.ps1` 涓<>殑 `$commitMapping` 鍝堝笇琛<E7AC87>細
|
||
```powershell
|
||
$commitMapping = @{
|
||
"124dc35" = "feat: add general chat feature (without project/agent concept)"
|
||
"9618eca" = "fix: AgentChatPage conversation data extraction issue"
|
||
# 娣诲姞鏇村<E98F87>闇€瑕佷慨澶嶇殑鎻愪氦...
|
||
}
|
||
```
|
||
|
||
3. **鎵ц<E98EB5>淇<EFBFBD><E6B787>**
|
||
```powershell
|
||
.\fix-git-commit-messages.ps1 -SkipConfirm
|
||
```
|
||
|
||
4. **楠岃瘉缁撴灉**
|
||
```bash
|
||
# 鏌ョ湅淇<E6B985><E6B787>鍚庣殑鎻愪氦鍘嗗彶
|
||
git log --oneline -20
|
||
|
||
# 妫€鏌ユ槸鍚﹁繕鏈変腑鏂囦贡鐮?git log --all --oneline | Select-String "[\u4e00-\u9fa5]"
|
||
```
|
||
|
||
5. **寮哄埗鎺ㄩ€佸埌杩滅▼**
|
||
```bash
|
||
git push --force origin master
|
||
```
|
||
|
||
6. **娓呯悊澶囦唤**
|
||
```bash
|
||
# 濡傛灉淇<E78189><E6B787>鎴愬姛锛屽垹闄ゅ<E99784>浠藉垎鏀?git branch -D backup-before-fix
|
||
|
||
# 娓呯悊涓存椂寮曠敤
|
||
git for-each-ref --format="%(refname)" refs/original/ | ForEach-Object { git update-ref -d $_ }
|
||
|
||
# 杩愯<E69DA9>鍨冨溇鍥炴敹
|
||
git reflog expire --expire=now --all
|
||
git gc --prune=now --aggressive
|
||
```
|
||
|
||
### 鈿狅笍 娉ㄦ剰浜嬮」
|
||
|
||
**淇<><E6B787>鍘嗗彶鎻愪氦鐨勯<E990A8>闄╋細**
|
||
- 鈿狅笍 浼氭敼鍙樻墍鏈夊悗缁<E68297>彁浜ょ殑 SHA-1 鍝堝笇鍊?- 鈿狅笍 闇€瑕佸己鍒舵帹閫侊紙`--force`锛夊埌杩滅▼浠撳簱
|
||
- 鈿狅笍 浼氬奖鍝嶆墍鏈夊崗浣滆€呯殑鏈<E6AE91>湴浠撳簱
|
||
- 鈿狅笍 蹇呴』閫氱煡鍥㈤槦鎴愬憳閲嶆柊鍏嬮殕鎴栭噸缃?
|
||
**寤鸿<E5AFA4>锛?*
|
||
- 鉁?鍦ㄩ」鐩<E3808D>棭鏈熻繘琛屼慨澶?- 鉁?鎻愬墠閫氱煡鎵€鏈夊洟闃熸垚鍛?- 鉁?鍒涘缓澶囦唤鍒嗘敮
|
||
- 鉁?浼樺厛浣跨敤鑻辨枃鎻愪氦淇℃伅锛岄伩鍏嶇紪鐮侀棶棰?
|
||
---
|
||
|
||
## Git 鍘嗗彶閲嶅啓涓庣淮鎶?
|
||
### 馃洜锔?甯哥敤鍛戒护
|
||
|
||
**淇<>敼鏈€鍚庝竴娆℃彁浜わ細**
|
||
```bash
|
||
# 淇<>敼鎻愪氦淇℃伅
|
||
git commit --amend -m "new message"
|
||
|
||
# 娣诲姞閬楁紡鐨勬枃浠?git add forgotten-file.txt
|
||
git commit --amend --no-edit
|
||
```
|
||
|
||
**閲嶇疆鎻愪氦锛?*
|
||
```bash
|
||
# 杞<>噸缃<E599B8>紙淇濈暀鏇存敼锛?git reset --soft HEAD~1
|
||
|
||
# 娣峰悎閲嶇疆锛堥粯璁わ紝淇濈暀宸ヤ綔鍖烘洿鏀癸級
|
||
git reset HEAD~1
|
||
|
||
# 纭<>噸缃<E599B8>紙涓㈠純鎵€鏈夋洿鏀癸級鈿狅笍 鍗遍櫓
|
||
git reset --hard HEAD~1
|
||
```
|
||
|
||
**浜や簰寮忓彉鍩猴細**
|
||
```bash
|
||
# 閲嶆柊鎺掑垪銆佸悎骞躲€佺紪杈戞渶杩?3 娆℃彁浜?git rebase -i HEAD~3
|
||
|
||
# 鍙樺熀鍒?develop 鍒嗘敮
|
||
git rebase develop
|
||
```
|
||
|
||
**鎷i€夋彁浜わ細**
|
||
```bash
|
||
# 灏嗙壒瀹氭彁浜ゅ簲鐢ㄥ埌褰撳墠鍒嗘敮
|
||
git cherry-pick <commit-hash>
|
||
```
|
||
|
||
**杩囨护鍘嗗彶锛?*
|
||
```bash
|
||
# 淇<>敼鎵€鏈夊巻鍙叉彁浜ょ殑浣滆€呬俊鎭?git filter-branch --env-filter '
|
||
if [ "$GIT_COMMITTER_EMAIL" = "old@email.com" ]
|
||
then
|
||
export GIT_COMMITTER_EMAIL="new@email.com"
|
||
export GIT_AUTHOR_EMAIL="new@email.com"
|
||
fi
|
||
' --tag-name-filter cat -- --all
|
||
|
||
# 浠庢墍鏈夊巻鍙蹭腑鍒犻櫎鏂囦欢锛堝<E9949B>鏁忔劅淇℃伅锛?git filter-branch --tree-filter 'rm -f passwords.txt' HEAD
|
||
```
|
||
|
||
### 寮哄埗鎺ㄩ€佽<E282AC>鑼?
|
||
**鈿狅笍 鍗遍櫓鎿嶄綔锛岄渶璋ㄦ厧锛?*
|
||
|
||
**鍩烘湰寮哄埗鎺ㄩ€侊細**
|
||
```bash
|
||
git push --force origin master
|
||
```
|
||
|
||
**鏇村畨鍏ㄧ殑寮哄埗鎺ㄩ€侊細** 猸?鎺ㄨ崘
|
||
```bash
|
||
# 鍙<>湁褰撹繙绋嬪垎鏀<E59E8E>笌鏈<E7AC8C>湴棰勬湡涓€鑷存椂鎵嶆帹閫?git push --force-with-lease origin master
|
||
```
|
||
|
||
**绂佹<E7BB82>寮哄埗鎺ㄩ€佺殑鍒嗘敮锛?*
|
||
- 鉂?`master` / `main` 锛堥櫎闈炰慨澶嶅巻鍙查棶棰橈級
|
||
- 鉂?`develop` 锛堥渶瑕佸洟闃熷悓鎰忥級
|
||
- 鉁?`feature/*` 锛堝彲浠ワ紝浠呭奖鍝嶄釜浜猴級
|
||
- 鉁?`fix/*` 锛堝彲浠ワ紝浠呭奖鍝嶄釜浜猴級
|
||
|
||
**寮哄埗鎺ㄩ€佸墠妫€鏌ユ竻鍗曪細**
|
||
- [ ] 鏄<>惁宸插垱寤哄<E5AFA4>浠藉垎鏀<E59E8E>紵
|
||
- [ ] 鏄<>惁宸查€氱煡鍥㈤槦鎴愬憳锛?- [ ] 鏄<>惁纭<E68381><E7BAAD>娌℃湁鍏朵粬浜哄熀浜庡綋鍓嶅垎鏀<E59E8E>伐浣滐紵
|
||
- [ ] 鏄<>惁浜嗚В寮哄埗鎺ㄩ€佺殑鍚庢灉锛?- [ ] 鏄<>惁鍙<E68381>互浣跨敤 `--force-with-lease` 鏇夸唬 `--force`锛?
|
||
### 鍨冨溇鍥炴敹涓庢竻鐞?
|
||
**娓呯悊鏈<E6828A>拷韪<E68BB7>枃浠讹細**
|
||
```bash
|
||
# 棰勮<E6A3B0>灏嗚<E7818F>鍒犻櫎鐨勬枃浠?git clean -n
|
||
|
||
# 鍒犻櫎鏈<E6AB8E>拷韪<E68BB7>枃浠?git clean -f
|
||
|
||
# 鍒犻櫎鏈<E6AB8E>拷韪<E68BB7>枃浠跺拰鐩<E68BB0>綍
|
||
git clean -fd
|
||
|
||
# 鍖呮嫭 .gitignore 涓<>殑鏂囦欢
|
||
git clean -fdx
|
||
```
|
||
|
||
**娓呯悊杩囨湡寮曠敤锛?*
|
||
```bash
|
||
# 娓呯悊杩囨湡鐨?reflog
|
||
git reflog expire --expire=now --all
|
||
|
||
# 杩愯<E69DA9>鍨冨溇鍥炴敹
|
||
git gc --prune=now
|
||
|
||
# 绉<>瀬鐨勫瀮鍦惧洖鏀讹紙鏇村交搴曪紝鏇存參锛?git gc --prune=now --aggressive
|
||
```
|
||
|
||
**鏌ョ湅浠撳簱澶у皬锛?*
|
||
```bash
|
||
# 鏌ョ湅 .git 鐩<>綍澶у皬
|
||
git count-objects -vH
|
||
```
|
||
|
||
---
|
||
|
||
## 浠g爜瀹℃煡娴佺▼
|
||
|
||
### 馃懃 Pull Request / Merge Request 瑙勮寖
|
||
|
||
**PR/MR 鏍囬<E98F8D>锛?*
|
||
```
|
||
[绫诲瀷] 绠€鐭<E282AC>弿杩帮紙鈮?0瀛楃<E7809B>锛?
|
||
绀轰緥锛?[Feature] 瀹炵幇 AI 鏅鸿兘鏂囩尞鏍囬<E98F8D>鎽樿<E98EBD>鍒濈瓫
|
||
[Fix] 淇<><E6B787>涓嬫媺鑿滃崟鐐瑰嚮鏃犲搷搴旈棶棰?[Refactor] 閲嶆瀯鐢ㄦ埛璁よ瘉閫昏緫
|
||
[Docs] 鏇存柊 Git 鎻愪氦瑙勮寖鏂囨。
|
||
```
|
||
|
||
**PR/MR 鎻忚堪妯℃澘锛?*
|
||
```markdown
|
||
## 馃摑 鍙樻洿璇存槑
|
||
绠€瑕佹弿杩拌繖涓?PR 鍋氫簡浠€涔?
|
||
## 馃幆 鍏宠仈 Issue
|
||
Closes #123
|
||
|
||
## 鉁?涓昏<E6B693>鍙樻洿
|
||
- 娣诲姞浜?XXX 鍔熻兘
|
||
- 淇<><E6B787>浜?YYY 闂<><E99782>
|
||
- 閲嶆瀯浜?ZZZ 妯″潡
|
||
|
||
## 馃И 娴嬭瘯
|
||
- [ ] 鍗曞厓娴嬭瘯閫氳繃
|
||
- [ ] 闆嗘垚娴嬭瘯閫氳繃
|
||
- [ ] 鎵嬪姩娴嬭瘯瀹屾垚
|
||
|
||
## 馃摳 鎴<>浘锛堝<E9949B>鏋滈€傜敤锛?[娣诲姞鎴<E5A79E>浘]
|
||
|
||
## 鈿狅笍 娉ㄦ剰浜嬮」
|
||
闇€瑕佹敞鎰忕殑鐗规畩鎯呭喌鎴栦緷璧?
|
||
## 馃搵 妫€鏌ユ竻鍗?- [ ] 浠g爜绗﹀悎椤圭洰瑙勮寖
|
||
- [ ] 娣诲姞浜嗗繀瑕佺殑娴嬭瘯
|
||
- [ ] 鏇存柊浜嗙浉鍏虫枃妗?- [ ] 閫氳繃浜嗘墍鏈?CI 妫€鏌?```
|
||
|
||
### Code Review 妫€鏌ユ竻鍗?
|
||
**浠g爜璐ㄩ噺锛?*
|
||
- [ ] 浠g爜閫昏緫姝g‘锛屾棤鏄庢樉 bug
|
||
- [ ] 绗﹀悎浠g爜瑙勮寖锛圗SLint/Prettier锛?- [ ] 鍙橀噺銆佸嚱鏁板懡鍚嶆竻鏅?- [ ] 鏃犻噸澶嶄唬鐮侊紙DRY 鍘熷垯锛?- [ ] 閫傚綋鐨勬敞閲婂拰鏂囨。
|
||
|
||
**鍔熻兘瀹屾暣鎬э細**
|
||
- [ ] 瀹炵幇浜嗘墍鏈夐渶姹?- [ ] 杈圭晫鏉′欢澶勭悊姝g‘
|
||
- [ ] 閿欒<E996BF>澶勭悊瀹屽杽
|
||
- [ ] 鏃犳€ц兘闂<E58598><E99782>
|
||
|
||
**娴嬭瘯锛?*
|
||
- [ ] 鍖呭惈鍗曞厓娴嬭瘯
|
||
- [ ] 娴嬭瘯瑕嗙洊鐜囪揪鏍?- [ ] 娴嬭瘯鐢ㄤ緥鍚堢悊
|
||
|
||
**瀹夊叏鎬э細**
|
||
- [ ] 鏃?SQL 娉ㄥ叆椋庨櫓
|
||
- [ ] 鏃?XSS 椋庨櫓
|
||
- [ ] 鏁忔劅淇℃伅鏈<E4BC85>硠闇?- [ ] 鏉冮檺妫€鏌ユ<E98F8C>纭?
|
||
**鏂囨。锛?*
|
||
- [ ] API 鏂囨。宸叉洿鏂?- [ ] README 宸叉洿鏂帮紙濡傞渶瑕侊級
|
||
- [ ] 鏁版嵁搴撳彉鏇村凡璁板綍
|
||
|
||
### Review 鍝嶅簲鏃堕棿
|
||
|
||
| 浼樺厛绾?| 鍝嶅簲鏃堕棿 | 璇存槑 |
|
||
|--------|----------|------|
|
||
| 馃敶 绱ф€?| 2 灏忔椂鍐?| 鐢熶骇鐜<E9AA87><E9909C> Bug銆佸畨鍏ㄦ紡娲?|
|
||
| 馃煛 楂?| 1 澶╁唴 | 闃诲<E99783>鍏朵粬寮€鍙戠殑鍔熻兘 |
|
||
| 馃煝 涓?| 2 澶╁唴 | 甯歌<E794AF>鍔熻兘鍜屼慨澶?|
|
||
| 鈿?浣?| 3 澶╁唴 | 浼樺寲銆侀噸鏋勩€佹枃妗?|
|
||
|
||
---
|
||
|
||
## 甯歌<E794AF>闂<EFBFBD><E99782>涓庢渶浣冲疄璺?
|
||
### 馃<> 甯歌<E794AF>闂<EFBFBD><E99782>
|
||
|
||
**Q1: 鎻愪氦鍚庡彂鐜版湁閿欒<E996BF>锛屽<E9949B>浣曚慨鏀癸紵**
|
||
```bash
|
||
# 淇<>敼鍚庨噸鏂版彁浜わ紙鏈<E7B499>帹閫佸埌杩滅▼锛?git add .
|
||
git commit --amend --no-edit
|
||
|
||
# 濡傛灉宸叉帹閫侊紝闇€瑕佸己鍒舵帹閫?git push --force-with-lease origin feature/xxx
|
||
```
|
||
|
||
**Q2: 濡備綍鎾ら攢宸叉帹閫佺殑鎻愪氦锛?*
|
||
```bash
|
||
# 鏂瑰紡 1锛氬垱寤轰竴涓<E7ABB4>柊鐨?revert 鎻愪氦锛堟帹鑽愶級
|
||
git revert <commit-hash>
|
||
git push origin master
|
||
|
||
# 鏂瑰紡 2锛氶噸缃<E599B8>悗寮哄埗鎺ㄩ€侊紙鍗遍櫓锛屼笉鎺ㄨ崘锛?git reset --hard HEAD~1
|
||
git push --force origin master
|
||
```
|
||
|
||
**Q3: 濡備綍瑙e喅鍚堝苟鍐茬獊锛?*
|
||
```bash
|
||
# 1. 鎷夊彇鏈€鏂颁唬鐮?git pull origin develop
|
||
|
||
# 2. 鎵嬪姩瑙e喅鍐茬獊鏂囦欢
|
||
|
||
# 3. 鏍囪<E98F8D>涓哄凡瑙e喅
|
||
git add <conflicted-files>
|
||
|
||
# 4. 瀹屾垚鍚堝苟
|
||
git commit -m "chore: merge develop into feature/xxx"
|
||
```
|
||
|
||
**Q4: 濡備綍鏌ョ湅鏌愪釜鏂囦欢鐨勪慨鏀瑰巻鍙诧紵**
|
||
```bash
|
||
# 鏌ョ湅鏂囦欢鐨勬彁浜ゅ巻鍙?git log --follow -- path/to/file
|
||
|
||
# 鏌ョ湅鏂囦欢鐨勮<E990A8>缁嗕慨鏀瑰唴瀹?git log -p -- path/to/file
|
||
|
||
# 鏌ョ湅姣忚<E5A7A3>浠g爜鐨勬渶鍚庝慨鏀逛俊鎭?git blame path/to/file
|
||
```
|
||
|
||
**Q5: 濡備綍鎭㈠<E98EAD>宸插垹闄ょ殑鏂囦欢锛?*
|
||
```bash
|
||
# 鏌ユ壘鍒犻櫎璇ユ枃浠剁殑鎻愪氦
|
||
git log --all --full-history -- path/to/file
|
||
|
||
# 鎭㈠<E98EAD>鏂囦欢锛堜粠鍒犻櫎鍓嶇殑鎻愪氦锛?git checkout <commit-hash>^ -- path/to/file
|
||
```
|
||
|
||
**Q6: 濡備綍涓存椂淇濆瓨鏈<E793A8>彁浜ょ殑鏇存敼锛?*
|
||
```bash
|
||
# 淇濆瓨鏇存敼
|
||
git stash save "鎻忚堪淇℃伅"
|
||
|
||
# 鏌ョ湅淇濆瓨鐨勬洿鏀?git stash list
|
||
|
||
# 鎭㈠<E98EAD>鏇存敼
|
||
git stash pop
|
||
|
||
# 鎭㈠<E98EAD>鐗瑰畾鐨?stash
|
||
git stash apply stash@{0}
|
||
```
|
||
|
||
**Q7: 鎻愪氦淇℃伅鍐欓敊浜嗘€庝箞鍔烇紵**
|
||
```bash
|
||
# 淇<>敼鏈€鍚庝竴娆℃彁浜や俊鎭<E4BF8A>紙鏈<E7B499>帹閫侊級
|
||
git commit --amend -m "姝g‘鐨勬彁浜や俊鎭?
|
||
|
||
# 濡傛灉宸叉帹閫?git commit --amend -m "姝g‘鐨勬彁浜や俊鎭?
|
||
git push --force-with-lease origin branch-name
|
||
|
||
# 淇<>敼鏇存棭鐨勬彁浜や俊鎭?git rebase -i HEAD~3 # 淇<>敼鏈€杩?3 娆℃彁浜?# 鍦ㄧ紪杈戝櫒涓<E6AB92>皢 pick 鏀逛负 reword
|
||
```
|
||
|
||
### 馃挕 鏈€浣冲疄璺?
|
||
**鎻愪氦棰戠巼锛?*
|
||
- 鉁?**姣忓ぉ鑷冲皯鎻愪氦涓€娆?*锛圕ursor鐜<72><E9909C>寮哄埗瑕佹眰锛?- 鉁?姣忎釜鎻愪氦鍙<E6B0A6>仛涓€浠朵簨
|
||
- 鉁?鎻愪氦鍙<E6B0A6>紪璇戙€佸彲杩愯<E69DA9>鐨勪唬鐮?- 鈿狅笍 鍙<>互绉<E4BA92>疮涓€澶╃殑鏇存敼锛屼絾涓嶈<E6B693>瓒呰繃涓€澶?- 鉂?**缁濆<E7BC81>涓嶈<E6B693>**璁╀唬鐮佽繃澶滀笉鎻愪氦锛圕ursor鐜<72><E9909C>椋庨櫓锛?
|
||
**鎻愪氦鍐呭<E98D90>锛?*
|
||
- 鉁?鍙<>彁浜ょ浉鍏崇殑鏇存敼
|
||
- 鉁?浣跨敤 `.gitignore` 鎺掗櫎鏃犲叧鏂囦欢
|
||
- 鉂?涓嶈<E6B693>鎻愪氦鐢熸垚鐨勬枃浠讹紙`node_modules/`, `dist/`, `.env`锛?- 鉂?涓嶈<E6B693>鎻愪氦鏁忔劅淇℃伅锛堝瘑鐮併€佸瘑閽ワ級
|
||
|
||
**鍒嗘敮绠$悊锛?*
|
||
- 鉁?浠庢渶鏂扮殑 `develop` 鍒涘缓鍔熻兘鍒嗘敮
|
||
- 鉁?瀹氭湡灏?`develop` 鍚堝苟鍒板姛鑳藉垎鏀?- 鉁?鍔熻兘瀹屾垚鍚庡強鏃跺悎骞跺拰鍒犻櫎鍒嗘敮
|
||
- 鉂?涓嶈<E6B693>闀挎湡淇濇寔鍔熻兘鍒嗘敮涓嶅悎骞?
|
||
**鍗忎綔锛?*
|
||
- 鉁?鎺ㄩ€佸墠鍏堟媺鍙栵紙`git pull --rebase`锛?- 鉁?鍙婃椂鍝嶅簲 Code Review
|
||
- 鉁?涓诲姩娌熼€氬啿绐佸拰闂<E68BB0><E99782>
|
||
- 鉂?涓嶈<E6B693>鐩存帴鎺ㄩ€佸埌 `master` 鍒嗘敮
|
||
|
||
### 馃敡 鏈夌敤鐨?Git 鍒<>悕
|
||
|
||
鍦?`~/.gitconfig` 涓<>坊鍔狅細
|
||
|
||
```ini
|
||
[alias]
|
||
# 鐘舵€佸拰鏃ュ織
|
||
st = status
|
||
co = checkout
|
||
br = branch
|
||
ci = commit
|
||
|
||
# 缇庡寲鐨勬棩蹇? lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
||
|
||
# 绠€娲佺殑鐘舵€? s = status -s
|
||
|
||
# 鏈€杩戠殑鎻愪氦
|
||
last = log -1 HEAD
|
||
|
||
# 鎾ら攢鏈€鍚庝竴娆℃彁浜わ紙淇濈暀鏇存敼锛? undo = reset --soft HEAD~1
|
||
|
||
# 鏌ョ湅宸<E6B985>紓
|
||
d = diff
|
||
dc = diff --cached
|
||
|
||
# 鎷夊彇骞跺彉鍩? up = pull --rebase
|
||
|
||
# 鎺ㄩ€佸綋鍓嶅垎鏀? push-current = "!git push -u origin $(git rev-parse --abbrev-ref HEAD)"
|
||
```
|
||
|
||
浣跨敤绀轰緥锛?```bash
|
||
git st # 鐩稿綋浜?git status
|
||
git lg # 缇庡寲鐨勬棩蹇?git push-current # 鎺ㄩ€佸綋鍓嶅垎鏀?```
|
||
|
||
### 馃摎 鎺ㄨ崘闃呰<E99783>
|
||
|
||
**Git 瀛︿範璧勬簮锛?*
|
||
- [Pro Git Book锛堜腑鏂囩増锛塢(https://git-scm.com/book/zh/v2)
|
||
- [Git 瀹樻柟鏂囨。](https://git-scm.com/docs)
|
||
- [Learn Git Branching锛堜氦浜掑紡鏁欑▼锛塢(https://learngitbranching.js.org/)
|
||
|
||
**鎻愪氦瑙勮寖锛?*
|
||
- [Conventional Commits](https://www.conventionalcommits.org/)
|
||
- [Angular Commit Guidelines](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit)
|
||
|
||
---
|
||
|
||
## 馃摓 鑾峰彇甯<E5BD87>姪
|
||
|
||
**閬囧埌闂<E59F8C><E99782>锛?*
|
||
1. 鏌ョ湅鏈<E6B985>枃妗g殑甯歌<E794AF>闂<EFBFBD><E99782>閮ㄥ垎
|
||
2. 鎼滅储 Git 瀹樻柟鏂囨。
|
||
3. 鍚戝洟闃熸妧鏈<E5A6A7>礋璐d汉鍜ㄨ<E98D9C>
|
||
4. 鍦ㄥ洟闃熺兢鑱婁腑璁ㄨ<E79281>
|
||
|
||
**鏂囨。鍙嶉<E98D99>锛?*
|
||
濡傛灉鍙戠幇鏂囨。閿欒<EFBFBD>鎴栨湁鏀硅繘寤鸿<EFBFBD>锛岃<EFBFBD>锛?1. 鎻愪氦 Issue
|
||
2. 鐩存帴淇<E5B8B4>敼骞舵彁浜?PR
|
||
3. 鑱旂郴鏂囨。缁存姢浜?
|
||
---
|
||
|
||
## 鈿狅笍 Cursor IDE 鐜<><E9909C>涓撶敤鏈€浣冲疄璺?
|
||
> **猸愨瓙猸愨瓙猸?琛€娉<E282AC>暀璁<E69A80>細鏈<E7B4B0>彁浜ょ殑浠g爜鍙<E7889C>兘姘镐箙涓㈠け锛?*
|
||
|
||
### 馃敶 鐪熷疄妗堜緥锛欴C妯″潡浠g爜涓㈠け浜嬩欢
|
||
|
||
**浜嬩欢鍥為【锛?025-11-27锛夛細**
|
||
|
||
1. **寮€鍙戣繃绋?*锛? - 瀹屾垚浜咲C妯″潡Tool B鐨勫畬鏁村紑鍙? - 鍖呭惈4涓狿risma琛ㄦā鍨嬶紙dc_health_checks, dc_templates, dc_extraction_tasks, dc_extraction_items锛? - 鍖呭惈4涓猄ervice锛圚ealthCheckService, TemplateService, DualModelExtractionService, ConflictDetectionService锛? - 鍖呭惈Controller銆丷outes绛夊畬鏁翠唬鐮? - 瀹屾垚浜哃LM闆嗘垚娴嬭瘯
|
||
|
||
2. **鎮插墽鍙戠敓**锛? - 寮€鍙戝畬鎴愬悗鏈<E68297>珛鍗虫彁浜ゅ埌Git
|
||
- 浠g爜鍋滅暀鍦–ursor鐨勪复鏃剁紦瀛樹腑
|
||
- Cursor閲嶅惎/缂撳瓨娓呯悊鍚庯紝浠g爜鍏ㄩ儴娑堝け
|
||
- 鍙<>繚鐣欎簡鏂囨。鍜岀┖鐩<E29496>綍缁撴瀯
|
||
|
||
3. **鎹熷け璇勪及**锛? - 馃挃 2-3澶╃殑寮€鍙戝伐浣滃畬鍏ㄤ涪澶? - 馃挃 鎵€鏈塖ervice瀹炵幇浠g爜涓㈠け
|
||
- 馃挃 Prisma妯″瀷瀹氫箟涓㈠け
|
||
- 馃挃 娴嬭瘯浠g爜涓㈠け
|
||
- 鉁?骞歌繍鐨勬槸璁捐<E79281>鏂囨。淇濈暀浜?
|
||
4. **鎭㈠<E98EAD>闅惧害**锛? - 鉂?Cursor缂撳瓨宸叉竻鐞嗭紝鏃犳硶鎭㈠<E98EAD>
|
||
- 鉂?Git鍘嗗彶涓<E5BDB6>棤浠讳綍璁板綍
|
||
- 鉂?Windows鏂囦欢鍘嗗彶鏃犺<E98F83>褰? - 鉁?鍙<>兘鍩轰簬璁捐<E79281>鏂囨。瀹屽叏閲嶅缓
|
||
|
||
### 馃洝锔?闃叉<E99783>浠g爜涓㈠け鐨勫己鍒惰<E98D92>鍒?
|
||
#### **瑙勫垯1锛氭瘡澶╀笅鐝<E7AC85>墠蹇呴』鎻愪氦 猸愨瓙猸愨瓙猸?*
|
||
|
||
```bash
|
||
# 姣忓ぉ涓嬬彮鍓嶆墽琛岀殑鏍囧噯娴佺▼
|
||
cd D:\MyCursor\AIclinicalresearch
|
||
|
||
# 1. 鏌ョ湅鐘舵€?git status
|
||
|
||
# 2. 娣诲姞鎵€鏈変慨鏀?git add .
|
||
|
||
# 3. 鎻愪氦锛堝繀椤讳娇鐢ㄨ嫳鏂囷級
|
||
git commit -m "feat(module): Complete Day X development
|
||
|
||
Summary:
|
||
- [浠婂ぉ瀹屾垚鐨勪富瑕佸伐浣淽
|
||
- [瀹炵幇鐨勬牳蹇冨姛鑳絔
|
||
- [鏇存柊鐨勬枃妗<E69E83>
|
||
|
||
Status: Code tested and verified locally"
|
||
|
||
# 4. 鎺ㄩ€佸埌杩滅▼锛堝叧閿<E58FA7>紒锛?git push origin master
|
||
|
||
# 5. 纭<><E7BAAD>鎺ㄩ€佹垚鍔?git log -1
|
||
```
|
||
|
||
**鎵ц<E98EB5>鏃舵満锛?*
|
||
- 鉁?姣忓ぉ涓嬬彮鍓嶏紙寮哄埗锛?- 鉁?鍗堜紤鍓?- 鉁?闀挎椂闂寸<E99782>寮€鐢佃剳鍓?- 鉁?鍑嗗<E98D91>鍏抽棴Cursor鍓?- 鉁?绯荤粺鏇存柊/閲嶅惎鍓?
|
||
#### **瑙勫垯2锛氶噸瑕佸姛鑳藉畬鎴愬悗绔嬪嵆鎻愪氦**
|
||
|
||
```bash
|
||
# 鍦烘櫙锛氬垰瀹屾垚涓€涓猄ervice鐨勫疄鐜?git add backend/src/modules/dc/tool-b/services/HealthCheckService.ts
|
||
git commit -m "feat(dc): Implement HealthCheckService
|
||
|
||
Features:
|
||
- Excel parsing logic
|
||
- Empty rate calculation
|
||
- Token estimation
|
||
- Interception strategy
|
||
|
||
Tested: Basic unit tests passed"
|
||
|
||
git push origin master
|
||
```
|
||
|
||
#### **瑙勫垯3锛氫娇鐢℅it鐘舵€佹<E282AC>鏌ヨ剼鏈?*
|
||
|
||
鍦ㄩ」鐩<EFBFBD>牴鐩<EFBFBD>綍鍒涘缓 `check-git-status.ps1`锛?
|
||
```powershell
|
||
# check-git-status.ps1
|
||
Write-Host "=== Git Status Check ===" -ForegroundColor Yellow
|
||
cd D:\MyCursor\AIclinicalresearch
|
||
|
||
$status = git status --short
|
||
if ($status) {
|
||
Write-Host "鈿狅笍 You have uncommitted changes!" -ForegroundColor Red
|
||
Write-Host $status
|
||
Write-Host ""
|
||
Write-Host "Please commit your changes before closing Cursor!" -ForegroundColor Red
|
||
Write-Host "Run: git add . && git commit -m 'your message' && git push" -ForegroundColor Yellow
|
||
} else {
|
||
Write-Host "鉁?All changes committed!" -ForegroundColor Green
|
||
}
|
||
|
||
Write-Host ""
|
||
Write-Host "Last commit:" -ForegroundColor Cyan
|
||
git log -1 --oneline
|
||
```
|
||
|
||
**浣跨敤鏂规硶锛?*
|
||
```bash
|
||
# 鍏抽棴Cursor鍓嶈繍琛?.\check-git-status.ps1
|
||
```
|
||
|
||
#### **瑙勫垯4锛氳<E9949B>缃瓹ursor鍏抽棴鎻愰啋**
|
||
|
||
鍦?`workspace settings.json` 涓<>坊鍔狅細
|
||
```json
|
||
{
|
||
"git.enableSmartCommit": true,
|
||
"git.confirmSync": false,
|
||
"git.autofetch": true,
|
||
"git.showUnpushedChangesIndicator": true
|
||
}
|
||
```
|
||
|
||
### 馃毃 Cursor鐜<72><E9909C>椋庨櫓鐐?
|
||
| 椋庨櫓鐐?| 璇存槑 | 闃茶寖鎺<E5AF96>柦 |
|
||
|--------|------|---------|
|
||
| **缂撳瓨娓呯悊** | Cursor鍙<72>兘娓呯悊涓存椂鏂囦欢 | 姣忔棩鎻愪氦 |
|
||
| **IDE宕╂簝** | Cursor宕╂簝鍙<E7B09D>兘涓㈠け鏈<E38191>繚瀛樺唴瀹?| 姣忔棩鎻愪氦 + 姣忓皬鏃禖trl+S |
|
||
| **绯荤粺閲嶅惎** | Windows鏇存柊寮哄埗閲嶅惎 | 涓嬬彮鍓嶆彁浜?|
|
||
| **AI鐢熸垚浠g爜** | AI鐢熸垚鐨勪唬鐮佹湭鑷<E6B9AD>姩淇濆瓨 | 鐢熸垚鍚庣珛鍗抽獙璇佸苟鎻愪氦 |
|
||
| **澶氭枃浠舵搷浣?* | 鎵归噺淇<E599BA>敼鍚庢湭淇濆瓨 | 鎿嶄綔鍚庢<E98D9A>鏌<EFBFBD>it status |
|
||
|
||
### 鉁?瀹夊叏鐨勫紑鍙戞祦绋?
|
||
```
|
||
1. 鎷夊彇鏈€鏂颁唬鐮? git pull origin master
|
||
鈫?2. 寮€濮嬪紑鍙? [缂栧啓浠g爜銆佹祴璇曘€佽皟璇昡
|
||
鈫?3. 闃舵<E99783>鎬т繚瀛? Ctrl+S锛堟瘡闅?5-30鍒嗛挓锛? 鈫?4. 鍔熻兘瀹屾垚鍚庨獙璇? [杩愯<E69DA9>娴嬭瘯銆佹<E98A86>鏌ュ姛鑳絔
|
||
鈫?5. 绔嬪嵆鎻愪氦
|
||
git add .
|
||
git commit -m "..."
|
||
git push origin master
|
||
鈫?6. 纭<><E7BAAD>鎺ㄩ€佹垚鍔? git log -1
|
||
妫€鏌<E282AC>itee缃戦〉鏄<E38089>惁鏇存柊
|
||
```
|
||
|
||
### 馃搵 姣忔棩寮€鍙戞<E98D99>鏌ユ竻鍗?
|
||
**寮€濮嬪紑鍙戝墠锛?*
|
||
- [ ] 鎷夊彇鏈€鏂颁唬鐮侊細`git pull`
|
||
- [ ] 妫€鏌ュ綋鍓嶅垎鏀<E59E8E>細`git branch`
|
||
- [ ] 纭<><E7BAAD>宸ヤ綔鍖哄共鍑€锛歚git status`
|
||
|
||
**寮€鍙戣繃绋嬩腑锛?*
|
||
- [ ] 姣?0鍒嗛挓淇濆瓨锛歚Ctrl+S`
|
||
- [ ] 姣忓皬鏃舵<E98F83>鏌ョ姸鎬侊細`git status`
|
||
- [ ] 閲嶈<E996B2>鍔熻兘瀹屾垚鍚庣珛鍗虫彁浜?
|
||
**涓嬬彮鍓嶏紙寮哄埗锛夛細**
|
||
- [ ] 淇濆瓨鎵€鏈夋枃浠讹細`Ctrl+Shift+S`
|
||
- [ ] 鏌ョ湅淇<E6B985>敼鍐呭<E98D90>锛歚git status`
|
||
- [ ] 娣诲姞淇<E5A79E>敼锛歚git add .`
|
||
- [ ] 鎻愪氦浠g爜锛歚git commit -m "..."`
|
||
- [ ] 鎺ㄩ€佸埌杩滅▼锛歚git push origin master`
|
||
- [ ] 纭<><E7BAAD>鎺ㄩ€佹垚鍔燂細璁块棶Gitee鏌ョ湅
|
||
|
||
**鍏抽棴Cursor鍓嶏細**
|
||
- [ ] 杩愯<E69DA9>妫€鏌ヨ剼鏈<E589BC>細`.\check-git-status.ps1`
|
||
- [ ] 纭<><E7BAAD>鏃犳湭鎻愪氦淇<E6B0A6>敼
|
||
- [ ] 纭<><E7BAAD>鏈€鏂版彁浜ゅ凡鎺ㄩ€?
|
||
### 馃啒 绱ф€ユ仮澶嶆寚鍗?
|
||
**濡傛灉浠g爜宸蹭涪澶憋紝灏濊瘯浠ヤ笅鏂规硶锛?*
|
||
|
||
1. **妫€鏌<E282AC>ursor缂撳瓨**锛?```bash
|
||
Get-ChildItem "C:\Users\zhibo\.cursor\" -Recurse -Include "*.ts"
|
||
| Sort-Object LastWriteTime -Descending | Select-Object -First 50
|
||
```
|
||
|
||
2. **妫€鏌<E282AC>it瀵硅薄**锛?```bash
|
||
git fsck --lost-found
|
||
git reflog
|
||
```
|
||
|
||
3. **妫€鏌<E282AC>indows鏂囦欢鍘嗗彶**锛? - 鍙抽敭椤圭洰鏂囦欢澶?鈫?灞炴€?鈫?浠ュ墠鐨勭増鏈?
|
||
4. **濡傛灉瀹屽叏鏃犳硶鎭㈠<E98EAD>**锛? - 鍩轰簬璁捐<E79281>鏂囨。閲嶅缓锛堝垢濂戒繚鐣欎簡鏂囨。锛? - 鍚稿彇鏁欒<E98F81>锛屽己鍖栨瘡鏃ユ彁浜や範鎯?
|
||
### 馃挕 Cursor鐜<72><E9909C>鎺ㄨ崘璁剧疆
|
||
|
||
**VS Code / Cursor 璁剧疆**锛?```json
|
||
{
|
||
"files.autoSave": "afterDelay",
|
||
"files.autoSaveDelay": 1000,
|
||
"git.enableSmartCommit": true,
|
||
"git.confirmSync": false,
|
||
"git.autofetch": true,
|
||
"git.showUnpushedChangesIndicator": true,
|
||
"editor.formatOnSave": true
|
||
}
|
||
```
|
||
|
||
---
|
||
|
||
**鏈€鍚庢洿鏂帮細** 2025-11-28
|
||
**缁存姢浜猴細** 鎶€鏈<E282AC>灦鏋勫笀
|
||
**鐗堟湰鍘嗗彶锛?*
|
||
- v1.2 (2025-11-28): **娣诲姞Cursor鐜<72><E9909C>涓撶敤鏈€浣冲疄璺?*锛屽熀浜嶥C妯″潡浠g爜涓㈠け浜嬩欢鐨勮<E990A8>娉<EFBFBD>暀璁? - 鏂板<E98F82>"Cursor IDE鐜<45><E9909C>涓撶敤鏈€浣冲疄璺?绔犺妭
|
||
- 寮哄埗瑕佹眰姣忔棩鎻愪氦
|
||
- 娣诲姞浠g爜涓㈠け闃茶寖鎺<E5AF96>柦
|
||
- 娣诲姞姣忔棩寮€鍙戞<E98D99>鏌ユ竻鍗?- v1.1 (2025-11-22): **寮哄埗瑕佹眰 Commit Message 浣跨敤鑻辨枃**锛岄伩鍏嶄腑鏂囦贡鐮侀棶棰? - 鍦?Commit Message 瑙勮寖"寮€澶存坊鍔犻噸瑕佹彁绀? - 鏇存柊鎵€鏈夌ず渚嬩负鑻辨枃鐗堟湰
|
||
- 灏?浼樺厛浣跨敤鑻辨枃"鏀逛负"蹇呴』浣跨敤鑻辨枃"
|
||
- v1.0 (2025-11-16): 鍒濆<E98D92>鐗堟湰锛屽寘鍚<E5AF98>畬鏁寸殑 Git 瑙勮寖鍜屼腑鏂囦贡鐮佽В鍐虫柟妗?
|
||
|
||
|