处理多站点信息。

TEAMModelBI/Controllers/BIAbility/AbilityMgmtController.cs

@@ -59,8 +59,8 @@ namespace TEAMModelBI.Controllers.BIAbility
                 if (!jsonElement.TryGetProperty("standard", out JsonElement standard)) return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<Ability> abilities = new List<Ability>();
                 string sqltxt = "select value(c) from c";
@@ -94,8 +94,8 @@ namespace TEAMModelBI.Controllers.BIAbility
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
 
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 Ability ability = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<Ability>($"{abilityId}", new PartitionKey($"Ability-{standard}"));
                 return Ok(new { state = 200, ability = ability });
             }
@@ -132,11 +132,11 @@ namespace TEAMModelBI.Controllers.BIAbility
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 List<AbilityTask> syllabus = new List<AbilityTask>();
                 string sql = $"select value(c) from c where c.abilityId='{id}'";
@@ -198,11 +198,11 @@ namespace TEAMModelBI.Controllers.BIAbility
                 var azureClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    azureClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    azureClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 string tempType = "";
                 //新增册别
@@ -285,11 +285,11 @@ namespace TEAMModelBI.Controllers.BIAbility
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                     foreach (var item in currencys)
                 {

TEAMModelBI/Controllers/BIAbility/AbilityTaskMgmtController.cs

@@ -61,8 +61,8 @@ namespace TEAMModelBI.Controllers.BIAbility
                 if (!jsonElement.TryGetProperty("abilityId", out JsonElement abilityId)) return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 Ability ability = null;
                 List<AbilityTaskTreeNode> abilityTaskTreeNodes = new List<AbilityTaskTreeNode>();//原始数据未排序
                 List<AbilityTaskTreeNode> redtAbilityTaskTreeNodes = new List<AbilityTaskTreeNode>();//排序后的数据
@@ -133,11 +133,11 @@ namespace TEAMModelBI.Controllers.BIAbility
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 StringBuilder msgBuilder = new StringBuilder($"{_tmdName}【{_tmdId}】");
@@ -255,11 +255,11 @@ namespace TEAMModelBI.Controllers.BIAbility
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemStreamAsync(id.ToString(), new PartitionKey($"AbilityTask-{standard}"));
 

TEAMModelBI/Controllers/BIHome/AnalyseFileController.cs

@@ -120,10 +120,10 @@ namespace TEAMModelBI.Controllers.BIHome
             int day = dateTime.Day;
             int hour = dateTime.Hour;
 
-            var blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog",name:BIConst.LogChinaSite);
-            if ($"{site}".Equals(BIConst.LogGlobalSite)) 
+            var blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog",name:BIConst.LogChina);
+            if ($"{site}".Equals(BIConst.Global)) 
             {
-                blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog", name: BIConst.LogGlobalSite);
+                blobClient = _azureStorage.GetBlobContainerClient($"insights-logs-applicationgatewayfirewalllog", name: BIConst.Global);
             }
             //地址:    y={year}/m={month}/d={day}/h={hour}/m=00/PT1H.json
             string logName = "resourceId=/SUBSCRIPTIONS/73B7F9EF-D8B7-4444-9E8D-D80B43BF3CD4/RESOURCEGROUPS/TEAMMODELCHENGDU/PROVIDERS/MICROSOFT.NETWORK/APPLICATIONGATEWAYS/OSFIREWARE";

TEAMModelBI/Controllers/BIHome/HomeStatisController.cs

@@ -50,8 +50,8 @@ namespace TEAMModelBI.Controllers.BIHome
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var client = _azureCosmos.GetCosmosClient();;
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    client = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    client = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 //查询全部教师人数
                 long teacherCount = await CommonFind.FindTotals(client, "select count(c.id) as totals from c where c.code='Base'", new List<string>() { "Teacher" });
@@ -85,8 +85,8 @@ namespace TEAMModelBI.Controllers.BIHome
                 if (!jsonElement.TryGetProperty("tmdid", out JsonElement _tmdid)) return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient(); 
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 int surveyJoinCount = 0;        //调查参加数量
                 int surveyDoneCount = 0;        //调查完成数量
@@ -198,8 +198,8 @@ namespace TEAMModelBI.Controllers.BIHome
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<SticsCity> standards = new();
                 StringBuilder stringBuder = new("select c.id,c.name,c.provName,c.cityName,c.standard from c");
@@ -280,8 +280,8 @@ namespace TEAMModelBI.Controllers.BIHome
                 if(!jsonElement.TryGetProperty("cityCode", out JsonElement _cityCode))  return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<string> areaStandard = new();
                 //查询省份区域
@@ -332,8 +332,8 @@ namespace TEAMModelBI.Controllers.BIHome
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<ProvinceStandard> standards = new();
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryStreamIterator(queryText: $"select c.provCode,c.provName,c.standard from c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
@@ -441,8 +441,8 @@ namespace TEAMModelBI.Controllers.BIHome
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<CityStandard> standards = new();
                 //查询省份区域
@@ -510,8 +510,8 @@ namespace TEAMModelBI.Controllers.BIHome
                 if (!jsonElement.TryGetProperty("cityCode", out JsonElement _cityCode)) return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<DistrictStandard> districtStandards = new();
                 //查询省份区域
@@ -584,8 +584,8 @@ namespace TEAMModelBI.Controllers.BIHome
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 List<AllCityStics> tempAllCityStics = new();
                 //查询省份区域
@@ -701,10 +701,10 @@ namespace TEAMModelBI.Controllers.BIHome
                 Dictionary<string, object> dic = new() { { "PartitionKey", "authority-bi" } };
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("SchoolSetting");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("SchoolSetting");
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("SchoolSetting");
                 }
 
                 List<Authority> authorityBIList = await table.FindListByDict<Authority>(dic);
@@ -757,10 +757,10 @@ namespace TEAMModelBI.Controllers.BIHome
                 List<string> schoolId = new();
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var redisClinet = _azureRedis.GetRedisClient(8);
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.Global);
                 }
 
 
