update

TEAMModelBI/Controllers/BIAbility/AbilityMgmtController.cs

@@ -13,11 +13,9 @@ using System.Text.Json;
 using Azure.Cosmos;
 using HTEXLib.COMM.Helpers;
 using System.Text;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK.Context.BI;
 
 namespace TEAMModelBI.Controllers.BIAbility

TEAMModelBI/Controllers/BIAbility/AbilityTaskMgmtController.cs

@@ -18,7 +18,6 @@ using TEAMModelBI.Filter;
 using TEAMModelOS.SDK.Services;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK.Context.BI;
 
 namespace TEAMModelBI.Controllers.BIAbility

TEAMModelBI/Controllers/BINormal/AppCompanyController.cs

@@ -9,7 +9,6 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Models.Extension;
 using TEAMModelBI.Tool.Extension;

TEAMModelBI/Controllers/BISchool/AreaRelevantController.cs

@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Models;
 using TEAMModelBI.Tool.Extension;

TEAMModelBI/Controllers/BISchool/BatchAreaController.cs

@@ -20,7 +20,6 @@ using TEAMModelOS.SDK.Models.Service;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelBI.Tool;
-using TEAMModelBI.DI.BIAzureStorage;
 using Azure.Storage.Blobs.Models;
 using Azure;
 using Azure.Storage.Blobs.Specialized;
@@ -160,7 +159,7 @@ namespace TEAMModelBI.Controllers.BISchool
             }
             catch (Exception ex)
             {
-                //await _dingDing.SendBotMsg($"BI,{_option.Location} batcharea/get-areas \n {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
+                await _dingDing.SendBotMsg($"BI,{_option.Location} batcharea/get-areas \n {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
                 return BadRequest();
             }
         }

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -26,7 +26,6 @@ using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelBI.Tool;
 using TEAMModelBI.Models;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Context.Constant;

TEAMModelBI/Controllers/BISchool/RoomController.cs

@@ -7,7 +7,6 @@ using System;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.Models;

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -14,7 +14,6 @@ using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Models;
 using TEAMModelBI.Tool;

TEAMModelBI/Controllers/BITable/BIOpenApiController.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.Models;

TEAMModelBI/Controllers/BITable/CompanyController.cs

@@ -9,7 +9,6 @@ using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Models.Extension;
 using TEAMModelBI.Tool.Extension;

TEAMModelBI/Controllers/BITable/OperateLogController.cs

@@ -15,7 +15,7 @@ using TEAMModelOS.SDK.Models.Table;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelBI.DI.BIAzureStorage;
+
 using TEAMModelOS.SDK.Context.BI;
 
 namespace TEAMModelBI.Controllers.BITable

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -45,7 +45,6 @@ using System.Net;
 using TEAMModelBI.Tool.CosmosBank;
 using System.Diagnostics;
 using StackExchange.Redis;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Context.Constant;
@@ -1449,7 +1448,7 @@ namespace TEAMModelBI.Controllers.BITest
         public async Task<IActionResult> GetLogAnalyse(JsonElement jsonElement) 
         {
             if (!jsonElement.TryGetProperty("path", out JsonElement path)) return BadRequest();
-            var (an ,saveUrl) = await BILogAnalyseService.GetPathAnalyse(_azureStorage, $"{path}");
+            var (an ,saveUrl) = await BILogAnalyseService.GetPathAnalyse(_azureStorage, $"{path}", BIConst.LogGlobal);
 
             return Ok(new { state = RespondCode.Ok, an, saveUrl });
         }

TEAMModelBI/Controllers/Core/BlobController.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelBI.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;

TEAMModelBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -25,7 +25,6 @@ using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelBI.Models;
 using TEAMModelBI.Tool.CosmosBank;
-using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Models;

TEAMModelBI/Controllers/LoginController.cs

