chore : Configuration adjustment

masastack · Feb 24, 2023 · 8c3c9db · 8c3c9db
1 parent 1083322
commit 8c3c9db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/Services/Masa.Mc.Service/Program.cs b/src/Services/Masa.Mc.Service/Program.cs
@@ -20,13 +20,13 @@
 });
 var publicConfiguration = builder.Services.GetMasaConfiguration().ConfigurationApi.GetPublic();
 var ossOptions = publicConfiguration.GetSection("$public.OSS").Get<OssOptions>();
-builder.Services.AddAliyunStorage(new AliyunStorageOptions(ossOptions.AccessId, ossOptions.AccessSecret, ossOptions.Endpoint, ossOptions.RoleArn, ossOptions.RoleSessionName)
+builder.Services.AddObjectStorage(option => option.UseAliyunStorage(new AliyunStorageOptions(ossOptions.AccessId, ossOptions.AccessSecret, ossOptions.Endpoint, ossOptions.RoleArn, ossOptions.RoleSessionName)
 {
     Sts = new AliyunStsOptions()
     {
         RegionId = ossOptions.RegionId
     }
-});
+}));
 
 builder.Services.AddObservable(builder.Logging, () =>
 {

diff --git a/src/Services/Masa.Mc.Service/appsettings.json b/src/Services/Masa.Mc.Service/appsettings.json
@@ -1,4 +1,7 @@
 {
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=rm-bp17pbv791jbq67z6.sqlserver.rds.aliyuncs.com,3433;Database=loncloud-mc;User Id=masastack;Password=Hzss@123masastack;"
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -12,5 +15,20 @@
     "AccessKeyId": "",
     "EndPoint": "dysmsapi.aliyuncs.com"
   },
-  "AppId": "masa-mc-service-admin"
+  "DccOptions": {
+    "ManageServiceAddress": "https://dcc-service.lonsid.cn/",
+    "RedisOptions": {
+      "Servers": [
+        {
+          "Host": "r-bp1pu2t1ydd4pdkozz.redis.rds.aliyuncs.com",
+          "Port": "6379"
+        }
+      ],
+      "DefaultDatabase": 8,
+      "Password": "hzss@123redis"
+    }
+  },
+  "AppId": "masa-mc-service-admin",
+  "Secret": "",
+  "Cluster": "Default"
 }
diff --git a/src/Web/Masa.Mc.Web.Admin.Server/appsettings.json b/src/Web/Masa.Mc.Web.Admin.Server/appsettings.json
@@ -7,13 +7,6 @@
     }
   },
   "AllowedHosts": "*",
-  "Masa": {
-    "Observable": {
-      "ServiceName": "masa-mc-web",
-      "ServiceVersion": "1.0.0",
-      "OtlpUrl": "http://otel-collector-dev.open-telemetry:4317"
-    }
-  },
   "DccOptions": {
     "ManageServiceAddress": "https://dcc-service.lonsid.cn/",
     "RedisOptions": {