@@ -796,9 +796,9 @@ namespace TEAMModelBI.Controllers.BIHome
                     else
                     {
                         var client = _azureStorage.GetBlobContainerClient(itemId);
-                        if ($"{site}".Equals(BIConst.GlobalSite))
+                        if ($"{site}".Equals(BIConst.Global))
                         {
-                            client = _azureStorage.GetBlobContainerClient(containerName: itemId, name: BIConst.GlobalSite);
+                            client = _azureStorage.GetBlobContainerClient(containerName: itemId, name: BIConst.Global);
                         }
                         var size = await client.GetBlobsCatalogSize();
                         await redisClinet.HashSetAsync($"Blob:Record", itemId, size.Item1);
@@ -833,9 +833,9 @@ namespace TEAMModelBI.Controllers.BIHome
                     else
                     {
                         var client = _azureStorage.GetBlobContainerClient(itemId);
-                        if ($"{site}".Equals(BIConst.GlobalSite))
+                        if ($"{site}".Equals(BIConst.Global))
                         {
-                            client = _azureStorage.GetBlobContainerClient(containerName: itemId, name: BIConst.GlobalSite);
+                            client = _azureStorage.GetBlobContainerClient(containerName: itemId, name: BIConst.Global);
                         }
                         var size = await client.GetBlobsCatalogSize();
                         await redisClinet.HashSetAsync($"Blob:Record", itemId, size.Item1);
@@ -1017,10 +1017,10 @@ namespace TEAMModelBI.Controllers.BIHome
                 Dictionary<string, long> typeStics = new(); //所有类型
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var redisClinet = _azureRedis.GetRedisClient(8);
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.Global);
                 }
 
                 //查询教师的大小和教师集合信息

TEAMModelBI/Controllers/BIHome/OnLineController.cs

@@ -47,11 +47,11 @@ namespace TEAMModelBI.Controllers.BIHome
             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
             var blobClient = _azureStorage.GetBlobContainerClient($"0-public");
             jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.GlobalSite)) 
+            if ($"{site}".Equals(BIConst.Global)) 
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("IESLogin");
-                blobClient = _azureStorage.GetBlobContainerClient($"0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
+                blobClient = _azureStorage.GetBlobContainerClient($"0-public", BIConst.Global);
             }
 
             DateTimeOffset dateTime = DateTimeOffset.UtcNow;
@@ -144,10 +144,10 @@ namespace TEAMModelBI.Controllers.BIHome
             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
             var redisClinet = _azureRedis.GetRedisClient(8);
             jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("IESLogin");
-                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.GlobalSite);
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
+                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.Global);
             }
 
             DateTimeOffset dateTime =  DateTimeOffset.UtcNow;
@@ -288,9 +288,9 @@ namespace TEAMModelBI.Controllers.BIHome
             DateTimeOffset dateTime = DateTimeOffset.UtcNow;
             var cosmosClient = _azureCosmos.GetCosmosClient();
             jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             }
             int year = dateTime.Year;   //当前年
             int month = dateTime.Month;  //当前月
@@ -367,9 +367,9 @@ namespace TEAMModelBI.Controllers.BIHome
         {
             var cosmosClient = _azureCosmos.GetCosmosClient();
             jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             }
 
             int beCnt = 0; //基础班
@@ -423,11 +423,11 @@ namespace TEAMModelBI.Controllers.BIHome
             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
             var blobClient = _azureStorage.GetBlobContainerClient($"0-public");
             jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("IESLogin");
-                blobClient = _azureStorage.GetBlobContainerClient($"0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
+                blobClient = _azureStorage.GetBlobContainerClient($"0-public", BIConst.Global);
             }           
 
 

TEAMModelBI/Controllers/BINormal/AppCompanyController.cs

@@ -58,8 +58,8 @@ namespace TEAMModelBI.Controllers.BINormal
             jsonElement.TryGetProperty("site", out JsonElement site);
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             StringBuilder sqlTxt = new($"select c.id,c.pk,c.code,c.name,c.descr,c.picture,c.jwtKey,c.status,c.audit,c.refuseDesc,c.gateways,c.apis,c.webhookDomain,c.webHooks,c.schools from c where c.pk='App'");
             if (!string.IsNullOrEmpty($"{appId}"))
             {
@@ -121,11 +121,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 StringBuilder stringBuilder = new($"{loginName}【{loginId}】");
                 string type = "";
@@ -182,11 +182,11 @@ namespace TEAMModelBI.Controllers.BINormal
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
             StringBuilder sqlTxt = new();
 
@@ -250,11 +250,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite)) 
+                if ($"{site}".Equals(BIConst.Global)) 
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 StringBuilder strMsg = new($"{loginName}【{loginId}】");
                 List<AppIdOrCode> idOrCode = appIds.ToObject<List<AppIdOrCode>>();
@@ -329,11 +329,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 string bizcode = "";  //消息名称
                 List<string> sendWhom = new();//消息分发给谁   待完善
@@ -466,11 +466,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite)) 
+                if ($"{site}".Equals(BIConst.Global)) 
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 StringBuilder strMsg = new($"{loginName}【{loginId}】操作：");
                 List<string> haveSchool = new();

