diff --git a/Controllers/ConfigController.cs b/Controllers/ConfigController.cs index 6644386..6305287 100644 --- a/Controllers/ConfigController.cs +++ b/Controllers/ConfigController.cs @@ -5,6 +5,7 @@ using dy.net.service; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; using static Dm.net.buffer.ByteArrayBuffer; namespace dy.net.Controllers @@ -56,6 +57,10 @@ namespace dy.net.Controllers [HttpPost("add")] public async Task AddAsync([FromBody] DyUserCookies dyUserCookies) { + if(dyUserCookies.UpSecUserIdsJson!=null) + { + dyUserCookies.UpSecUserIds = JsonConvert.SerializeObject( dyUserCookies.UpSecUserIdsJson); + } var result = await dyCookieService.Add(dyUserCookies); if (result) { @@ -71,6 +76,12 @@ namespace dy.net.Controllers [HttpPost("update")] public async Task UpdateAsync([FromBody] DyUserCookies dyUserCookies) { + + if (dyUserCookies.UpSecUserIdsJson != null ) + { + dyUserCookies.UpSecUserIds = JsonConvert.SerializeObject(dyUserCookies.UpSecUserIdsJson); + } + if (dyUserCookies.Id == "0") { dyUserCookies.Id=IdGener.GetLong().ToString(); @@ -140,8 +151,20 @@ namespace dy.net.Controllers private async Task ReStartJob() { var config= commonService.GetConfig(); - if(config!=null) - await quartzJobService.StartJob(config.Cron); + + var cookies = await dyCookieService.GetAllCookies(); + //重置同步状态 + foreach (var cookie in cookies) + { + cookie.CollHasSyncd = 0; + cookie.FavHasSyncd = 0; + cookie.UperSyncd = 0; + await dyCookieService.UpdateAsync(cookie); + } + + if (config!=null) + quartzJobService.StartJob(config.Cron); + //避免前端等待 } } } diff --git a/Program.cs b/Program.cs index 51e5185..bfceaf3 100644 --- a/Program.cs +++ b/Program.cs @@ -238,21 +238,26 @@ namespace dy.net SavePath = "/app/collect", Status = 0, SecUserId = "--", - FavSavePath = "/app/favorite" + FavSavePath = "/app/favorite", + UpSavePath = "/app/uper", }); + + // ʼ var commonService = services.GetRequiredService(); var config = commonService.InitConfig(new AppConfig { Id = IdGener.GetLong().ToString(), Cron = "30", - BatchCount = 10 + BatchCount = 20 }); // ղƵ--ϰ汾-ԭľûֶ commonService.UpdateCollectViedoType(); + commonService.UpdateAllCookieSyncedToZero(); + // ʱ var quartzJobService = services.GetRequiredService(); quartzJobService.StartJob(config?.Cron ?? "30"); diff --git a/app/src/App.vue b/app/src/App.vue index c034e34..fa980da 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -1,6 +1,6 @@ +