From 53364e49114e7cbbd774594ce8bfcc84010fcf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=B9=E5=A6=B9=E4=B8=8B=E9=9B=A8=E5=9B=9E=E4=B8=8D?= =?UTF-8?q?=E5=8E=BB?= Date: Sat, 11 Feb 2023 00:22:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9page=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2deploy=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/page_deploy.sh | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/scripts/page_deploy.sh b/scripts/page_deploy.sh index 8479f71..9f1742d 100644 --- a/scripts/page_deploy.sh +++ b/scripts/page_deploy.sh @@ -4,14 +4,11 @@ commitInfo=${1} set -e -## 进入上级目录，并编译 -npm run build +npm run build-proxy && cd docs/.vuepress/dist -## 切换到dist文件目录 -cd docs/.vuepress/dist -git init -git add -A + +git init && git add -A ## 如果没有输入commit信息，则采用默认 if [ "${commitInfo}" -eq "" ]; then @@ -21,16 +18,13 @@ fi git commit -m "refactor:${commitInfo}" ## 配置个人信息 -git config user.name '妹妹手上有抹茶' -git config user.email 'fairy_408@2925.com' +git config user.name '妹妹脸上有抹茶' && git config user.email 'fairy_408@2925.com' && git config --list -git config --list -# if you are deploying to https://.github.io -# git push -f git@github.com:/.github.io.git master -# if you are deploying to https://.github.io/ -git push -f https://github.com/mmdapl/408CSFamily.git master:pages/github +# git push -f https://@github.com/mmdapl/408CSFamily.git main + +git push -f https://@github.com/mmdapl/408CSFamily.git main:pages/github cd - \ No newline at end of file From 298f25fef6424673d9eddd6bff734afb58913e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=B9=E5=A6=B9=E4=B8=8B=E9=9B=A8=E5=9B=9E=E4=B8=8D?= =?UTF-8?q?=E5=8E=BB?= Date: Sat, 11 Feb 2023 14:04:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=84=9A=E6=9C=AC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/page_deploy.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/page_deploy.sh b/scripts/page_deploy.sh index 9f1742d..b24c895 100644 --- a/scripts/page_deploy.sh +++ b/scripts/page_deploy.sh @@ -15,16 +15,15 @@ if [ "${commitInfo}" -eq "" ]; then commitInfo="408CSFamily page init" fi +## 配置个人信息 +git config user.name 'chu fan' && git config user.email 'fairy_408@2925.com' && git config --list + git commit -m "refactor:${commitInfo}" -## 配置个人信息 -git config user.name '妹妹脸上有抹茶' && git config user.email 'fairy_408@2925.com' && git config --list +# git push -f https://github.com/mmdapl/408CSFamily.git main - -# git push -f https://@github.com/mmdapl/408CSFamily.git main - -git push -f https://@github.com/mmdapl/408CSFamily.git main:pages/github +git push -f https://github.com/mmdapl/408CSFamily.git main:pages/github cd - \ No newline at end of file From 0d531806413e756f169dd21621d4ab02d176299c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=B9=E5=A6=B9=E4=B8=8B=E9=9B=A8=E5=9B=9E=E4=B8=8D?= =?UTF-8?q?=E5=8E=BB?= Date: Sat, 11 Feb 2023 20:32:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E9=A2=84=E8=A7=88=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +++++++++++ docs/README.md | 11 +++++++++-- scripts/build_image.sh | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 64dde7a..9787172 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,17 @@ 2. 建议结合思维导图进行学习 +## 在线阅读 + +https://408.142vip.cn + +网站无法访问时，建议通过科学上网访问备用网络 + +- Github： https://142vip.github.io/408CSFamily +- Netlify： https://408-family.netlify.app +- Vercel： https://408-family.vercel.app + + diff --git a/docs/README.md b/docs/README.md index c8b2a6b..efc9f19 100644 --- a/docs/README.md +++ b/docs/README.md @@ -144,8 +144,15 @@ yarn run dev ### 在线浏览 -- 个人网站 -- 静态托管 +https://408.142vip.cn + +网站无法访问时，建议通过科学上网访问备用网络 + +- Github： https://142vip.github.io/408CSFamily +- Netlify： https://408-family.netlify.app +- Vercel： https://408-family.vercel.app + + ### 提交记录 diff --git a/scripts/build_image.sh b/scripts/build_image.sh index 23e2350..7222eef 100644 --- a/scripts/build_image.sh +++ b/scripts/build_image.sh @@ -36,7 +36,7 @@ run(){ if [ "${isFaster}" == "faster" ];then ## 本地构建、快速制作镜像 - npm run build && docker build -f Faster.Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" . + pnpm build && docker build -f Faster.Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" . else ## ci流程构建 docker build -f Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" .