TEAMModelBI/Controllers/BINormal/BIOpenApiController.cs

@@ -48,8 +48,8 @@ namespace TEAMModelBI.Controllers.BINormal
             jsonElement.TryGetProperty("id", out JsonElement id);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             StringBuilder sqlTxt = new("select c.id,c.code,c.pk,c.name,c.rw,c.method,c.url,c.descr,c.type,c.descrUrl,c.createTime from c where c.pk='Api' ");
             if (!string.IsNullOrEmpty($"{id}")) 
             {
@@ -101,11 +101,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
                 StringBuilder strMsg = new($"{loginName}【{loginId}】");

TEAMModelBI/Controllers/BINormal/CompanyController.cs

@@ -58,10 +58,10 @@ namespace TEAMModelBI.Controllers.BINormal
                 jsonElenent.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("IESOpenApi");
@@ -113,11 +113,11 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 List<BusinessConfig> companys = new();
 
@@ -210,10 +210,10 @@ namespace TEAMModelBI.Controllers.BINormal
                 List<RecSc> recScs = _schools.ToObject<List<RecSc>>();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("IESOpenApi");
@@ -257,10 +257,10 @@ namespace TEAMModelBI.Controllers.BINormal
 
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("IESOpenApi");
@@ -301,10 +301,10 @@ namespace TEAMModelBI.Controllers.BINormal
 
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
 
             var table = tableClient.GetTableReference("IESOpenApi");
@@ -353,10 +353,10 @@ namespace TEAMModelBI.Controllers.BINormal
 
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }                      
 
             var table = tableClient.GetTableReference("IESOpenApi");

TEAMModelBI/Controllers/BINormal/CompanyUserController.cs

@@ -41,10 +41,10 @@ namespace TEAMModelBI.Controllers.BINormal
         {
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
             }
 
             var table = tableClient.GetTableReference("IESOpenApi");
@@ -95,10 +95,10 @@ namespace TEAMModelBI.Controllers.BINormal
 
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
                 }
                 var table = tableClient.GetTableReference("IESOpenApi");
 
@@ -141,10 +141,10 @@ namespace TEAMModelBI.Controllers.BINormal
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
             }
             var table = tableClient.GetTableReference("IESOpenApi");
             List<BusinessUser> bizUsers = await table.QueryWhereString<BusinessUser>($" PartitionKey eq 'BusinessUser' and tmdId eq '{tmdId}'");

TEAMModelBI/Controllers/BISchool/AreaRelevantController.cs

@@ -58,8 +58,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("isDefault", out JsonElement _isDefalue);
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient(); 
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 var isManyArea = false;
                 if (!string.IsNullOrEmpty($"{_isDefalue}"))
                 {
@@ -138,11 +138,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite)) 
+                if ($"{site}".Equals(BIConst.Global)) 
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{areaId}", new PartitionKey("AreaSetting"));
@@ -230,11 +230,11 @@ namespace TEAMModelBI.Controllers.BISchool
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
 
             Teacher teacher = null;

TEAMModelBI/Controllers/BISchool/BatchAreaController.cs

@@ -73,10 +73,10 @@ namespace TEAMModelBI.Controllers.BISchool
                 List<RecArea> areas = new();
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
                 var azureClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    azureClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("IESLogin");
+                    azureClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
                 }
 
                 await foreach (var item in azureClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryIterator<RecArea>(queryText: $"select c.id,c.code,c.pk,c.name,c.provCode,c.provName,c.cityCode,c.cityName,c.standard,c.standardName,c.institution from c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
@@ -154,11 +154,12 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 var activeTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");//秘钥地址
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    //serBusClient = _serviceBus.GetServiceBusClient(BIConst.GlobalSite);  //暂未确定使用默认
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", name: BIConst.Global);
+                    //serBusClient = _serviceBus.GetServiceBusClient(BIConst.Global);  //暂未确定使用默认
                     //activeTask = _configuration.GetValue<string>("GlobalAzure:ServiceBus:ActiveTask");   //暂未确定使用默认
                 }
 
@@ -573,12 +574,12 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var serBusClient = _serviceBus.GetServiceBusClient();
                 var activeTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");//秘钥地址
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                    serBusClient = _serviceBus.GetServiceBusClient(BIConst.GlobalSite);    //暂未确定使用默认 
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                    serBusClient = _serviceBus.GetServiceBusClient(BIConst.Global);    //暂未确定使用默认 
                     //activeTask = _configuration.GetValue<string>("GlobalAzure:ServiceBus:ActiveTask");  //暂未确定使用默认
                 }
                 var table = tableClient.GetTableReference("IESLogin");
@@ -825,10 +826,10 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("site", out JsonElement site);
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "teammodelos");
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "teammodelos", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "teammodelos", BIConst.Global);
             }
 
             var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{areaId}", new PartitionKey("Base-Area"));

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -69,8 +69,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("site", out JsonElement site);
             Dictionary<string, object> dic = new Dictionary<string, object> { { "PartitionKey", "authority-bi" } };
             var table = _azureStorage.GetCloudTableClient().GetTableReference("SchoolSetting");
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("SchoolSetting");
+            if ($"{site}".Equals(BIConst.Global))
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("SchoolSetting");
 
             List<Authority> authorityBIList = await table.FindListByDict<Authority>(dic);
 
@@ -97,8 +97,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 List<string> roles = new List<string>();//角色列表
                 List<string> permissions = new List<string>();//权限列表
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 var schoolRoles = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{id}", new PartitionKey($"Teacher-{schoolcode}"));
                 if (schoolRoles.Status == 200)
