diff --git a/src/AgileConfig.Server.Apisite/Controllers/api/ConfigController.cs b/src/AgileConfig.Server.Apisite/Controllers/api/ConfigController.cs index c4ed1ebe..6b105fc2 100644 --- a/src/AgileConfig.Server.Apisite/Controllers/api/ConfigController.cs +++ b/src/AgileConfig.Server.Apisite/Controllers/api/ConfigController.cs @@ -88,7 +88,7 @@ public async Task>> GetAppConfig(string appId, [F /// [TypeFilter(typeof(AdmBasicAuthenticationAttribute))] [HttpGet()] - public async Task>> GetConfigs(string appId, [FromQuery] EnvString env) + public async Task>> GetConfigs(string appId, EnvString env) { ArgumentException.ThrowIfNullOrEmpty(appId); @@ -105,7 +105,7 @@ public async Task>> GetConfigs(string appId, [Fro /// [TypeFilter(typeof(AdmBasicAuthenticationAttribute))] [HttpGet("{id}")] - public async Task> GetConfig(string id, [FromQuery] EnvString env) + public async Task> GetConfig(string id, EnvString env) { ArgumentException.ThrowIfNullOrEmpty(id); diff --git a/src/AgileConfig.Server.Apisite/InitService.cs b/src/AgileConfig.Server.Apisite/InitService.cs index 4d17fa96..bfc7ebaf 100644 --- a/src/AgileConfig.Server.Apisite/InitService.cs +++ b/src/AgileConfig.Server.Apisite/InitService.cs @@ -40,9 +40,10 @@ public InitService(IServiceScopeFactory serviceScopeFactory, public async Task StartAsync(CancellationToken cancellationToken) { + _systemInitializationService.TryInitDefaultEnvironment();//init DEV TEST STAGE PROD + if (Appsettings.IsAdminConsoleMode) { - _systemInitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD _systemInitializationService.TryInitJwtSecret();//初始化 jwt secret _systemInitializationService.TryInitSaPassword(); // init super admin password _systemInitializationService.TryInitDefaultApp(); diff --git a/src/AgileConfig.Server.Apisite/appsettings.Development.json b/src/AgileConfig.Server.Apisite/appsettings.Development.json index 4b460814..33aee0a9 100644 --- a/src/AgileConfig.Server.Apisite/appsettings.Development.json +++ b/src/AgileConfig.Server.Apisite/appsettings.Development.json @@ -30,7 +30,7 @@ "serviceUnhealthInterval": 30, // 判断服务不健康的间隔,超出这个时间没响应过则认为不健康,单位:秒 "removeServiceInterval": 0, // 如果一个服务超出这个时间没有响应,则直接移除这个服务,单位:秒;如果设定为 <= 0,则不会移除,默认 0 。 "pathBase": "", //使用反向代理的时候,或许需要修改这个值 /xxx 必须/开头 - "adminConsole": true, + "adminConsole": false, "saPassword": "123456", //super admin 的密码 "defaultApp": "myapp", // 默认应用,每次重启都会尝试新建 "cluster": false, // 集群模式:服务启动后自动加入节点列表,服务启动的时候会获取容器的ip,端口默认5000,适合 docker compose 环境使用 diff --git a/src/AgileConfig.Server.Service/SystemInitializationService.cs b/src/AgileConfig.Server.Service/SystemInitializationService.cs index 5468cd52..f409ae76 100644 --- a/src/AgileConfig.Server.Service/SystemInitializationService.cs +++ b/src/AgileConfig.Server.Service/SystemInitializationService.cs @@ -62,7 +62,14 @@ public bool TryInitDefaultEnvironment() Value = envArrayString, CreateTime = DateTime.Now }; - sysInitRepository.SaveInitSetting(setting); + try + { + sysInitRepository.SaveInitSetting(setting); + } + catch (Exception e) + { + logger.LogError("TryInitDefaultEnvironment error, maybe exec this saveing action in parallel on another node."); + } } ISettingService.EnvironmentList = envArrayString.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);