Merge branch 'hhb/develop-2206' into develop

TEAMModelBI/Controllers/OpenApi/SchoolController.cs

@@ -63,7 +63,7 @@ namespace TEAMModelAPI.Controllers
         public async Task<IActionResult> GetSchools() {
             var (id, _) = HttpContext.GetApiTokenInfo();
             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESOpenApi");
-            List<BusinessSchool> schools=  await table.FindListByDict<BusinessSchool>(new Dictionary<string, object> { { "PartitionKey", $"BusinessSchool-{id}" } });
+            List<BusinessSchool> schools=  await table.FindListByDict<BusinessSchool>(new Dictionary<string, object> { { "PartitionKey", $"BusinessSchool" },{ "bizid",id} });
             return Ok(new { schools = schools.Select(x => new {id =x.RowKey,x.name,x.picture })});
         }
         /// <summary>

TEAMModelOS.SDK/Context/Attributes/Filter/ApiTokenAttribute.cs

@@ -162,7 +162,7 @@ namespace TEAMModelOS.Filter
                                         if (!string.IsNullOrWhiteSpace(XAuthSchool))
                                         {
                                             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESOpenApi");
-                                            List<BusinessSchool> schools =   table.FindListByDictSync<BusinessSchool>(new Dictionary<string, object> { { "PartitionKey", $"BusinessSchool-{id}" } ,{ "RowKey",XAuthSchool } });
+                                            List<BusinessSchool> schools =   table.FindListByDictSync<BusinessSchool>(new Dictionary<string, object> { { "PartitionKey", $"BusinessSchool" } ,{ "school", XAuthSchool },{ "bizid" ,id} });
                                             List<BusinessConfig> configs = table.FindListByDictSync<BusinessConfig>(new Dictionary<string, object> { { "PartitionKey", $"BusinessConfig" }, { "RowKey", id } });
                                             //同时授权学校存在，且jti一致 ，验证jti原因在于 token轮换或刷新后，旧的token不能再使用。
                                             if (schools.Any() && configs.Any())