diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index a845200..5832c0d 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -13,12 +13,12 @@ "state": { "type": "markdown", "state": { - "file": "docs/学习笔记/gerrit分支规范.md", + "file": "docs/Obsidian笔记体系/Areas/07-系统安全/密钥存储与加密.md", "mode": "source", "source": false }, "icon": "lucide-file", - "title": "gerrit分支规范" + "title": "密钥存储与加密" } } ] @@ -185,10 +185,16 @@ }, "active": "f1ecba89214e3cc5", "lastOpenFiles": [ + "docs/Obsidian笔记体系/Areas/07-系统安全/漏洞案例库.md", + "docs/Obsidian笔记体系/Areas/01-系统启动流程/Launcher启动流程.md", "docs/Obsidian笔记体系/Areas/01-系统启动流程/README.md", - "docs/Obsidian笔记体系/README.md", "docs/Obsidian笔记体系/Areas/01-系统启动流程/SystemServer核心服务.md", + "docs/Obsidian笔记体系/Areas/01-系统启动流程/Zygote进程启动.md", + "docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md", "docs/Obsidian/2026-01-05 个人文档管理.md", + "docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md.bak", + "docs/学习笔记/gerrit分支规范.md", + "docs/Obsidian笔记体系/README.md", "docs/Obsidian笔记体系/MOCs/Android Framework知识体系图.md", "docs/Obsidian笔记体系/MOCs/源码阅读地图.md", "docs/Obsidian笔记体系/MOCs/高频问题索引.md", @@ -209,17 +215,11 @@ "docs/Obsidian笔记体系/Config/自定义脚本/源码链接生成器.py", "docs/Obsidian笔记体系/Config/自定义脚本/自动生成日报.js", "docs/Obsidian笔记体系/Config/主题与样式.css", - "docs/Obsidian笔记体系/Templates/源码解析模板.md", - "docs/Obsidian笔记体系/Templates/会议记录模板.md", - "docs/Obsidian笔记体系/Templates/技术方案设计模板.md", - "docs/Obsidian笔记体系/Templates/问题排查模板.md", - "docs/Obsidian笔记体系/MOCs/技能提升路线图.md", "docs/Obsidian笔记体系/Config/自定义脚本", "docs/Obsidian笔记体系/Daily/templates", "docs/Obsidian笔记体系/Archive/资源-历史会议记录", "docs/Obsidian笔记体系/Archive/领域-已废弃API研究", "docs/Obsidian笔记体系/Archive/项目-旧版ROM适配", - "docs/Obsidian笔记体系/Resources/会议与分享/内部技术分享记录", - "docs/Obsidian笔记体系/Resources/会议与分享/Android开发者峰会笔记" + "docs/Obsidian笔记体系/Resources/会议与分享/内部技术分享记录" ] } \ No newline at end of file diff --git a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md index 08028ef..e05e1f1 100644 Binary files a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md and b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md differ diff --git a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md.bak b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md.bak new file mode 100644 index 0000000..08028ef Binary files /dev/null and b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Bootloader到Init.md.bak differ diff --git a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Launcher启动流程.md b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Launcher启动流程.md index 8d4e189..886c846 100644 Binary files a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Launcher启动流程.md and b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Launcher启动流程.md differ diff --git a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Zygote进程启动.md b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Zygote进程启动.md index 64a3cdf..206bdf2 100644 Binary files a/docs/Obsidian笔记体系/Areas/01-系统启动流程/Zygote进程启动.md and b/docs/Obsidian笔记体系/Areas/01-系统启动流程/Zygote进程启动.md differ diff --git a/docs/Obsidian笔记体系/Areas/04-资源与包管理/PackageManagerService.md b/docs/Obsidian笔记体系/Areas/04-资源与包管理/PackageManagerService.md index 3ad4492..8ebf924 100644 Binary files a/docs/Obsidian笔记体系/Areas/04-资源与包管理/PackageManagerService.md and b/docs/Obsidian笔记体系/Areas/04-资源与包管理/PackageManagerService.md differ diff --git a/docs/Obsidian笔记体系/Areas/04-资源与包管理/README.md b/docs/Obsidian笔记体系/Areas/04-资源与包管理/README.md index 3fb86e0..2c9f76d 100644 Binary files a/docs/Obsidian笔记体系/Areas/04-资源与包管理/README.md and b/docs/Obsidian笔记体系/Areas/04-资源与包管理/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/04-资源与包管理/Resource资源加载机制.md b/docs/Obsidian笔记体系/Areas/04-资源与包管理/Resource资源加载机制.md index 754e4cd..f1210a4 100644 Binary files a/docs/Obsidian笔记体系/Areas/04-资源与包管理/Resource资源加载机制.md and b/docs/Obsidian笔记体系/Areas/04-资源与包管理/Resource资源加载机制.md differ diff --git a/docs/Obsidian笔记体系/Areas/04-资源与包管理/动态加载与热修复原理.md b/docs/Obsidian笔记体系/Areas/04-资源与包管理/动态加载与热修复原理.md index c298c39..33f9a71 100644 Binary files a/docs/Obsidian笔记体系/Areas/04-资源与包管理/动态加载与热修复原理.md and b/docs/Obsidian笔记体系/Areas/04-资源与包管理/动态加载与热修复原理.md differ diff --git a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/AIDL与HIDL使用与原理.md b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/AIDL与HIDL使用与原理.md index 3472b0e..0ee1e25 100644 Binary files a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/AIDL与HIDL使用与原理.md and b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/AIDL与HIDL使用与原理.md differ diff --git a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Binder机制(内核到Java层).md b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Binder机制(内核到Java层).md index c187095..3865725 100644 Binary files a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Binder机制(内核到Java层).md and b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Binder机制(内核到Java层).md differ diff --git a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Handler机制源码解析.md b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Handler机制源码解析.md index 7b8405c..ee1fe24 100644 Binary files a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Handler机制源码解析.md and b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/Handler机制源码解析.md differ diff --git a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/README.md b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/README.md index b11f5ad..8df7e69 100644 Binary files a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/README.md and b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/跨进程同步与锁优化.md b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/跨进程同步与锁优化.md index af6d90a..a97744c 100644 Binary files a/docs/Obsidian笔记体系/Areas/05-进程与线程通信/跨进程同步与锁优化.md and b/docs/Obsidian笔记体系/Areas/05-进程与线程通信/跨进程同步与锁优化.md differ diff --git a/docs/Obsidian笔记体系/Areas/06-性能优化体系/README.md b/docs/Obsidian笔记体系/Areas/06-性能优化体系/README.md index 807c4ec..425621e 100644 Binary files a/docs/Obsidian笔记体系/Areas/06-性能优化体系/README.md and b/docs/Obsidian笔记体系/Areas/06-性能优化体系/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/06-性能优化体系/内存优化(LeakCanary原理).md b/docs/Obsidian笔记体系/Areas/06-性能优化体系/内存优化(LeakCanary原理).md index c5ac13c..d85f301 100644 Binary files a/docs/Obsidian笔记体系/Areas/06-性能优化体系/内存优化(LeakCanary原理).md and b/docs/Obsidian笔记体系/Areas/06-性能优化体系/内存优化(LeakCanary原理).md differ diff --git a/docs/Obsidian笔记体系/Areas/06-性能优化体系/功耗优化工具链.md b/docs/Obsidian笔记体系/Areas/06-性能优化体系/功耗优化工具链.md index d25af37..7d9bb61 100644 Binary files a/docs/Obsidian笔记体系/Areas/06-性能优化体系/功耗优化工具链.md and b/docs/Obsidian笔记体系/Areas/06-性能优化体系/功耗优化工具链.md differ diff --git a/docs/Obsidian笔记体系/Areas/06-性能优化体系/启动优化方法论.md b/docs/Obsidian笔记体系/Areas/06-性能优化体系/启动优化方法论.md index 268ac91..6e57f60 100644 Binary files a/docs/Obsidian笔记体系/Areas/06-性能优化体系/启动优化方法论.md and b/docs/Obsidian笔记体系/Areas/06-性能优化体系/启动优化方法论.md differ diff --git a/docs/Obsidian笔记体系/Areas/06-性能优化体系/流畅度(Choreographer+VSYNC).md b/docs/Obsidian笔记体系/Areas/06-性能优化体系/流畅度(Choreographer+VSYNC).md index ef642b1..44fb4e1 100644 Binary files a/docs/Obsidian笔记体系/Areas/06-性能优化体系/流畅度(Choreographer+VSYNC).md and b/docs/Obsidian笔记体系/Areas/06-性能优化体系/流畅度(Choreographer+VSYNC).md differ diff --git a/docs/Obsidian笔记体系/Areas/07-系统安全/README.md b/docs/Obsidian笔记体系/Areas/07-系统安全/README.md index 15f0b23..cba35a1 100644 Binary files a/docs/Obsidian笔记体系/Areas/07-系统安全/README.md and b/docs/Obsidian笔记体系/Areas/07-系统安全/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/07-系统安全/SELinux策略编写.md b/docs/Obsidian笔记体系/Areas/07-系统安全/SELinux策略编写.md index 1397d04..f1c1215 100644 Binary files a/docs/Obsidian笔记体系/Areas/07-系统安全/SELinux策略编写.md and b/docs/Obsidian笔记体系/Areas/07-系统安全/SELinux策略编写.md differ diff --git a/docs/Obsidian笔记体系/Areas/07-系统安全/密钥存储与加密.md b/docs/Obsidian笔记体系/Areas/07-系统安全/密钥存储与加密.md index 3ddec4d..e22628c 100644 Binary files a/docs/Obsidian笔记体系/Areas/07-系统安全/密钥存储与加密.md and b/docs/Obsidian笔记体系/Areas/07-系统安全/密钥存储与加密.md differ diff --git a/docs/Obsidian笔记体系/Areas/07-系统安全/权限管理框架.md b/docs/Obsidian笔记体系/Areas/07-系统安全/权限管理框架.md index 0d5ba08..9d3da27 100644 Binary files a/docs/Obsidian笔记体系/Areas/07-系统安全/权限管理框架.md and b/docs/Obsidian笔记体系/Areas/07-系统安全/权限管理框架.md differ diff --git a/docs/Obsidian笔记体系/Areas/07-系统安全/漏洞案例库.md b/docs/Obsidian笔记体系/Areas/07-系统安全/漏洞案例库.md index 3cc43cc..c0a52fb 100644 Binary files a/docs/Obsidian笔记体系/Areas/07-系统安全/漏洞案例库.md and b/docs/Obsidian笔记体系/Areas/07-系统安全/漏洞案例库.md differ diff --git a/docs/Obsidian笔记体系/Areas/08-定制化开发/README.md b/docs/Obsidian笔记体系/Areas/08-定制化开发/README.md index ce95ef2..cbc97e8 100644 Binary files a/docs/Obsidian笔记体系/Areas/08-定制化开发/README.md and b/docs/Obsidian笔记体系/Areas/08-定制化开发/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/08-定制化开发/厂商定制接口规范.md b/docs/Obsidian笔记体系/Areas/08-定制化开发/厂商定制接口规范.md index 5770815..f65c7eb 100644 Binary files a/docs/Obsidian笔记体系/Areas/08-定制化开发/厂商定制接口规范.md and b/docs/Obsidian笔记体系/Areas/08-定制化开发/厂商定制接口规范.md differ diff --git a/docs/Obsidian笔记体系/Areas/08-定制化开发/开机动画与OTA.md b/docs/Obsidian笔记体系/Areas/08-定制化开发/开机动画与OTA.md index 5dc157d..60b47a5 100644 Binary files a/docs/Obsidian笔记体系/Areas/08-定制化开发/开机动画与OTA.md and b/docs/Obsidian笔记体系/Areas/08-定制化开发/开机动画与OTA.md differ diff --git a/docs/Obsidian笔记体系/Areas/08-定制化开发/系统属性定制.md b/docs/Obsidian笔记体系/Areas/08-定制化开发/系统属性定制.md index 9b26560..19145ec 100644 Binary files a/docs/Obsidian笔记体系/Areas/08-定制化开发/系统属性定制.md and b/docs/Obsidian笔记体系/Areas/08-定制化开发/系统属性定制.md differ diff --git a/docs/Obsidian笔记体系/Areas/08-定制化开发/系统服务添加流程.md b/docs/Obsidian笔记体系/Areas/08-定制化开发/系统服务添加流程.md index f25f3ff..514b613 100644 Binary files a/docs/Obsidian笔记体系/Areas/08-定制化开发/系统服务添加流程.md and b/docs/Obsidian笔记体系/Areas/08-定制化开发/系统服务添加流程.md differ diff --git a/docs/Obsidian笔记体系/Areas/09-调试与工具链/ADB高级命令.md b/docs/Obsidian笔记体系/Areas/09-调试与工具链/ADB高级命令.md index eefae3c..1674d74 100644 Binary files a/docs/Obsidian笔记体系/Areas/09-调试与工具链/ADB高级命令.md and b/docs/Obsidian笔记体系/Areas/09-调试与工具链/ADB高级命令.md differ diff --git a/docs/Obsidian笔记体系/Areas/09-调试与工具链/GDB_LLDB调试Native.md b/docs/Obsidian笔记体系/Areas/09-调试与工具链/GDB_LLDB调试Native.md index e4493b2..ce03494 100644 Binary files a/docs/Obsidian笔记体系/Areas/09-调试与工具链/GDB_LLDB调试Native.md and b/docs/Obsidian笔记体系/Areas/09-调试与工具链/GDB_LLDB调试Native.md differ diff --git a/docs/Obsidian笔记体系/Areas/09-调试与工具链/README.md b/docs/Obsidian笔记体系/Areas/09-调试与工具链/README.md index 6eaff73..ac63e95 100644 Binary files a/docs/Obsidian笔记体系/Areas/09-调试与工具链/README.md and b/docs/Obsidian笔记体系/Areas/09-调试与工具链/README.md differ diff --git a/docs/Obsidian笔记体系/Areas/09-调试与工具链/Systrace_Perfetto全解读.md b/docs/Obsidian笔记体系/Areas/09-调试与工具链/Systrace_Perfetto全解读.md index cc998f9..47c6169 100644 Binary files a/docs/Obsidian笔记体系/Areas/09-调试与工具链/Systrace_Perfetto全解读.md and b/docs/Obsidian笔记体系/Areas/09-调试与工具链/Systrace_Perfetto全解读.md differ diff --git a/docs/Obsidian笔记体系/Areas/09-调试与工具链/自定义调试工具开发.md b/docs/Obsidian笔记体系/Areas/09-调试与工具链/自定义调试工具开发.md index 512933e..5cfadcf 100644 Binary files a/docs/Obsidian笔记体系/Areas/09-调试与工具链/自定义调试工具开发.md and b/docs/Obsidian笔记体系/Areas/09-调试与工具链/自定义调试工具开发.md differ diff --git a/docs/Obsidian笔记体系/MOCs/技能提升路线图.md b/docs/Obsidian笔记体系/MOCs/技能提升路线图.md index abc8aa0..f63c2fb 100644 Binary files a/docs/Obsidian笔记体系/MOCs/技能提升路线图.md and b/docs/Obsidian笔记体系/MOCs/技能提升路线图.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/README.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/README.md index 3652bd5..ed6054e 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/README.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/README.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-Service重启机制优化.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-Service重启机制优化.md index 34e564d..e33d1e9 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-Service重启机制优化.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-Service重启机制优化.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-开机动画卡顿调试.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-开机动画卡顿调试.md index 545c18c..09144a3 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-开机动画卡顿调试.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/关键问题记录/2024-XX-XX-开机动画卡顿调试.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/复盘与总结.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/复盘与总结.md index 7d818c6..34fa5fc 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/复盘与总结.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/复盘与总结.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/技术方案设计.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/技术方案设计.md index 0924ffe..29cb2af 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/技术方案设计.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/技术方案设计.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/测试与验证记录.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/测试与验证记录.md index d034e4c..3361c9d 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/测试与验证记录.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/测试与验证记录.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/需求与背景.md b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/需求与背景.md index be29876..415cdd7 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目A-系统定制化/需求与背景.md and b/docs/Obsidian笔记体系/Projects/项目A-系统定制化/需求与背景.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/README.md b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/README.md index c3c9709..e979a3b 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/README.md and b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/README.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/工具链配置(Perfetto+Systrace).md b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/工具链配置(Perfetto+Systrace).md index fe7aaee..711119e 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/工具链配置(Perfetto+Systrace).md and b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/工具链配置(Perfetto+Systrace).md differ diff --git a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/目标与指标.md b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/目标与指标.md index 734b735..25efb56 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/目标与指标.md and b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/目标与指标.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/问题追踪列表.md b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/问题追踪列表.md index 5b9d721..c20a69b 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/问题追踪列表.md and b/docs/Obsidian笔记体系/Projects/项目B-性能优化专项/问题追踪列表.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/README.md b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/README.md index 5227f90..d4d974c 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/README.md and b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/README.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/架构设计.md b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/架构设计.md index d46ea30..33034bd 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/架构设计.md and b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/架构设计.md differ diff --git a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/迁移计划.md b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/迁移计划.md index 8c81f5c..0bc94f8 100644 Binary files a/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/迁移计划.md and b/docs/Obsidian笔记体系/Projects/项目C-XX模块重构/迁移计划.md differ diff --git a/docs/Obsidian笔记体系/Templates/会议记录模板.md b/docs/Obsidian笔记体系/Templates/会议记录模板.md index 1c260ea..c93bf5b 100644 Binary files a/docs/Obsidian笔记体系/Templates/会议记录模板.md and b/docs/Obsidian笔记体系/Templates/会议记录模板.md differ diff --git a/docs/Obsidian笔记体系/Templates/技术方案设计模板.md b/docs/Obsidian笔记体系/Templates/技术方案设计模板.md index 5c8e396..252a753 100644 Binary files a/docs/Obsidian笔记体系/Templates/技术方案设计模板.md and b/docs/Obsidian笔记体系/Templates/技术方案设计模板.md differ diff --git a/docs/Obsidian笔记体系/Templates/源码解析模板.md b/docs/Obsidian笔记体系/Templates/源码解析模板.md index 60142c2..e470323 100644 Binary files a/docs/Obsidian笔记体系/Templates/源码解析模板.md and b/docs/Obsidian笔记体系/Templates/源码解析模板.md differ diff --git a/docs/Obsidian笔记体系/Templates/问题排查模板.md b/docs/Obsidian笔记体系/Templates/问题排查模板.md index 8b316c1..c24b115 100644 Binary files a/docs/Obsidian笔记体系/Templates/问题排查模板.md and b/docs/Obsidian笔记体系/Templates/问题排查模板.md differ diff --git a/docs/学习笔记/gerrit分支规范.md b/docs/学习笔记/gerrit分支规范.md index 95cddfe..c33904f 100644 --- a/docs/学习笔记/gerrit分支规范.md +++ b/docs/学习笔记/gerrit分支规范.md @@ -1,128 +1,128 @@ -推荐标准分支模型: master/main主干分支 永远保持可编译、可运行 release-* 发布分支 只合并经过验证的Change hotfix-* 紧急修复 - - -您总结的Gerrit分支创建流程非常准确和实用!以下是对您提供内容的梳理和补充,使其更加清晰系统化。 - -## Gerrit 分支管理全流程 - -### 一、权限说明(重要前提) -- **Owner/Maintainer**:有权限创建新分支 -- **Developer**:默认只能推送提交到现有分支,不能创建新分支 -- **权限配置路径**:Project → Access → Reference: refs/heads/* - -### 二、分支创建详细步骤 - -#### 1. master/main分支(主干分支) -```bash -# 如果仓库为空,需要初始化master分支 -git clone ssh://user@gerrit-ip:29418/project-name -cd project-name -git checkout -b master -# 首次推送master分支(不走Review流程) -git push origin master -``` - -#### 2. release-*分支(发布分支) -```bash -# 1. 更新master分支 -git checkout master -git pull - -# 2. 创建本地release分支 -git checkout -b release-1.0 - -# 3. 推送到Gerrit创建远程分支 -git push origin release-1.0 -# 注意:这里直接push,不是refs/for/ -``` - -#### 3. hotfix-*分支(紧急修复分支) -```bash -# 从release分支创建 -git checkout release-1.0 -git pull -git checkout -b hotfix-crash-123 -git push origin hotfix-crash-123 - -# 从master分支创建(如果未建立release分支) -git checkout master -git pull -git checkout -b hotfix-issue-456 -git push origin hotfix-issue-456 -``` - -### 三、不同分支的提交方式差异 - -| 分支类型 | 推送命令 | 是否走Review | 说明 | -|---------|---------|-------------|------| -| 创建新分支 | `git push origin 分支名` | ❌ 否 | 直接创建分支 | -| master分支提交 | `git push origin HEAD:refs/for/master` | ✅ 是 | 常规开发流程 | -| release分支提交 | `git push origin HEAD:refs/for/release-1.0` | ✅ 是 | 修复bug流程 | -| hotfix分支提交 | `git push origin HEAD:refs/for/hotfix-*` | ✅ 是 | 紧急修复流程 | - -### 四、分支合并策略 - -#### hotfix修复后的合并流程: -```bash -# 1. 修复完成后,合并到release分支 -git checkout release-1.0 -git merge --no-ff hotfix-crash-123 -git push origin HEAD:refs/for/release-1.0 - -# 2. cherry-pick到master -git checkout master -git cherry-pick -git push origin HEAD:refs/for/master -``` - -### 五、最佳实践建议 - -1. **分支命名规范**: - - feature/xxx(功能分支,从master创建) - - release/x.y.z(发布分支) - - hotfix/xxx(紧急修复) - - bugfix/xxx(普通bug修复) - -2. **权限管理**: - ```bash - # 为开发者授予特定分支创建权限(Gerrit Web界面) - # Access → Reference: refs/heads/feature/* - # 添加 Push + Create Reference 权限给特定用户组 - ``` - -3. **CI/CD集成**: - - release-* 分支:触发正式环境构建 - - hotfix-* 分支:紧急修复通道,快速验证 - - master分支:每日/持续集成 - -4. **分支保护**: - - 保护master分支:必须通过Code Review - - 保护release分支:限制直接push,需通过Review - - 定期清理过期分支 - -### 六、常见问题排查 - -1. **权限拒绝错误**: - ``` - ! [remote rejected] release-1.0 -> release-1.0 (prohibited by Gerrit) - ``` - 解决方法:联系Owner/Maintainer授予分支创建权限 - -2. **分支已存在错误**: - ```bash - # 先拉取远程分支列表 - git fetch origin - git branch -r # 查看远程分支 - ``` - -3. **使用Gerrit插件创建分支**(可选): - ```bash - # 安装git-review插件 - pip install git-review - - # 创建分支并推送到Gerrit - git review -c -b release-1.0 - ``` - -您的总结已经非常全面,这些补充主要是为了让操作流程更加清晰,便于团队协作和标准化操作。 - +推荐标准分支模型: master/main主干分支 永远保持可编译、可运行 release-* 发布分支 只合并经过验证的Change hotfix-* 紧急修复 + + +您总结的Gerrit分支创建流程非常准确和实用!以下是对您提供内容的梳理和补充,使其更加清晰系统化。 + +## Gerrit 分支管理全流程 + +### 一、权限说明(重要前提) +- **Owner/Maintainer**:有权限创建新分支 +- **Developer**:默认只能推送提交到现有分支,不能创建新分支 +- **权限配置路径**:Project → Access → Reference: refs/heads/* + +### 二、分支创建详细步骤 + +#### 1. master/main分支(主干分支) +```bash +# 如果仓库为空,需要初始化master分支 +git clone ssh://user@gerrit-ip:29418/project-name +cd project-name +git checkout -b master +# 首次推送master分支(不走Review流程) +git push origin master +``` + +#### 2. release-*分支(发布分支) +```bash +# 1. 更新master分支 +git checkout master +git pull + +# 2. 创建本地release分支 +git checkout -b release-1.0 + +# 3. 推送到Gerrit创建远程分支 +git push origin release-1.0 +# 注意:这里直接push,不是refs/for/ +``` + +#### 3. hotfix-*分支(紧急修复分支) +```bash +# 从release分支创建 +git checkout release-1.0 +git pull +git checkout -b hotfix-crash-123 +git push origin hotfix-crash-123 + +# 从master分支创建(如果未建立release分支) +git checkout master +git pull +git checkout -b hotfix-issue-456 +git push origin hotfix-issue-456 +``` + +### 三、不同分支的提交方式差异 + +| 分支类型 | 推送命令 | 是否走Review | 说明 | +|---------|---------|-------------|------| +| 创建新分支 | `git push origin 分支名` | ❌ 否 | 直接创建分支 | +| master分支提交 | `git push origin HEAD:refs/for/master` | ✅ 是 | 常规开发流程 | +| release分支提交 | `git push origin HEAD:refs/for/release-1.0` | ✅ 是 | 修复bug流程 | +| hotfix分支提交 | `git push origin HEAD:refs/for/hotfix-*` | ✅ 是 | 紧急修复流程 | + +### 四、分支合并策略 + +#### hotfix修复后的合并流程: +```bash +# 1. 修复完成后,合并到release分支 +git checkout release-1.0 +git merge --no-ff hotfix-crash-123 +git push origin HEAD:refs/for/release-1.0 + +# 2. cherry-pick到master +git checkout master +git cherry-pick +git push origin HEAD:refs/for/master +``` + +### 五、最佳实践建议 + +1. **分支命名规范**: + - feature/xxx(功能分支,从master创建) + - release/x.y.z(发布分支) + - hotfix/xxx(紧急修复) + - bugfix/xxx(普通bug修复) + +2. **权限管理**: + ```bash + # 为开发者授予特定分支创建权限(Gerrit Web界面) + # Access → Reference: refs/heads/feature/* + # 添加 Push + Create Reference 权限给特定用户组 + ``` + +3. **CI/CD集成**: + - release-* 分支:触发正式环境构建 + - hotfix-* 分支:紧急修复通道,快速验证 + - master分支:每日/持续集成 + +4. **分支保护**: + - 保护master分支:必须通过Code Review + - 保护release分支:限制直接push,需通过Review + - 定期清理过期分支 + +### 六、常见问题排查 + +1. **权限拒绝错误**: + ``` + ! [remote rejected] release-1.0 -> release-1.0 (prohibited by Gerrit) + ``` + 解决方法:联系Owner/Maintainer授予分支创建权限 + +2. **分支已存在错误**: + ```bash + # 先拉取远程分支列表 + git fetch origin + git branch -r # 查看远程分支 + ``` + +3. **使用Gerrit插件创建分支**(可选): + ```bash + # 安装git-review插件 + pip install git-review + + # 创建分支并推送到Gerrit + git review -c -b release-1.0 + ``` + +您的总结已经非常全面,这些补充主要是为了让操作流程更加清晰,便于团队协作和标准化操作。 +