diff --git a/src/Midjourney.API/Startup.cs b/src/Midjourney.API/Startup.cs index 00375426..c481a596 100644 --- a/src/Midjourney.API/Startup.cs +++ b/src/Midjourney.API/Startup.cs @@ -63,7 +63,8 @@ public void ConfigureServices(IServiceCollection services) }; DbHelper.SettingStore.Save(setting); - Thread.Sleep(5 * 1000); + // 等待 1s + Thread.Sleep(1 * 1000); } GlobalConfiguration.Setting = setting; diff --git a/src/Midjourney.Infrastructure/GlobalConfiguration.cs b/src/Midjourney.Infrastructure/GlobalConfiguration.cs index 4b899f26..308357fa 100644 --- a/src/Midjourney.Infrastructure/GlobalConfiguration.cs +++ b/src/Midjourney.Infrastructure/GlobalConfiguration.cs @@ -15,7 +15,7 @@ public class GlobalConfiguration /// /// 版本号 /// - public static string Version { get; set; } = "v3.0.0-beta.4"; + public static string Version { get; set; } = "v3.0.0-beta.5"; /// /// 全局配置项 diff --git a/src/Midjourney.Infrastructure/Options/IpRateLimitingOptions.cs b/src/Midjourney.Infrastructure/Options/IpRateLimitingOptions.cs index ff21a099..049a8391 100644 --- a/src/Midjourney.Infrastructure/Options/IpRateLimitingOptions.cs +++ b/src/Midjourney.Infrastructure/Options/IpRateLimitingOptions.cs @@ -1,4 +1,5 @@ -using System.Net; +using LiteDB; +using System.Net; namespace Midjourney.Infrastructure.Options { @@ -20,13 +21,23 @@ public class IpRateLimitingOptions /// /// 白名单 IP 网络 /// + [BsonIgnore] + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] public List WhitelistNetworks { get { - // 格式化白名单 - // 如果没有 / , 则默认为 /32 - return Whitelist.Select(ip => !ip.Contains("/") ? IPNetwork2.Parse(ip + "/32") : IPNetwork2.Parse(ip)).ToList(); + try + { + // 格式化白名单 + // 如果没有 / , 则默认为 /32 + return Whitelist.Select(ip => !ip.Contains("/") ? IPNetwork2.Parse(ip + "/32") : IPNetwork2.Parse(ip)).ToList(); + } + catch + { + } + return new List(); } } @@ -38,12 +49,23 @@ public List WhitelistNetworks /// /// 黑名单 IP 网络 /// + [BsonIgnore] + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] public List BlacklistNetworks { get { - // 格式化黑名单 - return Blacklist.Select(ip => IPNetwork2.Parse(ip + "/32")).ToList(); + try + { + // 格式化黑名单 + return Blacklist.Select(ip => IPNetwork2.Parse(ip + "/32")).ToList(); + } + catch + { + } + + return new List(); } }