From bac72ffaa554547de1973988262949725fa2c77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=9C=E6=AC=A2=E8=8A=9D=E5=A3=AB=E7=9A=84=E5=A6=B9?= =?UTF-8?q?=E5=A6=B9?= Date: Mon, 27 Jun 2022 09:35:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 6 +++--- package.json | 1 + scripts/build_image.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nginx.conf b/nginx.conf index d4a5b94..3bcf9f0 100644 --- a/nginx.conf +++ b/nginx.conf @@ -9,13 +9,13 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; sendfile off; - access_log off; + access_log off; ## 关闭正常访问日志 keepalive_timeout 3000; server { listen 7000; server_name localhost; - #charset koi8-r; - access_log /var/log/nginx/access.log main; + +# access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; ## 静态资源代理 location / { diff --git a/package.json b/package.json index e6721c3..f830777 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vuepress dev docs", "build": "vuepress build docs", + "build-image": "bash scripts/build_image.sh $npm_package_version", "ali": "bash scripts/deploy.bash ali $npm_package_version", "github": "bash scripts/deploy.bash github" }, diff --git a/scripts/build_image.sh b/scripts/build_image.sh index b042d7a..0800b4e 100644 --- a/scripts/build_image.sh +++ b/scripts/build_image.sh @@ -2,8 +2,8 @@ ## 功能：本地前后端项目构建、打包镜像，上传docker仓库 ## 参考：https://blog.csdn.net/Dontla/article/details/125210694 ## 作者：Rong姐姐好可爱 -## 使用示例：bash xxx.sh 容器名称 版本号 -## - bash build_image.sh oauth_login 0.0.1 +## 使用示例：bash xxx.sh 版本号 +## - bash build_image.sh 0.0.1 ## From bc9a970e6a0f822751256c7cf6cdb1612d8cbd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=9C=E6=AC=A2=E8=8A=9D=E5=A3=AB=E7=9A=84=E5=A6=B9?= =?UTF-8?q?=E5=A6=B9?= Date: Mon, 27 Jun 2022 22:48:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20docs=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 --- docs/.vuepress/config.js | 2 +- docs/.vuepress/theme/layouts/Layout.vue | 3 +-- docs/DS/README11.md | 24 ++++++++++++------------ manuscripts/category/README.md | 24 ++++++++++++------------ 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index befae3b..557fdb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -# Logs logs *.log npm-debug.log* @@ -13,8 +12,6 @@ pids *.pid.lock # docs -docs11 -# Directory for instrumented libs generated by jscoverage/JSCover lib-cov # Coverage directory used by tools like istanbul diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index d456005..f2a6f0a 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -13,7 +13,7 @@ module.exports = { // theme: path.resolve(__dirname, './theme'), title: "计算机应试全家桶", description: "磨刀不误砍柴工，读完硕士再打工", - base: "/408CSFamily/", + // base: "/408CSFamily/", port: 4200, head: [ ["link", { rel: "icon", href: "/408_favicon.ico" }] diff --git a/docs/.vuepress/theme/layouts/Layout.vue b/docs/.vuepress/theme/layouts/Layout.vue index 3c8804f..c12d6cb 100644 --- a/docs/.vuepress/theme/layouts/Layout.vue +++ b/docs/.vuepress/theme/layouts/Layout.vue @@ -7,8 +7,7 @@ * @LastEditTime: 2022-04-24 08:47:23 --> +import ParentLayout from '@vuepress/theme-default/lib/client/layouts/Layout.vue'