Skip to content

Commit 0a4e70d

Browse files
MayueCifyanpengju
MayueCif
and
yanpengju
authored
Refactor/stackconfig (#579)
* refactor(stack-config): update stack config * feat:stack config * feat:modify appsettings and unit test * refactor:remove useless code * feat:refatcor MasaStackConfigUtils * fix:code smell * feat:add MASA_STACK * feat:rename host to domain * feat:host -> domain --------- Co-authored-by: yanpengju <yanpengju@masastack.com>
1 parent 1ff08ed commit 0a4e70d

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -53,55 +53,55 @@ public static string GetConnectionString(this IMasaStackConfig masaStackConfig,
5353
return dbModel?.ToString(databaseName) ?? "";
5454
}
5555

56-
public static string GetHost(this IMasaStackConfig masaStackConfig, string project, string app)
56+
public static string GetDomain(this IMasaStackConfig masaStackConfig, string project, string app)
5757
{
58-
return GetMasaStack(masaStackConfig).FirstOrDefault(i => i?["id"]?.ToString() == project)?[app]?["host"]?.ToString() ?? "";
58+
return GetMasaStack(masaStackConfig).FirstOrDefault(i => i?["id"]?.ToString() == project)?[app]?["domain"]?.ToString() ?? "";
5959
}
6060

6161

6262
public static string GetAuthServiceDomain(this IMasaStackConfig masaStackConfig)
6363
{
64-
return GetHost(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SERVICE);
64+
return GetDomain(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SERVICE);
6565
}
6666

6767
public static string GetPmServiceDomain(this IMasaStackConfig masaStackConfig)
6868
{
69-
return GetHost(masaStackConfig, MasaStackConstant.PM, MasaStackConstant.SERVICE);
69+
return GetDomain(masaStackConfig, MasaStackConstant.PM, MasaStackConstant.SERVICE);
7070
}
7171

7272
public static string GetDccServiceDomain(this IMasaStackConfig masaStackConfig)
7373
{
74-
return GetHost(masaStackConfig, MasaStackConstant.DCC, MasaStackConstant.SERVICE);
74+
return GetDomain(masaStackConfig, MasaStackConstant.DCC, MasaStackConstant.SERVICE);
7575
}
7676

7777
public static string GetTscServiceDomain(this IMasaStackConfig masaStackConfig)
7878
{
79-
return GetHost(masaStackConfig, MasaStackConstant.TSC, MasaStackConstant.SERVICE);
79+
return GetDomain(masaStackConfig, MasaStackConstant.TSC, MasaStackConstant.SERVICE);
8080
}
8181

8282
public static string GetAlertServiceDomain(this IMasaStackConfig masaStackConfig)
8383
{
84-
return GetHost(masaStackConfig, MasaStackConstant.ALERT, MasaStackConstant.SERVICE);
84+
return GetDomain(masaStackConfig, MasaStackConstant.ALERT, MasaStackConstant.SERVICE);
8585
}
8686

8787
public static string GetMcServiceDomain(this IMasaStackConfig masaStackConfig)
8888
{
89-
return GetHost(masaStackConfig, MasaStackConstant.MC, MasaStackConstant.SERVICE);
89+
return GetDomain(masaStackConfig, MasaStackConstant.MC, MasaStackConstant.SERVICE);
9090
}
9191

9292
public static string GetSchedulerServiceDomain(this IMasaStackConfig masaStackConfig)
9393
{
94-
return GetHost(masaStackConfig, MasaStackConstant.SCHEDULER, MasaStackConstant.SERVICE);
94+
return GetDomain(masaStackConfig, MasaStackConstant.SCHEDULER, MasaStackConstant.SERVICE);
9595
}
9696

9797
public static string GetSchedulerWorkerDomain(this IMasaStackConfig masaStackConfig)
9898
{
99-
return GetHost(masaStackConfig, MasaStackConstant.SCHEDULER, MasaStackConstant.WORKER);
99+
return GetDomain(masaStackConfig, MasaStackConstant.SCHEDULER, MasaStackConstant.WORKER);
100100
}
101101

102102
public static string GetSsoDomain(this IMasaStackConfig masaStackConfig)
103103
{
104-
return GetHost(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SSO);
104+
return GetDomain(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SSO);
105105
}
106106

107107
public static IEnumerable<(string, string, string)> GetAllUINames(this IMasaStackConfig masaStackConfig)
@@ -110,12 +110,12 @@ public static string GetSsoDomain(this IMasaStackConfig masaStackConfig)
110110
{
111111
var id = web["id"]?.ToString() ?? "";
112112
var name = web["name"]?.ToString() ?? "";
113-
var host = web["host"]?.ToString() ?? "";
113+
var domain = web["domain"]?.ToString() ?? "";
114114
if (string.IsNullOrEmpty(id))
115115
{
116116
continue;
117117
}
118-
yield return (id, name, host);
118+
yield return (id, name, domain);
119119
}
120120
}
121121

