Skip to content

Commit

Permalink
🎨 notes
Browse files Browse the repository at this point in the history
  • Loading branch information
oddfar committed May 31, 2021
1 parent 6f4a9ec commit e5fe720
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 84 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '[email protected]:oddfar/docs.git'
SOURCE_REPO: 'https://github.com/oddfar/notes.git'
DESTINATION_REPO: '[email protected]:oddfar/notes.git'
run: |
git clone --mirror "$SOURCE_REPO" && cd `basename "$SOURCE_REPO"`
git remote set-url --push origin "$DESTINATION_REPO"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

### 部署到自己服务器

Expand Down
8 changes: 4 additions & 4 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ initDist(){
#------------------------------------------

#url访问目录,这个是你 github 仓库的名字
initDist "module.exports = '/docs/'"
initDist "module.exports = '/notes/'"

# 生成静态文件
npm run build
Expand All @@ -23,11 +23,11 @@ cd docs/.vuepress/dist
if [ -z "$GITHUB_TOKEN" ]; then
# 手动部署
msg='deploy'
[email protected]:oddfar/docs.git
[email protected]: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 "[email protected]"
fi
Expand All @@ -54,7 +54,7 @@ else
# 进入生成的文件夹
cd docs/.vuepress/dist

[email protected]:oddfar/docs.git #gitee 仓库ssh地址
[email protected]:oddfar/notes.git #gitee 仓库ssh地址

git config --global user.name "oddfar"
git config --global user.email "[email protected]"
Expand Down
6 changes: 3 additions & 3 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '我们在黑暗中并肩前行,走在各自的朝圣路上!', // 描述,以 <meta> 标签渲染到页面html中
base, //后缀 '/docs/'
head: [
Expand All @@ -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', // 编辑的文件夹
Expand Down Expand Up @@ -87,7 +87,7 @@ module.exports = {
// },
footer: { // 页脚信息
createYear: 2021, // 博客创建年份
copyrightInfo: 'oddfar | docs', // 博客版权信息,支持a标签
copyrightInfo: 'oddfar | notes', // 博客版权信息,支持a标签
}
},
plugins: [ // 插件
Expand Down
15 changes: 3 additions & 12 deletions docs/.vuepress/config/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -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/' },
Expand Down
4 changes: 2 additions & 2 deletions docs/01.Java/01.前言.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


### 为何不用博客
Expand Down
13 changes: 0 additions & 13 deletions docs/02.Web/01.Html5/02.总览.md

This file was deleted.

16 changes: 0 additions & 16 deletions docs/02.Web/02.CSS/02.总览.md

This file was deleted.

14 changes: 0 additions & 14 deletions docs/02.Web/03.JavaScript/02.总览.md

This file was deleted.

14 changes: 0 additions & 14 deletions docs/02.Web/10.vue/02.总览.md

This file was deleted.

11 changes: 10 additions & 1 deletion docs/05.工具部署/10.docker/01.Docker - 概述.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,13 @@ title: Docker - 概述
date: 2021-05-28 23:41:35
---

## 概述
## 概述





额额额

<span style="text-decoration: overline;">Overline</span>额额额

5 changes: 3 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
home: true
heroImage: /img/web.png
heroText: OddFar's Docs
heroText: OddFar's Notes
tagline: 我们在黑暗中并肩前行,走在各自的朝圣路上!
actionText: 立刻进入 →
actionLink: /java/
Expand All @@ -15,4 +15,5 @@ postList: simple



黎明之前总有一段时间特别黑。
<h2 align="center">黎明之前总有一段时间特别黑。</h2>

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,9 @@
"vuepress-plugin-zooming": "^1.1.7",
"vuepress-theme-vdoing": "^1.8.3",
"yamljs": "^0.3.0"
},
"dependencies": {
"@vssue/api-github-v3": "^1.4.7",
"@vssue/vuepress-plugin-vssue": "^1.4.8"
}
}

0 comments on commit e5fe720

Please sign in to comment.