From f50eec764c5f66460cb43b4f88d4b47a45862499 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 12 May 2024 20:03:29 +0800 Subject: [PATCH 01/11] feat: listen ctrl+c at the very beginning --- CHANGELOG.md | 2 ++ common.props | 2 +- src/Ray.BiliBiliTool.Console/Program.cs | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb312047..889cd9fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.1.1 +- Feature: listen ctrl+c at the very beginning ## 2.1.0 - Feature[#691]: 重构并优化基于qinglong的部署方式，尝试解决偶发的安装失败的问题 - Feature[#670]: 新增针对App的AppUserAgent配置项，用于解决大会员大积分异常问题 diff --git a/common.props b/common.props index 6f3db6b1e..0ec5d8885 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ Ray - 2.1.0 + 2.1.1 $(NoWarn);CS1591;CS0436 diff --git a/src/Ray.BiliBiliTool.Console/Program.cs b/src/Ray.BiliBiliTool.Console/Program.cs index 0e3da4a4a..64f437ef7 100644 --- a/src/Ray.BiliBiliTool.Console/Program.cs +++ b/src/Ray.BiliBiliTool.Console/Program.cs @@ -1,5 +1,6 @@ using System; using System.Reflection; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -18,6 +19,12 @@ public class Program { public static async Task Main(string[] args) { + System.Console.CancelKeyPress += (sender, eventArgs) => + { + eventArgs.Cancel = true; + Environment.Exit(0); + }; + PrintLogo(); IHost host = CreateHost(args); From 8eb2bed0fbbc04070a191eb9dd1c9b733e5aa6b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9C=A87=E6=A5=BC?= <31154238+RayWangQvQ@users.noreply.github.com> Date: Mon, 13 May 2024 21:46:31 +0800 Subject: [PATCH 02/11] test: qinglong cron --- qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh index 5a7e34e78..e6e484dcc 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#5 9 * * * bili_dev_task_daily.sh -#new Env('bili每日任务[dev先行版]'); +# cron:5 9 * * * bili_dev_task_daily.sh +# new Env('bili每日任务[dev先行版]'); # . bili_dev_task_base.sh From 83d8fcbe2df98ba939f45d7dbefa567fa3deb673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9C=A87=E6=A5=BC?= <31154238+RayWangQvQ@users.noreply.github.com> Date: Mon, 13 May 2024 21:51:56 +0800 Subject: [PATCH 03/11] test: qinglong cron --- qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh index e6e484dcc..478ec0129 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# cron:5 9 * * * bili_dev_task_daily.sh +# cron:5 9 * * * qinglong/DefaultTasks/dev/bili_dev_task_daily.sh # new Env('bili每日任务[dev先行版]'); # From 07dc42fa6f4c02f8cca056b78ac60d0eb7de40b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9C=A87=E6=A5=BC?= <31154238+RayWangQvQ@users.noreply.github.com> Date: Mon, 13 May 2024 22:13:18 +0800 Subject: [PATCH 04/11] test: qinglong cron --- qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh index 478ec0129..9c7119e81 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -# cron:5 9 * * * qinglong/DefaultTasks/dev/bili_dev_task_daily.sh -# new Env('bili每日任务[dev先行版]'); +# cron:5 9 * * * bili_dev_task_daily.sh # . bili_dev_task_base.sh From 5147aca809dfe579d339f3cefc34a32e798f3b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9C=A87=E6=A5=BC?= <31154238+RayWangQvQ@users.noreply.github.com> Date: Mon, 13 May 2024 22:23:37 +0800 Subject: [PATCH 05/11] test: qinglong cron --- qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh index 9c7119e81..0eb102745 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -# cron:5 9 * * * bili_dev_task_daily.sh +# cron:5 9 * * * +# new Env('bili每日任务[dev先行版]'); # . bili_dev_task_base.sh From 4353f41511aebface72b97db9de921212cc269ba Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 13 May 2024 22:29:36 +0800 Subject: [PATCH 06/11] fix: fix qinglong cron read error --- qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 5 ++--- qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 1 - qinglong/DefaultTasks/dev/bili_dev_task_liveFansMedal.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_liveLottery.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_login.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_test.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_tryFix.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_unfollowBatched.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_vipBigPoint.sh | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index 19bd7977f..bfe415103 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -#0 0 1 1 * bili_dev_task_base.sh -#new Env("bili_dev_task_base"); -# +# cron:0 0 1 1 * +# new Env("bili_dev_task_base"); # Stop script on NZEC set -e diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh index 0eb102745..6e37d5b05 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_daily.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash # cron:5 9 * * * # new Env('bili每日任务[dev先行版]'); -# . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_liveFansMedal.sh b/qinglong/DefaultTasks/dev/bili_dev_task_liveFansMedal.sh index a3d558219..05f5f7741 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_liveFansMedal.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_liveFansMedal.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 5 0 * * * bili_dev_task_liveFansMedal.sh +# cron:5 0 * * * # new Env("bili直播粉丝牌[dev先行版]") . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_liveLottery.sh b/qinglong/DefaultTasks/dev/bili_dev_task_liveLottery.sh index 7d2c99680..40cade7b2 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_liveLottery.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_liveLottery.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 13 * * * bili_dev_task_liveLottery.sh +# cron:0 13 * * * # new Env("bili天选时刻[dev先行版]") . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_login.sh b/qinglong/DefaultTasks/dev/bili_dev_task_login.sh index 6d0912803..88976e6b1 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_login.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_login.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 0 1 1 * bili_dev_task_login.sh +# cron:0 0 1 1 * # new Env("bili扫码登录[dev先行版]") . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_test.sh b/qinglong/DefaultTasks/dev/bili_dev_task_test.sh index ccb435c5a..711c05e3d 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_test.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 8 * * * bili_dev_task_test.sh +# cron:0 8 * * * # new Env("bili测试ck[dev先行版]") . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_tryFix.sh b/qinglong/DefaultTasks/dev/bili_dev_task_tryFix.sh index f7048e19f..8bb72f8b8 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_tryFix.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_tryFix.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 0 1 1 * bili_dev_task_tryFix.sh +# cron:0 0 1 1 * # new Env("bili尝试修复异常[dev先行版]") dir_shell=$QL_DIR/shell diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_unfollowBatched.sh b/qinglong/DefaultTasks/dev/bili_dev_task_unfollowBatched.sh index 73a6a9d3d..f1bc52852 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_unfollowBatched.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_unfollowBatched.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 12 1 * * bili_dev_task_unfollowBatched.sh +# cron:0 12 1 * * # new Env("bili批量取关主播[dev先行版]") . bili_dev_task_base.sh diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_vipBigPoint.sh b/qinglong/DefaultTasks/dev/bili_dev_task_vipBigPoint.sh index d725c1387..7fadcfbe6 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_vipBigPoint.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_vipBigPoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 7 1 * * * bili_dev_task_vipBigPoint.sh +# cron:7 1 * * * # new Env("bili大会员大积分[dev先行版]") . bili_dev_task_base.sh From 87bcd43bc5b7e6c1ee234f965768b0c803013022 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 13 May 2024 22:37:27 +0800 Subject: [PATCH 07/11] fix: fix qinglong read cron error --- qinglong/DefaultTasks/bili_task_base.sh | 2 +- qinglong/DefaultTasks/bili_task_daily.sh | 2 +- qinglong/DefaultTasks/bili_task_liveFansMedal.sh | 2 +- qinglong/DefaultTasks/bili_task_liveLottery.sh | 2 +- qinglong/DefaultTasks/bili_task_login.sh | 2 +- qinglong/DefaultTasks/bili_task_test.sh | 2 +- qinglong/DefaultTasks/bili_task_tryFix.sh | 2 +- qinglong/DefaultTasks/bili_task_unfollowBatched.sh | 2 +- qinglong/DefaultTasks/bili_task_vipBigPoint.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index a8bceb9cd..8d78a8e4f 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 0 1 1 * bili_base.sh +# cron:0 0 1 1 * # new Env("bili_base") # Stop script on NZEC diff --git a/qinglong/DefaultTasks/bili_task_daily.sh b/qinglong/DefaultTasks/bili_task_daily.sh index 09fcc0a74..2c8e07543 100644 --- a/qinglong/DefaultTasks/bili_task_daily.sh +++ b/qinglong/DefaultTasks/bili_task_daily.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 9 * * * bili_task_daily.sh +# cron:0 9 * * * # new Env("bili每日任务") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_liveFansMedal.sh b/qinglong/DefaultTasks/bili_task_liveFansMedal.sh index 980bcfdd0..c8141a2de 100644 --- a/qinglong/DefaultTasks/bili_task_liveFansMedal.sh +++ b/qinglong/DefaultTasks/bili_task_liveFansMedal.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 5 0 * * * bili_task_liveFansMedal.sh +# cron:5 0 * * * # new Env("bili直播粉丝牌") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_liveLottery.sh b/qinglong/DefaultTasks/bili_task_liveLottery.sh index 24d4aa8c1..15eed1659 100644 --- a/qinglong/DefaultTasks/bili_task_liveLottery.sh +++ b/qinglong/DefaultTasks/bili_task_liveLottery.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 13 * * * bili_task_liveLottery.sh +# cron:0 13 * * * # new Env("bili天选时刻") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_login.sh b/qinglong/DefaultTasks/bili_task_login.sh index 1568312a1..a345e3aef 100644 --- a/qinglong/DefaultTasks/bili_task_login.sh +++ b/qinglong/DefaultTasks/bili_task_login.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 0 1 1 * bili_task_login.sh +# cron:0 0 1 1 * # new Env("bili扫码登录") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_test.sh b/qinglong/DefaultTasks/bili_task_test.sh index 03b4f7c9c..56e51b181 100644 --- a/qinglong/DefaultTasks/bili_task_test.sh +++ b/qinglong/DefaultTasks/bili_task_test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 8 * * * bili_task_test.sh +# cron:0 8 * * * # new Env("bili测试ck") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_tryFix.sh b/qinglong/DefaultTasks/bili_task_tryFix.sh index 0f417f6e5..4613edf51 100644 --- a/qinglong/DefaultTasks/bili_task_tryFix.sh +++ b/qinglong/DefaultTasks/bili_task_tryFix.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 0 1 1 * bili_task_tryFix.sh +# cron:0 0 1 1 * # new Env("bili尝试修复异常") dir_shell=$QL_DIR/shell diff --git a/qinglong/DefaultTasks/bili_task_unfollowBatched.sh b/qinglong/DefaultTasks/bili_task_unfollowBatched.sh index af7e5dbc0..523f2ce84 100644 --- a/qinglong/DefaultTasks/bili_task_unfollowBatched.sh +++ b/qinglong/DefaultTasks/bili_task_unfollowBatched.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 0 12 1 * * bili_task_unfollowBatched.sh +# cron:0 12 1 * * # new Env("bili批量取关主播") . bili_task_base.sh diff --git a/qinglong/DefaultTasks/bili_task_vipBigPoint.sh b/qinglong/DefaultTasks/bili_task_vipBigPoint.sh index 7f2bb21f7..d88f65595 100644 --- a/qinglong/DefaultTasks/bili_task_vipBigPoint.sh +++ b/qinglong/DefaultTasks/bili_task_vipBigPoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 7 1 * * * bili_task_vipBigPoint.sh +# cron:7 1 * * * # new Env("bili大会员大积分") . bili_task_base.sh From 2d108b747ef424708d66ffa59f8166cc935d5feb Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 13 May 2024 22:40:33 +0800 Subject: [PATCH 08/11] chore: update change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 889cd9fc1..5abf4504f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 2.1.1 - Feature: listen ctrl+c at the very beginning +- Fix: fix qinglong read cron error ## 2.1.0 - Feature[#691]: 重构并优化基于qinglong的部署方式，尝试解决偶发的安装失败的问题 - Feature[#670]: 新增针对App的AppUserAgent配置项，用于解决大会员大积分异常问题 From bd73f76d8d470026f0b4214f5112c0448b490e9f Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 14 May 2024 23:59:28 +0800 Subject: [PATCH 09/11] update CICD scripts --- .github/PULL_REQUEST_TEMPLATE.md | 5 +---- .github/workflows/auto-close-pr.yml | 12 +----------- .github/workflows/publish-image.yml | 4 +--- .github/workflows/publish-release.yml | 10 +++++++--- .github/workflows/tag.yml | 8 +++----- CHANGELOG.md | 2 ++ common.props | 2 +- 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 525670daf..6295e6634 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,4 @@ - - - - + ### 内容 diff --git a/.github/workflows/auto-close-pr.yml b/.github/workflows/auto-close-pr.yml index 0e73ed50f..d291cce9c 100644 --- a/.github/workflows/auto-close-pr.yml +++ b/.github/workflows/auto-close-pr.yml @@ -1,20 +1,10 @@ # 自动关闭不规范PR -name: AutocloserPR +name: AutoSetPR on: pull_request_target: types: [opened, edited] jobs: - Autoclose: - runs-on: ubuntu-latest - if: github.repository == 'RayWangQvQ/BiliBiliToolPro' - steps: - - uses: roots/issue-closer@v1.1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pr-close-message: "This PR was automatically closed because it did not meet the requirements, please check the requirements." - pr-pattern: ".*请问您是否明白：【yes】 -->.*" - checkTargetBranch: runs-on: ubuntu-latest needs: Autoclose diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index a31f8c10f..2356733fc 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -1,11 +1,9 @@ +# name: Publish image on: workflow_dispatch: inputs: - manualTag: - description: 'Manual Tag' - required: true autoWithLatestTag: description: 'Auto Add Latest Tag' required: true diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index bcfae54d4..c90bfb4ce 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -34,8 +34,12 @@ jobs: run: | content=$(sed -n '/^## /{p;:a;n;/^## /q;p;ba}' CHANGELOG.md) version=$(echo "$GITHUB_REF" | sed 's/refs\/tags\///') - echo "::set-output name=content::$content" - echo "::set-output name=version::$version" + echo "version=$version" >> $GITHUB_OUTPUT + { + echo 'content<> "$GITHUB_OUTPUT" - name: Create Release uses: softprops/action-gh-release@v1 @@ -44,7 +48,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} name: "BiliBiliToolPro-V${{ steps.release_notes.outputs.version }}" tag_name: ${{ github.event.inputs.version }} - body: ${{ steps.release_notes.outputs.content }} + body: '${{ steps.release_notes.outputs.content }}' discussion_category_name: Announcements generate_release_notes: true fail_on_unmatched_files: true diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 81d28dfb3..954bd8543 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -1,9 +1,7 @@ +# ϲmain֧tag name: Tag on: - push: - branches: - - main pull_request: types: - closed @@ -29,5 +27,5 @@ jobs: - name: Tag and push run: | new_tag="${{ steps.current_version.outputs.current_version }}" - git tag "$new_tag" - git push origin "$new_tag" + git tag -f "$new_tag" + git push -f origin "$new_tag" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5abf4504f..e40efbe59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.1.2 +- Feature: enhancement CICD scripts ## 2.1.1 - Feature: listen ctrl+c at the very beginning - Fix: fix qinglong read cron error diff --git a/common.props b/common.props index 0ec5d8885..34810691c 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ Ray - 2.1.1 + 2.1.2 $(NoWarn);CS1591;CS0436 From 368ed08d29a01edde99f57f8ee687a32db05d36d Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 15 May 2024 00:31:19 +0800 Subject: [PATCH 10/11] update issue templates --- .github/ISSUE_TEMPLATE/bug-report----.md | 5 +++-- .github/ISSUE_TEMPLATE/bug-report-qinglong----.md | 6 ++++-- .github/ISSUE_TEMPLATE/feature-request----.md | 3 ++- Ray.BiliBiliTool.sln | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report----.md b/.github/ISSUE_TEMPLATE/bug-report----.md index 871968086..378e96992 100644 --- a/.github/ISSUE_TEMPLATE/bug-report----.md +++ b/.github/ISSUE_TEMPLATE/bug-report----.md @@ -7,7 +7,8 @@ assignees: '' --- - + + ### 版本 @@ -59,4 +60,4 @@ BiliTool版本号：`x.x.x` <这里> ``` - \ No newline at end of file + diff --git a/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md b/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md index ab144cd47..c3264a028 100644 --- a/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md +++ b/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md @@ -7,7 +7,8 @@ assignees: '' --- - + + ### 版本 @@ -18,7 +19,8 @@ BiliTool版本号：`x.x.x` ### 确认 - [ ] 是的，我已搜索并确认，没有其他相同的议题 -- [ ] 是的，我确认，已尝试升级到最新版，但未解决 +- [ ] 是的，我确认，已尝试升级bilitool到最新版，但未解决 +- [ ] 是的，我确认，已尝试升级青龙到最新版，但未解决 ### 服务器架构 diff --git a/.github/ISSUE_TEMPLATE/feature-request----.md b/.github/ISSUE_TEMPLATE/feature-request----.md index 3fc4a945f..fda2f77b8 100644 --- a/.github/ISSUE_TEMPLATE/feature-request----.md +++ b/.github/ISSUE_TEMPLATE/feature-request----.md @@ -7,7 +7,8 @@ assignees: '' --- - + + ### 确认 diff --git a/Ray.BiliBiliTool.sln b/Ray.BiliBiliTool.sln index 2d67a6c97..c27d5bed0 100644 --- a/Ray.BiliBiliTool.sln +++ b/Ray.BiliBiliTool.sln @@ -116,6 +116,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{830361B7-BCC1-4853-879A-761B0FD86826}" ProjectSection(SolutionItems) = preProject .github\ISSUE_TEMPLATE\bug-report----.md = .github\ISSUE_TEMPLATE\bug-report----.md + .github\ISSUE_TEMPLATE\bug-report-qinglong----.md = .github\ISSUE_TEMPLATE\bug-report-qinglong----.md .github\ISSUE_TEMPLATE\feature-request----.md = .github\ISSUE_TEMPLATE\feature-request----.md .github\ISSUE_TEMPLATE\other----.md = .github\ISSUE_TEMPLATE\other----.md EndProjectSection From 0c58714e39e3782ef8b0891d183c1bd571b01e7a Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 18 May 2024 21:28:18 +0800 Subject: [PATCH 11/11] fix[#728]: compatible with qinglong history versions --- CHANGELOG.md | 1 + qinglong/DefaultTasks/bili_task_base.sh | 4 ++++ qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e40efbe59..4d118ecca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 2.1.2 - Feature: enhancement CICD scripts +- Fix[#728]: compatible with qinglong history versions ## 2.1.1 - Feature: listen ctrl+c at the very beginning - Fix: fix qinglong read cron error diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index 8d78a8e4f..fc4629f1d 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -72,6 +72,10 @@ MemoryWarn=${MemoryWarn:-""} DiskWarn=${DiskWarn:-""} dir_repo=${dir_repo:-"$QL_DIR/data/repo"} +# 需要兼容老版本青龙，https://github.com/RayWangQvQ/BiliBiliToolPro/issues/728 +if [ ! -d "$dir_repo" ] && [ -d "$QL_DIR/repo" ]; then + dir_repo="$QL_DIR/repo" +fi dir_shell=$QL_DIR/shell touch $dir_shell/env.sh && . $dir_shell/env.sh touch /root/.bashrc && . /root/.bashrc diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index bfe415103..84019263e 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -72,6 +72,10 @@ MemoryWarn=${MemoryWarn:-""} DiskWarn=${DiskWarn:-""} dir_repo=${dir_repo:-"$QL_DIR/data/repo"} +# 需要兼容老版本青龙，https://github.com/RayWangQvQ/BiliBiliToolPro/issues/728 +if [ ! -d "$dir_repo" ] && [ -d "$QL_DIR/repo" ]; then + dir_repo="$QL_DIR/repo" +fi dir_shell=$QL_DIR/shell touch $dir_shell/env.sh && . $dir_shell/env.sh touch /root/.bashrc && . /root/.bashrc