Merge branch 'release/0.2.0'

CHANGELOG.md

@@ -46,3 +46,5 @@
 - 【#169】领取大会员福利任务更改为每日都尝试执行
 - 青龙拉库兼容大小写问题
 - 【#197】合并PR，新增了阅读漫画功能到每日任务中（@ChanceLuo）
+## 0.2.0
+- 新增大会员大积分任务

README.md

@@ -56,6 +56,7 @@ BiliBiliTool
 - **月底在 B 币券过期前进行充电（支持指定想要支持的up主，如果没有喜欢的up，也可以为自己充个电啊，做个用爱为自己发电的人~）**
 - **直播中心天选时刻自动参与抽奖**
 - **批量取关**
+- **大会员大积分任务**
 - **支持多账号**
 - **理论上支持所有远端的日志推送（默认支持推送到Telegram、企业微信、钉钉、PushPlus、Server酱、钉钉、酷推，另外也支持自定义推送到任意api）**
 
@@ -217,6 +218,7 @@ dotnet Ray.BiliBiliTool.Console.dll --runTasks=Daily&LiveLottery
 | 每日任务 | Daily | 完成每日任务获取满额65点经验（登录、观看视频、分享视频、投币），以及签到、领福利和充电等附属功能 | bilibili-daily-task.yml | Production | 每天一次 | |
 | 天选时刻抽奖 | LiveLottery | 直播中心天选时刻抽奖 | live-lottery-task.yml | LiveLottery | 建议每天运行0-4次内 | 对应Actions工作流默认是关闭的，需要添加key为`ISOPENLIVELOTTERYTASK`、值为`true`的secret来手动开启；大部分抽奖都需要关注主播，介意的不要开启 |
 | 批量取关 | UnfollowBatched | 批量取关指定分组下的所有关注（主要用于清理天选抽奖而产生的关注） | unfollow-batched-task.yml | 无 | 需要时手动运行 | 需要通过配置指定2个参数：`GroupName`（分组名称，如`天选时刻`）和`Count`（目标取关个数，-1表示全部），应用会倒序从后往前取关指定个数 |
+| 大会员大积分 | VipBigPoint | 大会员大积分任务（签到、浏览、观看） | 无 | 无 | 每天凌晨一点运行 | |
 | 测试Cookie | Test | 测试Cookie是否正常 | 无，可以使用empty-task.yml来运行 | 无 | 需要时手动运行 | 主要用于调试 |
 | 空模板 | 无（只用于 GitHub Actions ） | 用于 GitHub Actions 运行指定的任意任务 | empty-task.yml | 无 | 需要时手动运行 | 需要通过配置指定要运行的任务Code（多个使用英文逗号分隔），主要用于调试 |
 

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>0.1.2</Version>
+    <Version>0.2.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

docs/configuration.md

@@ -611,7 +611,7 @@ P.S.访问链接需要能访问“外网”，有vpn的挂vpn。
 | 配置Key | `Serilog:WriteTo:6:Args:turboScKey` |
 | 值域   | 一串字符串 |
 | 默认值   | 空 |
-| 环境变量   | `Ray_Serilog__WriteTo__6__Args__turboScKey=abcdefg` |
+| 环境变量   | `Ray_Serilog__WriteTo__6__Args__turboScKey` |
 | GitHub Secrets  | `PUSHSERVERTSCKEY` |
 
 <a id="markdown-366-酷推" name="366-酷推"></a>

qinglong/DefaultTasks/bili_dev_task_vipBigPoint.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# new Env("bili大会员大积分[dev先行版]")
+# cron 7 1 * * * bili_dev_task_vipBigPoint.sh
+
+dir_shell=$QL_DIR/shell
+. $dir_shell/share.sh
+
+bili_repo="raywangqvq_bilibilitoolpro_develop"
+
+echo "repo目录: $dir_repo"
+bili_repo_dir="$(find $dir_repo -type d -iname $bili_repo | head -1)"
+echo -e "bili仓库目录: $bili_repo_dir\n"
+
+cd $bili_repo_dir
+export ENVIRONMENT=Production && \
+export Ray_RunTasks=VipBigPoint && \
+dotnet run --project ./src/Ray.BiliBiliTool.Console

