diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index abb2867..04c1c73 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -13,12 +13,12 @@ "state": { "type": "markdown", "state": { - "file": "docs/Obsidian笔记体系/Projects/知你-调测/知你--调测.md", + "file": "docs/Obsidian/高频命令.md", "mode": "source", "source": false }, "icon": "lucide-file", - "title": "知你--调测" + "title": "高频命令" } } ] @@ -185,10 +185,12 @@ }, "active": "dc4c0d0c9987c7cd", "lastOpenFiles": [ - "docs/Obsidian/2026-01-05 个人文档管理.md", - "docs/Obsidian/资源网站.md", + "docs/gerrit/gerrit每日工作流程.md", "docs/Obsidian/高频命令.md", "docs/cursor/cursor.md", + "docs/Obsidian/2026-01-05 个人文档管理.md", + "docs/Obsidian笔记体系/Projects/知你-调测/知你--调测.md", + "docs/Obsidian/资源网站.md", "docs/Obsidian/重要笔记.md", "docs/dify/作为安卓高级开发工程师,除了项目管理,你完全可以在技术专项、团队效能和个人成长三大领域构建更懂你的专属助手.md", "docs/dify/使用dify,可以生成一个专项事务助手吗,比如公司正规化事务助手.md", @@ -203,7 +205,6 @@ "docs/学习笔记/个人全自动研发体系.md", "docs/学习笔记/DevOps学习.md", "docs/git/git同步远程分支总结.md", - "docs/Obsidian笔记体系/Projects/知你-调测/知你--调测.md", "docs/学习笔记/honor工作资料.md", "docs/学习笔记/提交代码时候的钩子.md", "docs/Obsidian笔记体系/Projects/知你-调测", @@ -211,7 +212,6 @@ "docs/Obsidian笔记体系/Resources/工具/效率工具推荐/README.md", "docs/Obsidian笔记体系/Resources/会议与分享/内部技术分享记录/代码评审模板示例.md", "docs/Obsidian笔记体系/Daily/2026-01-13.md", - "docs/Obsidian笔记体系/Projects/项目A-系统定制化/测试与验证记录.md", "docs/gerrit", "gerrit", "更新部署脚本/deploy.sh", diff --git a/docs/Obsidian/高频命令.md b/docs/Obsidian/高频命令.md index e1417df..591b4d2 100644 --- a/docs/Obsidian/高频命令.md +++ b/docs/Obsidian/高频命令.md @@ -6,53 +6,13 @@ git config --global user.name "renjianbo" git config --global user.email "18691577328@qq.com" - 查看特定应用的进程 adb shell ps | grep com.xunpaisoft.social android 获取当前页面的 activity adb shell "dumpsys window | grep mCurrentFocus" -# 安装 commit-msg 钩子 -curl -Lo .git/hooks/commit-msg http://gerrit:8080/tools/hooks/commit-msg -chmod +x .git/hooks/commit-msg -# 为现有提交添加 Change-Id -git commit --amend --no-edit # 重新提交,钩子会自动添加 - - - -提交代码时的钩子 -curl -o ".git/hooks/commit-msg"http://101.43.95.130:8082/tools/hooks/commit-msgchmod +x ".git/hooks/commit-msg" -git commit --amend --no-edit - - -# 手动执行清理脚本 -/home/renjianbo/gerrit/cleanup_cursor_server.sh - -# 或者直接清理(临时解决) -pkill -f "cursor-server" - - - - - gerrit每日工作流程 - -# 早上 -git fetch origin -git rebase origin/master # 更新本地代码 - -# 开发中 -git add . -git commit -m "..." - -# 推送前 -git pull --rebase origin master # 再次更新 -解决冲突(如果有) -git push origin HEAD:refs/for/master - -# 查看 Gerrit 反馈 -# 根据评审意见修改 oppo测试命令 diff --git a/docs/cursor/cursor.md b/docs/cursor/cursor.md index e402f92..68881ee 100644 --- a/docs/cursor/cursor.md +++ b/docs/cursor/cursor.md @@ -2,6 +2,15 @@ curse 网站续费 https://cursor.com/cn/dashboard pkill -f "cursor-server" +# 手动执行清理脚本 +/home/renjianbo/gerrit/cleanup_cursor_server.sh + +# 或者直接清理(临时解决) +pkill -f "cursor-server" + + + + 联通大王卡号:13022988679 diff --git a/docs/gerrit/gerrit每日工作流程.md b/docs/gerrit/gerrit每日工作流程.md new file mode 100644 index 0000000..6581cc7 --- /dev/null +++ b/docs/gerrit/gerrit每日工作流程.md @@ -0,0 +1,15 @@ +# 早上 +git fetch origin +git rebase origin/master # 更新本地代码 + +# 开发中 +git add . +git commit -m "..." + +# 推送前 +git pull --rebase origin master # 再次更新 +解决冲突(如果有) +git push origin HEAD:refs/for/master + +# 查看 Gerrit 反馈 +# 根据评审意见修改 \ No newline at end of file diff --git a/docs/git/hello.md b/docs/git/hello.md deleted file mode 100644 index b6fc4c6..0000000 --- a/docs/git/hello.md +++ /dev/null @@ -1 +0,0 @@ -hello \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 1cecfed..a15289e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -186,6 +186,7 @@ nav: - gerrit/gerrit分支规范.md - gerrit/gerrit提交代码时遇到钩子问题的解决办法.md - gerrit/生成并配置SSH密钥、克隆仓库.md + - gerrit/gerrit每日工作流程.md - adb调试命令: - adb调试命令/adb常用命令.md - adb调试命令/常用linux命令.md @@ -197,7 +198,6 @@ nav: - git/git同步远程分支总结.md - git/git常用命令.md - git/git设置用户名和邮箱.md - - git/hello.md markdown_extensions: - pymdownx.highlight: