Browse Source

Merge branch 'PL/develop-BI' into develop

Li 3 years ago
parent
commit
5ad1b43399

+ 2 - 2
TEAMModelBI/Startup.cs

@@ -98,8 +98,8 @@ namespace TEAMModelBI
             storageConnects.Add(("Default", Configuration.GetValue<string>("Azure:Storage:ConnectionString")));      //大路站ClientString
             storageConnects.Add(("Global", Configuration.GetValue<string>("GlobalAzure:Storage:ConnectionString"))); //国际站ClientString
 
-            storageConnects.Add(("LogChina", Configuration.GetValue<string>("Azure:logStorage:ConnectionString"))); //防火墙日志 大陆站ClientString
-            storageConnects.Add(("LogGlobal", Configuration.GetValue<string>("GlobalAzure:logStorage:ConnectionString"))); //防火墙日志  国际站ClientString
+            storageConnects.Add(("LogChina", Configuration.GetValue<string>("Azure:LogStorage:ConnectionString"))); //防火墙日志 大陆站ClientString
+            storageConnects.Add(("LogGlobal", Configuration.GetValue<string>("GlobalAzure:LogStorage:ConnectionString"))); //防火墙日志  国际站ClientString
             services.AddBIAzureStorage(storageConnects);
 
             //cosmosDB注入

+ 2 - 2
TEAMModelBI/appsettings.Development.json

@@ -24,7 +24,7 @@
     "Storage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
     },
-    "logStorage": { 
+    "LogStorage": { 
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodellog;AccountKey=lxVDrgs+6rKtmASL3k1WrarrEd5Rk42wS1Mu5+sqQlPya1JLSlFDtnZUvMPeHHe7zlESfn/1NY7CZdGviy2UCw==;BlobEndpoint=https://teammodellog.blob.core.chinacloudapi.cn/;QueueEndpoint=https://teammodellog.queue.core.chinacloudapi.cn/;TableEndpoint=https://teammodellog.table.core.chinacloudapi.cn/;FileEndpoint=https://teammodellog.file.core.chinacloudapi.cn/;" },
     "Cosmos": {
       "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
@@ -43,7 +43,7 @@
     "Storage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn" // 之前未删除连接字符
     },
-    "logStorage": {
+    "LogStorage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodellog;AccountKey=lxVDrgs+6rKtmASL3k1WrarrEd5Rk42wS1Mu5+sqQlPya1JLSlFDtnZUvMPeHHe7zlESfn/1NY7CZdGviy2UCw==;BlobEndpoint=https://teammodellog.blob.core.chinacloudapi.cn/;QueueEndpoint=https://teammodellog.queue.core.chinacloudapi.cn/;TableEndpoint=https://teammodellog.table.core.chinacloudapi.cn/;FileEndpoint=https://teammodellog.file.core.chinacloudapi.cn/;"
     },
     "Cosmos": {

+ 2 - 2
TEAMModelBI/appsettings.json

@@ -32,7 +32,7 @@
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
       //"ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
     },
-    "logStorage": {
+    "LogStorage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodellog;AccountKey=lxVDrgs+6rKtmASL3k1WrarrEd5Rk42wS1Mu5+sqQlPya1JLSlFDtnZUvMPeHHe7zlESfn/1NY7CZdGviy2UCw==;BlobEndpoint=https://teammodellog.blob.core.chinacloudapi.cn/;QueueEndpoint=https://teammodellog.queue.core.chinacloudapi.cn/;TableEndpoint=https://teammodellog.table.core.chinacloudapi.cn/;FileEndpoint=https://teammodellog.file.core.chinacloudapi.cn/;"
     },
     "Cosmos": {
@@ -56,7 +56,7 @@
     "Storage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn" // 之前未删除连接字符
     },
-    "logStorage": {
+    "LogStorage": {
       "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodellog;AccountKey=lxVDrgs+6rKtmASL3k1WrarrEd5Rk42wS1Mu5+sqQlPya1JLSlFDtnZUvMPeHHe7zlESfn/1NY7CZdGviy2UCw==;BlobEndpoint=https://teammodellog.blob.core.chinacloudapi.cn/;QueueEndpoint=https://teammodellog.queue.core.chinacloudapi.cn/;TableEndpoint=https://teammodellog.table.core.chinacloudapi.cn/;FileEndpoint=https://teammodellog.file.core.chinacloudapi.cn/;"
     },
     "Cosmos": {