From f59ce30c96d5d87f12e62c106517cfc57581a42c Mon Sep 17 00:00:00 2001 From: zclkkk Date: Sat, 11 Feb 2023 14:23:03 +0800 Subject: [PATCH 1/4] entry.sh: Fix typo (#425) --- docker/scripts/entry.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/scripts/entry.sh b/docker/scripts/entry.sh index 51da38c56..97d3d94c8 100644 --- a/docker/scripts/entry.sh +++ b/docker/scripts/entry.sh @@ -32,8 +32,8 @@ else if ! [ -z "$Ray_VipBigPointConfig__Cron" ]; then echo "$Ray_VipBigPointConfig__Cron cd /app && dotnet $CONSOLE_DLL --runTasks=VipBigPoint" >>$CRON_FILE fi - if ! [ -z "$Ray_LiveFansMedalConfig__Cron" ]; then - echo "$Ray_LiveFansMedalConfig__Cron cd /app && dotnet $CONSOLE_DLL --runTasks=LiveFansMedal" >>$CRON_FILE + if ! [ -z "$Ray_LiveFansMedalTaskConfig__Cron " ]; then + echo "$Ray_LiveFansMedalTaskConfig__Cron cd /app && dotnet $CONSOLE_DLL --runTasks=LiveFansMedal" >>$CRON_FILE fi fi From 26015eb5b286b8f4cc0f03e9291f49eb074480ec Mon Sep 17 00:00:00 2001 From: zclkkk Date: Sat, 11 Feb 2023 14:23:42 +0800 Subject: [PATCH 2/4] docker: Completion default crontab (#426) --- docker/crontab | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/crontab b/docker/crontab index 4b39fc56f..d5a3711df 100644 --- a/docker/crontab +++ b/docker/crontab @@ -1,4 +1,5 @@ -0 15 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=Daily >> /var/log/cron.log -0 22 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=LiveLottery >> /var/log/cron.log -7 1 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=VipBigPoint >> /var/log/cron.log -5 0 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=LiveFansMedal >> /var/log/cron.log +0 15 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=Daily >> /var/log/cron.log +0 22 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=LiveLottery >> /var/log/cron.log +0 6 1 * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=UnfollowBatched >> /var/log/cron.log +7 1 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=VipBigPoint >> /var/log/cron.log +5 0 * * * dotnet /app/Ray.BiliBiliTool.Console.dll --runTasks=LiveFansMedal >> /var/log/cron.log From 6a7612ea4b2619f1285c1b328ba732b9ab2324c4 Mon Sep 17 00:00:00 2001 From: zclkkk Date: Sat, 11 Feb 2023 21:44:01 +0800 Subject: [PATCH 3/4] docker: Remove settings in docker compose config (#427) * They should be set in appsettings.json --- docker/sample/docker-compose.yml | 39 +++----------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/docker/sample/docker-compose.yml b/docker/sample/docker-compose.yml index c6b7a4f2a..2f29670a6 100644 --- a/docker/sample/docker-compose.yml +++ b/docker/sample/docker-compose.yml @@ -1,51 +1,18 @@ version: '3.9' - services: bilibili_tool: - image: zai7lou/bilibili_tool_pro + image: zai7lou/bilibili_tool_pro:latest container_name: bili - # restart: always + restart: unless-stopped + tty: true volumes: - ./Logs:/app/Logs - ./appsettings.json:/app/appsettings.json - ./cookies.json:/app/cookies.json - tty: true environment: - - ASPNETCORE_ENVIRONMENT=Production - - Ray_Security__IsSkipDailyTask=false - # 定时任务 - Ray_DailyTaskConfig__Cron=0 15 * * * - Ray_LiveLotteryTaskConfig__Cron=0 22 * * * - Ray_UnfollowBatchedTaskConfig__Cron=0 6 1 * * - Ray_VipBigPointConfig__Cron=7 1 * * * - Ray_LiveFansMedalTaskConfig__Cron=5 0 * * * - - # UA： - - Ray_Security__UserAgent= - # 开始运行前随机随眠最大分钟数： - - Ray_Security__RandomSleepMaxMin=2 - # 调用接口间的间隔秒数： - - Ray_Security__IntervalSecondsBetweenRequestApi= - - # 目标投币数量： - - Ray_DailyTaskConfig__NumberOfCoins= - # 达到六级后是否开始白嫖： - - Ray_DailyTaskConfig__SaveCoinsWhenLv6= - - # 天选抽奖指定排除关键字 - - Ray_LiveLotteryTaskConfig__ExcludeAwardNames= - # 天选抽奖指定包含关键字 - - Ray_LiveLotteryTaskConfig__IncludeAwardNames= - - # 企业微信推送地址： - - Ray_Serilog__WriteTo__4__Args__webHookUrl= - # 钉钉： - - Ray_Serilog__WriteTo__5__Args__webHookUrl= - # PushPlus推送： - - Ray_Serilog__WriteTo__9__Args__token= - - Ray_Serilog__WriteTo__9__Args__topic= - - Ray_Serilog__WriteTo__9__Args__channel= - - Ray_Serilog__WriteTo__9__Args__webhook= - # Server酱推送scKey： - - Ray_Serilog__WriteTo__6__Args__turboScKey= From 8d9df99323784bf9b91baaafb70c5733d12c71ac Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 11 Feb 2023 22:44:20 +0800 Subject: [PATCH 4/4] chore: update change log --- CHANGELOG.md | 14 +++++++++++++- common.props | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65bde9d06..2998da7a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + ## 0.0.1 - 重启项目 - 支持[青龙面板](https://github.com/whyour/qinglong)部署 @@ -79,4 +87,8 @@ - Fix( #366 #361 )，修复一些低级bug - Feature( #359 )，兼容读取不到`$QL_DIR`的情况 ## 0.4.0 -- 合并PR（ #381 #383 ），新增直播间挂机功能，感谢@bakapiano \ No newline at end of file +- 合并PR（ #381 #383 ），新增直播间挂机功能，感谢@bakapiano +## 0.4.1 +- Merge PR #418 : Fix search video api's error, thx @catlair +## 0.4.2 +- Merfe PRs #425 #426 #427 : enhancement docker things, thx @zclkkk \ No newline at end of file diff --git a/common.props b/common.props index 8693d4eb0..04bcab69d 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ Ray - 0.4.0 + 0.4.2 $(NoWarn);CS1591;CS0436