diff --git a/Controllers/ConfigController.cs b/Controllers/ConfigController.cs
index a53aed4..60aac53 100644
--- a/Controllers/ConfigController.cs
+++ b/Controllers/ConfigController.cs
@@ -114,6 +114,7 @@ namespace dy.net.Controllers
PageRequestDto dto)
{
var (list, totalCount) = await dyCookieService.GetPagedAsync(dto.PageIndex, dto.PageSize);
+
return ApiResult.Success(new
{
data = list,
@@ -148,29 +149,6 @@ namespace dy.net.Controllers
}
- ///
- /// 新增用户Cookie
- ///
- [HttpPost("add")]
- public async Task AddAsync([FromBody] DouyinCookie dyUserCookies)
- {
-
- var checkCk = await httpClientService.CheckCookie(dyUserCookies);
- if (!checkCk)
- {
- return ApiResult.Fail("Cookie无效,请按照文档提示重新获取有效Cookie,不要使用插件获取cookie");
- }
-
- var result = await dyCookieService.Add(dyUserCookies);
- if (result)
- {
- ReStartJob();
- return ApiResult.Success();
- }
- return ApiResult.Fail("添加失败");
- }
-
-
///
/// 非docker初始化
///
@@ -244,7 +222,7 @@ namespace dy.net.Controllers
/// 更新用户Cookie
///
[HttpPost("update")]
- public async Task UpdateAsync([FromBody] DouyinCookie dyUserCookies)
+ public async Task AddOrUpdateAsync([FromBody] DouyinCookie dyUserCookies)
{
var checkCk = await httpClientService.CheckCookie(dyUserCookies);
if (!checkCk)
diff --git a/Program.cs b/Program.cs
index 216adfc..e7b7f3d 100644
--- a/Program.cs
+++ b/Program.cs
@@ -10,7 +10,7 @@ namespace dy.net
public class Program
{
// 常量定义
- private static string DefaultListenUrl = "http://*:10101";
+ private static readonly string DefaultListenUrl = "http://*:10101";
private const string SpaRootPath = "app/dist";
private const string SpaSourcePath = "app/";
private const string SwaggerDocTitle = "dy.net WebApi Docs";
@@ -18,7 +18,7 @@ namespace dy.net
///
///
///
- public static void Main(string[] args)
+ public static async Task Main(string[] args)
{
// 初始化编码提供器
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -35,10 +35,10 @@ namespace dy.net
ConfigureMiddleware(app, builder.Environment);
Log.Debug($"dy.sync app is started successfully on {DefaultListenUrl}");
// 初始化应用服务
- InitApplicationServices(app, isDevelopment);
+ await InitApplicationServices(app, isDevelopment);
Console.WriteLine();
- app.Run();
+ await app.RunAsync();
}
///
@@ -136,7 +136,7 @@ namespace dy.net
services.AddSqlsugar(dbPath);
// 定时任务
- services.AddQuartzService();
+ services.AddQuartzService(dbPath);
// 仓储和服务注册
services.AddServicesFromNamespace("dy.net.repository")
@@ -201,7 +201,7 @@ namespace dy.net
///
/// 初始化应用服务数据
///
- private static void InitApplicationServices(WebApplication app, bool isDevelopment)
+ private static async Task InitApplicationServices(WebApplication app, bool isDevelopment)
{
using var scope = app.Services.CreateScope();
var services = scope.ServiceProvider;
@@ -230,14 +230,14 @@ namespace dy.net
//Serilog.Log.Debug("isRestart1=" + config.IsFirstRunning);
- if (!isDevelopment)
+ //if (!isDevelopment)
{
- var cookie = cookieService.GetOpendCookies();
+ var cookie = await cookieService.GetOpendCookies();
if (cookie != null && cookie.Any())
{
// 启动定时任务
var quartzJobService = services.GetRequiredService();
- quartzJobService.InitOrReStartAllJobs(config?.Cron <= 0 ? "30" : config.Cron.ToString());
+ await quartzJobService.InitOrReStartAllJobs(config?.Cron <= 0 ? "30" : config.Cron.ToString());
}
}
}
diff --git a/app/src/pages/cok/CookieTable.vue b/app/src/pages/cok/CookieTable.vue
index 2f21e40..a456171 100644
--- a/app/src/pages/cok/CookieTable.vue
+++ b/app/src/pages/cok/CookieTable.vue
@@ -184,6 +184,8 @@ function submit() {
message.success('修改成功,同步任务将在5-10秒按新配置运行...');
reset();
GetRecords();
+ }else{
+ message.success('修改失败,'+res.message);
}
});
})
diff --git a/dy.net.csproj b/dy.net.csproj
index 6e8679e..2a8e25a 100644
--- a/dy.net.csproj
+++ b/dy.net.csproj
@@ -59,11 +59,12 @@
-
+
-
-
+
+
+