diff --git a/README.md b/README.md index e65d834d4..044b43fd3 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,10 @@ pnpm build - [x] 徽章:标题后可显示徽章,此功能来自于 VitePress 未合并的 PR,如若后续被合并,则改用官方主题功能 - [x] Mermaid 流程图:在 Markdown 中绘制流程图、状态图、时序图、甘特图、饼图等,更多语法请参见:[Mermaid 官方文档](https://github.com/mermaid-js/mermaid/blob/develop/README.zh-CN.md) 。(Typora 编辑器也支持 `mermaid` 语法) - [x] 更多细节优化:敬请发现 + - [x] 文章内图片增加圆角样式优化([#56](https://github.com/Charles7c/charles7c.github.io/issues/56)) + - [x] 浏览器滚动条样式优化(支持 Firfox、谷歌系浏览器)([#69](https://github.com/Charles7c/charles7c.github.io/pull/69)) + - [x] ...... + ## 部分页面截图 diff --git a/docs/categories/fragments/2019/12/31/个人常用Linux命令.md b/docs/categories/fragments/2019/12/31/个人常用Linux命令.md index f6d9bff04..895be4252 100644 --- a/docs/categories/fragments/2019/12/31/个人常用Linux命令.md +++ b/docs/categories/fragments/2019/12/31/个人常用Linux命令.md @@ -15,6 +15,10 @@ tags: ## 系统相关 +::: tip 已测试系统 +CentOS +::: + ### 查询系统详情 ```shell @@ -57,9 +61,26 @@ env env | grep xxx ``` +### 编辑环境变量 + +```shell +# 1、打开 profile 文件 +vim /etc/profile + +# 2、在其中插入环境变量配置 +# 添加 JAVA_HOME 环境变量 +JAVA_HOME=/opt/disk/java/jdk1.8.0_202 +CLASSPATH=.:$JAVA_HOME/lib.tools.jar +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME CLASSPATH PATH + +# 3、重新加载环境变量 +source /etc/profile +``` + ## 防火墙相关 -::: tip 已测试适用系统 +::: tip 已测试系统 CentOS 7.5 ::: @@ -116,6 +137,10 @@ firewall-cmd --reload ## 监控相关 +::: tip 已测试系统 +CentOS +::: + ### 查询RAM信息(内存) ```shell @@ -245,8 +270,21 @@ top 命令也是用来查看进程状态的,相比于 ps 命令,top 命令 | TIME+ | 进程使用的 CPU 时间总计,单位1/100秒 | | COMMAND | 命令名 | +### 查看socket状态 + +```shell +# -t:显示 tcp socket +# -a:显示所有的 +# -l:显示本地打开的端口 +ss -tal +``` + ## 文件编辑相关 +::: tip 已测试系统 +CentOS +::: + ### 文本编辑器 ```shell diff --git a/docs/categories/fragments/2022/10/01/个人常用Docker命令.md b/docs/categories/fragments/2022/10/01/个人常用Docker命令.md index c5a6909a1..dd6ab5364 100644 --- a/docs/categories/fragments/2022/10/01/个人常用Docker命令.md +++ b/docs/categories/fragments/2022/10/01/个人常用Docker命令.md @@ -180,16 +180,6 @@ exit docker cp 宿主机内文件路径 容器名称:容器内文件路径 ``` -### 备份容器为本地镜像 - -::: warning 笔者说 -如果镜像名称后不指定 **标签/版本** ,则会默认使用最新版本(latest)。 -::: - -```shell -docker commit [-a "作者"] [-m "信息"] 容器ID/容器名称 镜像名称[:标签/版本] -``` - ### 查看容器日志 ```shell @@ -203,6 +193,32 @@ docker commit [-a "作者"] [-m "信息"] 容器ID/容器名称 镜像名称[: docker logs -f [-t] [-n 行数] [--since 开始时间] [--until 结束时间] 容器ID/容器名称 ``` +### 备份容器为本地镜像 + +::: warning 笔者说 +如果镜像名称后不指定 **标签/版本** ,则会默认使用最新版本(latest)。 +::: + +```shell +docker commit [-a "作者"] [-m "信息"] 容器ID/容器名称 镜像名称[:标签/版本] +``` + +### 将容器导出为 tar.gz 文件 + +```shell +docker export 容器ID/容器名称 > 文件路径.tar.gz +``` + +### 将 tar.gz 文件导入为镜像 + +::: warning 笔者说 +如果镜像名称后不指定 **标签/版本** ,则会默认使用最新版本(latest)。 +::: + +```shell +docker import 文件路径.tar.gz 镜像名称[:标签/版本] +``` + ## 网络相关 ### 查看网络列表 diff --git a/docs/public/screenshot/Mermaid流程图1.png b/docs/public/screenshot/Mermaid流程图1.png index 4bfd4c0f2..ccafc75fb 100644 Binary files a/docs/public/screenshot/Mermaid流程图1.png and b/docs/public/screenshot/Mermaid流程图1.png differ diff --git a/docs/public/screenshot/侧边栏置顶分组.png b/docs/public/screenshot/侧边栏置顶分组.png index 276832710..912a9e0db 100644 Binary files a/docs/public/screenshot/侧边栏置顶分组.png and b/docs/public/screenshot/侧边栏置顶分组.png differ diff --git a/docs/public/screenshot/徽章.png b/docs/public/screenshot/徽章.png index 8503e4bb2..7598e69b3 100644 Binary files a/docs/public/screenshot/徽章.png and b/docs/public/screenshot/徽章.png differ diff --git a/docs/public/screenshot/我的归档1.png b/docs/public/screenshot/我的归档1.png index eaf899f7d..de3e7a916 100644 Binary files a/docs/public/screenshot/我的归档1.png and b/docs/public/screenshot/我的归档1.png differ diff --git a/docs/public/screenshot/我的归档2.png b/docs/public/screenshot/我的归档2.png index d2da9e1de..317e33e15 100644 Binary files a/docs/public/screenshot/我的归档2.png and b/docs/public/screenshot/我的归档2.png differ diff --git a/docs/public/screenshot/我的标签1.png b/docs/public/screenshot/我的标签1.png index 4f91fae1a..376e58584 100644 Binary files a/docs/public/screenshot/我的标签1.png and b/docs/public/screenshot/我的标签1.png differ diff --git a/docs/public/screenshot/我的标签2.png b/docs/public/screenshot/我的标签2.png index b6b501658..71c6ac623 100644 Binary files a/docs/public/screenshot/我的标签2.png and b/docs/public/screenshot/我的标签2.png differ diff --git a/docs/public/screenshot/文章元数据信息.png b/docs/public/screenshot/文章元数据信息.png index 44a40db89..b2505cc22 100644 Binary files a/docs/public/screenshot/文章元数据信息.png and b/docs/public/screenshot/文章元数据信息.png differ diff --git a/docs/public/screenshot/文章评论1.png b/docs/public/screenshot/文章评论1.png index a69ff48fe..579f8df8a 100644 Binary files a/docs/public/screenshot/文章评论1.png and b/docs/public/screenshot/文章评论1.png differ diff --git a/docs/public/screenshot/文章评论2.png b/docs/public/screenshot/文章评论2.png index b04993fda..5e05a5e09 100644 Binary files a/docs/public/screenshot/文章评论2.png and b/docs/public/screenshot/文章评论2.png differ diff --git a/docs/public/screenshot/文章评论3.png b/docs/public/screenshot/文章评论3.png index 7733bff86..cc4a60205 100644 Binary files a/docs/public/screenshot/文章评论3.png and b/docs/public/screenshot/文章评论3.png differ diff --git a/package.json b/package.json index f6d371a0f..8b42e12b1 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "markdown-it": "^13.0.1", "mermaid": "^9.1.7", "unplugin-vue-components": "^0.22.8", - "vite": "^3.1.7", - "vitepress": "1.0.0-alpha.21", + "vite": "^3.1.8", + "vitepress": "1.0.0-alpha.22", "vitepress-plugin-mermaid": "^2.0.8", "vitepress-plugin-search": "1.0.4-alpha.11", "vue": "^3.2.40" @@ -19,7 +19,7 @@ "dependencies": { "@antv/g2plot": "^2.4.20", "blueimp-md5": "^2.19.0", - "dayjs": "^1.11.5", + "dayjs": "^1.11.6", "fast-glob": "^3.2.12", "gitalk": "^1.8.0", "gray-matter": "^4.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1af3dab70..79b8d7c91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ specifiers: '@antv/g2plot': ^2.4.20 '@arco-design/web-vue': ^2.37.4 blueimp-md5: ^2.19.0 - dayjs: ^1.11.5 + dayjs: ^1.11.6 fast-glob: ^3.2.12 gitalk: ^1.8.0 gray-matter: ^4.0.3 @@ -12,8 +12,8 @@ specifiers: markdown-it: ^13.0.1 mermaid: ^9.1.7 unplugin-vue-components: ^0.22.8 - vite: ^3.1.7 - vitepress: 1.0.0-alpha.21 + vite: ^3.1.8 + vitepress: 1.0.0-alpha.22 vitepress-plugin-mermaid: ^2.0.8 vitepress-plugin-search: 1.0.4-alpha.11 vue: ^3.2.40 @@ -21,7 +21,7 @@ specifiers: dependencies: '@antv/g2plot': 2.4.20 blueimp-md5: 2.19.0 - dayjs: 1.11.5 + dayjs: 1.11.6 fast-glob: 3.2.12 gitalk: 1.8.0 gray-matter: 4.0.3 @@ -32,10 +32,10 @@ devDependencies: markdown-it: 13.0.1 mermaid: 9.1.7 unplugin-vue-components: 0.22.8_vue@3.2.40 - vite: 3.1.7 - vitepress: 1.0.0-alpha.21 - vitepress-plugin-mermaid: 2.0.8_p2f7u5fmo5pvuz7r246u7meg3a - vitepress-plugin-search: 1.0.4-alpha.11_7uvfdhgyrqlsg74r4igd4pnlbi + vite: 3.1.8 + vitepress: 1.0.0-alpha.22 + vitepress-plugin-mermaid: 2.0.8_p34z6dwq43erxgx4dxznje46me + vitepress-plugin-search: 1.0.4-alpha.11_eny7drxhzzrhshlyu255qt5dum vue: 3.2.40 packages: @@ -345,7 +345,7 @@ packages: b-tween: 0.3.3 b-validate: 1.4.2 compute-scroll-into-view: 1.0.17 - dayjs: 1.11.5 + dayjs: 1.11.6 number-precision: 1.5.2 resize-observer-polyfill: 1.5.1 scroll-into-view-if-needed: 2.2.29 @@ -473,14 +473,14 @@ packages: resolution: {integrity: sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA==} dev: true - /@vitejs/plugin-vue/3.1.2_vite@3.1.7+vue@3.2.40: + /@vitejs/plugin-vue/3.1.2_vite@3.1.8+vue@3.2.40: resolution: {integrity: sha512-3zxKNlvA3oNaKDYX0NBclgxTQ1xaFdL7PzwF6zj9tGFziKwmBa3Q/6XcJQxudlT81WxDjEhHmevvIC4Orc1LhQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: 3.1.7 + vite: 3.1.8 vue: 3.2.40 dev: true @@ -1320,8 +1320,8 @@ packages: engines: {node: '>=0.11'} dev: false - /dayjs/1.11.5: - resolution: {integrity: sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==} + /dayjs/1.11.6: + resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==} /debug/3.1.0: resolution: {integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==} @@ -2676,8 +2676,8 @@ packages: webpack-virtual-modules: 0.4.5 dev: true - /vite/3.1.7: - resolution: {integrity: sha512-5vCAmU4S8lyVdFCInu9M54f/g8qbOMakVw5xJ4pjoaDy5wgy9sLLZkGdSLN52dlsBqh0tBqxjaqqa8LgPqwRAA==} + /vite/3.1.8: + resolution: {integrity: sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -2703,7 +2703,7 @@ packages: fsevents: 2.3.2 dev: true - /vitepress-plugin-mermaid/2.0.8_p2f7u5fmo5pvuz7r246u7meg3a: + /vitepress-plugin-mermaid/2.0.8_p34z6dwq43erxgx4dxznje46me: resolution: {integrity: sha512-ywWxTeg9kMv7ZPf/igCBF4ZHhWZAyRtbPnA12ICQuNK2AMp7r5IHOfnuX1EJQf8gNdsh8bcvvSvm8Ll92fdOTw==} peerDependencies: mermaid: ^8.0.0 || ^9.0.0 @@ -2711,10 +2711,10 @@ packages: vitepress: ^0.21.6 || ^1.0.0 || ^1.0.0-alpha dependencies: mermaid: 9.1.7 - vitepress: 1.0.0-alpha.21 + vitepress: 1.0.0-alpha.22 dev: true - /vitepress-plugin-search/1.0.4-alpha.11_7uvfdhgyrqlsg74r4igd4pnlbi: + /vitepress-plugin-search/1.0.4-alpha.11_eny7drxhzzrhshlyu255qt5dum: resolution: {integrity: sha512-fKJIpPj6QGQeXda31Dx5f9DtCYnPVHKQVsOUpnJOzahWHPPgGofslwwvwaeRMWIGvpslxi/m4RVK6C+ydqKukA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -2722,23 +2722,23 @@ packages: vitepress: ^1.0.0-alpha.13 vue: '3' dependencies: - vite: 3.1.7 - vitepress: 1.0.0-alpha.21 + vite: 3.1.8 + vitepress: 1.0.0-alpha.22 vue: 3.2.40 dev: true - /vitepress/1.0.0-alpha.21: - resolution: {integrity: sha512-D/tkoDW16uUZ9pnWd28Kk1vX26zNiTml3m9oGbfx2pAfYg99PHd1GceZyEm4jZsJU0+n9S++1ctFxoQvsq376A==} + /vitepress/1.0.0-alpha.22: + resolution: {integrity: sha512-IWqnAxMDNaiyl6Bz+/79l40Ho6xsjrqxRp/WZw0+5BXR0BTZbmHyhGtI3XrH6oSn8MisLPjCccikaj3mcmCoWg==} hasBin: true dependencies: '@docsearch/css': 3.2.1 '@docsearch/js': 3.2.1 - '@vitejs/plugin-vue': 3.1.2_vite@3.1.7+vue@3.2.40 + '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.40 '@vue/devtools-api': 6.4.4 '@vueuse/core': 9.3.0_vue@3.2.40 body-scroll-lock: 4.0.0-beta.0 shiki: 0.11.1 - vite: 3.1.7 + vite: 3.1.8 vue: 3.2.40 transitivePeerDependencies: - '@algolia/client-search'