Merge branch 'release/0.4.1'

RayWangQvQ · Feb 9, 2023 · 5406f20 · 5406f20
2 parents a2803da + 31bc73e
commit 5406f20
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/docker/scripts/entry.sh b/docker/scripts/entry.sh
@@ -15,7 +15,7 @@ echo -e "=>完成\n"
 echo "[step 2/4]配置cron定时任务"
 echo "SHELL=/bin/bash" >$CRON_FILE
 echo "BASH_ENV=/etc/cron.env" >>$CRON_FILE
-if [ -z "$Ray_LiveLotteryTaskConfig__Cron$Ray_UnfollowBatchedTaskConfig__Cron$Ray_VipBigPointConfig__Cron$Ray_LiveFansMedalTaskConfig__Cron" ]; then
+if [ -z "$Ray_DailyTaskConfig__Cron$Ray_LiveLotteryTaskConfig__Cron$Ray_UnfollowBatchedTaskConfig__Cron$Ray_VipBigPointConfig__Cron$Ray_LiveFansMedalTaskConfig__Cron" ]; then
 	echo "=>使用默认的定时任务配置"
 	cat /app/scripts/crontab >>$CRON_FILE
 else

diff --git a/src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/IVideoApi.cs b/src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/IVideoApi.cs
@@ -59,6 +59,20 @@ public interface IVideoApi : IBiliBiliApi
         [HttpGet("/x/web-interface/archive/coins")]
         Task<BiliApiResponse<DonatedCoinsForVideo>> GetDonatedCoinsForVideo(GetAlreadyDonatedCoinsRequest request);
         #endregion
+
+        /// <summary>
+        /// 搜索指定Up的视频列表
+        /// </summary>
+        /// <param name="upId"></param>
+        /// <param name="pageSize">[1,100]验证不通过接口会报异常</param>
+        /// <param name="pageNumber"></param>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+        [Header("Referer", "https://www.bilibili.com/")]
+        [Header("Origin", "https://space.bilibili.com")]
+        [HttpGet("/x/space/wbi/arc/search?mid={upId}&ps={pageSize}&tid=0&pn={pageNumber}&keyword={keyword}&order=pubdate&jsonp=jsonp")]
+        Task<BiliApiResponse<SearchUpVideosResponse>> SearchVideosByUpId(long upId, int pageSize = 30, int pageNumber = 1, string keyword = "");
+
     }
 
     /// <summary>
@@ -95,18 +109,6 @@ public interface IVideoWithoutCookieApi : IVideoApi
         [HttpGet("/x/web-interface/ranking/v2?rid=0&type=all")]
         Task<BiliApiResponse<Ranking>> GetRegionRankingVideosV2();
 
-        /// <summary>
-        /// 搜索指定Up的视频列表
-        /// </summary>
-        /// <param name="upId"></param>
-        /// <param name="pageSize">[1,100]验证不通过接口会报异常</param>
-        /// <param name="pageNumber"></param>
-        /// <param name="keyword"></param>
-        /// <returns></returns>
-        [Header("Referer", "https://www.bilibili.com/")]
-        [Header("Origin", "https://space.bilibili.com")]
-        [HttpGet("/x/space/arc/search?mid={upId}&ps={pageSize}&tid=0&pn={pageNumber}&keyword={keyword}&order=pubdate&jsonp=jsonp")]
-        Task<BiliApiResponse<SearchUpVideosResponse>> SearchVideosByUpId(long upId, int pageSize = 30, int pageNumber = 1, string keyword = "");
 
     }
 }
diff --git a/src/Ray.BiliBiliTool.DomainService/VideoDomainService.cs b/src/Ray.BiliBiliTool.DomainService/VideoDomainService.cs
@@ -77,7 +77,7 @@ public UpVideoInfo GetRandomVideoOfUp(long upId, int total)
             if (total <= 0) return null;
 
             int pageNum = new Random().Next(1, total + 1);
-            BiliApiResponse<SearchUpVideosResponse> re = _videoWithoutCookieApi.SearchVideosByUpId(upId, 1, pageNum).GetAwaiter().GetResult();
+            BiliApiResponse<SearchUpVideosResponse> re = _videoApi.SearchVideosByUpId(upId, 1, pageNum).GetAwaiter().GetResult();
 
             if (re.Code != 0)
             {
@@ -94,7 +94,7 @@ public UpVideoInfo GetRandomVideoOfUp(long upId, int total)
         /// <returns></returns>
         public int GetVideoCountOfUp(long upId)
         {
-            BiliApiResponse<SearchUpVideosResponse> re = _videoWithoutCookieApi.SearchVideosByUpId(upId)
+            BiliApiResponse<SearchUpVideosResponse> re = _videoApi.SearchVideosByUpId(upId)
                 .GetAwaiter().GetResult();
             if (re.Code != 0)
             {