diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6f67b63..e2ab0275 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,8 @@ jobs: # 工作流 echo "StrictHostKeyChecking no" >> ~/.ssh/config - name: Push Gitee Mirror #★★★★★★步骤4:推送到gitee env: - SOURCE_REPO: 'https://github.com/oddfar/docs.git' - DESTINATION_REPO: 'git@gitee.com:oddfar/docs.git' + SOURCE_REPO: 'https://github.com/oddfar/notes.git' + DESTINATION_REPO: 'git@gitee.com:oddfar/notes.git' run: | git clone --mirror "$SOURCE_REPO" && cd `basename "$SOURCE_REPO"` git remote set-url --push origin "$DESTINATION_REPO" diff --git a/README.md b/README.md index 077f40a5..9b3a9729 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ githubUrl=https://oddfar:${GITHUB_TOKEN}@github.com/oddfar/docs.git ### 自动部署到github -详情查看:https://github.com/oddfar/docs/blob/master/docs/10.%E5%85%B3%E4%BA%8E/02.%E5%85%B3%E4%BA%8E%20-%20%E6%9C%AC%E7%AB%99/05.%E6%96%87%E6%A1%A3%E7%9A%84%E9%83%A8%E7%BD%B2.md +详情查看:[点击此处](https://github.com/oddfar/notes/blob/master/docs/10.%E5%85%B3%E4%BA%8E/02.%E5%85%B3%E4%BA%8E%20-%20%E6%9C%AC%E7%AB%99/05.%E6%96%87%E6%A1%A3%E7%9A%84%E9%83%A8%E7%BD%B2.md) ### 部署到自己服务器 diff --git a/deploy.sh b/deploy.sh index f9e65d0f..4979cfe0 100644 --- a/deploy.sh +++ b/deploy.sh @@ -12,7 +12,7 @@ initDist(){ #------------------------------------------ #url访问目录,这个是你 github 仓库的名字 -initDist "module.exports = '/docs/'" +initDist "module.exports = '/notes/'" # 生成静态文件 npm run build @@ -23,11 +23,11 @@ cd docs/.vuepress/dist if [ -z "$GITHUB_TOKEN" ]; then # 手动部署 msg='deploy' - githubUrl=git@github.com:oddfar/docs.git + githubUrl=git@github.com:oddfar/notes.git else # 自动部署 msg='来自github actions的自动部署' - githubUrl=https://oddfar:${GITHUB_TOKEN}@github.com/oddfar/docs.git + githubUrl=https://oddfar:${GITHUB_TOKEN}@github.com/oddfar/notes.git git config --global user.name "oddfar" git config --global user.email "oddfar@163.com" fi @@ -54,7 +54,7 @@ else # 进入生成的文件夹 cd docs/.vuepress/dist - giteeUrl=git@gitee.com:oddfar/docs.git #gitee 仓库ssh地址 + giteeUrl=git@gitee.com:oddfar/notes.git #gitee 仓库ssh地址 git config --global user.name "oddfar" git config --global user.email "oddfar@163.com" diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 67606ed0..ad03bfdc 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -3,7 +3,7 @@ const base = require('../../base.js'); const htmlModules = require('./config/htmlModules.js'); module.exports = { - title: "OddFar's Docs", + title: "OddFar's Notes", description: '我们在黑暗中并肩前行,走在各自的朝圣路上!', // 描述,以 标签渲染到页面html中 base, //后缀 '/docs/' head: [ @@ -23,7 +23,7 @@ module.exports = { nav, sidebarDepth: 2, // 侧边栏显示深度,默认1,最大2(显示到h3标题) logo: '/img/logo.png', // 导航栏logo - repo: 'oddfar/docs', // 导航栏右侧生成Github链接 + repo: 'oddfar/notes', // 导航栏右侧生成Github链接 searchMaxSuggestions: 10, // 搜索结果显示最大数 lastUpdated: '最后更新', // 更新的时间,及前缀文字 string | boolean (取值为git提交时间) docsDir: 'docs', // 编辑的文件夹 @@ -87,7 +87,7 @@ module.exports = { // }, footer: { // 页脚信息 createYear: 2021, // 博客创建年份 - copyrightInfo: 'oddfar | docs', // 博客版权信息,支持a标签 + copyrightInfo: 'oddfar | notes', // 博客版权信息,支持a标签 } }, plugins: [ // 插件 diff --git a/docs/.vuepress/config/nav.js b/docs/.vuepress/config/nav.js index e3078c2f..7be46eca 100644 --- a/docs/.vuepress/config/nav.js +++ b/docs/.vuepress/config/nav.js @@ -20,22 +20,13 @@ module.exports = [ }, { text: 'Java-ee', items: [ - + { text: 'JavaWeb', link: '/javaweb/basic-concepts/' }, ] }, ] }, - { - text: 'Web', - items: [ - { text: 'HTML', link: '/html5/overview/' }, - { text: 'CSS', link: '/css/overview/' }, - { text: 'JavaScript', link: '/javascript/overview/' }, - { text: 'vue', link: '/vue/overview/' }, - ] - }, { text: '数据库', items: [ @@ -61,12 +52,12 @@ module.exports = [ { text: 'MyBatis', link: '/mybatis/study-note/' }, { text: 'MyBatis-Plus', link: '/mybatis-plus/study-note/' }, { text: 'Spring', link: '/spring/study-note/' }, - + ] }, - { + { text: '工具|部署', items: [ { text: 'Git', link: '/git/simple-commit/' }, diff --git "a/docs/01.Java/01.\345\211\215\350\250\200.md" "b/docs/01.Java/01.\345\211\215\350\250\200.md" index c1d3dc98..54e002f5 100644 --- "a/docs/01.Java/01.\345\211\215\350\250\200.md" +++ "b/docs/01.Java/01.\345\211\215\350\250\200.md" @@ -23,8 +23,8 @@ categories: -GitHub:[https://github.com/oddfar/docs](https://github.com/oddfar/docs) - +GitHub:[https://github.com/oddfar/notes](https://github.com/oddfar/notes) +Gitee: [https://gitee.com/oddfar/notes](https://gitee.com/oddfar/notes) ### 为何不用博客 diff --git "a/docs/02.Web/01.Html5/02.\346\200\273\350\247\210.md" "b/docs/02.Web/01.Html5/02.\346\200\273\350\247\210.md" deleted file mode 100644 index 4f35a28c..00000000 --- "a/docs/02.Web/01.Html5/02.\346\200\273\350\247\210.md" +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 总览 -permalink: /html5/overview -date: 2021-05-09 09:50:58 ---- - - - - - -# 总览 - -html5 \ No newline at end of file diff --git "a/docs/02.Web/02.CSS/02.\346\200\273\350\247\210.md" "b/docs/02.Web/02.CSS/02.\346\200\273\350\247\210.md" deleted file mode 100644 index b9969cf2..00000000 --- "a/docs/02.Web/02.CSS/02.\346\200\273\350\247\210.md" +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: 总览 -permalink: /css/overview -categories: - - java - - java-web -date: 2021-05-09 09:53:16 ---- - - - - - -# 总览 - -css \ No newline at end of file diff --git "a/docs/02.Web/03.JavaScript/02.\346\200\273\350\247\210.md" "b/docs/02.Web/03.JavaScript/02.\346\200\273\350\247\210.md" deleted file mode 100644 index f23a8340..00000000 --- "a/docs/02.Web/03.JavaScript/02.\346\200\273\350\247\210.md" +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: 总览 -permalink: /javascript/overview -date: 2021-05-09 09:53:35 ---- - - - - - -# 总览 - -JavaScript - diff --git "a/docs/02.Web/10.vue/02.\346\200\273\350\247\210.md" "b/docs/02.Web/10.vue/02.\346\200\273\350\247\210.md" deleted file mode 100644 index 5f47d9fa..00000000 --- "a/docs/02.Web/10.vue/02.\346\200\273\350\247\210.md" +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: 总览 -permalink: /vue/overview -date: 2021-05-09 09:53:35 ---- - - - - - -# 总览 - -vue - diff --git "a/docs/05.\345\267\245\345\205\267\351\203\250\347\275\262/10.docker/01.Docker - \346\246\202\350\277\260.md" "b/docs/05.\345\267\245\345\205\267\351\203\250\347\275\262/10.docker/01.Docker - \346\246\202\350\277\260.md" index 64318a55..816702b0 100644 --- "a/docs/05.\345\267\245\345\205\267\351\203\250\347\275\262/10.docker/01.Docker - \346\246\202\350\277\260.md" +++ "b/docs/05.\345\267\245\345\205\267\351\203\250\347\275\262/10.docker/01.Docker - \346\246\202\350\277\260.md" @@ -4,4 +4,13 @@ title: Docker - 概述 date: 2021-05-28 23:41:35 --- -## 概述 \ No newline at end of file +## 概述 + + + + + +额额额 + +Overline额额额 + diff --git a/docs/index.md b/docs/index.md index 650676ca..4e8d2603 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,7 @@ --- home: true heroImage: /img/web.png -heroText: OddFar's Docs +heroText: OddFar's Notes tagline: 我们在黑暗中并肩前行,走在各自的朝圣路上! actionText: 立刻进入 → actionLink: /java/ @@ -15,4 +15,5 @@ postList: simple -黎明之前总有一段时间特别黑。 +