‎src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigUtils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static DccOptions GetDefaultDccOptions(Dictionary<string, string> configM
1010
{
1111
var value = configMap.GetValueOrDefault(MasaStackConfigConstant.MASA_STACK) ?? "";
1212
var data = JsonSerializer.Deserialize<JsonArray>(value) ?? new();
13-
var dccServerAddress = data.FirstOrDefault(i => i?["id"]?.ToString() == MasaStackConstant.DCC)?[MasaStackConstant.SERVICE]?["host"]?.ToString() ?? "";
13+
var dccServerAddress = data.FirstOrDefault(i => i?["id"]?.ToString() == MasaStackConstant.DCC)?[MasaStackConstant.SERVICE]?["domain"]?.ToString() ?? "";
1414
var redisStr = configMap.GetValueOrDefault(MasaStackConfigConstant.REDIS) ?? throw new Exception("redis options can not null");
1515
var redis = JsonSerializer.Deserialize<RedisModel>(redisStr) ?? throw new JsonException();
1616
var secret = configMap.GetValueOrDefault(MasaStackConfigConstant.DCC_SECRET);

‎src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"DOMAIN_NAME": "masastack.com",
55
"ELASTIC": "{\"Nodes\": [\"masastack-es.masastack\"],\"Index\": \"user_dev\"}",
66
"IS_DEMO": "true",
7-
"MASA_STACK": "[{\"id\":\"pm\",\"name\":\"PM\",\"service\":{\"name\":\"PM.Service\",\"id\":\"pm-service\",\"host\":\"pm-staging.masastack\"},\"web\":{\"name\":\"PM.Web\",\"id\":\"pm-web\",\"host\":\"\"}},{\"id\":\"dcc\",\"name\":\"DCC\",\"service\":{\"name\":\"Dcc.Service\",\"id\":\"dcc-service\",\"host\":\"dcc-staging.masastack\"},\"web\":{\"name\":\"DCC.Web\",\"id\":\"dcc-web\",\"host\":\"\"}},{\"id\":\"tsc\",\"name\":\"TSC\",\"service\":{\"name\":\"TSC.Service\",\"id\":\"tsc-service\",\"host\":\"\"},\"web\":{\"name\":\"TSC.Web\",\"id\":\"tsc-web\",\"host\":\"\"}},{\"id\":\"alert\",\"name\":\"Alert\",\"service\":{\"name\":\"Alert.Service\",\"id\":\"alert-service\",\"host\":\"\"},\"web\":{\"name\":\"Alert.Web\",\"id\":\"alert-web\",\"host\":\"\"}},{\"id\":\"scheduler\",\"name\":\"Scheduler\",\"service\":{\"name\":\"Scheduler.Service\",\"id\":\"scheduler-service\",\"host\":\"\"},\"worker\":{\"name\":\"Scheduler.Worker\",\"id\":\"scheduler-worker\",\"host\":\"\"},\"web\":{\"name\":\"Scheduler.Web\",\"id\":\"scheduler-web\",\"host\":\"\"}},{\"id\":\"mc\",\"name\":\"MC\",\"service\":{\"name\":\"MC.Service\",\"id\":\"mc-service\",\"host\":\"\"},\"web\":{\"name\":\"MC.Web\",\"id\":\"mc-web\",\"host\":\"\"}},{\"id\":\"auth\",\"name\":\"Auth\",\"service\":{\"name\":\"Auth.Service\",\"id\":\"auth-service\",\"host\":\"\"},\"web\":{\"name\":\"Auth.Web\",\"id\":\"auth-web\",\"host\":\"\"},\"sso\":{\"name\":\"Auth.SSO\",\"id\":\"auth-sso\",\"host\":\"\"}}]",
7+
"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\":\"\"}}]",
88
"OTLP_URL": "otel-collector.masastack:9013",
99
"REDIS": "{\"RedisHost\": \"localhost\", \"RedisPort\": 6379, \"RedisDb\": 0,\"RedisPassword\": \"\"}",
1010
"VERSION": "1.0-Preview1",

‎src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Middleware.Tests/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"DOMAIN_NAME": "masastack.com",
55
"ELASTIC": "{\"ElasticNodes\": [\"masastack-es.masastack\"],\"Index\": \"user_dev\"}",
66
"IS_DEMO": "true",
7-
"MASA_STACK": "[{\"id\":\"pm\",\"name\":\"PM\",\"service\":{\"name\":\"PM.Service\",\"id\":\"pm-service\",\"host\":\"pm-staging.masastack\"},\"web\":{\"name\":\"PM.Web\",\"id\":\"pm-web\",\"host\":\"\"}},{\"id\":\"dcc\",\"name\":\"DCC\",\"service\":{\"name\":\"Dcc.Service\",\"id\":\"dcc-service\",\"host\":\"\"},\"web\":{\"name\":\"DCC.Web\",\"id\":\"dcc-web\",\"host\":\"\"}},{\"id\":\"tsc\",\"name\":\"TSC\",\"service\":{\"name\":\"TSC.Service\",\"id\":\"tsc-service\",\"host\":\"\"},\"web\":{\"name\":\"TSC.Web\",\"id\":\"tsc-web\",\"host\":\"\"}},{\"id\":\"alert\",\"name\":\"Alert\",\"service\":{\"name\":\"Alert.Service\",\"id\":\"alert-service\",\"host\":\"\"},\"web\":{\"name\":\"Alert.Web\",\"id\":\"alert-web\",\"host\":\"\"}},{\"id\":\"scheduler\",\"name\":\"Scheduler\",\"service\":{\"name\":\"Scheduler.Service\",\"id\":\"scheduler-service\",\"host\":\"\"},\"worker\":{\"name\":\"Scheduler.Worker\",\"id\":\"scheduler-worker\",\"host\":\"\"},\"web\":{\"name\":\"Scheduler.Web\",\"id\":\"scheduler-web\",\"host\":\"\"}},{\"id\":\"mc\",\"name\":\"MC\",\"service\":{\"name\":\"MC.Service\",\"id\":\"mc-service\",\"host\":\"\"},\"web\":{\"name\":\"MC.Web\",\"id\":\"mc-web\",\"host\":\"\"}},{\"id\":\"auth\",\"name\":\"Auth\",\"service\":{\"name\":\"Auth.Service\",\"id\":\"auth-service\",\"host\":\"\"},\"web\":{\"name\":\"Auth.Web\",\"id\":\"auth-web\",\"host\":\"\"},\"sso\":{\"name\":\"Auth.SSO\",\"id\":\"auth-sso\",\"host\":\"\"}}]",
7+
"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\":\"\"}}]",
88
"OTLP_URL": "otel-collector.masastack:9013",
99
"REDIS": "{\"RedisHost\": \"localhost\", \"RedisPort\": 6379, \"RedisDb\": 0,\"RedisPassword\": \"\"}",
1010
"VERSION": "1.0-Preview1",

0 commit comments

Comments
 (0)