@@ -34,8 +34,6 @@ using TEAMModelBI.Models.Extension;
 using TEAMModelOS.SDK;
 using Microsoft.AspNetCore.Hosting;
 using TEAMModelBI.Tool;
-using TEAMModelBI.DI.BIAzureStorage;
-using TEAMModelOS.SDK.Models.Table;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelBI.Models;
 using TEAMModelOS.SDK.Context.BI;

TEAMModelBI/Startup.cs

@@ -15,11 +15,8 @@ using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelBI.Controllers;
-using TEAMModelBI.DI.BI;
-using TEAMModelBI.Filter;
+using TEAMModelOS.SDK.DI.Multiple;
 using TEAMModelBI.Models;
-using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
@@ -101,25 +98,25 @@ namespace TEAMModelBI
 
             storageConnects.Add(("LogChina", Configuration.GetValue<string>("Azure:LogStorage:ConnectionString"))); //防火墙日志 大陆站ClientString
             storageConnects.Add(("LogGlobal", Configuration.GetValue<string>("GlobalAzure:LogStorage:ConnectionString"))); //防火墙日志  国际站ClientString
-            services.AddBIAzureStorage(storageConnects);
+            services.AddMultipleAzureStorage(storageConnects);
 
             //cosmosDB注入
             List<(string name,string connectionString)> cosmosDBConnects = new();
             cosmosDBConnects.Add(("Default", Configuration.GetValue<string>("Azure:Cosmos:ConnectionString")));      //大路站ClientString
             cosmosDBConnects.Add(("Global", Configuration.GetValue<string>("GlobalAzure:Cosmos:ConnectionString"))); //国际站ClientString
-            services.AddBIAzureCosmos(cosmosDBConnects);
+            services.AddMultipleAzureCosmos(cosmosDBConnects);
 
             //redis注入
             List<(string name, string connectionString)> redisConnects = new();
             redisConnects.Add(("Default", Configuration.GetValue<string>("Azure:Redis:ConnectionString")));
             redisConnects.Add(("Global", Configuration.GetValue<string>("GlobalAzure:Redis:ConnectionString")));
-            services.AddBIAzureRedis(redisConnects);
+            services.AddMultipleAzureRedis(redisConnects);
 
             //serverBus 注入 
             List<(string name, string connectionString)> funConnects = new();
             funConnects.Add(("Default", Configuration.GetValue<string>("Azure:ServiceBus:ConnectionString")));
             funConnects.Add(("Global", Configuration.GetValue<string>("GlobalAzure:ServiceBus:ConnectionString")));
-            services.AddBIAzureServiceBus(funConnects);
+            services.AddMultipleAzureServiceBus(funConnects);
             
             //单一注入
             //services.AddAzureStorage(Configuration.GetValue<string>("Azure:Storage:ConnectionString"));

TEAMModelOS.SDK/Models/Service/BI/BILogAnalyseService.cs

@@ -92,16 +92,12 @@ namespace TEAMModelOS.SDK.Models.Service.BI
         /// 通过路径获取日志文件并分析结果
         /// </summary>
         /// <param name="_azureStorage"></param>
-        /// <param name="path"></param>
-        /// <param name="site"></param>
+        /// <param name="path">防火墙路径</param>
+        /// <param name="connectStr">连接字串</param>
         /// <returns></returns>
-        public static async Task<(List<RecCnt> recCnts, List<string> saveUrls)> GetPathAnalyse(AzureStorageFactory _azureStorage,string path, string site = null)
+        public static async Task<(List<RecCnt> recCnts, List<string> saveUrls)> GetPathAnalyse(AzureStorageFactory _azureStorage,string path, string connectStr)
         {
-            var blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog", name: BIConst.LogChina);
-            if ($"{site}".Equals(BIConst.Global))
-            {
-                blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog", name: BIConst.LogGlobal);
-            }
+            var blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog", name: connectStr);
 
             List<RecCnt> recCnts = new();
             List<string> urls = new();