@@ -150,11 +150,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if (BIConst.GlobalSite.Equals($"{foundSchools.site}"))
+                if (BIConst.Global.Equals($"{foundSchools.site}"))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 if (foundSchools.biSchools.Count > 0)
@@ -353,8 +353,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("schoolCode", out JsonElement _schoolCode);
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 int? pageSize = null;      //默认不指定返回大小        
                 string continuationToken = string.Empty;     //返给前端分页token           
@@ -508,8 +508,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 //查询学校的顾问
                 string managerSql = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId, c.id, c.name FROM c WHERE ARRAY_CONTAINS(c.roles, 'assist', true) AND c.pk = 'Teacher' AND c.status = 'join'{managerWhereOption}";
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: managerSql, requestOptions: new QueryRequestOptions() { }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
@@ -621,11 +621,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
 
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 School tempShool = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{_schoolId}", new PartitionKey("Base"));
@@ -802,8 +802,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("site", out JsonElement site);
 
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 string sqltxt = $"SELECT * FROM c where c.dist='{_dist}'";
 
@@ -838,8 +838,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("site", out JsonElement site);
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             string sqltxt = $"SELECT * FROM c order by c.id offset {endPosition} limit {pageSize}";
 
             await foreach (var itemSchool in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<School>(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))

TEAMModelBI/Controllers/BISchool/LessonController.cs

@@ -295,8 +295,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("site", out JsonElement site);
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<LessonRecord> allLesson = new();
 

TEAMModelBI/Controllers/BISchool/ProductController.cs

@@ -49,8 +49,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("site", out JsonElement site);
             var clientContainer = _azureCosmos.GetCosmosClient();
 
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                clientContainer = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                clientContainer = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<SchoolProductSerial> serials = new List<SchoolProductSerial>(); //软体
             List<SchoolProductService> services = new List<SchoolProductService>(); //服务

TEAMModelBI/Controllers/BISchool/RoomController.cs

@@ -62,11 +62,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{roomId}", new PartitionKey($"{roomCode}"));

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -70,8 +70,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("areaId", out JsonElement areaId);
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 //默认不指定返回大小
                 int? pageSize = null;
@@ -201,11 +201,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{_areaId}", new PartitionKey("AreaSetting"));
@@ -290,8 +290,8 @@ namespace TEAMModelBI.Controllers.BISchool
 
                 List<object> schools = new List<object>();
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 //List<string> schoolIds = new List<string>();
                 //string sqlTxt = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId FROM c WHERE c.pk = 'Teacher' AND c.status = 'join' AND ARRAY_CONTAINS(c.roles, 'assist', true) AND c.id='{tmdId}' ";
                 //await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
@@ -340,8 +340,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("site", out JsonElement site);
 
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 AssistSchool schoolAssists = new(); //返回学校列表集合
                 string sqlTxt = $"select c.id,c.code,c.schoolCode,c.name,c.region,c.province,c.city,c.dist,c.size,c.address,c.picture,c.type,c.scale,c.areaId,c.standard,c.period from c where c.id='{schoolId}'";
@@ -405,11 +405,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 string _auth = HttpContext.GetXAuth("AuthToken");
                 //var (tmdId, tmdName) = HttpJwtAnalysis.JwtXAuth(_auth, _option);
@@ -493,8 +493,8 @@ namespace TEAMModelBI.Controllers.BISchool
             if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<string> schools = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
             List<SchoolSpace> schoolSpaces = new();
@@ -609,11 +609,11 @@ namespace TEAMModelBI.Controllers.BISchool
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
 
             SchoolTeacher schoolTeacher = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemAsync<SchoolTeacher>($"{_tmdId}", new PartitionKey($"Teacher-{_school}"));
@@ -684,8 +684,8 @@ namespace TEAMModelBI.Controllers.BISchool
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 string divide = _option.Location;
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 Dictionary<string, object> dic = new() { { "PartitionKey", $"{parKey}" } };
                 if (!string.IsNullOrEmpty($"{userId}"))
