From 1c088d0615cb86b12ef9406377daf938b76e1d7c 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:48:06 +0800
Subject: [PATCH] Release 2.1.1 (#725)
* feat: listen ctrl+c at the very beginning
* test: qinglong cron
* test: qinglong cron
* test: qinglong cron
* test: qinglong cron
* fix: fix qinglong cron read error
* fix: fix qinglong read cron error
* chore: update change log
---
CHANGELOG.md | 3 +++
common.props | 2 +-
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 +-
qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 5 ++---
qinglong/DefaultTasks/dev/bili_dev_task_daily.sh | 5 ++---
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 +-
src/Ray.BiliBiliTool.Console/Program.cs | 7 +++++++
21 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcb312047..5abf4504f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +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配置项，用于解决大会员大积分异常问题
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/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
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 5a7e34e78..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
-#5 9 * * * bili_dev_task_daily.sh
-#new Env('bili每日任务[dev先行版]');
-#
+# 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
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);