From 3178d447451d65911393b365e5e38bd85cbb9387 Mon Sep 17 00:00:00 2001 From: Mayue Date: Mon, 8 May 2023 14:09:44 +0800 Subject: [PATCH] refactor:remove stack name and rename GetAllUINames to GetUIDomainPairs --- .../MasaStackConfigExtensions.cs | 5 ++--- .../MasaStackConfigTest.cs | 2 +- .../Masa.Contrib.StackSdks.Config.Tests/appsettings.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs index 260d1cbb7..bf31f3687 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs @@ -104,18 +104,17 @@ public static string GetSsoDomain(this IMasaStackConfig masaStackConfig) return GetDomain(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SSO); } - public static IEnumerable<(string, string, string)> GetAllUINames(this IMasaStackConfig masaStackConfig) + public static IEnumerable> GetUIDomainPairs(this IMasaStackConfig masaStackConfig) { foreach (var web in GetAllWeb(masaStackConfig)) { var id = web["id"]?.ToString() ?? ""; - var name = web["name"]?.ToString() ?? ""; var domain = web["domain"]?.ToString() ?? ""; if (string.IsNullOrEmpty(id)) { continue; } - yield return (id, name, domain); + yield return new KeyValuePair(id, domain); } } diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs index 724330a2d..2f04f0177 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs @@ -80,7 +80,7 @@ public void TestGetEnvironment() [TestMethod] public void TestGetAllUINames() { - var allUIs = _stackConfig.GetAllUINames(); + var allUIs = _stackConfig.GetUIDomainPairs(); Assert.IsNotNull(allUIs); } diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json index a560784b5..c2515eea2 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json @@ -4,7 +4,7 @@ "DOMAIN_NAME": "masastack.com", "ELASTIC": "{\"Nodes\": [\"masastack-es.masastack\"],\"Index\": \"user_dev\"}", "IS_DEMO": "true", - "MASA_STACK": "[{\"id\":\"pm\",\"name\":\"PM\",\"service\":{\"name\":\"PM.Service\",\"id\":\"pm-service\",\"domain\":\"pm-staging.masastack\"},\"web\":{\"name\":\"PM.Web\",\"id\":\"pm-web\",\"domain\":\"\"}},{\"id\":\"dcc\",\"name\":\"DCC\",\"service\":{\"name\":\"Dcc.Service\",\"id\":\"dcc-service\",\"domain\":\"dcc-staging.masastack\"},\"web\":{\"name\":\"DCC.Web\",\"id\":\"dcc-web\",\"domain\":\"\"}},{\"id\":\"tsc\",\"name\":\"TSC\",\"service\":{\"name\":\"TSC.Service\",\"id\":\"tsc-service\",\"domain\":\"\"},\"web\":{\"name\":\"TSC.Web\",\"id\":\"tsc-web\",\"domain\":\"\"}},{\"id\":\"alert\",\"name\":\"Alert\",\"service\":{\"name\":\"Alert.Service\",\"id\":\"alert-service\",\"domain\":\"\"},\"web\":{\"name\":\"Alert.Web\",\"id\":\"alert-web\",\"domain\":\"\"}},{\"id\":\"scheduler\",\"name\":\"Scheduler\",\"service\":{\"name\":\"Scheduler.Service\",\"id\":\"scheduler-service\",\"domain\":\"\"},\"worker\":{\"name\":\"Scheduler.Worker\",\"id\":\"scheduler-worker\",\"domain\":\"\"},\"web\":{\"name\":\"Scheduler.Web\",\"id\":\"scheduler-web\",\"domain\":\"\"}},{\"id\":\"mc\",\"name\":\"MC\",\"service\":{\"name\":\"MC.Service\",\"id\":\"mc-service\",\"domain\":\"\"},\"web\":{\"name\":\"MC.Web\",\"id\":\"mc-web\",\"domain\":\"\"}},{\"id\":\"auth\",\"name\":\"Auth\",\"service\":{\"name\":\"Auth.Service\",\"id\":\"auth-service\",\"domain\":\"\"},\"web\":{\"name\":\"Auth.Web\",\"id\":\"auth-web\",\"domain\":\"\"},\"sso\":{\"name\":\"Auth.SSO\",\"id\":\"auth-sso\",\"domain\":\"\"}}]", + "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service\",\"domain\":\"pm-staging.masastack\"},\"web\":{\"id\":\"pm-web\",\"domain\":\"pm.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service\",\"domain\":\"dcc-staging.masastack\"},\"web\":{\"id\":\"dcc-web\",\"domain\":\"\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service\",\"domain\":\"\"},\"web\":{\"id\":\"tsc-web\",\"domain\":\"\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service\",\"domain\":\"\"},\"web\":{\"id\":\"alert-web\",\"domain\":\"\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service\",\"domain\":\"\"},\"worker\":{\"id\":\"scheduler-worker\",\"domain\":\"\"},\"web\":{\"id\":\"scheduler-web\",\"domain\":\"\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service\",\"domain\":\"\"},\"web\":{\"id\":\"mc-web\",\"domain\":\"\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service\",\"domain\":\"\"},\"web\":{\"id\":\"auth-web\",\"domain\":\"\"},\"sso\":{\"id\":\"auth-sso\",\"domain\":\"\"}}]", "OTLP_URL": "otel-collector.masastack:9013", "REDIS": "{\"RedisHost\": \"localhost\", \"RedisPort\": 6379, \"RedisDb\": 0,\"RedisPassword\": \"\"}", "VERSION": "1.0-Preview1",