diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs index a3bb05fd6..24f9703c9 100644 --- a/IRaCIS.Core.API/Program.cs +++ b/IRaCIS.Core.API/Program.cs @@ -52,29 +52,27 @@ namespace IRaCIS.Core.API .Build(); + //// Serilog + SerilogExtension.AddSerilogSetup(enviromentName, host.Services); + Log.Logger.Warning($"当前环境:{enviromentName}"); + + NewId.SetProcessIdProvider(new CurrentProcessIdProvider()); - - - - //// Serilog - SerilogExtension.AddSerilogSetup(enviromentName, host.Services); - //缓存项目的状态 匿名化数据 await InitCache(host); - WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "en-US.json") ); + WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, StaticData.En_US_Json) ); - WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "zh-CN.json")); + WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, StaticData.Zh_CN_Json)); host.Run(); - Log.Logger.Warning($"当前环境:{enviromentName}"); } catch (Exception e) @@ -83,46 +81,6 @@ namespace IRaCIS.Core.API Log.Logger.Error(e.InnerException is null ? e.Message + e.StackTrace : e.InnerException?.Message + e.InnerException?.StackTrace); } - - - #region Nlog 废弃 - //var logger = NLog.Web.NLogBuilder.ConfigureNLog("NLog.config").GetCurrentClassLogger(); - //try - //{ - // var ihostBuilder = CreateHostBuilder(args); - - // ihostBuilder.UseEnvironment(environment); - - // ihostBuilder.ConfigureAppConfiguration((hostContext, config) => - // { - - // //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName); - // config.AddJsonFile("appsettings.json", false, true) - // .AddJsonFile($"appsettings.{environment}.json", false, true); - // }); - - // var host = ihostBuilder.Build(); - - // CacheTrialStatus(host); - - // host.Run(); - - //} - //catch (Exception exception) - //{ - // //NLog: catch setup errors - // logger.Error(exception, "Stopped program because of exception"); - //} - //finally - //{ - // // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux) - // NLog.LogManager.Shutdown(); - //} - - #endregion - - - } public static IHostBuilder CreateHostBuilder(string[] args) => @@ -141,17 +99,8 @@ namespace IRaCIS.Core.API //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合 webBuilder.UseStartup(); }).UseSerilog() - .UseServiceProviderFactory(new AutofacServiceProviderFactory());//使用Autofac替代本身容器 - //ConfigureLogging(logging => - //{ - // logging.ClearProviders(); - // logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); - //}) - //.UseNLog() - // NLog: Setup NLog for Dependency injection; - - - + .UseServiceProviderFactory(new AutofacServiceProviderFactory()); + private static async Task InitCache(IHost host) { @@ -176,7 +125,7 @@ namespace IRaCIS.Core.API foreach (IConfigurationSection section in enConfiguration.GetChildren()) { - if (filePath.Contains("en-US.json") ) + if (filePath.Contains(StaticData.En_US_Json) ) { StaticData.En_US_Dic[section.Key] = section.Value; @@ -195,11 +144,13 @@ namespace IRaCIS.Core.API } public static void WatchJsonFile(string filePath) { + LoadJsonFile(filePath); + + FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath)); watcher.Changed += (sender, e) => LoadJsonFile(filePath); watcher.EnableRaisingEvents = true; - LoadJsonFile(filePath); } } diff --git a/IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs index f4af9e13a..f0740dbbf 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs @@ -36,10 +36,10 @@ namespace IRaCIS.Core.API config.WriteTo.Email(new EmailConnectionInfo() { EmailSubject = "绯荤粺璀﹀憡,璇烽熼熸煡鐪!",//閭欢鏍囬 - FromEmail = "iracis_grr@163.com",//鍙戜欢浜洪偖绠 - MailServer = "smtp.163.com",//smtp鏈嶅姟鍣ㄥ湴鍧 - NetworkCredentials = new NetworkCredential("iracis_grr@163.com", "XLWVQKZAEKLDWOAH"),//涓や釜鍙傛暟鍒嗗埆鏄彂浠朵汉閭涓庡鎴风鎺堟潈鐮 - Port = 25,//绔彛鍙 + FromEmail = "test@extimaging.com",//鍙戜欢浜洪偖绠 + MailServer = "smtp.qiye.aliyun.com",//smtp鏈嶅姟鍣ㄥ湴鍧 + NetworkCredentials = new NetworkCredential("test@extimaging.com", "SHzyyl2021"),//涓や釜鍙傛暟鍒嗗埆鏄彂浠朵汉閭涓庡鎴风鎺堟潈鐮 + Port = 465,//绔彛鍙 ToEmail = "872297557@qq.com"//鏀朵欢浜 }, restrictedToMinimumLevel: LogEventLevel.Error, outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [ {Level} {ClientIp} {ClientAgent} {TokenUserRealName} {TokenUserType} ] || [path: {RequestPath} arguments: {RequestBody}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine})"); diff --git a/IRaCIS.Core.Domain/_Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs index a6d0b10a6..c77d20da2 100644 --- a/IRaCIS.Core.Domain/_Config/_StaticData.cs +++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs @@ -1,4 +1,6 @@ -锘縰sing System.Collections.Generic; +锘縰sing System; +using System.Collections.Generic; +using System.IO; namespace IRaCIS.Core.Domain.Share; @@ -10,6 +12,12 @@ public static class StaticData public static Dictionary Zh_CN_Dic = new Dictionary(); + public static readonly string En_US_Json = "en-US.json"; + public static readonly string Zh_CN_Json = "zh-CN.json"; + + + + #region 瀛楀吀琛ㄩ」鍥哄畾鍊 public static readonly string Title = "Title";