diff --git a/_posts/2019-11-18-new_gitbook_tutors.md b/_posts/2019-11-18-new_gitbook_tutors.md index 1024e27..cfc0e90 100644 --- a/_posts/2019-11-18-new_gitbook_tutors.md +++ b/_posts/2019-11-18-new_gitbook_tutors.md @@ -1,104 +1,104 @@ ---- -layout: post -title: "新版本gitbook配置图书预览和生成" -date: 2019-11-18 -tags: [tool] -comments: true -author: lemonchann - ---- - -什么是Gitbook? 简单说就是可以把用md写的多个文档组织成**书**发布,md你可以放在github管理,配置gitbook关联github可以实现实时commit的预览生成。也可本地预览,甚至生成各种格式文档输出的强大工具。 - - - -## 安装Gitbook -* 安装nodejs可以去[官网](http://nodejs.cn/download/)下载对应版本 -* 安装gitbook,打开win cmd输入npm install gitbook-cli -g -> 常用命令: -> **gitbook -V 查看版本** -> **gitbook serve 生成网页localhost:4000预览** - 命令输入要进到SUMMARY.md所在目录![gitbook_serve](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook_serve.png) -> gitbook init //初始化目录文件 -> gitbook help //列出gitbook所有的命令 -> gitbook --help //输出gitbook-cli的帮助信息 -> gitbook build //生成静态网页 -> gitbook serve //生成静态网页并运行服务器 -> gitbook build --gitbook=2.0.1 //生成时指定gitbook的版本, 本地没有会先下载 -> gitbook ls //列出本地所有的gitbook版本 -> gitbook ls-remote //列出远程可用的gitbook版本 -> gitbook fetch 标签/版本号 //安装对应的gitbook版本 -> gitbook update //更新到gitbook的最新版本 -> gitbook uninstall 2.0.1 //卸载对应的gitbook版本 -> gitbook build --log=debug //指定log的级别 -> gitbook builid --debug //输出错误信息 - -## 用Gitbook转换markdown文件生成PDF - -### 安装calibre -* 电子书生成下载依赖calibre否则会报错,建议先安装,[下载地址](https://calibre-ebook.com/download) -* 配置calibre环境变量,我的目录是C:\Program Files\Calibre2 - - ![环境变量设置1](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E7%8E%AF%E5%A2%83%E5%8F%98%E9%87%8F%E8%AE%BE%E7%BD%AE1.PNG) - - ![环境变量设置2](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E7%8E%AF%E5%A2%83%E5%8F%98%E9%87%8F%E8%AE%BE%E7%BD%AE2.PNG) - -### 生成PDF - -打开win cmd命令行,到SUMMARY.md所在目录执行 **gitbook pdf 生成pdf** -> 转换PDF失败原因: -1. 没有安装calibre -2. 安装calibre之后需要设置环境变量C:\Program Files\Calibre2 -3. [报错1](http://xcoding.tech/2018/08/08/hexo/%E5%A6%82%E4%BD%95%E4%BB%8E%E6%A0%B9%E6%9C%AC%E8%A7%A3%E5%86%B3hexo%E4%B8%8D%E5%85%BC%E5%AE%B9%7B%7B%7D%7D%E6%A0%87%E7%AD%BE%E9%97%AE%E9%A2%98/) - -## Gitbook关联github - -**Gitbook上同步github的配置界面已经发生了变化,新界面操作如下:** - -![gitbook空间](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook%E7%A9%BA%E9%97%B4.png) - -![关联github](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E5%85%B3%E8%81%94github.png) - -### 发布到github pages -#### 关于 GitHub Pages ->GitHub Pages 是一项静态站点托管服务,它直接从 GitHub 上的仓库获取 HTML、CSS 和 JavaScript 文件,(可选)通过构建过程运行文件,然后发布网站。 您可以在 GitHub Pages 示例集合中查看 GitHub Pages 站点的示例。 - -您可以在 GitHub 的 github.io 域或自己的自定义域上托管站点。 更多信息请参阅“对 GitHub Pages 使用自定义域”。 - -要开始使用,请参阅“创建 GitHub Pages 站点”。 - -#### GitHub Pages 站点的类型 -有三种类型的 GitHub Pages 站点:项目、用户和组织。 项目站点连接到 GitHub 上托管的特定项目,例如 JavaScript 库或配方集合。 用户和组织站点连接到特定的 GitHub 帐户。 - -用户和组织站点始终从名为 .github.io 或 .github.io 的仓库发布。 除非您使用自定义域,否则用户和组织站点位于 http(s)://.github.io 或 http(s)://.github.io。 - -项目站点的源文件与其项目存储在同一个仓库中。 除非您使用自定义域,否则项目站点位于 http(s)://.github.io/ 或 http(s)://.github.io/。 -[更多](https://help.github.com/cn/github/working-with-github-pages/about-github-pages) - -#### [这里](http://www.chengweiyang.cn/gitbook/github-pages/README.html)也包含推送到**github.page**的方法 -- master, 保存书籍的源码 -- gh-pages, 保存书籍编译后的 HTML 文件 - -**步骤:** - -- `gitbook build` 将书籍内容输出到默认目录,也就是当前目录下的 _book 目录 - - ![gitbook_pdf](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook_pdf.png) - -- 创建gh-pages分支,并且删除不需要的文件,仅保留git目录和 _book目录 -> $ git checkout --orphan gh-pages -$ git rm --cached -r . -$ git clean -df -$ rm -rf *~` -- 然后,加入 _book 下的内容到分支中: -> $ cp -r _book/* . -$ git add . -$ git commit -m "Publish book" -- 将编译好的书籍内容上传到 GitHub 项目的 远程gh-pages 分支了 -> $git push -u origin gh-pages - - -### 参考 -[详细教程](https://jackchan1999.github.io/2017/05/01/gitbook/GitBook%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B/) -[官方指引-integrations-Github](https://docs.gitbook.com/integrations/github) -[Github的GitBook项目](https://github.com/GitbookIO/gitbook/blob/master/docs/setup.md) +--- +layout: post +title: "新版本gitbook配置图书预览和生成" +date: 2019-11-18 +tags: [tool] +comments: true +author: lemonchann + +--- + +什么是Gitbook? 简单说就是可以把用md写的多个文档组织成**书**发布,md你可以放在github管理,配置gitbook关联github可以实现实时commit的预览生成。也可本地预览,甚至生成各种格式文档输出的强大工具。 + + + +## 安装Gitbook +* 安装nodejs可以去[官网](http://nodejs.cn/download/)下载对应版本 , Gitbook 只支持 node 6.x.x版本 。参考: https://www.jianshu.com/p/57b46db0564e +* 安装gitbook,打开win cmd输入npm install gitbook-cli -g +> 常用命令: +> **gitbook -V 查看版本** +> **gitbook serve 生成网页localhost:4000预览** - 命令输入要进到SUMMARY.md所在目录![gitbook_serve](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook_serve.png) +> gitbook init //初始化目录文件 +> gitbook help //列出gitbook所有的命令 +> gitbook --help //输出gitbook-cli的帮助信息 +> gitbook build //生成静态网页 +> gitbook serve //生成静态网页并运行服务器 +> gitbook build --gitbook=2.0.1 //生成时指定gitbook的版本, 本地没有会先下载 +> gitbook ls //列出本地所有的gitbook版本 +> gitbook ls-remote //列出远程可用的gitbook版本 +> gitbook fetch 标签/版本号 //安装对应的gitbook版本 +> gitbook update //更新到gitbook的最新版本 +> gitbook uninstall 2.0.1 //卸载对应的gitbook版本 +> gitbook build --log=debug //指定log的级别 +> gitbook builid --debug //输出错误信息 + +## 用Gitbook转换markdown文件生成PDF + +### 安装calibre +* 电子书生成下载依赖calibre否则会报错,建议先安装,[下载地址](https://calibre-ebook.com/download) +* 配置calibre环境变量,我的目录是C:\Program Files\Calibre2 + + ![环境变量设置1](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E7%8E%AF%E5%A2%83%E5%8F%98%E9%87%8F%E8%AE%BE%E7%BD%AE1.PNG) + + ![环境变量设置2](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E7%8E%AF%E5%A2%83%E5%8F%98%E9%87%8F%E8%AE%BE%E7%BD%AE2.PNG) + +### 生成PDF + +打开win cmd命令行,到SUMMARY.md所在目录执行 **gitbook pdf 生成pdf** +> 转换PDF失败原因: +1. 没有安装calibre +2. 安装calibre之后需要设置环境变量C:\Program Files\Calibre2 +3. [报错1](http://xcoding.tech/2018/08/08/hexo/%E5%A6%82%E4%BD%95%E4%BB%8E%E6%A0%B9%E6%9C%AC%E8%A7%A3%E5%86%B3hexo%E4%B8%8D%E5%85%BC%E5%AE%B9%7B%7B%7D%7D%E6%A0%87%E7%AD%BE%E9%97%AE%E9%A2%98/) + +## Gitbook关联github + +**Gitbook上同步github的配置界面已经发生了变化,新界面操作如下:** + +![gitbook空间](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook%E7%A9%BA%E9%97%B4.png) + +![关联github](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/%E5%85%B3%E8%81%94github.png) + +### 发布到github pages +#### 关于 GitHub Pages +>GitHub Pages 是一项静态站点托管服务,它直接从 GitHub 上的仓库获取 HTML、CSS 和 JavaScript 文件,(可选)通过构建过程运行文件,然后发布网站。 您可以在 GitHub Pages 示例集合中查看 GitHub Pages 站点的示例。 + +您可以在 GitHub 的 github.io 域或自己的自定义域上托管站点。 更多信息请参阅“对 GitHub Pages 使用自定义域”。 + +要开始使用,请参阅“创建 GitHub Pages 站点”。 + +#### GitHub Pages 站点的类型 +有三种类型的 GitHub Pages 站点:项目、用户和组织。 项目站点连接到 GitHub 上托管的特定项目,例如 JavaScript 库或配方集合。 用户和组织站点连接到特定的 GitHub 帐户。 + +用户和组织站点始终从名为 .github.io 或 .github.io 的仓库发布。 除非您使用自定义域,否则用户和组织站点位于 http(s)://.github.io 或 http(s)://.github.io。 + +项目站点的源文件与其项目存储在同一个仓库中。 除非您使用自定义域,否则项目站点位于 http(s)://.github.io/ 或 http(s)://.github.io/。 +[更多](https://help.github.com/cn/github/working-with-github-pages/about-github-pages) + +#### [这里](http://www.chengweiyang.cn/gitbook/github-pages/README.html)也包含推送到**github.page**的方法 +- master, 保存书籍的源码 +- gh-pages, 保存书籍编译后的 HTML 文件 + +**步骤:** + +- `gitbook build` 将书籍内容输出到默认目录,也就是当前目录下的 _book 目录 + + ![gitbook_pdf](https://github.com/lemonchann/lemonchann.github.io/raw/master/images/2019-11-18-new_gitbook_tutors/gitbook_pdf.png) + +- 创建gh-pages分支,并且删除不需要的文件,仅保留git目录和 _book目录 +> $ git checkout --orphan gh-pages +$ git rm --cached -r . +$ git clean -df +$ rm -rf *~` +- 然后,加入 _book 下的内容到分支中: +> $ cp -r _book/* . +$ git add . +$ git commit -m "Publish book" +- 将编译好的书籍内容上传到 GitHub 项目的 远程gh-pages 分支了 +> $git push -u origin gh-pages + + +### 参考 +[详细教程](https://jackchan1999.github.io/2017/05/01/gitbook/GitBook%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B/) +[官方指引-integrations-Github](https://docs.gitbook.com/integrations/github) +[Github的GitBook项目](https://github.com/GitbookIO/gitbook/blob/master/docs/setup.md) [github pages中文帮助](https://help.github.com/cn/github/working-with-github-pages/about-github-pages) \ No newline at end of file diff --git a/_posts/linux/进程线程协程/进程线程协程.rar b/_posts/linux/进程线程协程/进程线程协程.rar new file mode 100644 index 0000000..9f8c695 Binary files /dev/null and b/_posts/linux/进程线程协程/进程线程协程.rar differ diff --git a/_posts/software/git_flow/gitlab_flow.md b/_posts/software/git_flow/gitlab_flow.md new file mode 100644 index 0000000..0855b5d --- /dev/null +++ b/_posts/software/git_flow/gitlab_flow.md @@ -0,0 +1,109 @@ +标题:别再把git当svn用了!大厂程序员都是这样用git做版本管理的 + +## 版本控制 + +### 集中式 + +大家日常开发应该都有接触过版本控制,说起版本控制软件首先会想到老大哥`svn` ,很多公司的老项目都会用svn来管理,因为它是集中式的版本控制软件,部署简单,使用方便时svn的最大特点。我上家公司用的版本控制软件就是 `svn` ,包括鹅厂早起的项目也是基于 `svn` 做版本控制的,不过现在项目都是使用更加强大的 `git` 来做版本控制。 + +### 分布式 + +那么为什么需要版本控制呢? + + + +## Git是什么 + + + +## 三种主流工作流 + +### Git flow + +### Github flow + +### Gitlab flow + + + +## 实际操作 + +通用操作: git br -a 查看分支 + +开发分支操作: + +// 1. 初始创建开发分支 + +git checkout -b dev/appeal_optimize_2 //创建并切换分支 + +git push -u origin dev/appeal_optimize_2 // 推送创建的分支到远端 (可选) + + + +步骤2 可选 + +// 2.其他小伙伴下载代码后切换到开发分支 + +git clone + +git checkout -b dev/appeal_optimize_2 origin/dev/appeal_optimize_2 // 创建本地开发分支并关联到远端分支 + + + +//3. 创建者已经在dev分支,正常开发提交,推送到dev分支 + +git add file + +git ci file -m 'msg' + +git pull //拉取dev分支其他人的最新提交 + +git push // 推送到dev分支(可选) + + + +// 4. 切换到master分支后把dev分支合并进来 + +git checkout master + +git merge dev/appeal_optimize_2 + + + +//5. 开发完成,删除dev分支(必选),包括本地和远程dev分支 + +git branch -d dev/appeal_optimize_2 // 删除本地分支 + +git push origin -d dev/appeal_optimize_2 或者 git push origin :dev/appeal_optimize_2 // 删除远程分支(可选) + + + +出release版本流程操作 (非多人协作收集版本暂时可以不用这一步) + +出release分支,操作类似,最后清除release分支 + + + +// 出完版本在master打tag做记录 + +git tag -a v2.0.0 -m "appeal optimize v2 region check and observe" master //本地 + +git push --tags 或者 git push origin v2.0.0 //远程 + + + +//版本出问题从master的tag处拉bugfix分支,不影响其他开发分支 + +git checkout -b bugfix/appeal_optimize_2 v2.0.0 + +修改完合入master分支,最后清除bugfix分支 + +## Reference + + https://segmentfault.com/a/1190000016865867 + +https://iwiki.oa.tencent.com/pages/viewpage.action?pageId=103528756 主要参考 GitLab flow + +http://km.oa.com/articles/show/349413?kmref=search&from_page=1&no=2 参考命令行 但是 他是Gitflow + +http://km.oa.com/articles/show/429718?ts=1571801581 参考分支命名 但是他是Gitflow \ No newline at end of file diff --git a/images/2018-10-12-Play_with_vscode_PlantUML_preview/时序图.png b/images/2018-10-12-Play_with_vscode_PlantUML_preview/时序图.png deleted file mode 100644 index b5f1b97..0000000 Binary files a/images/2018-10-12-Play_with_vscode_PlantUML_preview/时序图.png and /dev/null differ diff --git a/images/2018-10-12-Play_with_vscode_PlantUML_preview/活动图.png b/images/2018-10-12-Play_with_vscode_PlantUML_preview/活动图.png deleted file mode 100644 index ad35e26..0000000 Binary files a/images/2018-10-12-Play_with_vscode_PlantUML_preview/活动图.png and /dev/null differ diff --git a/images/2018-10-12-Play_with_vscode_PlantUML_preview/状态图.png b/images/2018-10-12-Play_with_vscode_PlantUML_preview/状态图.png deleted file mode 100644 index 4e6f337..0000000 Binary files a/images/2018-10-12-Play_with_vscode_PlantUML_preview/状态图.png and /dev/null differ diff --git a/images/2018-10-12-Play_with_vscode_PlantUML_preview/用例图.png b/images/2018-10-12-Play_with_vscode_PlantUML_preview/用例图.png deleted file mode 100644 index f92fac7..0000000 Binary files a/images/2018-10-12-Play_with_vscode_PlantUML_preview/用例图.png and /dev/null differ diff --git a/images/2018-10-12-Play_with_vscode_PlantUML_preview/类图.png b/images/2018-10-12-Play_with_vscode_PlantUML_preview/类图.png deleted file mode 100644 index fee0873..0000000 Binary files a/images/2018-10-12-Play_with_vscode_PlantUML_preview/类图.png and /dev/null differ diff --git a/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记1.png b/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记1.png deleted file mode 100644 index 6130c18..0000000 Binary files a/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记1.png and /dev/null differ diff --git a/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记2.png b/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记2.png deleted file mode 100644 index 2d9f2bd..0000000 Binary files a/images/2018-6-21-Markdown_brief_syntactic/Markdown语法简明笔记2.png and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/gitbook_pdf.png b/images/2019-11-18-new_gitbook_tutors/gitbook_pdf.png deleted file mode 100644 index d58d52f..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/gitbook_pdf.png and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/gitbook_serve.png b/images/2019-11-18-new_gitbook_tutors/gitbook_serve.png deleted file mode 100644 index 24e0433..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/gitbook_serve.png and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/gitbook空间.png b/images/2019-11-18-new_gitbook_tutors/gitbook空间.png deleted file mode 100644 index 6bc2b14..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/gitbook空间.png and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/关联github.png b/images/2019-11-18-new_gitbook_tutors/关联github.png deleted file mode 100644 index e231d24..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/关联github.png and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/环境变量设置1.PNG b/images/2019-11-18-new_gitbook_tutors/环境变量设置1.PNG deleted file mode 100644 index 7b9b695..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/环境变量设置1.PNG and /dev/null differ diff --git a/images/2019-11-18-new_gitbook_tutors/环境变量设置2.PNG b/images/2019-11-18-new_gitbook_tutors/环境变量设置2.PNG deleted file mode 100644 index c872c5b..0000000 Binary files a/images/2019-11-18-new_gitbook_tutors/环境变量设置2.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/PicGo.png b/images/2019-11-22-create_blog_with_github_pages/PicGo.png deleted file mode 100644 index dbe0cf9..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/PicGo.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/blogPage.png b/images/2019-11-22-create_blog_with_github_pages/blogPage.png deleted file mode 100644 index 8048f83..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/blogPage.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/config文件.png b/images/2019-11-22-create_blog_with_github_pages/config文件.png deleted file mode 100644 index c97a517..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/config文件.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/fork博客.png b/images/2019-11-22-create_blog_with_github_pages/fork博客.png deleted file mode 100644 index 9a76406..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/fork博客.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/google分析页面.png b/images/2019-11-22-create_blog_with_github_pages/google分析页面.png deleted file mode 100644 index 5198692..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/google分析页面.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/google站长统计.png b/images/2019-11-22-create_blog_with_github_pages/google站长统计.png deleted file mode 100644 index e32d7be..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/google站长统计.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/jekyll_error.PNG b/images/2019-11-22-create_blog_with_github_pages/jekyll_error.PNG deleted file mode 100644 index c7c9f28..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/jekyll_error.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/jekyll_error_EASSE.png b/images/2019-11-22-create_blog_with_github_pages/jekyll_error_EASSE.png deleted file mode 100644 index 1cacb5e..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/jekyll_error_EASSE.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/jekyll_server_erro错误2.PNG b/images/2019-11-22-create_blog_with_github_pages/jekyll_server_erro错误2.PNG deleted file mode 100644 index b156fc9..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/jekyll_server_erro错误2.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/jekyll_server成功.PNG b/images/2019-11-22-create_blog_with_github_pages/jekyll_server成功.PNG deleted file mode 100644 index 9975754..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/jekyll_server成功.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/jekyll安装.PNG b/images/2019-11-22-create_blog_with_github_pages/jekyll安装.PNG deleted file mode 100644 index 4a67331..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/jekyll安装.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/search_block.png b/images/2019-11-22-create_blog_with_github_pages/search_block.png deleted file mode 100644 index 73e3d9c..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/search_block.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/zhihuSvg.png b/images/2019-11-22-create_blog_with_github_pages/zhihuSvg.png deleted file mode 100644 index df51503..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/zhihuSvg.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/任务管理器.png b/images/2019-11-22-create_blog_with_github_pages/任务管理器.png deleted file mode 100644 index 19bf0c7..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/任务管理器.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/修改仓库名称.png b/images/2019-11-22-create_blog_with_github_pages/修改仓库名称.png deleted file mode 100644 index 9a496e1..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/修改仓库名称.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/创建gitalk鉴权app.png b/images/2019-11-22-create_blog_with_github_pages/创建gitalk鉴权app.png deleted file mode 100644 index e7d953a..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/创建gitalk鉴权app.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/安装ruby.PNG b/images/2019-11-22-create_blog_with_github_pages/安装ruby.PNG deleted file mode 100644 index cf4d6ec..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/安装ruby.PNG and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/更改名称.png b/images/2019-11-22-create_blog_with_github_pages/更改名称.png deleted file mode 100644 index 0243773..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/更改名称.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/更改社交链接.png b/images/2019-11-22-create_blog_with_github_pages/更改社交链接.png deleted file mode 100644 index af82ddb..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/更改社交链接.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/查看netstat.png b/images/2019-11-22-create_blog_with_github_pages/查看netstat.png deleted file mode 100644 index b448df0..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/查看netstat.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/配置gittalk.png b/images/2019-11-22-create_blog_with_github_pages/配置gittalk.png deleted file mode 100644 index 65c993a..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/配置gittalk.png and /dev/null differ diff --git a/images/2019-11-22-create_blog_with_github_pages/配置提交.png b/images/2019-11-22-create_blog_with_github_pages/配置提交.png deleted file mode 100644 index b03b6cd..0000000 Binary files a/images/2019-11-22-create_blog_with_github_pages/配置提交.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/tcp握手与套接字对应.png b/images/2019-12-27-cpp_reference/tcp握手与套接字对应.png deleted file mode 100644 index b26ad5a..0000000 Binary files a/images/2019-12-27-cpp_reference/tcp握手与套接字对应.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/单一继承.png b/images/2019-12-27-cpp_reference/单一继承.png deleted file mode 100644 index 89fd87e..0000000 Binary files a/images/2019-12-27-cpp_reference/单一继承.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/单一继承1.png b/images/2019-12-27-cpp_reference/单一继承1.png deleted file mode 100644 index 3311944..0000000 Binary files a/images/2019-12-27-cpp_reference/单一继承1.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/多重继承.png b/images/2019-12-27-cpp_reference/多重继承.png deleted file mode 100644 index 2ace1a3..0000000 Binary files a/images/2019-12-27-cpp_reference/多重继承.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/多重继承1.png b/images/2019-12-27-cpp_reference/多重继承1.png deleted file mode 100644 index dc8b68f..0000000 Binary files a/images/2019-12-27-cpp_reference/多重继承1.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/多重继承2.png b/images/2019-12-27-cpp_reference/多重继承2.png deleted file mode 100644 index 9fda71f..0000000 Binary files a/images/2019-12-27-cpp_reference/多重继承2.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/成员函数指针.png b/images/2019-12-27-cpp_reference/成员函数指针.png deleted file mode 100644 index bb8558e..0000000 Binary files a/images/2019-12-27-cpp_reference/成员函数指针.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/成员虚函数指针.png b/images/2019-12-27-cpp_reference/成员虚函数指针.png deleted file mode 100644 index aa843f7..0000000 Binary files a/images/2019-12-27-cpp_reference/成员虚函数指针.png and /dev/null differ diff --git a/images/2019-12-27-cpp_reference/放置new对象.png b/images/2019-12-27-cpp_reference/放置new对象.png deleted file mode 100644 index 09ee8e7..0000000 Binary files a/images/2019-12-27-cpp_reference/放置new对象.png and /dev/null differ diff --git a/images/2020-1-29-red_packet_thinking_lock/题图.png b/images/2020-1-29-red_packet_thinking_lock/题图.png deleted file mode 100644 index 5e8813a..0000000 Binary files a/images/2020-1-29-red_packet_thinking_lock/题图.png and /dev/null differ diff --git a/images/2020-1-4-learn_cpp/资料截图.png b/images/2020-1-4-learn_cpp/资料截图.png deleted file mode 100644 index fe23155..0000000 Binary files a/images/2020-1-4-learn_cpp/资料截图.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/加载扩展程序.png b/images/2020-2-21-sourcegraph/加载扩展程序.png deleted file mode 100644 index 2130182..0000000 Binary files a/images/2020-2-21-sourcegraph/加载扩展程序.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/启动插件.png b/images/2020-2-21-sourcegraph/启动插件.png deleted file mode 100644 index 3f46ead..0000000 Binary files a/images/2020-2-21-sourcegraph/启动插件.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/工程文件浏览.png b/images/2020-2-21-sourcegraph/工程文件浏览.png deleted file mode 100644 index 6bff34e..0000000 Binary files a/images/2020-2-21-sourcegraph/工程文件浏览.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/应用商店.png b/images/2020-2-21-sourcegraph/应用商店.png deleted file mode 100644 index 5177cfd..0000000 Binary files a/images/2020-2-21-sourcegraph/应用商店.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/插件中心.png b/images/2020-2-21-sourcegraph/插件中心.png deleted file mode 100644 index a01c8cb..0000000 Binary files a/images/2020-2-21-sourcegraph/插件中心.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/查找定义.png b/images/2020-2-21-sourcegraph/查找定义.png deleted file mode 100644 index 4955d9b..0000000 Binary files a/images/2020-2-21-sourcegraph/查找定义.png and /dev/null differ diff --git a/images/2020-2-21-sourcegraph/查找引用.png b/images/2020-2-21-sourcegraph/查找引用.png deleted file mode 100644 index f3ced1a..0000000 Binary files a/images/2020-2-21-sourcegraph/查找引用.png and /dev/null differ diff --git a/images/github_pages/jekyll error EASSE.png b/images/github_pages/jekyll error EASSE.png deleted file mode 100644 index 1cacb5e..0000000 Binary files a/images/github_pages/jekyll error EASSE.png and /dev/null differ diff --git a/images/github_pages/jekyll error.PNG b/images/github_pages/jekyll error.PNG deleted file mode 100644 index c7c9f28..0000000 Binary files a/images/github_pages/jekyll error.PNG and /dev/null differ diff --git a/images/github_pages/jekyll serve erro错误2.PNG b/images/github_pages/jekyll serve erro错误2.PNG deleted file mode 100644 index b156fc9..0000000 Binary files a/images/github_pages/jekyll serve erro错误2.PNG and /dev/null differ diff --git a/images/github_pages/jekyll server成功.PNG b/images/github_pages/jekyll server成功.PNG deleted file mode 100644 index 9975754..0000000 Binary files a/images/github_pages/jekyll server成功.PNG and /dev/null differ diff --git a/images/github_pages/jekyll安装.PNG b/images/github_pages/jekyll安装.PNG deleted file mode 100644 index 4a67331..0000000 Binary files a/images/github_pages/jekyll安装.PNG and /dev/null differ diff --git a/images/github_pages/安装ruby.PNG b/images/github_pages/安装ruby.PNG deleted file mode 100644 index cf4d6ec..0000000 Binary files a/images/github_pages/安装ruby.PNG and /dev/null differ diff --git a/images/公众号.png b/images/公众号.png new file mode 100644 index 0000000..e14a6fc Binary files /dev/null and b/images/公众号.png differ