diff --git a/src/AgileConfig.Server.Apisite/InitService.cs b/src/AgileConfig.Server.Apisite/InitService.cs index 66458a97..ca02c32d 100644 --- a/src/AgileConfig.Server.Apisite/InitService.cs +++ b/src/AgileConfig.Server.Apisite/InitService.cs @@ -41,7 +41,7 @@ public async Task StartAsync(CancellationToken cancellationToken) { if (Appsettings.IsAdminConsoleMode) { - await _systemInitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + _systemInitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD _systemInitializationService.TryInitJwtSecret();//初始化 jwt secret _ = _remoteServerNodeProxy.TestEchoAsync();//开启节点检测 _ = _serviceHealthCheckService.StartCheckAsync();//开启服务健康检测 @@ -54,8 +54,8 @@ public async Task StartAsync(CancellationToken cancellationToken) var ip = GetIp(); if (!string.IsNullOrEmpty(ip)) { - var desc = Appsettings.IsAdminConsoleMode ? "控制台节点" : ""; - _ = _serverNodeService.JoinAsync(ip, 5000, desc); + var desc = Appsettings.IsAdminConsoleMode ? "Console node" : ""; + await _serverNodeService.JoinAsync(ip, 5000, desc); _logger.LogInformation($"AgileConfig node http://{ip}:5000 joined ."); } } diff --git a/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs b/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs index 97feba36..3d98a6d0 100644 --- a/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs +++ b/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs @@ -14,7 +14,7 @@ public interface ISysInitRepository /// get default environment from db /// /// - Task GetDefaultEnvironmentAsync(); + string? GetDefaultEnvironmentFromDb(); /// /// save initialization setting diff --git a/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs index 5638f507..b83ca1c8 100644 --- a/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs +++ b/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs @@ -14,10 +14,11 @@ public SysInitRepository(IFreeSqlFactory freeSqlFactory) this.freeSqlFactory = freeSqlFactory; } - public async Task GetDefaultEnvironmentAsync() + public string? GetDefaultEnvironmentFromDb() { - var setting = await freeSqlFactory.Create().Select().Where(x => x.Id == SystemSettings.DefaultEnvironmentKey) - .ToOneAsync(); + var setting = freeSqlFactory.Create().Select().Where(x => x.Id == SystemSettings.DefaultEnvironmentKey) + .ToOne(); + return setting?.Value; } @@ -25,6 +26,7 @@ public SysInitRepository(IFreeSqlFactory freeSqlFactory) { var setting = freeSqlFactory.Create().Select().Where(x => x.Id == SystemSettings.DefaultJwtSecretKey) .ToOne(); + return setting?.Value; } diff --git a/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs index 31aff54b..8f74d99b 100644 --- a/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs +++ b/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs @@ -13,17 +13,18 @@ public SysInitRepository(IConfiguration configuration) private MongodbAccess _access => new MongodbAccess(_configuration["db:conn"]); private readonly IConfiguration _configuration; - public Task GetDefaultEnvironmentAsync() + public string? GetDefaultEnvironmentFromDb() { var setting = _access.MongoQueryable.FirstOrDefault(x => x.Id == SystemSettings.DefaultEnvironmentKey); var val = setting?.Value; - return Task.FromResult(val); + return val; } public string? GetJwtTokenSecret() { var setting = _access.MongoQueryable.FirstOrDefault(x => x.Id == SystemSettings.DefaultJwtSecretKey); + return setting?.Value; } diff --git a/src/AgileConfig.Server.IService/ISystemInitializationService.cs b/src/AgileConfig.Server.IService/ISystemInitializationService.cs index 0016056d..314b0319 100644 --- a/src/AgileConfig.Server.IService/ISystemInitializationService.cs +++ b/src/AgileConfig.Server.IService/ISystemInitializationService.cs @@ -6,5 +6,5 @@ public interface ISystemInitializationService { bool TryInitJwtSecret(); - Task TryInitDefaultEnvironmentAsync(); + bool TryInitDefaultEnvironment(); } \ No newline at end of file diff --git a/src/AgileConfig.Server.Service/ServerNodeService.cs b/src/AgileConfig.Server.Service/ServerNodeService.cs index 37833726..8fe6d8c4 100644 --- a/src/AgileConfig.Server.Service/ServerNodeService.cs +++ b/src/AgileConfig.Server.Service/ServerNodeService.cs @@ -115,12 +115,7 @@ public async Task JoinAsync(string ip, int port, string desc) var nodes = await _serverNodeRepository.QueryAsync(x => x.Id == address); if (nodes.Count > 0) { - nodes.ForEach(n => - { - n.Id = address; - n.Remark = desc; - n.Status = NodeStatus.Online; - }); + // if already there, noting to do } else { diff --git a/src/AgileConfig.Server.Service/SystemInitializationService.cs b/src/AgileConfig.Server.Service/SystemInitializationService.cs index 01283192..fb61c926 100644 --- a/src/AgileConfig.Server.Service/SystemInitializationService.cs +++ b/src/AgileConfig.Server.Service/SystemInitializationService.cs @@ -47,15 +47,16 @@ public bool TryInitJwtSecret() return true; } - public async Task TryInitDefaultEnvironmentAsync() + public bool TryInitDefaultEnvironment() { - var envArrayString = await sysInitRepository.GetDefaultEnvironmentAsync(); + var envArrayString = sysInitRepository.GetDefaultEnvironmentFromDb(); if (envArrayString == null) { + envArrayString = SystemSettings.DefaultEnvironment; var setting = new Setting { Id = SystemSettings.DefaultEnvironmentKey, - Value = SystemSettings.DefaultEnvironment, + Value = envArrayString, CreateTime = DateTime.Now }; sysInitRepository.SaveInitSetting(setting); diff --git a/test/AgileConfig.Server.ServiceTests/mysql/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/mysql/AppServiceTests.cs index d4721c9b..b1de2bed 100644 --- a/test/AgileConfig.Server.ServiceTests/mysql/AppServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/mysql/AppServiceTests.cs @@ -7,6 +7,7 @@ namespace AgileConfig.Server.ServiceTests.mysql { + [TestClass] public class AppServiceTests_mysql : AppServiceTests { static MySqlContainer _container = new MySqlBuilder().WithImage("mysql:8.0").Build(); diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs index 6655acab..c4d60466 100644 --- a/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs @@ -63,7 +63,7 @@ public async Task TestInitialize() _serviceProvider = services.BuildServiceProvider(); var systeminitializationService = _serviceProvider.GetService(); - systeminitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD systeminitializationService.TryInitJwtSecret();//初始化 jwt secret diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs index bb0adc29..19c52ff8 100644 --- a/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs @@ -64,7 +64,7 @@ public async Task TestInitialize() _serviceProvider = services.BuildServiceProvider(); var systeminitializationService = _serviceProvider.GetService(); - systeminitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD systeminitializationService.TryInitJwtSecret();//初始化 jwt secret diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/ServerNodeServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/ServerNodeServiceTests.cs index 9703a34c..a5d26c03 100644 --- a/test/AgileConfig.Server.ServiceTests/sqlite/ServerNodeServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/sqlite/ServerNodeServiceTests.cs @@ -62,7 +62,7 @@ public async Task TestInitialize() _serviceProvider = services.BuildServiceProvider(); var systeminitializationService = _serviceProvider.GetService(); - systeminitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD systeminitializationService.TryInitJwtSecret();//初始化 jwt secret diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs index ed6c18a4..c487dbc6 100644 --- a/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs @@ -65,7 +65,7 @@ public async Task TestInitialize() _serviceProvider = services.BuildServiceProvider(); var systeminitializationService = _serviceProvider.GetService(); - systeminitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD systeminitializationService.TryInitJwtSecret();//初始化 jwt secret diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs index 63f36978..4be2f429 100644 --- a/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs +++ b/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs @@ -66,7 +66,7 @@ public async Task TestInitialize() _serviceProvider = services.BuildServiceProvider(); var systeminitializationService = _serviceProvider.GetService(); - systeminitializationService.TryInitDefaultEnvironmentAsync();//初始化环境 DEV TEST STAGE PROD + systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD systeminitializationService.TryInitJwtSecret();//初始化 jwt secret