nanxun/douyin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉大量多余的配置

Browse Source
This commit is contained in:
jianzhichu
2026-01-22 13:26:55 +08:00
parent eb0769d595
commit a8c3201c1d
27 changed files with 212 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/DouyinCommonService.cs
+12 -12
View File
@@ -50,7 +50,7 @@ namespace dy.net.service
BatchCount = 18,
LogKeepDay = 7,
//UperSaveTogether = false,//博主视频：true-->每个视频单独一个文件夹 false-->所有视频放在同一个文件夹
UperUseViedoTitle = false,//博主视频：true-->使用视频标题作为文件名 false-->使用视频id作为文件名
//UperUseViedoTitle = false,//博主视频：true-->使用视频标题作为文件名 false-->使用视频id作为文件名
DownImageVideo = true,//默认下载图文视频
DownMp3 = false,
DownImage = false,
@@ -111,18 +111,18 @@ namespace dy.net.service
/// 重置所有Cookie的同步状态为0
/// </summary>
/// <returns></returns>
public bool UpdateAllCookieSyncedToZero()
{
//public bool UpdateAllCookieSyncedToZero()
//{
var cookies = sqlSugarClient.Queryable<DouyinCookie>().ToList();
foreach (var cookie in cookies)
{
cookie.CollHasSyncd = 0;
cookie.FavHasSyncd = 0;
cookie.UperSyncd = 0;
}
return sqlSugarClient.Updateable(cookies).ExecuteCommand() > 0;
}
// var cookies = sqlSugarClient.Queryable<DouyinCookie>().ToList();
// foreach (var cookie in cookies)
// {
// cookie.CollHasSyncd = 0;
// cookie.FavHasSyncd = 0;
// cookie.UperSyncd = 0;
// }
// return sqlSugarClient.Updateable(cookies).ExecuteCommand() > 0;
//}
/// <summary>
/// 查询是否已删除
service/DouyinCookieService.cs
+15 -15
View File
@@ -61,9 +61,9 @@ namespace dy.net.service
FavSavePath = "/app/favorite",
UpSavePath = "/app/uper",
//ImgSavePath="/app/images",
CollHasSyncd = 0,
FavHasSyncd = 0,
UperSyncd = 0,
//CollHasSyncd = 0,
//FavHasSyncd = 0,
//UperSyncd = 0,
MyUserId=""
};
return _cookieRepository.Insert(cookie);
@@ -111,19 +111,19 @@ namespace dy.net.service
/// 将所有同步类型的同步状态改为已同步，这样，之后就不会再扫描所有接口数据，只会读取最新一页的数据了
/// </summary>
/// <returns></returns>
public async Task<bool> SetOnlySyncNew()
{
var cks= await _cookieRepository.GetAllAsync();
//public async Task<bool> SetOnlySyncNew()
//{
// var cks= await _cookieRepository.GetAllAsync();
foreach (var item in cks)
{
item.CollHasSyncd = 1;
item.FavHasSyncd = 1;
item.UperSyncd = 1;
}
var d= await _cookieRepository.UpdateRangeAsync(cks);
return d>0;
}
// foreach (var item in cks)
// {
// item.CollHasSyncd = 1;
// item.FavHasSyncd = 1;
// item.UperSyncd = 1;
// }
// var d= await _cookieRepository.UpdateRangeAsync(cks);
// return d>0;
//}
}
}
service/DouyinQuartzJobService.cs
+19 -8
View File
@@ -99,8 +99,9 @@ namespace dy.net.service
/// 启动所有抖音相关定时任务（所有任务独立执行）
/// </summary>
/// <param name="expression">Cron表达式或间隔分钟数（所有任务使用相同的执行频率）</param>
/// <param name="isRestart"></param>
/// <returns>是否启动成功</returns>
public async Task<bool> InitOrReStartAllJobs(string expression)
public async Task<bool> InitOrReStartAllJobs(string expression,bool isRestart=false)
{
if (string.IsNullOrWhiteSpace(expression))
{
@@ -116,13 +117,15 @@ namespace dy.net.service
await RemoveAllExistingJobs(scheduler);
// 遍历启动所有任务（独立执行，无顺序依赖）
var allJobKeys = JobConfigs.Keys.Where(k => k != "follow_user_once").ToList(); // 排除单次执行的任务
foreach (var jobKey in allJobKeys)
// 统一生成任务列表
var jobKeys = isRestart
? JobConfigs.Keys.Where(k => k != "follow_user_once").ToList()
: JobConfigs.Keys.Where(k => k != "follow_user_once" && k != "follow_user").ToList();
// 执行任务启动逻辑
foreach (var jobKey in jobKeys)
{
if (jobKey == "follow_user")
{
expression = "60";
}
if (jobKey == "follow_user") expression = "60";
var startSuccess = await StartJobAsync(jobKey, expression);
if (startSuccess)
{
@@ -133,8 +136,16 @@ namespace dy.net.service
Log.Error($"启动任务失败：{jobKey}");
}
}
// 补充日志和单次任务
if (isRestart)
{
Log.Information($"共启动 {jobKeys.Count} 个定时任务");
}
else
{
await StartOneTimeJobAsync("follow_user_once");
}
Log.Information($"共启动 {allJobKeys.Count} 个定时任务，执行频率：{expression}");
//await StartJobAsync(VideoTypeEnum.dy_custom_collect.GetDesc(), expression);
service/DouyinVideoService.cs
+31 -31
View File
@@ -328,39 +328,39 @@ namespace dy.net.service
}
}
var CookieIds = reDownList.Select(x => x.CookieId).Distinct();
foreach (var ck in CookieIds)
{
var cookie = douyinCookieRepository.GetById(ck);
if (cookie == null)
continue;
var viedoTypes = videos.Where(x => x.CookieId == ck).Select(x => x.ViedoType).Distinct();
//var CookieIds = reDownList.Select(x => x.CookieId).Distinct();
//foreach (var ck in CookieIds)
//{
// var cookie = douyinCookieRepository.GetById(ck);
// if (cookie == null)
// continue;
// var viedoTypes = videos.Where(x => x.CookieId == ck).Select(x => x.ViedoType).Distinct();
if (viedoTypes != null && viedoTypes.Any())
{
foreach (VideoTypeEnum item in viedoTypes)
{
switch (item)
{
case VideoTypeEnum.dy_favorite:
cookie.FavHasSyncd = 0;
break;
case VideoTypeEnum.dy_collects:
cookie.CollHasSyncd = 0;
break;
case VideoTypeEnum.dy_follows:
cookie.UperSyncd = 0;
break;
case VideoTypeEnum.ImageVideo:
break;
default:
break;
}
}
}
await douyinCookieRepository.UpdateAsync(cookie);
// //if (viedoTypes != null && viedoTypes.Any())
// //{
// // foreach (VideoTypeEnum item in viedoTypes)
// // {
// // switch (item)
// // {
// // case VideoTypeEnum.dy_favorite:
// // cookie.FavHasSyncd = 0;
// // break;
// // case VideoTypeEnum.dy_collects:
// // cookie.CollHasSyncd = 0;
// // break;
// // case VideoTypeEnum.dy_follows:
// // cookie.UperSyncd = 0;
// // break;
// // case VideoTypeEnum.ImageVideo:
// // break;
// // default:
// // break;
// // }
// // }
// //}
// await douyinCookieRepository.UpdateAsync(cookie);
}
//}
if (!forever)
Serilog.Log.Debug("重新下载视频流程执行完成：成功创建{0}条重新下载记录，删除{1}个文件,等待重新下载...", reDownList.Count, filePathsToDelete.Count);
return true;