From 5ddf3557999e5f7d0519dc8e0adab4443ea8b4aa Mon Sep 17 00:00:00 2001 From: ShaoHua <345265198@qq.com> Date: Sat, 22 Apr 2023 23:50:34 +0800 Subject: [PATCH] add description in english --- Hua.DDNS/Common/Config/Options/AppOption.cs | 7 ++++++ .../Common/Config/Options/DomainOption.cs | 23 ++++++----------- Hua.DDNS/Common/Config/SettingProvider.cs | 8 +++++- Hua.DDNS/Jobs/AppJob.cs | 2 +- Hua.DDNS/Start/Cache.cs | 4 +-- Hua.DDNS/Start/Program.cs | 25 +++++++++++++------ 6 files changed, 42 insertions(+), 27 deletions(-) diff --git a/Hua.DDNS/Common/Config/Options/AppOption.cs b/Hua.DDNS/Common/Config/Options/AppOption.cs index 9565706..4efe455 100644 --- a/Hua.DDNS/Common/Config/Options/AppOption.cs +++ b/Hua.DDNS/Common/Config/Options/AppOption.cs @@ -1,8 +1,15 @@ namespace Hua.DDNS.Common.Config.Options { + /// + /// app configuration class + /// public class AppOption { + + /// + /// domain configuration + /// public DomainOption Domain { get; set; } } } diff --git a/Hua.DDNS/Common/Config/Options/DomainOption.cs b/Hua.DDNS/Common/Config/Options/DomainOption.cs index 622d980..02594a6 100644 --- a/Hua.DDNS/Common/Config/Options/DomainOption.cs +++ b/Hua.DDNS/Common/Config/Options/DomainOption.cs @@ -6,17 +6,18 @@ using System.Threading.Tasks; namespace Hua.DDNS.Common.Config.Options { - - + /// + /// domain configuration class + /// public class DomainOption { /// - /// 平台 + /// platform from [Ali,Tencent] /// public string Platform { get; set; } /// - /// Id + /// Id, the id and key from AliCould or DnsPod /// public string Id { get; set; } @@ -26,25 +27,15 @@ namespace Hua.DDNS.Common.Config.Options public string Key { get; set; } /// - /// 域名 + /// domain /// public string domain { get; set; } /// - /// 子域列表 + /// sub domain, eg. www,git /// public string[] subDomainArray { get; set; } - - /// - /// 解析记录类型 - /// - public string type { get; set; } - - /// - /// 间隔时间 秒 - /// - public string time { get; set; } } } diff --git a/Hua.DDNS/Common/Config/SettingProvider.cs b/Hua.DDNS/Common/Config/SettingProvider.cs index 35dfaa6..52a053f 100644 --- a/Hua.DDNS/Common/Config/SettingProvider.cs +++ b/Hua.DDNS/Common/Config/SettingProvider.cs @@ -2,13 +2,19 @@ namespace Hua.DDNS.Common.Config { + + /// + /// this is a strongly-typed configuration provider + /// public class SettingProvider { private readonly AppOption _app; + private readonly IConfiguration _configuration; public SettingProvider(IConfiguration configuration) { + _configuration = configuration; _app = new AppOption(); - configuration.GetSection("App").Bind(_app); + _configuration.GetSection("App").Bind(_app); } public AppOption App => _app; diff --git a/Hua.DDNS/Jobs/AppJob.cs b/Hua.DDNS/Jobs/AppJob.cs index e409cf8..3f84c45 100644 --- a/Hua.DDNS/Jobs/AppJob.cs +++ b/Hua.DDNS/Jobs/AppJob.cs @@ -122,7 +122,7 @@ namespace Hua.DDNS.Jobs Type = aliDomainRecord.Type, Value = CurrentIpv4Address, }); - _logger.LogInformation($"更新域名解析记录{aliDomainRecord.Value} To {CurrentIpv4Address}"); + _logger.LogInformation($"Update SubDomain[{aliDomainRecord.RR}.{aliDomainRecord.DomainName}] Value {aliDomainRecord.Value} To {CurrentIpv4Address}"); } break; } diff --git a/Hua.DDNS/Start/Cache.cs b/Hua.DDNS/Start/Cache.cs index 0a15c41..d06fe11 100644 --- a/Hua.DDNS/Start/Cache.cs +++ b/Hua.DDNS/Start/Cache.cs @@ -3,9 +3,9 @@ public class Cache { /// - /// Tocken + /// Token /// - public static string Tocken { get; set; } = null; + public static string? Token { get; set; } = null; } } diff --git a/Hua.DDNS/Start/Program.cs b/Hua.DDNS/Start/Program.cs index a88df73..1527f42 100644 --- a/Hua.DDNS/Start/Program.cs +++ b/Hua.DDNS/Start/Program.cs @@ -1,9 +1,11 @@ +using System.Configuration; using Hua.DDNS.Common; using Hua.DDNS.Common.Config; using Hua.DDNS.Common.Http; using Hua.DDNS.Jobs; using Quartz; using Serilog; +using Serilog.Extensions.Logging; namespace Hua.DDNS.Start { @@ -11,6 +13,14 @@ namespace Hua.DDNS.Start { public static async Task Main(string[] args) { + Log.Logger = new LoggerConfiguration() + .Enrich.FromLogContext() + .WriteTo.Console() + .WriteTo.File( + Path.Combine("Log\\log-.log"), + rollingInterval: RollingInterval.Day) + .CreateLogger(); + await CreateHostBuilder(args).Build().RunAsync(); } @@ -18,15 +28,16 @@ namespace Hua.DDNS.Start Host.CreateDefaultBuilder(args) .UseWindowsService() .UseSerilog() + .ConfigureAppConfiguration((context, config) => + { + // clear all config provider + config.Sources.Clear(); + config + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile($"appsettings.{context.HostingEnvironment.EnvironmentName}.json", optional: true, reloadOnChange: true); + }) .ConfigureServices((hostContext, services) => { - Log.Logger = new LoggerConfiguration() - .Enrich.FromLogContext() - .WriteTo.Console() - .WriteTo.File( - Path.Combine("Log\\log-.log"), - rollingInterval: RollingInterval.Day) - .CreateLogger(); ConfigDi(hostContext, services); ConfigQuartz(hostContext, services); });