chore: update

masastack · Sep 12, 2024 · 756095d · 756095d
1 parent 54e9275
commit 756095d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/src/Domain/Masa.Alert.Domain/AlarmRules/Aggregates/AlarmRule.cs b/src/Domain/Masa.Alert.Domain/AlarmRules/Aggregates/AlarmRule.cs
@@ -34,9 +34,9 @@ public class AlarmRule : FullAggregateRoot<Guid, Guid>
 
     public Guid SchedulerJobId { get; protected set; } = Guid.Empty;
 
-    public string Source { get; set; } = default!;
+    public string Source { get; protected set; } = default!;
 
-    public bool Show { get; set; }
+    public bool Show { get; protected set; }
 
     private AlarmRule() { }
 

diff --git a/src/Services/Masa.Alert.Service/Program.cs b/src/Services/Masa.Alert.Service/Program.cs
@@ -83,19 +83,13 @@
     DefaultDatabase = masaStackConfig.RedisModel.RedisDb,
     Password = masaStackConfig.RedisModel.RedisPassword
 };
-#if DEBUG
-builder.Services.AddAuthClient("https://auth-service-dev.masastack.com", redisOptions);
-builder.Services.AddPmClient("https://pm-service-dev.masastack.com");
-builder.Services.AddTscClient("https://tsc-service-dev.masastack.com");
-builder.Services.AddMcClient("https://mc-service-dev.masastack.com");
-builder.Services.AddSchedulerClient("https://scheduler-service-dev.masastack.com");
-#else
+
 builder.Services.AddAuthClient(masaStackConfig.GetAuthServiceDomain(), redisOptions);
 builder.Services.AddPmClient(masaStackConfig.GetPmServiceDomain());
 builder.Services.AddTscClient(masaStackConfig.GetTscServiceDomain());
 builder.Services.AddMcClient(masaStackConfig.GetMcServiceDomain());
 builder.Services.AddSchedulerClient(masaStackConfig.GetSchedulerServiceDomain());
-#endif
+
 builder.Services.AddRulesEngine(rulesEngineOptions =>
 {
     rulesEngineOptions.UseMicrosoftRulesEngine();

diff --git a/src/Services/Masa.Alert.Service/Properties/launchSettings.json b/src/Services/Masa.Alert.Service/Properties/launchSettings.json
@@ -15,21 +15,21 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DAPR_GRPC_PORT": "3601",
-        "DAPR_HTTP_PORT": "3600",
-        "VERSION": "1.0-Prev",
-        "IS_DEMO": "False",
+        "DAPR_HTTP_PORT": "3600",        
+        "MASA_CLUSTER": "Default",
+        "DCC_SECRET": "masastack.com",
+        "ADMIN_PWD": "admin123",
         "DOMAIN_NAME": "masastack.com",
-        "NAMESPACE": "masastack.com",
-        "TLS_NAME": "",
-        "CLUSTER": "Default",
-        "OTLP_URL": "https://otel-collector.masastack:9013",
+        "MASA_NAMESPACE": "masastack",
+        "TLS_NAME": "masastack",
+        "MASA_VERSION": "1.0-Preview1",
+        "IS_DEMO": "false",
+        "OTLP_URL": "http://otel-collector.masastack:9013",
+        "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
         "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}",
-        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
+        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
         "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]",
-        "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
-        "ENVIRONMENT": "Development",
-        "ADMIN_PWD": "admin_pwd",
-        "DCC_SECRET": "masastack.com",
+        "MASA_ENVIRONMENT": "Development",
         "SUFFIX_IDENTITY": "dev"
       },
       "applicationUrl": "https://localhost:19701;http://localhost:19711",

diff --git a/src/Web/Masa.Alert.Web.Admin.Server/Properties/launchSettings.json b/src/Web/Masa.Alert.Web.Admin.Server/Properties/launchSettings.json
@@ -13,21 +13,21 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "VERSION": "1.0-Prev",
-        "IS_DEMO": "False",
+        "MASA_CLUSTER": "Default",
+        "DCC_SECRET": "masastack.com",
+        "ADMIN_PWD": "admin123",
         "DOMAIN_NAME": "masastack.com",
-        "NAMESPACE": "masastack.com",
-        "TLS_NAME": "",
-        "CLUSTER": "Default",
-        "OTLP_URL": "https://otel-collector.masastack:9013",
+        "MASA_NAMESPACE": "masastack",
+        "TLS_NAME": "masastack",
+        "MASA_VERSION": "1.0-Preview1",
+        "IS_DEMO": "false",
+        "OTLP_URL": "http://otel-collector.masastack:9013",
+        "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
         "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}",
         "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
         "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]",
-        "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
-        "ENVIRONMENT": "Development",
-        "ADMIN_PWD": "admin_pwd",
-        "DCC_SECRET": "masastack.com",
-        "SUFFIX_IDENTITY": "develop"
+        "MASA_ENVIRONMENT": "Development",
+        "SUFFIX_IDENTITY": "dev"
       },
       "applicationUrl": "https://localhost:19700;http://localhost:19710",
       "dotnetRunMessages": true