qinglong/DefaultTasks/bili_task_vipBigPoint.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# new Env("bili大会员大积分")
+# cron 7 1 * * * bili_task_vipBigPoint.sh
+
+dir_shell=$QL_DIR/shell
+. $dir_shell/share.sh
+
+bili_repo="raywangqvq_bilibilitoolpro"
+
+echo "repo目录: $dir_repo"
+bili_repo_dir="$(find $dir_repo -type d -iname $bili_repo | head -1)"
+echo -e "bili仓库目录: $bili_repo_dir\n"
+
+cd $bili_repo_dir
+export ENVIRONMENT=Production && \
+export Ray_RunTasks=VipBigPoint && \
+dotnet run --project ./src/Ray.BiliBiliTool.Console

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/VipTask/ReceiveOrCompleteTaskRequest.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.VipTask
+{
+    public class ReceiveOrCompleteTaskRequest
+    {
+        public ReceiveOrCompleteTaskRequest(string taskCode)
+        {
+            TaskCode=taskCode;
+        }
+
+        public string TaskCode { get; set; }
+    }
+}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/VipTask/SignRequest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.VipTask
+{
+    public class SignRequest
+    {
+        public string Statistics { get; set; }= "{\"appId\":1,\"platform\":3,\"version\":\"6.85.0\",\"abtest\":\"\"}";
+    }
+}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/VipTask/ViewRequest.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.VipTask
+{
+    public class ViewRequest
+    {
+        public ViewRequest(string position)
+        {
+            this.position=position;
+        }
+
+        public string position { get; set; }
+
+        public string c_locale { get; set; } = "zh_CN";
+
+        public string channel { get; set; } = "html5_search_baidu";
+
+        public int disable_rcmd { get; set; } = 0;
+
+        public string mobi_app { get; set; } = "android";
+
+        public string platform { get; set; } = "android";
+
+        public string s_locale { get; set; } = "zh_CN";
+
+        public string statistics { get; set; } = "{\"appId\":1,\"platform\":3,\"version\":\"6.85.0\",\"abtest\":\"\"}";
+    }
+}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/VipTask/VipTaskListItem.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.VipTask
+{
+    public class VipTaskInfo
+    {
+        public TaskInfo Task_info { get; set; }
+
+        public void LogInfo(ILogger logger)
+        {
+            logger.LogInformation("------当前任务状态------");
+
+            logger.LogInformation("打卡：{signed}", Task_info.Sing_task_item.IsTodaySigned ? "√" : "X");
+
+            foreach (var moduleItem in Task_info.Modules)
+            {
+                logger.LogInformation("-{title}", moduleItem.module_title);
+                foreach (var commonTaskItem in moduleItem.common_task_item)
+                {
+                    logger.LogInformation("---{title}：{status}",
+                        commonTaskItem.title,
+                        commonTaskItem.state == 3 ? "√" : "X");
+                }
+            }
+            logger.LogInformation("------------------------{newLine}", Environment.NewLine);
+
+        }
+    }
+
+    public class TaskInfo
+    {
+        public int Score_month { get; set; }
+
+        public int Score_limit { get; set; }
+
+        public List<ModuleItem> Modules { get; set; }
+
+        public SingTaskItem Sing_task_item { get; set; }
+    }
+
+    public class SingTaskItem
+    {
+        public int Count { get; set; }
+
+        public int Base_score { get; set; }
+
+        public List<Histtory> Histories { get; set; } = new List<Histtory>();
+
+        public Histtory TodayHistory => Histories.FirstOrDefault(x => x.Is_today);
+
+        public bool IsTodaySigned => TodayHistory?.Signed == true;
+    }
+
+    public class ModuleItem
+    {
+        public string module_title { get; set; }
+
+        public List<CommonTaskItem> common_task_item { get; set; }
+    }
+
+    public class CommonTaskItem
+    {
+        public string title { get; set; }
+
+        public string subtitle { get; set; }
+
+        public string explain { get; set; }
+
+        public string task_code { get; set; }
+
+        public int state { get; set; }
+
+        public int vip_limit { get; set; }
+
+        public int complete_times { get; set; }
+
+        public int max_times { get; set; }
+
+        public int recall_num { get; set; }
+    }
+
+    public class Histtory
+    {
+        public DateTime Day { get; set; }
+
+        public bool Signed { get; set; }
+
+        public int Score { get; set; }
+
+        public bool Is_today { get; set; }
+    }
+}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/IVipBigPointApi.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ray.BiliBiliTool.Agent.Attributes;
+using Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos;
+using Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.VipTask;
+using WebApiClientCore.Attributes;
+
+namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Interfaces
+{
+    /// <summary>
+    /// 大会员大积分
+    /// </summary>
+    [Header("Host", "api.bilibili.com")]
+    [Header("Referer", "https://big.bilibili.com/mobile/bigPoint/task")]
+    [Header("User-Agent", "Mozilla/5.0 (Linux; Android 6.0.1; MuMu Build/V417IR; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.158 Mobile Safari/537.36 os/android model/MuMu build/6720300 osVer/6.0.1 sdkInt/23 network/2 BiliApp/6720300 mobi_app/android channel/html5_search_baidu Buvid/XZFC135F5263B6897C8A4BE7AEB125BBF10F8 sessionID/72d3f4c9 innerVer/6720310 c_locale/zh_CN s_locale/zh_CN disable_rcmd/0 6.72.0 os/android model/MuMu mobi_app/android build/6720300 channel/html5_search_baidu innerVer/6720310 osVer/6.0.1 network/2")]
+    [LogFilter]
+    public interface IVipBigPointApi
+    {
+        [HttpGet("/x/vip_point/task/combine")]
+        Task<BiliApiResponse<VipTaskInfo>> GetTaskList();
+
+        [HttpPost("/pgc/activity/score/task/sign")]
+        Task<BiliApiResponse> Sign([FormContent] SignRequest request);
+
+        [HttpPost("/pgc/activity/score/task/receive")]
+        Task<BiliApiResponse> Receive([JsonContent] ReceiveOrCompleteTaskRequest request);
+
+        [HttpPost("/pgc/activity/score/task/complete")]
+        Task<BiliApiResponse> Complete([JsonContent] ReceiveOrCompleteTaskRequest request);
+
+        [HttpPost("/pgc/activity/deliver/task/complete")]
+        Task<BiliApiResponse> ViewComplete([FormContent] ViewRequest request);
+    }
+}

src/Ray.BiliBiliTool.Agent/Extensions/ServiceCollectionExtension.cs

@@ -67,6 +67,8 @@ public static IServiceCollection AddBiliBiliClientApi(this IServiceCollection se
             services.AddBiliBiliClientApi<IVideoApi>("https://api.bilibili.com");
             services.AddBiliBiliClientApi<IVideoWithoutCookieApi>("https://api.bilibili.com", false);
 
+            services.AddBiliBiliClientApi<IVipBigPointApi>("https://api.bilibili.com");
+
             return services;
         }
 

src/Ray.BiliBiliTool.Application.Contracts/IVipBigPointAppService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace Ray.BiliBiliTool.Application.Contracts
+{
+    /// <summary>
+    /// 每日自动任务
+    /// </summary>
+    [Description("VipBigPoint")]
+
+    public interface IVipBigPointAppService : IAppService
+    {
+    }
+}