@@ -784,8 +784,8 @@ namespace TEAMModelBI.Controllers.BISchool
             if (!jsonElement.TryGetProperty("isAdmin", out JsonElement isAdmin)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<SchoolTeacher> schoolTeachers = new List<SchoolTeacher>();
             //string sqlTxt = "select value(c) from c where array_contains(c.roles,'admin')";
             string sqlTxt = "select value(c) from c";
@@ -843,11 +843,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 StringBuilder strMsg = new($"{_tmdName}【{_tmdId}】账户将{tmdName}【{tmdId}】");
 
@@ -904,7 +904,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         {
                             id = $"{tmdId}",
                             code = $"Teacher-{schoolId}",
-                            roles = new List<string> { "admin" },
+                            roles = new List<string> { "admin", "teacher" },
                             job = "管理员",
                             name = $"{tmdName}",
                             picture = string.IsNullOrEmpty($"{picture}") ? "" : $"{picture}",
@@ -952,11 +952,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 StringBuilder msg = new();
                 List<DelSchoolRel> delSchoolRels = new();
@@ -1066,11 +1066,11 @@ namespace TEAMModelBI.Controllers.BISchool
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
 
             List<ApplySchool> applySchools = new();
@@ -1094,8 +1094,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("schoolId", out JsonElement schoolId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             StringBuilder sqlTxt = new StringBuilder("select * from c");
             if (!string.IsNullOrEmpty($"{schoolId}"))
             {
@@ -1132,8 +1132,8 @@ namespace TEAMModelBI.Controllers.BISchool
             jsonElement.TryGetProperty("schoolId", out JsonElement schoolId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             long allSize = 0;    //全部大小
             int teacherSpace = 0;  //学校分配给教师的空间
             long useSize = 0;   //已使用大小 
@@ -1290,8 +1290,8 @@ namespace TEAMModelBI.Controllers.BISchool
             if (!jsonElement.TryGetProperty("schoolId", out JsonElement schoolId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             DateTimeOffset dtime = DateTimeOffset.UtcNow;
             var (weekS, weekE) = TimeHelper.GetStartOrEnd(dtime, "week");
@@ -1398,8 +1398,8 @@ namespace TEAMModelBI.Controllers.BISchool
             if (!jsonElement.TryGetProperty("schoolId", out JsonElement schoolId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<double> weekTrend = new();
             int year = DateTimeOffset.UtcNow.Year;

TEAMModelBI/Controllers/BIStudent/StuActivityController.cs

@@ -46,8 +46,8 @@ namespace TEAMModelBI.Controllers.BIStudent
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
 
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
                 //string sqlTxt = "SELECT select c.id,c.code,c.classIds FROM c  where c.pk='Activity' and c.classIds <> []";
                 string sqlTxt = "select c.id,c.code,c.classIds from c where c.school='cswznb' and c.classIds <> []";

TEAMModelBI/Controllers/BIStudent/StudentController.cs

@@ -41,8 +41,8 @@ namespace TEAMModelBI.Controllers.BIStudent
             jsonElement.TryGetProperty("code", out JsonElement code);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> objs = new List<object>();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.id='{studentId}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
             {

TEAMModelBI/Controllers/BITeacher/TeacherController.cs

@@ -42,8 +42,8 @@ namespace TEAMModelBI.Controllers.BITeacher
             jsonElement.TryGetProperty("schoolCode", out JsonElement schoolCode);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             
             List<SchoolTeacher> teachers = new List<SchoolTeacher>();
             string sqlTxt = "";
@@ -89,8 +89,8 @@ namespace TEAMModelBI.Controllers.BITeacher
             jsonElement.TryGetProperty("site", out JsonElement site);
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> objs = new List<object>();
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.id='{teacherId}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -168,12 +168,12 @@ namespace TEAMModelBI.Controllers.BITest
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
             var redisClinet = _azureRedis.GetRedisClient(8);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.Global);
             }
 
             var (_tmdId, _tmdName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
@@ -1294,11 +1294,11 @@ namespace TEAMModelBI.Controllers.BITest
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var table = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
             var redisClinet = _azureRedis.GetRedisClient(8);
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("");
-                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.GlobalSite);
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("");
+                redisClinet = _azureRedis.GetRedisClient(dbnum: 8, name: BIConst.Global);
             }
 
 
@@ -1398,8 +1398,8 @@ namespace TEAMModelBI.Controllers.BITest
         {
             var cosmosClient = _azureCosmos.GetCosmosClient();
 
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             linqTest linqTest = new linqTest();
             linqTest.id = linqTestm.id; linqTest.name = linqTestm.name;
 

TEAMModelBI/Controllers/Census/ActivitySticsController.cs

@@ -58,8 +58,8 @@ namespace TEAMModelBI.Controllers.Census
                 (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
             }
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
              List<object> activityCount = new List<object>();
 
             if (!string.IsNullOrEmpty($"{tmdId}"))
@@ -122,8 +122,8 @@ namespace TEAMModelBI.Controllers.Census
             {
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 List<KeyValuePair<string, long>> typeCount = new List<KeyValuePair<string, long>>();
                 foreach (var type in StaticValue.activityTypes)
                 {
@@ -156,8 +156,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
 
@@ -197,8 +197,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
 
@@ -256,8 +256,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("areaId", out JsonElement areaId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<RecSchool> schools = new();
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecSchool>(queryText: $"select c.id,c.name,c.picture,c.scale from c where c.areaId='{areaId}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
@@ -320,8 +320,8 @@ namespace TEAMModelBI.Controllers.Census
             var (termStart, termEnd) = TimeHelper.GetStartOrEnd(DateTimeOffset.UtcNow, "term");
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<RecSchool> schools = new();
 
 
@@ -498,8 +498,8 @@ namespace TEAMModelBI.Controllers.Census
         {
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<AreaInfo> areaInfos = new();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Normal").GetItemQueryIterator<AreaInfo>(queryText: $"select c.id,c.name,c.standard,c.standardName from c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
@@ -602,8 +602,8 @@ namespace TEAMModelBI.Controllers.Census
             //if (jsonElement.TryGetProperty("", out JsonElement code)) return BadRequest();
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> infos = new List<object>();
             StringBuilder sqlTxt = new StringBuilder($"select * from c where c.id='{id}'");
             if (!string.IsNullOrEmpty($"{activity}"))

TEAMModelBI/Controllers/Census/BlobLogController.cs

@@ -47,8 +47,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("site", out JsonElement site);
             jsonElement.TryGetProperty("areaId", out JsonElement areaId);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             StringBuilder sqlSize = new($"select sum(c.size) as totals from c ");
             long useSize = 0;  //使用大小
             List<RecBlobFile> blobFiles = new();

TEAMModelBI/Controllers/Census/ItemSticsController.cs

@@ -44,8 +44,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             if (!string.IsNullOrEmpty($"{tmdId}"))
             {
@@ -94,8 +94,8 @@ namespace TEAMModelBI.Controllers.Census
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<string> itemType = new List<string> { "single", "multiple", "judge", "complete", "subjective", "connector", "correct", "compose" };
             List<object> typeCount = new List<object>();
 
@@ -160,8 +160,8 @@ namespace TEAMModelBI.Controllers.Census
             if(!jsonElement.TryGetProperty("term", out JsonElement term)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
 
             List<object> levelCount = new List<object>();
@@ -232,8 +232,8 @@ namespace TEAMModelBI.Controllers.Census
 
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> layerCount = new List<object>();
 
             if (!string.IsNullOrEmpty($"{tmdId}"))
@@ -300,8 +300,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("isPersonal", out JsonElement isPersonal);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<object> objItems = new List<object>();
             string sqlTxt = $"select * from c where c.id='{itemId}' and c.pk='Item'";

TEAMModelBI/Controllers/Census/LessonSticsController.cs

@@ -50,8 +50,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("term", out JsonElement term)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
             object totals = new();
             StringBuilder sqlTxt = new($"select COUNT(c.id) AS totals  from c where c.pk='LessonRecord'");
@@ -114,8 +114,8 @@ namespace TEAMModelBI.Controllers.Census
                 jsonElement.TryGetProperty("site", out JsonElement site);
 
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 string lessonSql = $"select COUNT(c.id) AS totals from c where c.pk='LessonRecord'";
                 long total = await CommonFind.FindTotals(cosmosClient, lessonSql, new List<string>() { "School","Teacher" });
 
@@ -142,8 +142,8 @@ namespace TEAMModelBI.Controllers.Census
                 if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+                if ($"{site}".Equals(BIConst.Global))
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 List<SchoolLen> schoolLens = new();
 
                 List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
@@ -184,8 +184,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             if (!string.IsNullOrEmpty($"{tmdId}"))
             {
                 jsonElement.TryGetProperty("years", out JsonElement _years);
@@ -245,8 +245,8 @@ namespace TEAMModelBI.Controllers.Census
             if (jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<SchoolLen> schoolLens = new();
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
@@ -349,8 +349,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("site", out JsonElement site);
             List<string> schools = new();
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             StringBuilder scSqlTxt = new("select c.id from c");
             if (!string.IsNullOrEmpty($"{areaId}"))
@@ -421,8 +421,8 @@ namespace TEAMModelBI.Controllers.Census
             //Dictionary<int, double> weeks = new();
             List<double> weeks = new();
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             int year = DateTimeOffset.UtcNow.Year;
             int dayOfweek = (int)DateTimeOffset.Parse($"{year}-1-1").DayOfWeek;
@@ -565,8 +565,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("lessonId", out JsonElement lessonId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> lessons = new();
             string sqlTxt = $"select * from c where c.id='{lessonId}'";
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { })) 

TEAMModelBI/Controllers/Census/PaperController.cs

@@ -50,8 +50,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("site", out JsonElement site);
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             object paperCount = new object();            
 
             if (!string.IsNullOrEmpty($"{tmdId}"))
@@ -117,8 +117,8 @@ namespace TEAMModelBI.Controllers.Census
         {
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             string sqlTxt = $"select COUNT(c.id) AS totals from c where c.pk='Paper'";
 
             long totals = await CommonFind.FindTotals(cosmosClient, sqlTxt.ToString(), new List<string>() { "School" });       
@@ -138,8 +138,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<string> schoolIds = new List<string>();
             List<SchoolPaper> schoolPapers = new List<SchoolPaper>();
 
@@ -176,8 +176,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<MonthStartEnd> endList1 = TimeHelper.GetYearMonthlyStartEnd13(DateTimeOffset.UtcNow.Year);
             if (string.IsNullOrEmpty($"{tmdId}"))
             {
@@ -237,8 +237,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             var (start, end) = TimeHelper.GetTermStartOrEnd(DateTime.Now);
 
              var totals = new object();
@@ -305,8 +305,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("isPersonal", out JsonElement isPersonal);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<object> paperInfos = new List<object>();
             string sqlTxt = $"select * from c where c.id='{paperId}' and c.pk='Paper'";

TEAMModelBI/Controllers/Census/ProductStatisController.cs

@@ -53,8 +53,8 @@ namespace TEAMModelBI.Controllers.Census
         {
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<ProductStatis> productStatis = new List<ProductStatis>();
             await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: $"SELECT c.serial,c.service FROM c",requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
             {
@@ -175,8 +175,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
             List<SchoolProduct> schoolProducts = new List<SchoolProduct>();
@@ -285,8 +285,8 @@ namespace TEAMModelBI.Controllers.Census
             jsonElement.TryGetProperty("tmdId", out JsonElement tmdId);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             long buyServiceCount = 0; //所有购买服务数量
             long buySerialsCount = 0; //所有购买软体数量
@@ -405,8 +405,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             long buyServiceCount = 0;  //购买服务数量
             long buySerialsCount = 0;  //购买软体数量

TEAMModelBI/Controllers/Census/SchoolController.cs

@@ -47,8 +47,8 @@ namespace TEAMModelBI.Controllers.Census
         {
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
 
             long schoolCount = 0;   //学校数量
             int tecCount = 0;  //教师数量
@@ -167,8 +167,8 @@ namespace TEAMModelBI.Controllers.Census
             long weekActivity = 0;  //本周学校所有活动
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
 
             var (lastWeekStart, lastWeekEnd) = TimeHelper.GetStartOrEnd(DateTimeOffset.UtcNow, "lastweek");   //计算上周开始/结束时间
@@ -267,8 +267,8 @@ namespace TEAMModelBI.Controllers.Census
             int yearBlob = 0;  //去年的资源
 
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             var (lastWeekStart, lastWeekEnd) = TimeHelper.GetStartOrEnd(DateTimeOffset.UtcNow, "lastweek");   //计算上周开始/结束时间
             var (weekStart, weekEnd) = TimeHelper.GetStartOrEnd(DateTimeOffset.UtcNow, "week");             //计算本周开始/结束时间
             var (lastTermStart, lastTermEnd) = TimeHelper.GetStartOrEnd(DateTimeOffset.UtcNow, "lastterm");   //计算上学期开始/结束时间
@@ -358,8 +358,8 @@ namespace TEAMModelBI.Controllers.Census
             if (!jsonElement.TryGetProperty("id", out JsonElement id)) return BadRequest();
             jsonElement.TryGetProperty("site", out JsonElement site);
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<object> infos = new List<object>();
 
             string sqlTxt = $"select value(c) from c where c.id='{id}'";

TEAMModelBI/Controllers/Census/StudyController.cs

@@ -53,8 +53,8 @@ namespace TEAMModelBI.Controllers.Census
 
             List<TeacherTrain> trains = new();
             var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"select c.id from c where c.areaId='{areaId}'", "Base");
 
             AreaSetting setting = null;

TEAMModelBI/Controllers/Core/BlobController.cs

@@ -58,12 +58,12 @@ namespace TEAMModelBI.Controllers.Core
             var (id, _, _, school) = HttpContext.GetAuthTokenInfo();
             string fileExt = FileType.GetExtention(file.FileName).ToLower();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+            if ($"{site}".Equals(BIConst.Global))
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
 
             if (ContentTypeDict.dict.ContainsKey($".{fileExt}"))
             {
-                //var url = await _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite).UploadFileByContainer("0-public", file.OpenReadStream(), "school", $"{Guid.NewGuid()}.{fileExt}", false);
+                //var url = await _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global).UploadFileByContainer("0-public", file.OpenReadStream(), "school", $"{Guid.NewGuid()}.{fileExt}", false);
                 //var url = await BIAzureStorageBlobExtensions.UploadFileByContainer(blobClient, file.OpenReadStream(), "school", $"{Guid.NewGuid()}.{fileExt}");
                 var url = await AzureStorageBlobExtensions.UploadFileByContainer(blobClient, file.OpenReadStream(), "school", $"{Guid.NewGuid()}.{fileExt}");
                 return Ok(new { url });

TEAMModelBI/Controllers/DingDingStruc/DDStructController.cs

@@ -284,8 +284,8 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 List<DingDingUserInfo> ddUserInfos = new();
 
                 var tabledd = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("BIDDUserInfo");
+                if ($"{site}".Equals(BIConst.Global))
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("BIDDUserInfo");
 
                 if (rspV2UserList1.Result.List != null)
                 {
@@ -499,10 +499,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 Dictionary<string, object> dic = new Dictionary<string, object> { { "PartitionKey", "authority-bi" } };
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("SchoolSetting");
                 var cosmosClient = _azureCosmos.GetCosmosClient();
-                if ($"{site}".Equals(BIConst.GlobalSite)) 
+                if ($"{site}".Equals(BIConst.Global)) 
                 {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("SchoolSetting");
+                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("SchoolSetting");
                 }
 
                 List<Authority> authorityBIList = await table.FindListByDict<Authority>(dic);

TEAMModelBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -72,10 +72,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var table = tableClient.GetTableReference("BIDDUserInfo");                
 
@@ -225,9 +225,9 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var cosmosCliet = _azureCosmos.GetCosmosClient();
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("BIDDUserInfo");
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("BIDDUserInfo");
                 }
                 //string divide = _configuration["CustomParam:SiteScope"];
                 string divide = _option.Location;
@@ -346,10 +346,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var table = tableClient.GetTableReference("BIDDUserInfo");
 
@@ -429,10 +429,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var table = tableClient.GetTableReference("BIDDUserInfo");           
 
@@ -506,10 +506,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
 
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("BIDDUserInfo");
@@ -582,11 +582,11 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 var cosmosCliet = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosCliet = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosCliet = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 };
 
                 var table = tableClient.GetTableReference("BIDDUserInfo");
@@ -740,10 +740,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
 
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("BIDDUserInfo");
@@ -848,10 +848,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
 
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("BIDDUserInfo");
@@ -959,10 +959,10 @@ namespace TEAMModelBI.Controllers.DingDingStruc
 
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
             }
 
             var table = tableClient.GetTableReference("BIDDUserInfo");
@@ -1025,11 +1025,11 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    cosmosCliet = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    cosmosCliet = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 var table = tableClient.GetTableReference("BIDDUserInfo");
 
@@ -1168,9 +1168,9 @@ namespace TEAMModelBI.Controllers.DingDingStruc
             jsonElement.TryGetProperty("mobile", out JsonElement mobile);
             jsonElement.TryGetProperty("site", out JsonElement site);
             var table = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("BIDDUserInfo");
+                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("BIDDUserInfo");
             }
 
             //string divide = _configuration["CustomParam:SiteScope"];

TEAMModelBI/Controllers/LoginController.cs

@@ -99,11 +99,11 @@ namespace TEAMModelBI.Controllers
                 jsonElement.TryGetProperty("site", out JsonElement site);
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                    Website = BIConst.GlobalSite;
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                    Website = BIConst.Global;
                 }
 
                 //获取access_token
@@ -306,16 +306,16 @@ namespace TEAMModelBI.Controllers
                     id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, ddUserInfo.tmdId?.ToString(), ddUserInfo.tmdName?.ToString(), ddUserInfo.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: isExploit, ddUserInfo.userId?.ToString(), ddUserInfo.name?.ToString(), ddUserInfo.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
                 }
 
-                if (Website.Equals(BIConst.GlobalSite))
+                if (Website.Equals(BIConst.Global))
                 {
-                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.GlobalSite);
+                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.Global);
                 }
                 else
                 {
                     (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
                 }
 
-                //(osblob_uri, osblob_sas) = roles.Contains("assist") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List, BIConst.GlobalSite);
+                //(osblob_uri, osblob_sas) = roles.Contains("assist") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List, BIConst.Global);
 
                 return Ok(new { state = 200, ddUserInfos = ddusers, id_token, roles, permissions, osblob_uri, osblob_sas });
             }
@@ -344,11 +344,11 @@ namespace TEAMModelBI.Controllers
                 string Website = "China";
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                    Website = BIConst.GlobalSite;
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                    Website = BIConst.Global;
                 }
 
                 HttpClient httpClient = _http.CreateClient();
@@ -430,9 +430,9 @@ namespace TEAMModelBI.Controllers
                 ddUserInfos = await table.UpdateAll(ddUserInfos);
                 string osblob_uri = null, osblob_sas = null;
 
-                if (Website.Equals(BIConst.GlobalSite))
+                if (Website.Equals(BIConst.Global))
                 {
-                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.GlobalSite);
+                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.Global);
                 }
                 else
                 {
@@ -470,11 +470,11 @@ namespace TEAMModelBI.Controllers
                 string Website = "China";
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                    Website = BIConst.GlobalSite;
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                    Website = BIConst.Global;
                 }
                 var table = tableClient.GetTableReference("BIDDUserInfo");
                 var tempUser = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{partitionKey}" }, { "userId", $"{userId}" } });
@@ -558,9 +558,9 @@ namespace TEAMModelBI.Controllers
 
                 string osblob_uri = null, osblob_sas = null;
 
-                if (Website.Equals(BIConst.GlobalSite))
+                if (Website.Equals(BIConst.Global))
                 {
-                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.GlobalSite);
+                    (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete, BIConst.Global);
                 }
                 else
                 {
@@ -594,12 +594,12 @@ namespace TEAMModelBI.Controllers
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                Website = BIConst.GlobalSite;
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                Website = BIConst.Global;
             }
 
             StringBuilder sqlTxt = new($"select value(c) from c");
@@ -655,12 +655,12 @@ namespace TEAMModelBI.Controllers
             var cosmosClient = _azureCosmos.GetCosmosClient();
             var tableClient = _azureStorage.GetCloudTableClient();
             var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.GlobalSite))
+            if ($"{site}".Equals(BIConst.Global))
             {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.GlobalSite);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
-                Website = BIConst.GlobalSite;
+                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
+                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
+                Website = BIConst.Global;
             }
 
             string salt = Utils.CreatSaltString(8);

TEAMModelBI/Controllers/OperateRecord/OperateLogController.cs

@@ -65,8 +65,8 @@ namespace TEAMModelBI.Controllers.OperateRecord
                     tableSql.Append(!string.IsNullOrEmpty(tableSql.ToString()) ? $" and platform eq '{platform}' " : $" platform eq '{platform}' ");
                 
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("BIOptLog");
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("BIOptLog");
+                if ($"{site}".Equals(BIConst.Global))
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("BIOptLog");
 
                 //lambda 表达式排序
                 operateLogs = await table.QueryWhereString<BIOptLog>(tableSql.ToString());
@@ -124,10 +124,10 @@ namespace TEAMModelBI.Controllers.OperateRecord
                 }
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.GlobalSite))
+                if ($"{site}".Equals(BIConst.Global))
                 {
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.GlobalSite);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.GlobalSite);
+                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
+                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
 
                 var table = tableClient.GetTableReference("BIOptLog");
@@ -171,8 +171,8 @@ namespace TEAMModelBI.Controllers.OperateRecord
                 else storageSql = $"tmdId eq '{tmdId}'";
 
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("BIOptLog");
-                if ($"{site}".Equals(BIConst.GlobalSite))
-                    table = _azureStorage.GetCloudTableClient(BIConst.GlobalSite).GetTableReference("BIOptLog");
+                if ($"{site}".Equals(BIConst.Global))
+                    table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("BIOptLog");
                 var optLogs = await table.QueryWhereString<BIOptLog>(storageSql);
 
                 return Ok(new { state = 200, optLogs });

TEAMModelBI/Tool/Context/BIConst.cs

@@ -2,18 +2,26 @@
 {
     public class BIConst
     {
+        /// <summary>
+        /// 大陆测试站
+        /// </summary>
+        public static readonly string ChinaTest = "Global-Test";
         /// <summary>
         /// 通用数据库国际站点连接字串名称
         /// </summary>
-        public static readonly string GlobalSite = "Global";
+        public static readonly string Global = "Global";
+        /// <summary>
+        /// 国际站点测试站
+        /// </summary>
+        public static readonly string GlobalTest = "Global-Test";
 
         /// <summary>
         /// 中国站防火墙日志连接字串名称
         /// </summary>
-        public static readonly string LogChinaSite = "LogChina";
+        public static readonly string LogChina = "LogChina";
         /// <summary>
         /// 国际站防火墙日志连接字串名称
         /// </summary>
-        public static readonly string LogGlobalSite = "LogGlobal";
+        public static readonly string LogGlobal = "LogGlobal";
     }
 }