CrazyIter_Bin 11 月之前
父節點
當前提交
c073593234
共有 100 個文件被更改,包括 512 次插入512 次删除
  1. 3 3
      TEAMModelBI/Controllers/BIHome/HomeStatisController.cs
  2. 3 3
      TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs
  3. 7 7
      TEAMModelBI/Controllers/BINormal/AreaRelevantController.cs
  4. 12 12
      TEAMModelBI/Controllers/BINormal/BatchAreaController.cs
  5. 4 4
      TEAMModelBI/Controllers/BINormal/BusinessConfigController.cs
  6. 3 3
      TEAMModelBI/Controllers/BINormal/BusinessUsersController.cs
  7. 7 7
      TEAMModelBI/Controllers/BIProductAnalysis/ProductAnalysisController.cs
  8. 24 24
      TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs
  9. 1 1
      TEAMModelBI/Controllers/BISchool/RoomController.cs
  10. 27 27
      TEAMModelBI/Controllers/BISchool/SchoolController.cs
  11. 2 2
      TEAMModelBI/Controllers/BIStudent/StudentController.cs
  12. 1 1
      TEAMModelBI/Controllers/BITable/BIOpenApiController.cs
  13. 4 4
      TEAMModelBI/Controllers/BITable/DDStructController.cs
  14. 1 1
      TEAMModelBI/Controllers/BITable/OperateLogController.cs
  15. 3 3
      TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs
  16. 2 2
      TEAMModelBI/Controllers/BITeacher/TeacherController.cs
  17. 12 12
      TEAMModelBI/Controllers/BITest/Ies5TestController.cs
  18. 11 11
      TEAMModelBI/Controllers/BITest/TestController.cs
  19. 11 11
      TEAMModelBI/Controllers/BITmid/TmidController.cs
  20. 5 5
      TEAMModelBI/Controllers/Census/ActivitySticsController.cs
  21. 10 10
      TEAMModelBI/Controllers/Census/ItemSticsController.cs
  22. 11 11
      TEAMModelBI/Controllers/Census/LessonSticsController.cs
  23. 7 7
      TEAMModelBI/Controllers/Census/PaperController.cs
  24. 12 12
      TEAMModelBI/Controllers/Census/ProductStatisController.cs
  25. 12 12
      TEAMModelBI/Controllers/Census/SchoolController.cs
  26. 5 5
      TEAMModelBI/Controllers/RepairApi/SchoolRepController.cs
  27. 1 1
      TEAMModelBI/Controllers/RepairApi/TeacherREPController.cs
  28. 1 1
      TEAMModelBI/Startup.cs
  29. 5 5
      TEAMModelBI/Tool/CommonFind.cs
  30. 2 2
      TEAMModelBI/Tool/CosmosBank/ActivityWay.cs
  31. 1 1
      TEAMModelBI/Tool/CosmosBank/ProductWay.cs
  32. 1 1
      TEAMModelBI/Tool/CosmosBank/StatsWay.cs
  33. 10 10
      TEAMModelOS.Function/CosmosDBTriggers/TriggerArt.cs
  34. 12 12
      TEAMModelOS.Function/CosmosDBTriggers/TriggerCorrect.cs
  35. 24 24
      TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs
  36. 3 3
      TEAMModelOS.Function/CosmosDBTriggers/TriggerExamLite.cs
  37. 3 3
      TEAMModelOS.Function/CosmosDBTriggers/TriggerHomework.cs
  38. 4 4
      TEAMModelOS.Function/CosmosDBTriggers/TriggerStudy.cs
  39. 5 5
      TEAMModelOS.Function/CosmosDBTriggers/TriggerSurvey.cs
  40. 3 3
      TEAMModelOS.Function/CosmosDBTriggers/TriggerVote.cs
  41. 1 1
      TEAMModelOS.Function/IESCosmosDBTrigger.cs
  42. 13 13
      TEAMModelOS.Function/IESServiceBusTrigger.cs
  43. 4 4
      TEAMModelOS.SDK/Context/Attributes/Filter/ApiTokenAttribute.cs
  44. 4 4
      TEAMModelOS.SDK/DI/AzureCosmos/AzureCosmosExtensions.cs
  45. 2 2
      TEAMModelOS.SDK/DI/AzureRedis/AzureRedisExtensions.cs
  46. 1 1
      TEAMModelOS.SDK/DI/AzureRedis/AzureRedisFactory.cs
  47. 5 5
      TEAMModelOS.SDK/DI/AzureStorage/AzureStorageBlobExtensions.cs
  48. 1 1
      TEAMModelOS.SDK/DI/AzureStorage/AzureStorageFactory.cs
  49. 2 2
      TEAMModelOS.SDK/DI/AzureStorage/AzureStorageTableExtensions.cs
  50. 1 1
      TEAMModelOS.SDK/DI/AzureStorage/Inner/AzureBlobModel.cs
  51. 4 4
      TEAMModelOS.SDK/DI/Mail/MailFactory.cs
  52. 1 1
      TEAMModelOS.SDK/Models/Cosmos/BI/AreaQuoteRecord.cs
  53. 1 1
      TEAMModelOS.SDK/Models/Cosmos/BI/BICommon/Notice.cs
  54. 1 1
      TEAMModelOS.SDK/Models/Cosmos/BI/BITable/LessStats.cs
  55. 1 1
      TEAMModelOS.SDK/Models/Cosmos/BI/Company.cs
  56. 1 1
      TEAMModelOS.SDK/Models/Cosmos/BI/DingDingUserInfo.cs
  57. 4 4
      TEAMModelOS.SDK/Models/Service/BI/BILeesonService.cs
  58. 6 6
      TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs
  59. 9 9
      TEAMModelOS.SDK/Models/Service/BI/BIStats.cs
  60. 1 1
      TEAMModelOS.SDK/Models/Service/BI/BIStatsNotice.cs
  61. 5 5
      TEAMModelOS.SDK/Models/Service/BI/CosmosQueryHelper.cs
  62. 2 2
      TEAMModelOS.SDK/Models/Service/BI/LessonStatisWay.cs
  63. 1 1
      TEAMModelOS.SDK/Models/Service/BI/ProductUseRecordService.cs
  64. 1 1
      TEAMModelOS.SDK/Models/Service/BIStatsWay/SchoolStatsWay.cs
  65. 1 1
      TEAMModelOS.SDK/Models/Service/BIStatsWay/StudyStatsWay.cs
  66. 5 5
      TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs
  67. 1 1
      TEAMModelOS.SDK/Models/Service/Common/ActivityStudentService.cs
  68. 1 1
      TEAMModelOS.SDK/Models/Service/Common/BlobService.cs
  69. 1 1
      TEAMModelOS.SDK/Models/Service/Common/SyllabusService.cs
  70. 5 5
      TEAMModelOS.SDK/Models/Service/Common/TeacherService.cs
  71. 1 1
      TEAMModelOS.SDK/Models/Service/ErrorItemsService.cs
  72. 5 5
      TEAMModelOS.SDK/Models/Service/ExamService.cs
  73. 6 6
      TEAMModelOS.SDK/Models/Service/FixDataService.cs
  74. 16 16
      TEAMModelOS.SDK/Models/Service/GroupListService.cs
  75. 18 18
      TEAMModelOS.SDK/Models/Service/IESActivityService.cs
  76. 3 3
      TEAMModelOS.SDK/Models/Service/LessonService.cs
  77. 3 3
      TEAMModelOS.SDK/Models/Service/OpenApiService.cs
  78. 3 3
      TEAMModelOS.SDK/Models/Service/SchoolService.cs
  79. 10 10
      TEAMModelOS.SDK/Models/Service/StudentService.cs
  80. 1 1
      TEAMModelOS.SDK/Models/Service/SystemService.cs
  81. 1 1
      TEAMModelOS.SDK/Models/Service/Third/Sc/ScYxptModel.cs
  82. 3 3
      TEAMModelOS.SDK/Models/Service/Third/ThirdService.cs
  83. 1 1
      TEAMModelOS.SDK/Models/Service/Third/Xkw/XkwOAuthModel.cs
  84. 1 1
      TEAMModelOS.SDK/Models/Table/BIOptLog.cs
  85. 1 1
      TEAMModelOS.SDK/Models/Table/ChangeRecord.cs
  86. 1 1
      TEAMModelOS.SDK/Models/Table/IESLogin.cs
  87. 1 1
      TEAMModelOS.SDK/Models/Table/Lesson.cs
  88. 1 1
      TEAMModelOS.SDK/Models/Table/OpenApi.cs
  89. 1 1
      TEAMModelOS.SDK/Models/Table/OptLog.cs
  90. 1 1
      TEAMModelOS.SDK/Models/Table/SchoolSetting.cs
  91. 1 1
      TEAMModelOS.SDK/Models/Table/SchoolYear.cs
  92. 1 1
      TEAMModelOS.SDK/Models/Table/ShortUrl.cs
  93. 1 1
      TEAMModelOS.SDK/TEAMModelOS.SDK.csproj
  94. 8 8
      TEAMModelOS/Controllers/Analysis/AchievementController.cs
  95. 4 4
      TEAMModelOS/Controllers/Analysis/AnalysisController.cs
  96. 3 3
      TEAMModelOS/Controllers/Analysis/ArtAnalysisController.cs
  97. 15 15
      TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs
  98. 20 20
      TEAMModelOS/Controllers/Both/CourseBaseController.cs
  99. 20 20
      TEAMModelOS/Controllers/Both/CourseController.cs
  100. 0 0
      TEAMModelOS/Controllers/Both/GroupListController.cs

+ 3 - 3
TEAMModelBI/Controllers/BIHome/HomeStatisController.cs

@@ -90,7 +90,7 @@ namespace TEAMModelBI.Controllers.BIHome
                 List<ProvinceStandard> standards = new();
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryStreamIteratorSql(queryText: $"select c.provCode,c.provName,c.standard from c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -476,7 +476,7 @@ namespace TEAMModelBI.Controllers.BIHome
                     await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT sum(c.size) as size FROM c ",
                         requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{itemId}") }))
                     {
-                        var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        var json = await JsonDocument.ParseAsync(item.Content);
                         foreach (var elmt in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             if (elmt.TryGetProperty("size", out JsonElement _size) && _size.ValueKind.Equals(JsonValueKind.Number))
@@ -593,7 +593,7 @@ namespace TEAMModelBI.Controllers.BIHome
                 ////查询教师的大小和教师集合信息
                 //await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: $"select c.id,c.size from c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 //{
-                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(item.Content);
                 //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 //    {
                 //        totalSize += obj.GetProperty("size").GetInt64();

+ 3 - 3
TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs

@@ -174,7 +174,7 @@ namespace TEAMModelBI.Controllers.BINormal
                             abilityTask.scope = abilityTaskTree.scope;
                             abilityTask.codeval = $"{recordAbilityTask.standard}";
                             abilityTask.standard = $"{recordAbilityTask.standard}";
-                            await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AbilityTask>(abilityTask, new Azure.Cosmos.PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
+                            await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AbilityTask>(abilityTask, new PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
                             msgBuilder.Append($"新增章节功能,章节ID:{abilityTask.id} 分区键:{abilityTask.code}");
                             type = "abilityTask-add";
                         }
@@ -188,7 +188,7 @@ namespace TEAMModelBI.Controllers.BINormal
                             AbilityService.TreeToList(abilityTaskTree.trees, nodes, now);
                             abilityTask.children = nodes;
                             abilityTaskTree.auth = abilityTask.auth;
-                            await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AbilityTask>(abilityTask, abilityTask.id, new Azure.Cosmos.PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
+                            await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AbilityTask>(abilityTask, abilityTask.id, new PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
                             msgBuilder.Append($"修改章节功能,章节ID:{abilityTask.id} 分区键:{abilityTask.code}");
                             type = "abilityTask-update";
                         }
@@ -215,7 +215,7 @@ namespace TEAMModelBI.Controllers.BINormal
                             codeval = $"{recordAbilityTask.standard}",
                             standard = $"{recordAbilityTask.standard}"
                         };
-                        await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AbilityTask>(abilityTask, new Azure.Cosmos.PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
+                        await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AbilityTask>(abilityTask, new PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
 
                         msgBuilder.Append($"新增章节功能,章节ID:{abilityTask.id} 分区键:{abilityTask.code}");
                         type = "abilityTask-add";

+ 7 - 7
TEAMModelBI/Controllers/BINormal/AreaRelevantController.cs

@@ -81,7 +81,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 //IES5實體學校
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: sqltxt, requestOptions:new QueryRequestOptions() { PartitionKey = new PartitionKey("Base")})) 
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0) 
                     {
                         foreach(var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -120,7 +120,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 //虛擬學校
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("VirtualBase") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -187,7 +187,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{areaId}", new PartitionKey("AreaSetting"));
                 if (responseSet.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                     AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                     if (!string.IsNullOrEmpty(delSet.accessConfig))
                         return Ok(new { state = 401, msg = "区域已经规定了,不能切换能能力" });
@@ -293,7 +293,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Base"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 teacher = json.ToObject<Teacher>();
                 var existArea = teacher.areas.Find(f => f.areaId.Equals($"{areaId}"));
                 if (existArea == null)
@@ -337,7 +337,7 @@ namespace TEAMModelBI.Controllers.BINormal
                                 var resScTch = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Teacher-{item.id}"));
                                 if (resScTch.Status == 200)
                                 {
-                                    using var json = await JsonDocument.ParseAsync(resScTch.ContentStream);
+                                    using var json = await JsonDocument.ParseAsync(resScTch.Content);
                                     schoolTeacher = json.ToObject<SchoolTeacher>();
                                     if (!schoolTeacher.roles.Contains("admin"))
                                     {
@@ -445,7 +445,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Base"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 teacher = json.ToObject<Teacher>();
                 var existArea = teacher.areas.Find(f => f.areaId.Equals($"{areaId}"));
                 if (existArea != null)
@@ -498,7 +498,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(areaSc.id, new PartitionKey("ProductSum"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                     {
                         areaSc.serial = serial.ToObject<List<SchoolProductSumData>>().Count;//.Select(x => x.prodCode).ToList();

+ 12 - 12
TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -133,7 +133,7 @@ namespace TEAMModelBI.Controllers.BINormal
 
                 await foreach (var itemArea in cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryStreamIteratorSql(queryText: areaSql.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base-Area") })) 
                 {
-                    using var json = await JsonDocument.ParseAsync(itemArea.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(itemArea.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0) 
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -689,7 +689,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 ///學區簡碼重複驗證
                 //await foreach (var item in _azureCosmosClientCsv2Read.GetContainer("Core", "School").GetItemQueryStreamIteratorSql(queryText: sqlCheckRep, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("district") })) 
                 //{
-                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(item.Content);
                 //    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                 //    {
                 //        return Ok(new { state = 1, message = "此学区简码与其他 [学区] 简码相同请检查!" });
@@ -698,7 +698,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 ///學校簡碼重複驗證
                 //await foreach (var item in _azureCosmosClientCsv2Read.GetContainer("Core", "School").GetItemQueryStreamIteratorSql(queryText: sqlCheckRep, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base") }))
                 //{
-                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(item.Content);
                 //    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                 //    {
                 //        return Ok(new { state = 1, message = "此学区简码与其他 [学校] 简码相同请检查!" });
@@ -768,7 +768,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{_oldId}", new PartitionKey("AreaSetting"));
                 if (responseSet.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                     AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                     if (!string.IsNullOrEmpty(delSet.accessConfig))
                         return Ok(new { state = 401, msg = "区域已经规定了,不能切换能能力" });
@@ -899,7 +899,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     var respFile = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(saveFile.id, new PartitionKey("StandardFile"));
                     if (respFile.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(respFile.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(respFile.Content);
                         tempFile = json.ToObject<StandardFile>();
                         await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<StandardFile>(tempFile.id, new PartitionKey("StandardFile"));
                     }
@@ -926,7 +926,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     var respSetting = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(saveSetting.id, new PartitionKey("AreaSetting"));
                     if (respSetting.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(respSetting.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(respSetting.Content);
                         tempSetting = json.ToObject<AreaSetting>();
                         await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<AreaSetting>(tempFile.id, new PartitionKey("AreaSetting"));
                     }
@@ -1005,7 +1005,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{areaId}", new PartitionKey("Base-Area"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 Area area = json.ToObject<Area>();
                 if (area.standard == $"{standard}") 
                 {
@@ -1066,7 +1066,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     var responseFile = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(area.id, new PartitionKey("StandardFile"));
                     if(responseFile.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(responseFile.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(responseFile.Content);
                         delFile = fileJson.ToObject<StandardFile>();
                         await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<StandardFile>(delFile.id, new PartitionKey("StandardFile"));
                     }
@@ -1076,7 +1076,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(area.id, new PartitionKey("AreaSetting"));
                     if (responseSet.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                         delSet = fileJson.ToObject<AreaSetting>();
                         await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<AreaSetting>(delSet.id, new PartitionKey("AreaSetting"));
                     }
@@ -1150,7 +1150,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{_oldId}", new PartitionKey("AreaSetting"));
                     if (responseSet.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                         AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                         if (!string.IsNullOrEmpty(delSet.accessConfig))
                             return Ok(new { state = 401, msg = "区域已经规定了,不能切换能能力" });
@@ -1324,7 +1324,7 @@ namespace TEAMModelBI.Controllers.BINormal
                         var respFile = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(saveFile.id, new PartitionKey("StandardFile"));
                         if (respFile.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(respFile.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(respFile.Content);
                             tempFile = json.ToObject<StandardFile>();
                             await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<StandardFile>(tempFile.id, new PartitionKey("StandardFile"));
                         }
@@ -1359,7 +1359,7 @@ namespace TEAMModelBI.Controllers.BINormal
                         var respSetting = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync(saveSetting.id, new PartitionKey("AreaSetting"));
                         if (respSetting.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(respSetting.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(respSetting.Content);
                             tempSetting = json.ToObject<AreaSetting>();
                             await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").DeleteItemAsync<AreaSetting>(saveSetting.id, new PartitionKey("AreaSetting"));
                         }

+ 4 - 4
TEAMModelBI/Controllers/BINormal/BusinessConfigController.cs

@@ -105,7 +105,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(bizConfig.id, new PartitionKey("BizConfig"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     BizConfig tempBizConfig = json.ToObject<BizConfig>();
 
                     bizConfig.pk = "BizConfig";
@@ -231,7 +231,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{id}", new PartitionKey("BizConfig"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 bizConfig = json.ToObject<BizConfig>();
                 var auth_token = JwtAuthExtension.CreateBusinessApiToken(_option.Location, bizConfig.id, _option.JwtSecretKey, bizConfig.isCustomize);
                 bizConfig.jti = auth_token.jti;
@@ -286,7 +286,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{id}", new PartitionKey("BizConfig"));
             if (response.Status == RespondCode.Ok)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 bizConfig = json.ToObject<BizConfig>();
                 foreach (var item in bizSchool)
                 {
@@ -355,7 +355,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{id}", new PartitionKey("BizConfig"));
                 if (response.Status == RespondCode.Ok)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     bizConfig = json.ToObject<BizConfig>();
                     if (bizConfig.schools.Count > 0)
                     {

+ 3 - 3
TEAMModelBI/Controllers/BINormal/BusinessUsersController.cs

@@ -114,7 +114,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(bizUsers.id, new PartitionKey("BizUsers"));
                 if (response.Status == RespondCode.Ok)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     BizUsers tempbizUsers = json.ToObject<BizUsers>();
 
                     bizUsers.pk = "BizUsers";
@@ -195,7 +195,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{id}", new PartitionKey("BizUsers"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 bizUsers = json.ToObject<BizUsers>();
                 bizUsers.salt = salt;
                 bizUsers.pwd = Utils.HashedPassword(bizUsers.mobile.ToString(), salt);
@@ -281,7 +281,7 @@ namespace TEAMModelBI.Controllers.BINormal
             var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{id}", new PartitionKey("BizUsers"));
             if (response.Status == RespondCode.Ok)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 bizUsers = json.ToObject<BizUsers>();
             }
 

+ 7 - 7
TEAMModelBI/Controllers/BIProductAnalysis/ProductAnalysisController.cs

@@ -23,8 +23,8 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Service.BI;
-using PartitionKey = Azure.Cosmos.PartitionKey;
-using QueryRequestOptions = Azure.Cosmos.QueryRequestOptions;
+using PartitionKey = PartitionKey;
+using QueryRequestOptions = QueryRequestOptions;
 
 namespace TEAMModelBI.Controllers.ProductAnalysis
 {
@@ -100,7 +100,7 @@ namespace TEAMModelBI.Controllers.ProductAnalysis
                 }
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: SqlSch, requestOptions: null))
                 {
-                    var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         string schId = obj.GetProperty("id").GetString();
@@ -155,7 +155,7 @@ namespace TEAMModelBI.Controllers.ProductAnalysis
                         {
                             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: SqlSchProdSoft, requestOptions: null ))
                             {
-                                var json = await JsonDocument.ParseAsync(item.ContentStream);
+                                var json = await JsonDocument.ParseAsync(item.Content);
                                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                                 {
                                     SchoolProductSerial serialRow = obj.ToObject<SchoolProductSerial>();
@@ -209,7 +209,7 @@ namespace TEAMModelBI.Controllers.ProductAnalysis
                 }
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: Sql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ProdAnalysis") }))
                 {
-                    var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         ProdAnalysisApiResult resultRow = obj.ToObject<ProdAnalysisApiResult>();
@@ -387,7 +387,7 @@ namespace TEAMModelBI.Controllers.ProductAnalysis
                 //實體學校
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: Sql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -402,7 +402,7 @@ namespace TEAMModelBI.Controllers.ProductAnalysis
                 {
                     await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: Sql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"VirtualBase") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 24 - 24
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -163,7 +163,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         var respAreaId = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{bischool.areaId}", new PartitionKey("Base-Area"));
                         if (respAreaId.Status == 200)
                         {
-                            using var areaBase = await JsonDocument.ParseAsync(respAreaId.ContentStream);
+                            using var areaBase = await JsonDocument.ParseAsync(respAreaId.Content);
                             area = areaBase.ToObject<Area>();
                         }
 
@@ -246,7 +246,7 @@ namespace TEAMModelBI.Controllers.BISchool
                                 var resTeache = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync($"{tmdIndo.id}", new PartitionKey("Base"));
                                 if (resTeache.Status == 200)
                                 {
-                                    using var tchJson = await JsonDocument.ParseAsync(resTeache.ContentStream);
+                                    using var tchJson = await JsonDocument.ParseAsync(resTeache.Content);
                                     teacher = tchJson.ToObject<Teacher>();
                                     Teacher.TeacherSchool tchSc = null;
                                     //var tempTch = teacher.schools.Select(x => x.schoolId.Equals(upSchool.id)).ToString();
@@ -336,7 +336,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     //    var respAreaId = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{bischool.areaId}", new PartitionKey("Base-Area"));
                     //    if (respAreaId.Status == 200)
                     //    {
-                    //        using var areaBase = await JsonDocument.ParseAsync(respAreaId.ContentStream);
+                    //        using var areaBase = await JsonDocument.ParseAsync(respAreaId.Content);
                     //        area = areaBase.ToObject<Area>();
                     //    }
 
@@ -345,7 +345,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     //    var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{bischool.areaId}", new PartitionKey("AreaSetting"));
                     //    if (responseSet.Status == 200)
                     //    {
-                    //        using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                    //        using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                     //        AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                     //        if (!string.IsNullOrEmpty(delSet.accessConfig))
                     //            isSYNCArea = true;
@@ -417,7 +417,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     //                    var resTeache = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync($"{coreUser.id}", new PartitionKey("Base"));
                     //                    if (resTeache.Status == 200)
                     //                    {
-                    //                        using var tchJson = await JsonDocument.ParseAsync(resTeache.ContentStream);
+                    //                        using var tchJson = await JsonDocument.ParseAsync(resTeache.Content);
                     //                        teacher = tchJson.ToObject<Teacher>();
                     //                        //教师存在,在该教师信息中添加要管理的学校信息
                     //                        teacher.schools.Add(new Teacher.TeacherSchool { areaId = string.IsNullOrEmpty(bischool.areaId) ? "" : bischool.areaId, schoolId = createSchoolInfo.id, name = bischool.name, status = "join", time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
@@ -622,7 +622,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
                     await foreach (var itemSchool in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: stringBuilder.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemSchool.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemSchool.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -689,7 +689,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
                 //    await foreach (var itemSchool in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: stringBuilder.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
                 //    {
-                //        using var json = await JsonDocument.ParseAsync(itemSchool.ContentStream);
+                //        using var json = await JsonDocument.ParseAsync(itemSchool.Content);
                 //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                 //        {
                 //            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -710,7 +710,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(item.id, new PartitionKey("ProductSum"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                             item.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
                         if (json.RootElement.TryGetProperty("service", out JsonElement service) && !service.ValueKind.Equals(JsonValueKind.Null))
@@ -729,7 +729,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 //    var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(school.id, new PartitionKey("ProductSum"));
                 //    if (response.Status == 200)
                 //    {
-                //        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                //        using var json = await JsonDocument.ParseAsync(response.Content);
                 //        if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                 //        {
                 //            school.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -845,7 +845,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
                     await foreach (var itemSchool in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: stringBuilder.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemSchool.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemSchool.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -861,7 +861,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(item.id, new PartitionKey("ProductSum"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                             item.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
                         if (json.RootElement.TryGetProperty("service", out JsonElement service) && !service.ValueKind.Equals(JsonValueKind.Null))
@@ -898,7 +898,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(temp.id, new PartitionKey("ProductSum"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                     {
                         temp.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -943,7 +943,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 //    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: managerSql, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         string id = obj.GetProperty("id").GetString(); //管理员ID
@@ -970,7 +970,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 string baseWhereOption = (!string.IsNullOrEmpty(schoolId)) ? $" and c.id='{schoolId}'" : string.Empty;
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"select c.id from c join serviceProduct in c.service.product where serviceProduct.prodCode = 'IPDYZYLC' {baseWhereOption}", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Product") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         string tempSchoolId = obj.GetProperty("id").GetString();  //学校ID
@@ -983,7 +983,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 string schoolWhereOption = (!string.IsNullOrEmpty(schoolId)) ? $" where c.id='{schoolId}'" : string.Empty;
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"select c.id,c.name,c.period,c.schoolCode,c.region,c.province,c.city,c.picture from c {schoolWhereOption}", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         dynamic schoolExpando = new ExpandoObject();
@@ -1104,7 +1104,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         
                         //計算學校版本
                         List<SchoolProductSumData> services = new List<SchoolProductSumData>();
-                        Azure.Response productSumResponse = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{_schoolId}", new PartitionKey("ProductSum"));
+                        ResponseMessage productSumResponse = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{_schoolId}", new PartitionKey("ProductSum"));
                         if (productSumResponse.Status == 200)
                         {
                             var doc = JsonDocument.Parse(productSumResponse.Content);
@@ -1147,7 +1147,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         var respRel = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(tempShool.id, new PartitionKey("BIRel"));
                         if (respRel.Status == 200)
                         {
-                            using var fileJson = await JsonDocument.ParseAsync(respRel.ContentStream);
+                            using var fileJson = await JsonDocument.ParseAsync(respRel.Content);
                             biRel = fileJson.ToObject<BIRelation>();
                         }
                         else
@@ -1408,7 +1408,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{item}", new PartitionKey("AreaSetting"));
                     if (responseSet.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                         AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                         if (!string.IsNullOrEmpty(delSet.accessConfig))
                             synPro.Add(item);
@@ -1501,7 +1501,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{bISchool.areaId}", new PartitionKey("AreaSetting"));
                     if (responseSet.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                         AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                         if (!string.IsNullOrEmpty(delSet.accessConfig))
                             synPro.Add(bISchool);
@@ -1568,7 +1568,7 @@ namespace TEAMModelBI.Controllers.BISchool
                             var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{msId}", new PartitionKey($"Teacher-{scId}"));
                             if (response.Status == 200)
                             {
-                                using var tchJson = await JsonDocument.ParseAsync(response.ContentStream);
+                                using var tchJson = await JsonDocument.ParseAsync(response.Content);
                                 SchoolTeacher tchSc = tchJson.ToObject<SchoolTeacher>();
                                 if (tchSc.roles.Contains("admin"))
                                 {
@@ -1616,7 +1616,7 @@ namespace TEAMModelBI.Controllers.BISchool
                             var responseSc = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(scId, new PartitionKey("Base"));
                             if (responseSc.Status == 200)
                             {
-                                using var tchJson = await JsonDocument.ParseAsync(responseSc.ContentStream);
+                                using var tchJson = await JsonDocument.ParseAsync(responseSc.Content);
                                 School scInfo = tchJson.ToObject<School>();
                                 teacher.schools.Add(new() { schoolId = scInfo.id, name = scInfo.name, status = "join", time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), picture = scInfo.picture, areaId = scInfo.areaId });
                             }
@@ -1670,7 +1670,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var resSc = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{item.id}", new PartitionKey("Base"));
                 if (resSc.Status == 200)
                 {
-                    using var sJson = await JsonDocument.ParseAsync(resSc.ContentStream);
+                    using var sJson = await JsonDocument.ParseAsync(resSc.Content);
                     school = sJson.ToObject<School>();
                     //CoreUser coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"19940828843" } }, _option.Location, _configuration);
                     var content = new StringContent(item.mobiles.ToArray().ToJsonString(), Encoding.UTF8, "application/json");
@@ -1682,12 +1682,12 @@ namespace TEAMModelBI.Controllers.BISchool
                         var respone = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync($"{tmd.id}", new PartitionKey("Base"));
                         if (respone.Status == 200)
                         {
-                            using var tchJson = await JsonDocument.ParseAsync(respone.ContentStream);
+                            using var tchJson = await JsonDocument.ParseAsync(respone.Content);
                             teacher = tchJson.ToObject<Teacher>();
                             var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{tmd.id}", new PartitionKey($"Teacher-{item.id}"));
                             if (response.Status == 200)
                             {
-                                using var scTchJson = await JsonDocument.ParseAsync(response.ContentStream);
+                                using var scTchJson = await JsonDocument.ParseAsync(response.Content);
                                 SchoolTeacher tchSc = scTchJson.ToObject<SchoolTeacher>();
                                 if (tchSc.roles.Contains("admin"))
                                 {

+ 1 - 1
TEAMModelBI/Controllers/BISchool/RoomController.cs

@@ -72,7 +72,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{roomId}", new PartitionKey($"{roomCode}"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     Room roomInfo = json.ToObject<Room>();
                     roomInfo.serial = string.IsNullOrEmpty($"{serial}") ? null : $"{serial}";
 

+ 27 - 27
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -108,7 +108,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 List<NotAreaSchool> tempNotAreaSchools = new();
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: sqltxt.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -188,7 +188,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 {
                     await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{pk}") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -277,7 +277,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var responseSet = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{_areaId}", new PartitionKey("AreaSetting"));
                 if (responseSet.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(responseSet.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(responseSet.Content);
                     AreaSetting delSet = fileJson.ToObject<AreaSetting>();
                     if (!string.IsNullOrEmpty(delSet.accessConfig))
                         return Ok(new { state = 401, msg = "区域已经规定了,不能切换能能力" });
@@ -378,7 +378,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolAssists.id, new PartitionKey("ProductSum"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                         {
                             schoolAssists.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -501,14 +501,14 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(sid, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
 
                 long teach = 0;
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT sum(c.size) as size FROM c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{sid}") }))
                 {
-                    var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var elmt in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         if (elmt.TryGetProperty("size", out JsonElement _size) && _size.ValueKind.Equals(JsonValueKind.Number))
@@ -769,7 +769,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
                     if (resScInfo.Status == 200)
                     {
-                        using var tchJson = await JsonDocument.ParseAsync(resScInfo.ContentStream);
+                        using var tchJson = await JsonDocument.ParseAsync(resScInfo.Content);
                         School scInfo = tchJson.ToObject<School>();
                         areaId = scInfo.areaId;
                     }
@@ -782,7 +782,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var resTeacher = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Base"));
                 if (resTeacher.Status == 200)
                 {
-                    using var tchJson = await JsonDocument.ParseAsync(resTeacher.ContentStream);
+                    using var tchJson = await JsonDocument.ParseAsync(resTeacher.Content);
                     teacher = tchJson.ToObject<Teacher>();
 
                     var existArea = teacher.schools.Find(f => f.schoolId.Equals($"{schoolId}"));
@@ -813,7 +813,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Teacher-{schoolId}"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         schoolTeacher = json.ToObject<SchoolTeacher>();
                         if (!schoolTeacher.roles.Contains("admin"))
                         {
@@ -895,7 +895,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{tmdId}", new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     Teacher teacher = json.ToObject<Teacher>();
                     teacher.schools.RemoveAll(s => scIds.Contains(s.schoolId));
                     await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<Teacher>(teacher, teacher.id, new PartitionKey("Base"));
@@ -916,7 +916,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     }
                     else
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         scTeacher = json.ToObject<SchoolTeacher>();
                         if (scTeacher.roles.Contains("admin"))
                         {
@@ -970,7 +970,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     var resTeacher = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Base"));
                     if (resTeacher.Status == 200)
                     {
-                        using var tchJson = await JsonDocument.ParseAsync(resTeacher.ContentStream);
+                        using var tchJson = await JsonDocument.ParseAsync(resTeacher.Content);
                         teacher = tchJson.ToObject<Teacher>();
                     }
                     else
@@ -999,7 +999,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{tmdId}", new PartitionKey($"Teacher-{school.id}"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             schoolTeacher = json.ToObject<SchoolTeacher>();
                             if (!schoolTeacher.roles.Contains("admin"))
                             {
@@ -1134,7 +1134,7 @@ namespace TEAMModelBI.Controllers.BISchool
                             var tchBaseResponse = await cosmosClient.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync($"{item}", new PartitionKey("Base"));
                             if (tchBaseResponse.Status == 200)
                             {
-                                using var json = await JsonDocument.ParseAsync(tchBaseResponse.ContentStream);
+                                using var json = await JsonDocument.ParseAsync(tchBaseResponse.Content);
                                 Teacher teacher = json.ToObject<Teacher>();
                                 var tempSc = teacher.schools.Find(f => f.schoolId.Equals($"{tempId}"));
                                 if (tempSc != null)
@@ -1269,7 +1269,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolInfo.id, new PartitionKey("ProductSum"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                         schoolInfo.serial = serial.ToObject<List<ProductSumInfos>>();
 
@@ -1346,7 +1346,7 @@ namespace TEAMModelBI.Controllers.BISchool
             var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{schoolId}", new PartitionKey("Base"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 recSchool = json.ToObject<RecSchool>();
             }
             else return Ok(new { state = RespondCode.NotFound, msg = "未找到该学校" });
@@ -1866,7 +1866,7 @@ namespace TEAMModelBI.Controllers.BISchool
             var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{schoolId}", new PartitionKey("Base"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 school = json.ToObject<AnSchool>();
             }
             else return Ok(new { state = RespondCode.NotFound, msg = "未找到该学校" });
@@ -1885,7 +1885,7 @@ namespace TEAMModelBI.Controllers.BISchool
             var responseProduct = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(school.id, new PartitionKey("ProductSum"));
             if (responseProduct.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(responseProduct.ContentStream);
+                using var json = await JsonDocument.ParseAsync(responseProduct.Content);
                 if (json.RootElement.TryGetProperty("serial", out JsonElement _serial) && !_serial.ValueKind.Equals(JsonValueKind.Null))
                 {
                     school.serial = _serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -1988,7 +1988,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(scProd.id, new PartitionKey("ProductSum"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                             {
                                 List<string> serials = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -2015,7 +2015,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     //    var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(scProd.id, new PartitionKey("ProductSum"));
                     //    if (response.Status == 200)
                     //    {
-                    //        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    //        using var json = await JsonDocument.ParseAsync(response.Content);
                     //        if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                     //        {
                     //            scProd.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList(); 
@@ -2063,7 +2063,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -2109,7 +2109,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 {
                     await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT sum(c.size) as size FROM c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{school}") }))
                     {
-                        var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        var json = await JsonDocument.ParseAsync(item.Content);
                         foreach (var elmt in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             if (elmt.TryGetProperty("size", out JsonElement _size) && _size.ValueKind.Equals(JsonValueKind.Number))
@@ -2419,7 +2419,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var response = await db.ReadItemStreamAsync(school_code.ToString(), new PartitionKey($"ProductSum"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     productSum = json.ToObject<SchoolProductSum>();
                     prodinfo = productSum.prodinfo;
                     serviceSum = productSum.service;
@@ -2431,7 +2431,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 string serialQueryText = $"SELECT * FROM c WHERE c.dataType = 'serial' AND ARRAY_CONTAINS({serialPermitJsonStr}, c.prodCode)";
                 await foreach (var itemsr in db.GetItemQueryStreamIteratorSql(queryText: serialQueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{school_code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(itemsr.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(itemsr.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         deviceForCoreService uuidForCore;
@@ -2447,7 +2447,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 SchoolProductSum schoolProductSum;
                 await foreach (var items in db.GetItemQueryStreamIteratorSql(queryText: $"SELECT * FROM c WHERE c.id = '{school_code}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ProductSum") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(items.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(items.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -2474,7 +2474,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 //硬體
                 await foreach (var itemhd in db.GetItemQueryStreamIteratorSql(queryText: $"SELECT * FROM c WHERE c.dataType = 'hard'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{school_code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(itemhd.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(itemhd.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -2490,7 +2490,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 var querysp = $"SELECT SUM(c.size) as size FROM c";
                 await foreach (var item in db.GetItemQueryStreamIteratorSql(queryText: querysp, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{school_code}") }))
                 {
-                    var jsonts = await JsonDocument.ParseAsync(item.ContentStream);
+                    var jsonts = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in jsonts.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         teach = obj.GetProperty("size").GetInt64() * 1073741824; //G換算

+ 2 - 2
TEAMModelBI/Controllers/BIStudent/StudentController.cs

@@ -50,7 +50,7 @@ namespace TEAMModelBI.Controllers.BIStudent
             List<object> objs = new();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.id='{studentId}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0) 
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -85,7 +85,7 @@ namespace TEAMModelBI.Controllers.BIStudent
                 List<CorrectStu> correctStus = new();
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         obj.TryGetProperty("id", out JsonElement tempTd);

+ 1 - 1
TEAMModelBI/Controllers/BITable/BIOpenApiController.cs

@@ -59,7 +59,7 @@ namespace TEAMModelBI.Controllers.BITable
             List<ReadApi> openApis = new();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Normal").GetItemQueryStreamIteratorSql(queryText:sqlTxt.ToString(),requestOptions:new QueryRequestOptions() { PartitionKey = new PartitionKey("Api")}))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt32() > 0) 
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 4 - 4
TEAMModelBI/Controllers/BITable/DDStructController.cs

@@ -18,7 +18,7 @@ using Microsoft.Azure.Cosmos;
 using TEAMModelOS.SDK.Models;
 using TEAMModelBI.Controllers.BISchool;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
 
@@ -292,7 +292,7 @@ namespace TEAMModelBI.Controllers.BITable
                         //            var schoolRoles = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(item.id, new PartitionKey($"Teacher-{item.defaultSchool}"));
                         //            if (schoolRoles.Status == 200)
                         //            {
-                        //                using var json = await JsonDocument.ParseAsync(schoolRoles.ContentStream);
+                        //                using var json = await JsonDocument.ParseAsync(schoolRoles.Content);
                         //                if (json.RootElement.TryGetProperty("roles", out JsonElement _roles) && _roles.ValueKind != JsonValueKind.Null)
                         //                {
                         //                    foreach (var obj in _roles.EnumerateArray())
@@ -381,7 +381,7 @@ namespace TEAMModelBI.Controllers.BITable
                                                     var schoolRoles = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(item.id, new PartitionKey($"Teacher-{item.defaultSchool}"));
                                                     if (schoolRoles.Status == 200)
                                                     {
-                                                        using var json = await JsonDocument.ParseAsync(schoolRoles.ContentStream);
+                                                        using var json = await JsonDocument.ParseAsync(schoolRoles.Content);
                                                         if (json.RootElement.TryGetProperty("roles", out JsonElement _roles) && _roles.ValueKind != JsonValueKind.Null)
                                                         {
                                                             foreach (var obj in _roles.EnumerateArray())
@@ -513,7 +513,7 @@ namespace TEAMModelBI.Controllers.BITable
                                         var schoolRoles = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(item.id, new PartitionKey($"Teacher-{item.defaultSchool}"));
                                         if (schoolRoles.Status == 200)
                                         {
-                                            using var json = await JsonDocument.ParseAsync(schoolRoles.ContentStream);
+                                            using var json = await JsonDocument.ParseAsync(schoolRoles.Content);
                                             if (json.RootElement.TryGetProperty("roles", out JsonElement _roles) && _roles.ValueKind != JsonValueKind.Null)
                                             {
                                                 foreach (var obj in _roles.EnumerateArray())

+ 1 - 1
TEAMModelBI/Controllers/BITable/OperateLogController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;

+ 3 - 3
TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs

@@ -19,7 +19,7 @@ using System.Net;
 using TEAMModelOS.SDK.Extension;
 using System.Text;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelBI.Models;
@@ -1462,7 +1462,7 @@ namespace TEAMModelBI.Controllers.BITable
                     var respone = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(coreUser.id, new PartitionKey("Base"));
                     if (respone.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(respone.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(respone.Content);
                         teacher = json.ToObject<Teacher>();
                     }
                     else
@@ -1519,7 +1519,7 @@ namespace TEAMModelBI.Controllers.BITable
                     //    var resp = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{coreUser.id}", new PartitionKey($"{item.code}"));
                     //    if (resp.Status == 200)
                     //    {
-                    //        using var json = await JsonDocument.ParseAsync(resp.ContentStream);
+                    //        using var json = await JsonDocument.ParseAsync(resp.Content);
                     //        SchoolTeacher scTeacher = json.ToObject<SchoolTeacher>();
                     //        if (scTeacher.roles.Contains("sales"))
                     //            scTeacher.roles.Remove("sales");

+ 2 - 2
TEAMModelBI/Controllers/BITeacher/TeacherController.cs

@@ -60,7 +60,7 @@ namespace TEAMModelBI.Controllers.BITeacher
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions:new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0) 
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -99,7 +99,7 @@ namespace TEAMModelBI.Controllers.BITeacher
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.id='{teacherId}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0) 
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray()) 

+ 12 - 12
TEAMModelBI/Controllers/BITest/Ies5TestController.cs

@@ -103,7 +103,7 @@ namespace TEAMModelBI.Controllers.BITest
 
             if ($"{actType}".Equals("Study"))
             {
-                study = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Study>($"{id}", new Azure.Cosmos.PartitionKey($"Study-{code}"));
+                study = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Study>($"{id}", new PartitionKey($"Study-{code}"));
                 if (study.groupLists.Count > 0)
                 {
                     var group = study.groupLists;
@@ -122,7 +122,7 @@ namespace TEAMModelBI.Controllers.BITest
             }
             else if ($"{actType}".Equals("Vote"))
             {
-                vote = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Vote>($"{id}", new Azure.Cosmos.PartitionKey($"Vote-{code}"));
+                vote = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Vote>($"{id}", new PartitionKey($"Vote-{code}"));
                 classes = vote.classes;
                 stuLists = vote.stuLists;
                 tchLists = vote.tchLists;
@@ -130,7 +130,7 @@ namespace TEAMModelBI.Controllers.BITest
             }
             else if ($"{actType}".Equals("Homework"))
             {
-                work = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Homework>($"{id}", new Azure.Cosmos.PartitionKey($"Homework-{code}"));
+                work = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Homework>($"{id}", new PartitionKey($"Homework-{code}"));
                 classes = work.classes;
                 stuLists = work.stuLists;
                 tchLists = work.tchLists;
@@ -138,7 +138,7 @@ namespace TEAMModelBI.Controllers.BITest
             }
             else if ($"{actType}".Equals("Survey")) 
             {
-                survey = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Survey>($"{id}", new Azure.Cosmos.PartitionKey($"Survey-{code}"));
+                survey = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Survey>($"{id}", new PartitionKey($"Survey-{code}"));
                 classes = survey.classes;
                 stuLists = survey.stuLists;
                 tchLists = survey.tchLists;
@@ -146,7 +146,7 @@ namespace TEAMModelBI.Controllers.BITest
             }
             else if ($"{actType}".Equals("ExamLite")) 
             {
-                examLite = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamLite>($"{id}", new Azure.Cosmos.PartitionKey($"ExamLite-{code}"));
+                examLite = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamLite>($"{id}", new PartitionKey($"ExamLite-{code}"));
                 classes = examLite.classes;
                 stuLists = examLite.stuLists;
                 tchLists = examLite.tchLists;
@@ -154,7 +154,7 @@ namespace TEAMModelBI.Controllers.BITest
             }
             else if ($"{actType}".Equals("Exam"))
             {
-                examInfo = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamInfo>($"{id}", new Azure.Cosmos.PartitionKey($"Exam-{code}"));
+                examInfo = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamInfo>($"{id}", new PartitionKey($"Exam-{code}"));
                 classes = examInfo.classes;
                 stuLists = examInfo.stuLists;
                 school = examInfo.school;
@@ -165,37 +165,37 @@ namespace TEAMModelBI.Controllers.BITest
             if ($"{actType}".Equals("Study"))
             {
                 study.staffIds = idsList;
-                study = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Study>(study, study.id, new Azure.Cosmos.PartitionKey($"Study-{code}"));
+                study = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Study>(study, study.id, new PartitionKey($"Study-{code}"));
                 showAct = study;
             }
             else if ($"{actType}".Equals("Vote"))
             {
                 vote.staffIds = idsList;
-                vote = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Vote>(vote, vote.id, new Azure.Cosmos.PartitionKey($"Vote-{code}")); 
+                vote = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Vote>(vote, vote.id, new PartitionKey($"Vote-{code}")); 
                 showAct = vote;
             }
             else if ($"{actType}".Equals("Homework"))
             {
                 work.staffIds = idsList;
-                work = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Homework>(work, work.id, new Azure.Cosmos.PartitionKey($"Homework-{code}"));
+                work = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Homework>(work, work.id, new PartitionKey($"Homework-{code}"));
                 showAct = work;
             }
             else if ($"{actType}".Equals("Survey"))
             {
                 survey.staffIds = idsList;
-                survey = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Survey>(survey, survey.id, new Azure.Cosmos.PartitionKey($"Survey-{code}"));
+                survey = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Survey>(survey, survey.id, new PartitionKey($"Survey-{code}"));
                 showAct = work;
             }
             else if ($"{actType}".Equals("ExamLite"))
             {
                 examLite.staffIds = idsList;
-                examLite = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamLite>(examLite, examLite.id, new Azure.Cosmos.PartitionKey($"ExamLite-{code}"));
+                examLite = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamLite>(examLite, examLite.id, new PartitionKey($"ExamLite-{code}"));
                 showAct = work;
             }
             else if ($"{actType}".Equals("Exam"))
             {
                 examInfo.staffIds = idsList;
-                examInfo = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamInfo>(examInfo, examInfo.id, new Azure.Cosmos.PartitionKey($"Exam-{code}"));
+                examInfo = await cosmosClient.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamInfo>(examInfo, examInfo.id, new PartitionKey($"Exam-{code}"));
                 showAct = work;
             }
 

+ 11 - 11
TEAMModelBI/Controllers/BITest/TestController.cs

@@ -5,7 +5,7 @@ using DingTalk.Api.Response;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using System;
@@ -484,7 +484,7 @@ namespace TEAMModelBI.Controllers.BITest
                 //    var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(itemSchool.id, new PartitionKey("ProductSum"));
                 //    if (response.Status == 200)
                 //    {
-                //        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                //        using var json = await JsonDocument.ParseAsync(response.Content);
 
                 //        if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                 //        {
@@ -508,7 +508,7 @@ namespace TEAMModelBI.Controllers.BITest
 
                 await foreach (var itemSchool in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: stringBuilder.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 {
-                    using var jsonSchool = await JsonDocument.ParseAsync(itemSchool.ContentStream);
+                    using var jsonSchool = await JsonDocument.ParseAsync(itemSchool.Content);
                     foreach (var objSchool in jsonSchool.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         var schoolId = objSchool.GetProperty("id").GetString();
@@ -537,7 +537,7 @@ namespace TEAMModelBI.Controllers.BITest
                         var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("ProductSum"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                             {
                                 schoolAssist.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -587,7 +587,7 @@ namespace TEAMModelBI.Controllers.BITest
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(temp.id, new PartitionKey("ProductSum"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                     {
                         temp.serial = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -668,7 +668,7 @@ namespace TEAMModelBI.Controllers.BITest
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIteratorSql<int>(queryText: sqlText, requestOptions: new QueryRequestOptions() { }))
                 {
                     total += item;
-                    //using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    //using var json = await JsonDocument.ParseAsync(item.Content);
                     //if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                     //{
                     //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -683,7 +683,7 @@ namespace TEAMModelBI.Controllers.BITest
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryIteratorSql<int>(queryText: sqlText, requestOptions: new QueryRequestOptions() { }))
                 {
                     total += item;
-                    //using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    //using var json = await JsonDocument.ParseAsync(item.Content);
                     //if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt64() > 0)
                     //{
                     //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -782,7 +782,7 @@ namespace TEAMModelBI.Controllers.BITest
                 long tempCount = 0;
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c._ts,c.name,c.id FROM c WHERE c._ts>={start}L", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt64() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1029,7 +1029,7 @@ namespace TEAMModelBI.Controllers.BITest
             string sqlTxt = $"SELECT * FROM c order by c.id offset {pageSize} limit {endPosition}";
             await foreach (var tempPage in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey("Base") }))
             {
-                using var json = await JsonDocument.ParseAsync(tempPage.ContentStream);
+                using var json = await JsonDocument.ParseAsync(tempPage.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1079,7 +1079,7 @@ namespace TEAMModelBI.Controllers.BITest
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: "select value(c) from c", continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1353,7 +1353,7 @@ namespace TEAMModelBI.Controllers.BITest
             //School school = new();
             //if (response.Status == 200)
             //{
-            //    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+            //    using var json = await JsonDocument.ParseAsync(response.Content);
             //    school = json.ToObject<School>();
             //}
 

+ 11 - 11
TEAMModelBI/Controllers/BITmid/TmidController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Azure.Cosmos;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using System;
@@ -134,7 +134,7 @@ namespace TEAMModelBI.Controllers.BITmid
                             .GetContainer("Core", "ID2")
                             .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -171,7 +171,7 @@ namespace TEAMModelBI.Controllers.BITmid
                             .GetContainer("Core", "ID2")
                             .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base-ex") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -377,7 +377,7 @@ namespace TEAMModelBI.Controllers.BITmid
                                 .GetContainer(Constant.TEAMModelOS, "Teacher")
                                 .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -407,7 +407,7 @@ namespace TEAMModelBI.Controllers.BITmid
                                         .GetContainer(Constant.TEAMModelOS, "School")
                                         .GetItemQueryStreamIteratorSql(querysc, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                                     {
-                                        using var jsonsc = await JsonDocument.ParseAsync(itemsc.ContentStream);
+                                        using var jsonsc = await JsonDocument.ParseAsync(itemsc.Content);
                                         if (jsonsc.RootElement.TryGetProperty("_count", out JsonElement countsc) && countsc.GetUInt16() > 0)
                                         {
                                             foreach (var school in jsonsc.RootElement.GetProperty("Documents").EnumerateArray())
@@ -503,7 +503,7 @@ namespace TEAMModelBI.Controllers.BITmid
                                 .GetContainer("Core", "ID2")
                                 .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("benefits") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -530,7 +530,7 @@ namespace TEAMModelBI.Controllers.BITmid
                                 .GetContainer("Core", "ID2")
                                 .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("sokrates") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -780,7 +780,7 @@ namespace TEAMModelBI.Controllers.BITmid
                 .GetContainer("Core", "ID2")
                             .GetItemQueryStreamIteratorSql(query, continuationToken: continuationToken, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base"), MaxItemCount = pageSize }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -823,7 +823,7 @@ namespace TEAMModelBI.Controllers.BITmid
                             .GetContainer("Core", "ID2")
                             .GetItemQueryStreamIteratorSql(querye, continuationToken: continuationToken, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base-ex"), MaxItemCount = pageSize }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -873,7 +873,7 @@ namespace TEAMModelBI.Controllers.BITmid
                             .GetContainer("Core", "School")
                             .GetItemQueryStreamIteratorSql(querys, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1081,7 +1081,7 @@ namespace TEAMModelBI.Controllers.BITmid
             var result = new List<object>();
             await foreach (var item in client.GetItemQueryStreamIteratorSql(queryText: sql, requestOptions: qryOption))
             {
-                var json = await JsonDocument.ParseAsync(item.ContentStream);
+                var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 5 - 5
TEAMModelBI/Controllers/Census/ActivitySticsController.cs

@@ -262,7 +262,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIteratorSql(queryText: $"select c.id,c.code,c.totalTime,c.onlineTime,c.offlineTime,c.classTime,c.currency from c where c.pk='TeacherTrain' and {comSql}", requestOptions: new QueryRequestOptions() { })) 
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -688,7 +688,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -752,7 +752,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
                 ActivityCount activityCount = new() { id = itemId, name = school.name != null ? school.name : itemId };
@@ -797,7 +797,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
                     ActivityCount activityCount = new() { id = schoolId, name = school.name != null ? school.name : schoolId };
@@ -930,7 +930,7 @@ namespace TEAMModelBI.Controllers.Census
 
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIteratorSql(queryText: sqlTxt.ToString(), requestOptions: new QueryRequestOptions() { }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     infos.Add(obj.ToObject<object>());

+ 10 - 10
TEAMModelBI/Controllers/Census/ItemSticsController.cs

@@ -89,7 +89,7 @@ namespace TEAMModelBI.Controllers.Census
             {
                 await foreach (var item in cosmosClinet.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
 
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
@@ -104,7 +104,7 @@ namespace TEAMModelBI.Controllers.Census
             {
                 await foreach (var item in cosmosClinet.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
 
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
@@ -119,7 +119,7 @@ namespace TEAMModelBI.Controllers.Census
             {
                 await foreach (var item in cosmosClinet.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
 
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
@@ -132,7 +132,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClinet.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
 
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
@@ -174,7 +174,7 @@ namespace TEAMModelBI.Controllers.Census
                     var rsponse = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(scid, new PartitionKey("Base"));
                     if (rsponse.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(rsponse.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(rsponse.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -227,7 +227,7 @@ namespace TEAMModelBI.Controllers.Census
                     var rsponse = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (rsponse.Status == 200) 
                     {
-                        using var json = await JsonDocument.ParseAsync(rsponse.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(rsponse.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -296,7 +296,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200) 
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -363,7 +363,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200) 
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -432,7 +432,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", tableName).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         objItems.Add(obj.ToObject<object>());
@@ -446,7 +446,7 @@ namespace TEAMModelBI.Controllers.Census
                 {
                     await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", key).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             objItems.Add(obj.ToObject<object>());

+ 11 - 11
TEAMModelBI/Controllers/Census/LessonSticsController.cs

@@ -291,7 +291,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -356,7 +356,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -407,7 +407,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -461,7 +461,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(scid, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
 
@@ -632,7 +632,7 @@ namespace TEAMModelBI.Controllers.Census
             string sqlTxt = $"select * from c where c.id='{lessonId}'";
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { })) 
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     lessons.Add(obj.ToObject<object>());
@@ -762,7 +762,7 @@ namespace TEAMModelBI.Controllers.Census
             var openRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{year}", new PartitionKey("LessonYear"));
             if (openRes.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(openRes.ContentStream);
+                using var json = await JsonDocument.ParseAsync(openRes.Content);
                 LessonStats lessonYear = json.ToObject<LessonStats>();
                 if (type == 0)
                 {
@@ -796,7 +796,7 @@ namespace TEAMModelBI.Controllers.Census
             var lessRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{hourId}", new PartitionKey("LessonHour"));
             if (lessRes.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(lessRes.ContentStream);
+                using var json = await JsonDocument.ParseAsync(lessRes.Content);
                 LessonStats lessonHour = json.ToObject<LessonStats>();
                 if (type == 0)
                 {
@@ -833,7 +833,7 @@ namespace TEAMModelBI.Controllers.Census
                 var openResSc = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{year}", new PartitionKey($"LessonYear-{schoolId}"));
                 if (openResSc.Status == 200)
                 {
-                    using var jsonSc = await JsonDocument.ParseAsync(openResSc.ContentStream);
+                    using var jsonSc = await JsonDocument.ParseAsync(openResSc.Content);
                     LessonStats lessonYearSc = jsonSc.ToObject<LessonStats>();
                     if (type == 0)
                         if (lessonYearSc.open.Count == 0)
@@ -865,7 +865,7 @@ namespace TEAMModelBI.Controllers.Census
                 var lessResSc = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{hourId}", new PartitionKey($"LessonHour-{schoolId}"));
                 if (lessResSc.Status == 200)
                 {
-                    using var jsonSc = await JsonDocument.ParseAsync(lessResSc.ContentStream);
+                    using var jsonSc = await JsonDocument.ParseAsync(lessResSc.Content);
                     LessonStats lessonHourSc = jsonSc.ToObject<LessonStats>();
                     if (type == 0)
                         if (lessonHourSc.open.Count == 0)
@@ -932,7 +932,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(itemY.id, new PartitionKey($"{itemY.code}"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     LessonStats lessonYear = json.ToObject<LessonStats>();
                     lessonYear.open = itemY.open;
                     lessonYear.lesson = itemY.lesson;
@@ -948,7 +948,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(itemH.id, new PartitionKey($"{itemH.code}"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     LessonStats lessonHour = json.ToObject<LessonStats>();
                     lessonHour.open = itemH.open;
                     lessonHour.lesson = itemH.lesson;

+ 7 - 7
TEAMModelBI/Controllers/Census/PaperController.cs

@@ -293,7 +293,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -365,7 +365,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                 if (response.Status == 200) 
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
 
@@ -420,7 +420,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if (response.Status == 200) 
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -471,7 +471,7 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolId, new PartitionKey("Base"));
                     if(response.Status == 200) 
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
@@ -483,7 +483,7 @@ namespace TEAMModelBI.Controllers.Census
 
                     //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText:sqlTxt.ToString(),requestOptions:new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{schoolId}")}))
                     //{
-                    //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    //    using var json = await JsonDocument.ParseAsync(item.Content);
                     //    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                     //    {
                     //        foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -538,7 +538,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", tableName).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         paperInfos.Add(obj.ToObject<object>());
@@ -552,7 +552,7 @@ namespace TEAMModelBI.Controllers.Census
                 {
                     await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", temp).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             paperInfos.Add(obj.ToObject<object>());

+ 12 - 12
TEAMModelBI/Controllers/Census/ProductStatisController.cs

@@ -60,7 +60,7 @@ namespace TEAMModelBI.Controllers.Census
             List<ProductStatis> productStatis = new List<ProductStatis>();
             await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.serial,c.service FROM c",requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var itemCount in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -197,7 +197,7 @@ namespace TEAMModelBI.Controllers.Census
             var response = await clientContainer.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(schoolCode.ToString(), new PartitionKey($"ProductSum"));
             if (response.Status == 200)
             {
-                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                using var json = await JsonDocument.ParseAsync(response.Content);
                 productSum = json.ToObject<SchoolProductSum>();
                 prodinfo = productSum.prodinfo;
                 serialRecord = productSum.serial;
@@ -208,7 +208,7 @@ namespace TEAMModelBI.Controllers.Census
             //软体
             await foreach (var item in clientContainer.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: "SELECT * FROM c WHERE c.dataType='serial'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolCode}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -221,7 +221,7 @@ namespace TEAMModelBI.Controllers.Census
             //服务
             await foreach (var item in clientContainer.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: "SELECT * FROM c WHERE c.dataType='service'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolCode}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -234,7 +234,7 @@ namespace TEAMModelBI.Controllers.Census
             //硬体
             await foreach (var item in clientContainer.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: "SELECT * FROM c WHERE c.dataType='hard'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolCode}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -279,7 +279,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(scid, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
 
@@ -289,7 +289,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.serial,c.service FROM c where c.id='{scid}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var itemCount in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         ////所有的产品信息
@@ -409,13 +409,13 @@ namespace TEAMModelBI.Controllers.Census
                     var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(scId, new PartitionKey("Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         school = json.ToObject<School>();
                     }
 
                     await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.serial,c.service FROM c where c.id='{scId}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         foreach (var itemCount in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             //软体产品
@@ -459,7 +459,7 @@ namespace TEAMModelBI.Controllers.Census
 
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.serial,c.service FROM c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var itemCount in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         //软体产品
@@ -528,13 +528,13 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(scId, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
 
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.serial,c.service FROM c where c.id='{scId}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var itemCount in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         //软体产品

+ 12 - 12
TEAMModelBI/Controllers/Census/SchoolController.cs

@@ -201,7 +201,7 @@ namespace TEAMModelBI.Controllers.Census
                 var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
                 tecCount += await CommonFind.GetSqlValueCount(cosmosClient, "School", $"select value(count(c.id)) from c where ARRAY_CONTAINS(c.roles,'teacher',true) and c.status = 'join'", $"Teacher-{itemId}");
@@ -336,7 +336,7 @@ namespace TEAMModelBI.Controllers.Census
                 School sc = new();
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     sc = json.ToObject<School>();
                 }
 
@@ -511,7 +511,7 @@ namespace TEAMModelBI.Controllers.Census
             var respSc = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{scId}", new PartitionKey($"Base"));
             if (respSc.Status == 200)
             {
-                using var fileJson = await JsonDocument.ParseAsync(respSc.ContentStream);
+                using var fileJson = await JsonDocument.ParseAsync(respSc.Content);
                 school = fileJson.ToObject<School>();
             }
             else
@@ -524,7 +524,7 @@ namespace TEAMModelBI.Controllers.Census
             var scDataStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{DateTimeOffset.UtcNow.Year}-{scId}", new PartitionKey("Statistics"));
             if (scDataStats.Status == 200)
             {
-                using var fileJson = await JsonDocument.ParseAsync(scDataStats.ContentStream);
+                using var fileJson = await JsonDocument.ParseAsync(scDataStats.Content);
                 statsInfo = fileJson.ToObject<StatsInfo>();
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<LastYearLessAndAct>(queryText: $"select c.activity,c.lesson from c where c.id='{DateTimeOffset.UtcNow.Year - 1}-{scId}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Statistics") }))
                 {
@@ -637,7 +637,7 @@ namespace TEAMModelBI.Controllers.Census
             var respSc = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{scId}", new PartitionKey($"Base"));
             if (respSc.Status == 200)
             {
-                using var fileJson = await JsonDocument.ParseAsync(respSc.ContentStream);
+                using var fileJson = await JsonDocument.ParseAsync(respSc.Content);
                 school = fileJson.ToObject<School>();
             }
             else
@@ -650,7 +650,7 @@ namespace TEAMModelBI.Controllers.Census
                 var scDataStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{DateTimeOffset.UtcNow.Year}-{scId}", new PartitionKey("Statistics"));
                 if (scDataStats.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(scDataStats.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(scDataStats.Content);
                     statsInfo = fileJson.ToObject<StatsInfo>();
                     await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<LastYearLessAndAct>(queryText: $"select c.activity,c.lesson from c where c.id='{DateTimeOffset.UtcNow.Year - 1}-{scId}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Statistics") }))
                     {
@@ -805,7 +805,7 @@ namespace TEAMModelBI.Controllers.Census
             //    var respSc = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{areaId}", new PartitionKey($"Base-Area"));
             //    if (respSc.Status == 200)
             //    {
-            //        using var fileJson = await JsonDocument.ParseAsync(respSc.ContentStream);
+            //        using var fileJson = await JsonDocument.ParseAsync(respSc.Content);
             //        area = fileJson.ToObject<Area>();
             //    }
             //    else
@@ -1354,7 +1354,7 @@ namespace TEAMModelBI.Controllers.Census
             double itemCount = 0;
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as items FROM c where c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1370,7 +1370,7 @@ namespace TEAMModelBI.Controllers.Census
             double paperCount = 0;
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as papers FROM c where c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1423,7 +1423,7 @@ namespace TEAMModelBI.Controllers.Census
             StringBuilder sqlArea = new($"SELECT c.id, c.name FROM c WHERE ARRAY_CONTAINS({AreaListStr}, c.id, true)");
             await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryStreamIteratorSql(queryText: sqlArea.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
             {
-                var json = await JsonDocument.ParseAsync(item.ContentStream);
+                var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     string arId = obj.GetProperty("id").GetString();
@@ -1499,7 +1499,7 @@ namespace TEAMModelBI.Controllers.Census
             StringBuilder vrSqlArea = new($"SELECT c.id, c.name FROM c WHERE ARRAY_CONTAINS({vrAreaListStr}, c.id, true)");
             await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryStreamIteratorSql(queryText: vrSqlArea.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base-Area") }))
             {
-                var json = await JsonDocument.ParseAsync(item.ContentStream);
+                var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     string arId = obj.GetProperty("id").GetString();
@@ -1548,7 +1548,7 @@ namespace TEAMModelBI.Controllers.Census
             string sqlTxt = $"select value(c) from c where c.id='{id}'";
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     infos.Add(obj.ToObject<object>());

+ 5 - 5
TEAMModelBI/Controllers/RepairApi/SchoolRepController.cs

@@ -421,7 +421,7 @@ namespace TEAMModelBI.Controllers.RepairApi
                     if (resRel.Status == 200)
                     {
                         continue;
-                        //using var fileJson = await JsonDocument.ParseAsync(resRel.ContentStream);
+                        //using var fileJson = await JsonDocument.ParseAsync(resRel.Content);
                         //bIRelation = fileJson.ToObject<BIRelation>();
                     }
                     else
@@ -457,7 +457,7 @@ namespace TEAMModelBI.Controllers.RepairApi
                         var response = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(itemId, new PartitionKey("ProductSum"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             if (json.RootElement.TryGetProperty("serial", out JsonElement serial) && !serial.ValueKind.Equals(JsonValueKind.Null))
                             {
                                 List<string> serials = serial.ToObject<List<SchoolProductSumData>>().Select(x => x.prodCode).ToList();
@@ -529,7 +529,7 @@ namespace TEAMModelBI.Controllers.RepairApi
                     var scDataStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{year}-{sc}", new PartitionKey("Statistics"));
                     if (scDataStats.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(scDataStats.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(scDataStats.Content);
                         statsInfo = fileJson.ToObject<StatsInfo>();
                     }
                     else
@@ -640,7 +640,7 @@ namespace TEAMModelBI.Controllers.RepairApi
             qry = $"{qry}{where}";
             await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: qry, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -664,7 +664,7 @@ namespace TEAMModelBI.Controllers.RepairApi
                 qryBIRel = $"{qryBIRel}{whereBIRel}";
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: qryBIRel, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"BIRel") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelBI/Controllers/RepairApi/TeacherREPController.cs

@@ -92,7 +92,7 @@ namespace TEAMModelBI.Controllers.RepairApi
                         var resSc = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{teacher.schoolId}", new PartitionKey("Base"));
                         if (resSc.Status == 200)
                         {
-                            using var areaBase = await JsonDocument.ParseAsync(resSc.ContentStream);
+                            using var areaBase = await JsonDocument.ParseAsync(resSc.Content);
                             School school = areaBase.ToObject<School>();
                             if (teacher.areaId != school.areaId)
                                 teacher.areaId = school.areaId;

+ 1 - 1
TEAMModelBI/Startup.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SpaServices;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

+ 5 - 5
TEAMModelBI/Tool/CommonFind.cs

@@ -26,7 +26,7 @@ namespace TEAMModelBI.Tool
                 string managerSql = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId, c.id, c.name FROM c WHERE ARRAY_CONTAINS(c.roles, '{roles}', true) AND c.pk = 'Teacher' AND c.status = 'join' AND c.code = 'Teacher-{schoolId}'";
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: managerSql, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         SchoolTeacherRoles str = new()
@@ -59,7 +59,7 @@ namespace TEAMModelBI.Tool
             //string schoolSql = $"SELECT DISTINCT REPLACE(c.code,'Teacher-','') AS schoolId,c.code,c.roles,c.id,c.name From c where ARRAY_CONTAINS(c.roles,'assist',true) AND c.status = 'join' AND c.id='{tmdId}'";
             //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: schoolSql, requestOptions: new QueryRequestOptions() { }))
             //{
-            //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+            //    using var json = await JsonDocument.ParseAsync(item.Content);
             //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
             //    {
             //        schoolIds.Add(obj.GetProperty("schoolId").GetString());
@@ -112,7 +112,7 @@ namespace TEAMModelBI.Tool
             List<string> ids = new();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", container).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: !string.IsNullOrEmpty(code) ? new QueryRequestOptions() { PartitionKey = new PartitionKey(code) } : new QueryRequestOptions() { }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     ids.Add(obj.GetProperty(single).GetString());
@@ -139,7 +139,7 @@ namespace TEAMModelBI.Tool
 
             //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey(code) }))
             //{
-            //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+            //    using var json = await JsonDocument.ParseAsync(item.Content);
             //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
             //    {
             //        schoolIds.Add(obj.GetProperty("id").GetString());
@@ -175,7 +175,7 @@ namespace TEAMModelBI.Tool
                 //string sqlTxt = $"select c.id from c where ARRAY_CONTAINS(c.roles,'{rolesName}',true) and c.status = 'join'";
                 //await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() {PartitionKey =new PartitionKey($"Teacher-{school}") }))
                 //{
-                //    using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                 //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 //    {
                 //        teachers.Add(obj.GetProperty("id").GetString());

+ 2 - 2
TEAMModelBI/Tool/CosmosBank/ActivityWay.cs

@@ -30,7 +30,7 @@ namespace TEAMModelBI.Tool.CosmosBank
                         {
                             await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{sc}") }))
                             {
-                                using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                                using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                                 {
                                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -48,7 +48,7 @@ namespace TEAMModelBI.Tool.CosmosBank
                         {
                             await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{sc}") }))
                             {
-                                using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                                using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                                 {
                                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelBI/Tool/CosmosBank/ProductWay.cs

@@ -27,7 +27,7 @@ namespace TEAMModelBI.Tool.CosmosBank
                 string sqlTxt = $"select array_length(c.service) as totals from c where c.id='{sc.id}'";
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProductSum") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelBI/Tool/CosmosBank/StatsWay.cs

@@ -437,7 +437,7 @@ namespace TEAMModelBI.Tool.CosmosBank
             var responSett = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{school.areaId}", new PartitionKey("AreaSetting"));
             if (responSett.Status == 200)
             {
-                using var fileJson = await JsonDocument.ParseAsync(responSett.ContentStream);
+                using var fileJson = await JsonDocument.ParseAsync(responSett.Content);
                 setting = fileJson.ToObject<AreaSetting>();
             }
             if (setting == null)

+ 10 - 10
TEAMModelOS.Function/CosmosDBTriggers/TriggerArt.cs

@@ -62,7 +62,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     adcode = $"Activity-{tdata.creatorId}";
                     blobcntr = tdata.creatorId;
                 }
-                ArtEvaluation art = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ArtEvaluation>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                ArtEvaluation art = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ArtEvaluation>(tdata.id, new PartitionKey($"{tdata.code}"));
 
                 if (art != null)
                 {
@@ -258,7 +258,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                       string ql = $"select c.id,c.school,c.settings,c.classes from c where  c.pk = 'Art' and c.pId = '{art.id}'";
                                       await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIteratorSql(queryText: ql))
                                       {
-                                          using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                                          using var json = await JsonDocument.ParseAsync(item.Content);
                                           if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                           {
                                               var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -343,20 +343,20 @@ namespace TEAMModelOS.CosmosDBTriggers
                             //根据学校编码去获取区级ID
                             try {
                                 School scInfo = new();
-                                //School scInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
-                                var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
+                                //School scInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{art.school}", partitionKey: new PartitionKey("Base"));
+                                var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{art.school}", partitionKey: new PartitionKey("Base"));
                                 if (response.Status == 200)
                                 {
-                                    using var cJson = await JsonDocument.ParseAsync(response.ContentStream);
+                                    using var cJson = await JsonDocument.ParseAsync(response.Content);
                                     scInfo = cJson.ToObject<School>();
                                 }
                                 ArtSetting setting = new();
                                 try
                                 {
-                                    var artResponse = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{scInfo.areaId}", partitionKey: new Azure.Cosmos.PartitionKey("ArtSetting"));
+                                    var artResponse = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{scInfo.areaId}", partitionKey: new PartitionKey("ArtSetting"));
                                     if (response.Status == 200)
                                     {
-                                        using var json = await JsonDocument.ParseAsync(artResponse.ContentStream);
+                                        using var json = await JsonDocument.ParseAsync(artResponse.Content);
                                         setting = json.ToObject<ArtSetting>();
                                     }
                                 }
@@ -376,9 +376,9 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     });
                                     List<string> results = new();
                                     results = ids.Select(x => x.id).ToList();
-                                    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId in ({string.Join(",", results.Select(x => $"'{x}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{art.school}") }))
+                                    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId in ({string.Join(",", results.Select(x => $"'{x}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{art.school}") }))
                                     {
-                                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                                        using var json = await JsonDocument.ParseAsync(item.Content);
                                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                         {
                                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -818,7 +818,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                 List<(string name, List<string> kno)> blocks = new();
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     School sc = json.ToObject<School>();
                     var subjects = sc.period.Where(p => p.id.Equals(pId)).Select(x => x.subjects);
                     foreach (var sj in subjects)

+ 12 - 12
TEAMModelOS.Function/CosmosDBTriggers/TriggerCorrect.cs

@@ -56,7 +56,7 @@ namespace TEAMModelOS.CosmosDBTriggers
             var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
 
             try {
-                Correct correct = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<Correct>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                Correct correct = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<Correct>(tdata.id, new PartitionKey($"{tdata.code}"));
 
                 if (correct != null)
                 {
@@ -99,7 +99,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                             string eid = correct.id;
                             //评测的分区键
                             string ecode = correct.scode;
-                            ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(tdata.id, new Azure.Cosmos.PartitionKey($"{ecode}"));
+                            ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(tdata.id, new PartitionKey($"{ecode}"));
                             if (correct.subs.IsNotEmpty())
                             {
 
@@ -144,7 +144,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                                                 source = info.source
                                             };
-                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new Azure.Cosmos.PartitionKey(task.code));
+                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new PartitionKey(task.code));
                                         }
                                     }
 
@@ -184,7 +184,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                 type = 2,
                                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
                                             };
-                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new Azure.Cosmos.PartitionKey(task.code));
+                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new PartitionKey(task.code));
                                         }
 
 
@@ -226,7 +226,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                 type = 3,
                                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
                                             };
-                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new Azure.Cosmos.PartitionKey(task.code));
+                                            await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new PartitionKey(task.code));
                                         }
 
 
@@ -235,7 +235,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     string subjectId = sub.id;
                                     //生成临时作答数据存放到redis
                                     //var redisClient = _azureRedis.GetRedisClient(8);
-                                    //ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(eid, new Azure.Cosmos.PartitionKey(ecode));
+                                    //ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(eid, new PartitionKey(ecode));
                                     List<ExamClassResult> classResults = new List<ExamClassResult>();
                                     //获取原题配分
                                     int paperIndex = 0;
@@ -257,7 +257,7 @@ namespace TEAMModelOS.CosmosDBTriggers
 
                                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(
                                         queryText: $"select value(c) from c where c.examId = '{eid}' and c.subjectId = '{subjectId}'",
-                                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{info.school}") }))
+                                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{info.school}") }))
                                         {
                                             classResults.Add(item);
                                         }
@@ -266,7 +266,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     {
                                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(
                                             queryText: $"select value(c) from c where c.examId = '{eid}' and c.subjectId = '{subjectId}'",
-                                            requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{info.creatorId}") }))
+                                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{info.creatorId}") }))
                                         {
                                             classResults.Add(item);
                                         }
@@ -345,7 +345,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                     model = sub.model
 
                                                 };
-                                                tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<SDK.Models.Cosmos.Common.Scoring>(sc, new Azure.Cosmos.PartitionKey(sc.code)));
+                                                tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<SDK.Models.Cosmos.Common.Scoring>(sc, new PartitionKey(sc.code)));
                                             }
                                             //tasks.Add(redisClient.HashSetAsync($"Exam:Scoring:{eid}-{subjectId}", stuId, new { tmdId = tmds, ans = examClass.studentAnswers[index].Count > 0 ? examClass.studentAnswers[index][0] : "", score = examClass.studentScores[index] }.ToJsonString()));
                                         }
@@ -393,7 +393,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     foreach (var marker in sub.markers)
                                     {
                                         ids.Add(marker.id);
-                                        //await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new Azure.Cosmos.PartitionKey(task.code),new ItemRequestOptions().PostTriggers);
+                                        //await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<CorrectTask>(task, new PartitionKey(task.code),new ItemRequestOptions().PostTriggers);
                                     }
                                 }
                                 //异常卷处理人员
@@ -426,7 +426,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 {
                                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<CorrectTask>(
                                           queryText: $"select value(c) from c where c.cid = '{correct.id}'",
-                                          requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"CorrectTask-{id}") }))
+                                          requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CorrectTask-{id}") }))
                                     {
                                         corrects.Add(item);
                                     }
@@ -435,7 +435,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 foreach (CorrectTask task in corrects)
                                 {
                                     task.progress = "finish";
-                                    tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(task, task.id, new Azure.Cosmos.PartitionKey(task.code)));
+                                    tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(task, task.id, new PartitionKey(task.code)));
                                 }
                                 await Task.WhenAll(tasks);
                             }

+ 24 - 24
TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs

@@ -73,14 +73,14 @@ namespace TEAMModelOS.CosmosDBTriggers
                     await BIStats.SetTypeAddStats(client, _dingDing, data.school, "Exam", -1, careDate: data.startTime);//BI统计增/减量
                     return;
                 }
-                ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(data.id, new Azure.Cosmos.PartitionKey($"{data.code}"));
+                ExamInfo info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(data.id, new PartitionKey($"{data.code}"));
                 if (info != null)
                 {
                     if (info.scope.Equals("teacher", StringComparison.OrdinalIgnoreCase) || info.scope.Equals("private", StringComparison.OrdinalIgnoreCase))
                     {
-                        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{info.creatorId}") }))
+                        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{info.creatorId}") }))
                         {
-                            using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(item.Content);
                             if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -92,9 +92,9 @@ namespace TEAMModelOS.CosmosDBTriggers
                     }
                     else
                     {
-                        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{data.school}") }))
+                        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c where c.examId = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{data.school}") }))
                         {
-                            using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(item.Content);
                             if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -112,7 +112,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     School sc = new();
                     if (!string.IsNullOrEmpty(info.school) && !info.school.Equals("SYSTEM_NO_SCHOOL"))
                     {
-                        sc = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(info.school, new Azure.Cosmos.PartitionKey("Base"));
+                        sc = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(info.school, new PartitionKey("Base"));
                     }
 
                     foreach (ExamSubject subject in info.subjects)
@@ -121,7 +121,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     }
                     //整合名单
                     List<string> classes = ExamService.getClasses(info.classes, info.stuLists);
-                    //ChangeRecord record = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ChangeRecord>(input.Id, new Azure.Cosmos.PartitionKey($"{info.progress}"));
+                    //ChangeRecord record = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ChangeRecord>(input.Id, new PartitionKey($"{info.progress}"));
                     switch (info.progress)
                     {
                         case "pending":
@@ -139,7 +139,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 long start = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), message, DateTimeOffset.FromUnixTimeMilliseconds(data.startTime));
                                 records[0].sequenceNumber = start;
                                 await table.SaveOrUpdate<ChangeRecord>(records[0]);
-                                //await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(record, record.id, new Azure.Cosmos.PartitionKey($"{record.code}"));
+                                //await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(record, record.id, new PartitionKey($"{record.code}"));
                             }
                             else
                             {
@@ -153,7 +153,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     msgId = message.MessageId
                                 };
                                 await table.Save<ChangeRecord>(changeRecord);
-                                //await client.GetContainer(Constant.TEAMModelOS, "Common").CreateItemAsync(changeRecord, new Azure.Cosmos.PartitionKey($"{changeRecord.code}"));
+                                //await client.GetContainer(Constant.TEAMModelOS, "Common").CreateItemAsync(changeRecord, new PartitionKey($"{changeRecord.code}"));
                             }
                             break;
                         case "going":
@@ -236,11 +236,11 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                 marks.Add(new List<Details>());
                                                 ansPoint.Add(-1);
                                             }
-                                            var sresponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(cla, new Azure.Cosmos.PartitionKey($"Class-{info.school}"));
+                                            var sresponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(cla, new PartitionKey($"Class-{info.school}"));
                                             if (sresponse.Status == 200)
                                             {
 
-                                                using var json = await JsonDocument.ParseAsync(sresponse.ContentStream);
+                                                using var json = await JsonDocument.ParseAsync(sresponse.Content);
                                                 Class classroom = json.ToObject<Class>();
 
                                                 foreach (SDK.Models.Period period in sc.period)
@@ -273,9 +273,9 @@ namespace TEAMModelOS.CosmosDBTriggers
                                                 //result.info.name = classroom.name;
                                                 //result.gradeId = classroom.year.ToString();
                                                 //处理班级人数
-                                                /* await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIteratorSql(queryText: $"select c.id from c where c.classId = '{classroom.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Base-{info.school}") }))
+                                                /* await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIteratorSql(queryText: $"select c.id from c where c.classId = '{classroom.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{info.school}") }))
                                                  {
-                                                     using var json_stu = await JsonDocument.ParseAsync(item.ContentStream);
+                                                     using var json_stu = await JsonDocument.ParseAsync(item.Content);
                                                      if (json_stu.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                                      {
                                                          var accounts = json_stu.RootElement.GetProperty("Documents").EnumerateArray();
@@ -289,10 +289,10 @@ namespace TEAMModelOS.CosmosDBTriggers
                                             }
                                             /*if (info.scope.Equals("private", StringComparison.OrdinalIgnoreCase))
                                             {
-                                                var stuResponse = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(cla, new Azure.Cosmos.PartitionKey($"GroupList"));
+                                                var stuResponse = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(cla, new PartitionKey($"GroupList"));
                                                 if (stuResponse.Status == 200)
                                                 {
-                                                    using var json = await JsonDocument.ParseAsync(stuResponse.ContentStream);
+                                                    using var json = await JsonDocument.ParseAsync(stuResponse.Content);
                                                     GroupList stuList = json.ToObject<GroupList>();
                                                     //result.info.id = stuList.id;
                                                     result.info.name = stuList.name;
@@ -310,10 +310,10 @@ namespace TEAMModelOS.CosmosDBTriggers
                                             }
                                             else
                                             {
-                                                var stuResponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(cla, new Azure.Cosmos.PartitionKey($"GroupList-{info.school}"));
+                                                var stuResponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(cla, new PartitionKey($"GroupList-{info.school}"));
                                                 if (stuResponse.Status == 200)
                                                 {
-                                                    using var json = await JsonDocument.ParseAsync(stuResponse.ContentStream);
+                                                    using var json = await JsonDocument.ParseAsync(stuResponse.Content);
                                                     GroupList stuList = json.ToObject<GroupList>();
                                                     //result.info.id = stuList.id;
                                                     result.info.name = stuList.name;
@@ -412,7 +412,7 @@ namespace TEAMModelOS.CosmosDBTriggers
 
                                         records[0].sequenceNumber = end;
                                         await table.SaveOrUpdate<ChangeRecord>(records[0]);
-                                        //await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(record, record.id, new Azure.Cosmos.PartitionKey($"{record.code}"));
+                                        //await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(record, record.id, new PartitionKey($"{record.code}"));
                                     }
                                     else
                                     {
@@ -426,7 +426,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                             msgId = messageEnd.MessageId
                                         };
                                         await table.Save<ChangeRecord>(changeRecord);
-                                        //await client.GetContainer(Constant.TEAMModelOS, "Common").CreateItemAsync(changeRecord, new Azure.Cosmos.PartitionKey($"{changeRecord.code}"));
+                                        //await client.GetContainer(Constant.TEAMModelOS, "Common").CreateItemAsync(changeRecord, new PartitionKey($"{changeRecord.code}"));
                                     }
                                 } catch (Exception e) {
                                     await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-{info.id}-ChangeRecord{e.Message}\n{e.StackTrace}\n", GroupNames.醍摩豆服務運維群組);
@@ -548,7 +548,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     List<FMember> idList = await GroupListService.GetFinishMemberInfo(_coreAPIHttpService, client, _dingDing, info.school, info.classes, info.stuLists, null);
                                     info.staffIds = idList;
 
-                                    await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamInfo>(info, info.id, new Azure.Cosmos.PartitionKey(info.code));
+                                    await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamInfo>(info, info.id, new PartitionKey(info.code));
                                 }
                                 await SetLearnRecordContent(info, data, _azureStorage, _azureCosmos);
                             }
@@ -1010,7 +1010,7 @@ namespace TEAMModelOS.CosmosDBTriggers
             Settlement settlement = new();
             List<ExamResult> examResults = new();
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamResult>(
-                               queryText: $"select value(c) from c where c.examId  = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamResult-{info.id}") }))
+                               queryText: $"select value(c) from c where c.examId  = '{info.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamResult-{info.id}") }))
             {
                 examResults.Add(item);
             }
@@ -1489,7 +1489,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                             classResult.pc = pc;
                             classResult.krate = persent;
                         }
-                        await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(classResult, classResult.id, new Azure.Cosmos.PartitionKey($"{classResult.code}"));
+                        await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(classResult, classResult.id, new PartitionKey($"{classResult.code}"));
                     }
                     foreach (string k in knowledgeName)
                     {
@@ -1635,7 +1635,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                         classResult.fpc = pc;
                         classResult.frate = persent;
                     }
-                    await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(classResult, classResult.id, new Azure.Cosmos.PartitionKey($"{classResult.code}"));
+                    await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(classResult, classResult.id, new PartitionKey($"{classResult.code}"));
                 }
 
                 for (int i = 0; i < knowledgeName.Count; i++)
@@ -1896,7 +1896,7 @@ namespace TEAMModelOS.CosmosDBTriggers
             if (info.qamode != 2) {
                 await examRecordCount(info, subject, _dingDing, no, result, examClassResults, _azureCosmos);
             }          
-            await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").UpsertItemAsync(result, new Azure.Cosmos.PartitionKey($"ExamResult-{info.id}"));
+            await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").UpsertItemAsync(result, new PartitionKey($"ExamResult-{info.id}"));
             List<ErrorItems> errorItems = new();
             string code = string.Empty;
             string pk = string.Empty;

+ 3 - 3
TEAMModelOS.Function/CosmosDBTriggers/TriggerExamLite.cs

@@ -61,7 +61,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     blobcntr = tdata.creatorId;
                 }
                // await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}研修评测活动【{tdata.name}-{tdata.id}-ttl={tdata.ttl}】正在操作", GroupNames.醍摩豆服務運維群組);
-                ExamLite lite = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamLite>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                ExamLite lite = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamLite>(tdata.id, new PartitionKey($"{tdata.code}"));
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                 if (lite != null)
                 {
@@ -120,7 +120,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 School school = null;
                                 if (!string.IsNullOrEmpty(lite.school))
                                 {
-                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(lite.school, new Azure.Cosmos.PartitionKey("Base"));
+                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(lite.school, new PartitionKey("Base"));
                                     list.school = school.id;
                                     list.standard = school.standard;
                                 }
@@ -199,7 +199,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 List<FMember> idList = await GroupListService.GetFinishMemberInfo(_coreAPIHttpService, client, _dingDing, lite.school, lite.classes, lite.stuLists, lite.tchLists, gls);
                                 lite.staffIds = idList;
 
-                                await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamLite>(lite, lite.id, new Azure.Cosmos.PartitionKey(lite.code));
+                                await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<ExamLite>(lite, lite.id, new PartitionKey(lite.code));
                             }
                                 
 

+ 3 - 3
TEAMModelOS.Function/CosmosDBTriggers/TriggerHomework.cs

@@ -64,7 +64,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     blobcntr = tdata.creatorId;
                 }
                 //await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}作业活动【{tdata.name}-{tdata.id}-ttl={tdata.ttl}】正在操作", GroupNames.醍摩豆服務運維群組);
-                Homework work = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Homework>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                Homework work = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Homework>(tdata.id, new PartitionKey($"{tdata.code}"));
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                 if (work != null)
                 {
@@ -171,7 +171,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     List<FMember> idsList = await GroupListService.GetFinishMemberInfo(_coreAPIHttpService, client, _dingDing, work.school, work.classes, work.stuLists, work.tchLists, gls);
                                     work.staffIds = idsList;
 
-                                    await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Homework>(work, work.id, new Azure.Cosmos.PartitionKey(work.code));
+                                    await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Homework>(work, work.id, new PartitionKey(work.code));
                                 }
                             } catch (Exception e) {
                                 await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}研修作业活动finish{e.Message}\n{e.StackTrace}", GroupNames.醍摩豆服務運維群組);
@@ -351,7 +351,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                 School school = null;
                 if (!string.IsNullOrEmpty(work.school))
                 {
-                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(work.school, new Azure.Cosmos.PartitionKey("Base"));
+                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(work.school, new PartitionKey("Base"));
                     list.school = school.id;
                     list.standard = school.standard;
                 }

+ 4 - 4
TEAMModelOS.Function/CosmosDBTriggers/TriggerStudy.cs

@@ -68,7 +68,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     blobcntr = tdata.creatorId;
                 }
               
-                Study study = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Study>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                Study study = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Study>(tdata.id, new PartitionKey($"{tdata.code}"));
                 
                 if (study != null)
                 {
@@ -130,7 +130,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     School school = null;
                                     if (!string.IsNullOrEmpty(study.school))
                                     {
-                                        school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(study.school, new Azure.Cosmos.PartitionKey("Base"));
+                                        school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(study.school, new PartitionKey("Base"));
                                         list.school = school.id;
                                         list.standard = school.standard;
                                     }
@@ -139,7 +139,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetItemQueryStreamIteratorSql
                                         (queryText: queryScore))
                                     {
-                                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                                        using var json = await JsonDocument.ParseAsync(item.Content);
                                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                         {
                                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -248,7 +248,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 {
                                     List<FMember> idList = await GroupListService.GetFinishMemberInfo(_coreAPIHttpService, client, _dingDing, study.school, study.classes, study.stuLists, study.tchLists, gls);
                                     study.staffIds = idList;
-                                    await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Study>(study, study.id, new Azure.Cosmos.PartitionKey(study.code));
+                                    await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Study>(study, study.id, new PartitionKey(study.code));
 
                                 }
 

+ 5 - 5
TEAMModelOS.Function/CosmosDBTriggers/TriggerSurvey.cs

@@ -71,7 +71,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     adcode = $"Activity-{tdata.creatorId}";
                     blobcntr = tdata.creatorId;
                 }
-                Survey survey = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<Survey>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                Survey survey = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<Survey>(tdata.id, new PartitionKey($"{tdata.code}"));
 
                 if (survey != null)
                 {
@@ -230,7 +230,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 School school = null;
                                 if (!string.IsNullOrEmpty(survey.school))
                                 {
-                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(survey.school, new Azure.Cosmos.PartitionKey("Base"));
+                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(survey.school, new PartitionKey("Base"));
                                     list.school = school.id;
                                     list.standard = school.standard;
                                 }
@@ -469,7 +469,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                             if (string.IsNullOrEmpty(survey.recordUrl))
                             {
                                 survey.recordUrl = $"/survey/{survey.id}/record.json";
-                                await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<Survey>(survey, survey.id, new Azure.Cosmos.PartitionKey(survey.code));
+                                await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<Survey>(survey, survey.id, new PartitionKey(survey.code));
                             }
                             else
                             {
@@ -483,11 +483,11 @@ namespace TEAMModelOS.CosmosDBTriggers
                             //data.progress = "finish";
                             //if (survey.scope .Equals("school"))
                             //{
-                            //    await client.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<ActivityData>(data, data.id, new Azure.Cosmos.PartitionKey(data.code));
+                            //    await client.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<ActivityData>(data, data.id, new PartitionKey(data.code));
                             //}
                             //else if (survey.scope .Equals("private"))
                             //{
-                            //    await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<ActivityData>(data, data.id, new Azure.Cosmos.PartitionKey(data.code));
+                            //    await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<ActivityData>(data, data.id, new PartitionKey(data.code));
                             //}
 
                             break;

+ 3 - 3
TEAMModelOS.Function/CosmosDBTriggers/TriggerVote.cs

@@ -71,7 +71,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                     blobcntr = tdata.creatorId;
                 }
                // await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}投票活动【{tdata.name}-{tdata.id}-ttl={tdata.ttl}】正在操作", GroupNames.醍摩豆服務運維群組);
-                Vote vote = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Vote>(tdata.id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
+                Vote vote = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Vote>(tdata.id, new PartitionKey($"{tdata.code}"));
 
                 if (vote != null)
                 {
@@ -238,7 +238,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                 School school = null;
                                 if (!string.IsNullOrEmpty(vote.school))
                                 {
-                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(vote.school, new Azure.Cosmos.PartitionKey("Base"));
+                                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(vote.school, new PartitionKey("Base"));
                                     list.school = school.id;
                                     list.standard = school.standard;
                                 }
@@ -394,7 +394,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                             if (string.IsNullOrEmpty(vote.recordUrl))
                             {
                                 vote.recordUrl = url;
-                                await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Vote>(vote, vote.id, new Azure.Cosmos.PartitionKey(vote.code));
+                                await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync<Vote>(vote, vote.id, new PartitionKey(vote.code));
                             }
                             else
                             {

+ 1 - 1
TEAMModelOS.Function/IESCosmosDBTrigger.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK;
 using System.Xml.Linq;
-using Microsoft.Azure.Cosmos.Linq;
+using Microsoft.Linq;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.CosmosDBTriggers;
 namespace TEAMModelOS.Function

+ 13 - 13
TEAMModelOS.Function/IESServiceBusTrigger.cs

@@ -730,9 +730,9 @@ namespace TEAMModelOS.Function
                 ////序號
                 List<SchoolProductSumData> serialsProductSumOrg = new List<SchoolProductSumData>();
                 strQuery = $"SELECT * FROM c WHERE c.dataType = 'serial'";
-                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: strQuery, requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Product-{schoolId}") }))
+                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: strQuery, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -765,7 +765,7 @@ namespace TEAMModelOS.Function
                 string strQueryM = $"SELECT * FROM c WHERE c.dataType = 'servicePeriod' AND c.startDate <= {timestampToday} AND {timestampToday} <= c.endDate AND c.ttl < 0";
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: strQueryM, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -831,9 +831,9 @@ namespace TEAMModelOS.Function
                 ////硬體
                 List<SchoolProductSumDataHard> hardsProductSumOrg = new List<SchoolProductSumDataHard>();
                 strQuery = $"SELECT * FROM c WHERE c.dataType = 'hard'";
-                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: strQuery, requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Product-{schoolId}") }))
+                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: strQuery, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{schoolId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -982,10 +982,10 @@ namespace TEAMModelOS.Function
 
                     LessonRecord oldlessonRecord = null;
                     LessonRecord lessonRecord = null;
-                    Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(lessonId, new PartitionKey(code));
+                    ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(lessonId, new PartitionKey(code));
                     if (response.Status == 200)
                     {
-                        var doc = JsonDocument.Parse(response.ContentStream);
+                        var doc = JsonDocument.Parse(response.Content);
                         lessonRecord = doc.RootElement.ToObject<LessonRecord>();
                         oldlessonRecord = doc.RootElement.ToObject<LessonRecord>();
                     }
@@ -1368,7 +1368,7 @@ namespace TEAMModelOS.Function
                                             var cresponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(lessonRecord.courseId, new PartitionKey($"CourseBase-{lessonRecord.school}"));
                                             if (cresponse.Status == 200)
                                             {
-                                                using var cJson = await JsonDocument.ParseAsync(cresponse.ContentStream);
+                                                using var cJson = await JsonDocument.ParseAsync(cresponse.Content);
                                                 course = cJson.ToObject<CourseBase>();
                                             }
                                             else
@@ -1376,7 +1376,7 @@ namespace TEAMModelOS.Function
                                                 var sresponse = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(lessonRecord.courseId, new PartitionKey($"CourseBase"));
                                                 if (sresponse.Status == 200)
                                                 {
-                                                    using var cJson = await JsonDocument.ParseAsync(sresponse.ContentStream);
+                                                    using var cJson = await JsonDocument.ParseAsync(sresponse.Content);
                                                     course = cJson.ToObject<CourseBase>();
                                                 }
                                                 else
@@ -1442,7 +1442,7 @@ namespace TEAMModelOS.Function
                                             }
                                             var space = await BlobService.GetSurplusSpace(school, scope, $"{Environment.GetEnvironmentVariable("Option:Location")}", _azureCosmos, _azureRedis, _azureStorage, _dingDing, _httpTrigger);
                                             SchoolSetting setting = null;
-                                            Azure.Response schoolSetting = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(school, new PartitionKey("SchoolSetting"));
+                                            ResponseMessage schoolSetting = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(school, new PartitionKey("SchoolSetting"));
                                             if (schoolSetting.Status == 200)
                                             {
                                                 setting = JsonDocument.Parse(schoolSetting.Content).RootElement.Deserialize<SchoolSetting>();
@@ -1882,11 +1882,11 @@ namespace TEAMModelOS.Function
                     {
                         return;
                     }
-                    Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(lessonId, new PartitionKey(code));
+                    ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(lessonId, new PartitionKey(code));
                     if (response.Status == 200)
                     {
                         LessonRecord lessonRecord;
-                        var doc = JsonDocument.Parse(response.ContentStream);
+                        var doc = JsonDocument.Parse(response.Content);
                         lessonRecord = doc.RootElement.ToObject<LessonRecord>();
                         lessonRecord.status = 404;
                         await client.GetContainer(Constant.TEAMModelOS, tbname).ReplaceItemAsync(lessonRecord, lessonRecord.id, new PartitionKey(lessonRecord.code));
@@ -1949,7 +1949,7 @@ namespace TEAMModelOS.Function
                         queryText: $"SELECT TOP 1 * FROM c WHERE c.stuid = '{stu.GetString()}' and c.school='{school}'  ",
                         requestOptions: new() { PartitionKey = new($"Imei") }))
                         {
-                            using var root = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var root = await JsonDocument.ParseAsync(item.Content);
                             if (root.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 var doc = root.RootElement.GetProperty("Documents").EnumerateArray().First();

+ 4 - 4
TEAMModelOS.SDK/Context/Attributes/Filter/ApiTokenAttribute.cs

@@ -247,7 +247,7 @@ namespace TEAMModelOS.Filter
                                             {
                                                 //访问次数记录 开始
                                                 //long udate = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                                                //var respon = _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(id, new Azure.Cosmos.PartitionKey("BizVisit")).Result;
+                                                //var respon = _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(id, new PartitionKey("BizVisit")).Result;
                                                 //if (respon.Status == 200)
                                                 //{
                                                 //    BizVisitCnt bizVisit = JsonDocument.Parse(respon.Content).Deserialize<BizVisitCnt>();
@@ -260,16 +260,16 @@ namespace TEAMModelOS.Filter
                                                 //    //}
                                                 //    //else
                                                 //    bizVisit.apis.Add(new APIInfo() { name = $"{path}", upDate = udate });//记录加一下
-                                                //       _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<BizVisitCnt>(bizVisit, id, new Azure.Cosmos.PartitionKey("BizVisit"));
+                                                //       _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<BizVisitCnt>(bizVisit, id, new PartitionKey("BizVisit"));
                                                 //}
                                                 //else
                                                 //{
                                                 //    BizVisitCnt bizVisit = new() { id = id, visit = 1, apis = new List<APIInfo>() { new APIInfo() { name = $"{path}", upDate = udate } } };
-                                                //  _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<BizVisitCnt>(bizVisit, new Azure.Cosmos.PartitionKey("BizVisit"));
+                                                //  _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<BizVisitCnt>(bizVisit, new PartitionKey("BizVisit"));
                                                 //}
                                                 //访问次数记录 结束
 
-                                                var response = _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(id, new Azure.Cosmos.PartitionKey("BizConfig")).Result;
+                                                var response = _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(id, new PartitionKey("BizConfig")).Result;
                                                 if (response.Status == 200)
                                                 {
                                                     BizConfig bizConfig = JsonDocument.Parse(response.Content).Deserialize<BizConfig>();

+ 4 - 4
TEAMModelOS.SDK/DI/AzureCosmos/AzureCosmosExtensions.cs

@@ -236,7 +236,7 @@ namespace TEAMModelOS.SDK.DI
             return response;
         }
 
-        public static async IAsyncEnumerable<ResponseMessage> GetItemQueryStreamIteratorSql(this Microsoft.Azure.Cosmos.Container container, string queryText = null, Microsoft.Azure.Cosmos.QueryRequestOptions requestOptions = null, string continuationToken = null)
+        public static async IAsyncEnumerable<ResponseMessage> GetItemQueryStreamIteratorSql(this  Container container, string queryText = null, QueryRequestOptions requestOptions = null, string continuationToken = null)
         {
             var items = container.GetItemQueryStreamIterator(
             queryText: queryText, continuationToken: continuationToken,
@@ -254,7 +254,7 @@ namespace TEAMModelOS.SDK.DI
                 }
             }
         }
-        public static async IAsyncEnumerable<ResponseMessage> GetItemQueryStreamIteratorQuery(this Microsoft.Azure.Cosmos.Container container, Microsoft.Azure.Cosmos.QueryDefinition queryDefinition, Microsoft.Azure.Cosmos.QueryRequestOptions requestOptions = null, string continuationToken = null)
+        public static async IAsyncEnumerable<ResponseMessage> GetItemQueryStreamIteratorQuery(this Container container, QueryDefinition queryDefinition,QueryRequestOptions requestOptions = null, string continuationToken = null)
         {
             var items = container.GetItemQueryStreamIterator(
             queryDefinition: queryDefinition, continuationToken: continuationToken,
@@ -274,7 +274,7 @@ namespace TEAMModelOS.SDK.DI
             }
         }
 
-        public static async IAsyncEnumerable<T> GetItemQueryIteratorQuery<T>(this Microsoft.Azure.Cosmos.Container container, Microsoft.Azure.Cosmos.QueryDefinition queryDefinition, Microsoft.Azure.Cosmos.QueryRequestOptions requestOptions = null, string continuationToken = null)
+        public static async IAsyncEnumerable<T> GetItemQueryIteratorQuery<T>(this Container container, QueryDefinition queryDefinition, QueryRequestOptions requestOptions = null, string continuationToken = null)
         {
             var items = container.GetItemQueryIterator<T>(
             queryDefinition: queryDefinition, continuationToken: continuationToken,
@@ -295,7 +295,7 @@ namespace TEAMModelOS.SDK.DI
                 }
             }
         }
-        public static async IAsyncEnumerable<T> GetItemQueryIteratorSql<T>(this Microsoft.Azure.Cosmos.Container container, string queryText, Microsoft.Azure.Cosmos.QueryRequestOptions requestOptions = null, string continuationToken = null)
+        public static async IAsyncEnumerable<T> GetItemQueryIteratorSql<T>(this     Container container, string queryText, QueryRequestOptions requestOptions = null, string continuationToken = null)
         {
             var items = container.GetItemQueryIterator<T>(
             queryText: queryText, continuationToken: continuationToken,

+ 2 - 2
TEAMModelOS.SDK/DI/AzureRedis/AzureRedisExtensions.cs

@@ -1,5 +1,5 @@
-using Microsoft.Azure.Cosmos.Table;
-using Microsoft.Azure.Cosmos.Table.Queryable;
+using Microsoft.Table;
+using Microsoft.Table.Queryable;
 using System;
 using System.Collections;
 using System.Collections.Generic;

+ 1 - 1
TEAMModelOS.SDK/DI/AzureRedis/AzureRedisFactory.cs

@@ -1,5 +1,5 @@
 
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Logging;
 using System;

+ 5 - 5
TEAMModelOS.SDK/DI/AzureStorage/AzureStorageBlobExtensions.cs

@@ -16,7 +16,7 @@ using System.Text.Encodings.Web;
 using TEAMModelOS.SDK.Models.Table;
 using Microsoft.AspNetCore.Http;
 using TEAMModelOS.Models;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 
 using static TEAMModelOS.SDK.CoreAPIHttpService;
 
@@ -160,7 +160,7 @@ namespace TEAMModelOS.SDK.DI
                 BlobContainerClient bcc = client.GetBlobContainerClient(blobContainerName.ToLower());
                 BlobBatchClient bbc = client.GetBlobBatchClient();
                 List<Uri> blobs = new List<Uri>();
-                List<Task<Azure.Response<bool>>> list = new List<Task<Response<bool>>>();
+                List<Task<ResponseMessage<bool>>> list = new List<Task<Response<bool>>>();
                 foreach (var prefix in prefixs) {
                     string px = prefix;
                     if (prefix.StartsWith("/")) {
@@ -212,7 +212,7 @@ namespace TEAMModelOS.SDK.DI
                         int pages = (list.Count + 255) / 256; //256是批量操作最大值,pages = (total + max -1) / max;
                         for (int i = 0; i < pages; i++)
                         {
-                            List<Task<Azure.Response<bool>>> lists = list.Skip((i) * 256).Take(256).ToList();
+                            List<Task<ResponseMessage<bool>>> lists = list.Skip((i) * 256).Take(256).ToList();
                             await Task.WhenAll(lists);
                         }
                     }
@@ -223,7 +223,7 @@ namespace TEAMModelOS.SDK.DI
                 {
                     if (blobs.Count > 0) {
                         try {
-                            Azure.Response[] ass = await bbc.DeleteBlobsAsync(blobs); 
+                            ResponseMessage[] ass = await bbc.DeleteBlobsAsync(blobs); 
                         }
                         catch (AggregateException ex)
                         {
@@ -248,7 +248,7 @@ namespace TEAMModelOS.SDK.DI
                     for (int i = 0; i < pages; i++)
                     {
                         List<Uri> lists = blobs.Skip((i) * 256).Take(256).ToList();
-                        try { Azure.Response[] ass = await bbc.DeleteBlobsAsync(lists); }
+                        try { ResponseMessage[] ass = await bbc.DeleteBlobsAsync(lists); }
                         catch (AggregateException ex)
                         {
                             //删除多个时会,如果其中一个文件不存在 或者其中一个删除失败会引发该异常

+ 1 - 1
TEAMModelOS.SDK/DI/AzureStorage/AzureStorageFactory.cs

@@ -1,5 +1,5 @@
 
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Logging;
 using System;

+ 2 - 2
TEAMModelOS.SDK/DI/AzureStorage/AzureStorageTableExtensions.cs

@@ -1,5 +1,5 @@
-using Microsoft.Azure.Cosmos.Table;
-using Microsoft.Azure.Cosmos.Table.Queryable;
+using Microsoft.Table;
+using Microsoft.Table.Queryable;
 using System;
 using System.Collections;
 using System.Collections.Generic;

+ 1 - 1
TEAMModelOS.SDK/DI/AzureStorage/Inner/AzureBlobModel.cs

@@ -1,6 +1,6 @@
 
 using Microsoft.AspNetCore.Http;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.IO;

+ 4 - 4
TEAMModelOS.SDK/DI/Mail/MailFactory.cs

@@ -88,9 +88,9 @@ namespace TEAMModelOS.SDK.DI.Mail
                     }
                     try
                     {
-                        TMDOrder order = await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReadItemAsync<TMDOrder>(userToken, new Azure.Cosmos.PartitionKey("TMDOrder"));
+                        TMDOrder order = await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReadItemAsync<TMDOrder>(userToken, new PartitionKey("TMDOrder"));
                         order.invoiceNotify=result;
-                        await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReplaceItemAsync<TMDOrder>(order, userToken, new Azure.Cosmos.PartitionKey("TMDOrder"));
+                        await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReplaceItemAsync<TMDOrder>(order, userToken, new PartitionKey("TMDOrder"));
                     }
                     catch(Exception ex)
                     {
@@ -136,9 +136,9 @@ namespace TEAMModelOS.SDK.DI.Mail
                     }
                     //try
                     //{
-                    //    TMDOrder order = await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReadItemAsync<TMDOrder>(userToken, new Azure.Cosmos.PartitionKey("TMDOrder"));
+                    //    TMDOrder order = await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReadItemAsync<TMDOrder>(userToken, new PartitionKey("TMDOrder"));
                     //    order.invoiceNotify=result;
-                    //    await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReplaceItemAsync<TMDOrder>(order, userToken, new Azure.Cosmos.PartitionKey("TMDOrder"));
+                    //    await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).ReplaceItemAsync<TMDOrder>(order, userToken, new PartitionKey("TMDOrder"));
                     //}
                     //catch (Exception ex)
                     //{

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/BI/AreaQuoteRecord.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/BI/BICommon/Notice.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/BI/BITable/LessStats.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/BI/Company.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/BI/DingDingUserInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.SDK.Models.Cosmos.BI

+ 4 - 4
TEAMModelOS.SDK/Models/Service/BI/BILeesonService.cs

@@ -75,7 +75,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     var lessRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{dateDay}", new PartitionKey("LessonHour"));
                     if (lessRes.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(lessRes.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(lessRes.Content);
                         LessonStats lessonStats = json.ToObject<LessonStats>();
                         lessonStats.code = "LessonHour";
                         lessonStats.pk = "LessonHour";
@@ -116,7 +116,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     var lessRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{year}", new PartitionKey("LessonYear"));
                     if (lessRes.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(lessRes.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(lessRes.Content);
                         LessonStats lessonYear = json.ToObject<LessonStats>();
                         lessonYear.code = "LessonYear";
                         lessonYear.pk = "LessonYear";
@@ -168,7 +168,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                         var lessRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{dateDay}", new PartitionKey($"LessonHour-{schoolId}"));
                         if (lessRes.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(lessRes.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(lessRes.Content);
                             LessonStats lessonStats = json.ToObject<LessonStats>();
                             lessonStats.code = $"LessonHour-{schoolId}";
                             lessonStats.pk = "LessonHour";
@@ -208,7 +208,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                         var lessRes = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{year}", new PartitionKey($"LessonYear-{schoolId}"));
                         if (lessRes.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(lessRes.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(lessRes.Content);
                             LessonStats lessonYear = json.ToObject<LessonStats>();
                             lessonYear.code = $"LessonYear-{schoolId}";
                             lessonYear.pk = "LessonYear";

+ 6 - 6
TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs

@@ -127,7 +127,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 await foreach (var item in _azureCosmosClientCsv2.GetContainer("Core", "ID2")
                 .GetItemQueryStreamIteratorSql(querye, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base-ex")}))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -489,7 +489,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var query = $"SELECT * FROM c WHERE c.year = {y} AND c.dateUnit = 'month' AND c.schoolId != 'allschool'";
                 await foreach (var itemcr in _azureCosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("ProdAnalysis") }))
                 {
-                    var json = await JsonDocument.ParseAsync(itemcr.ContentStream);
+                    var json = await JsonDocument.ParseAsync(itemcr.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -589,7 +589,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     string schBaseQueryText = $"SELECT c.id FROM c where ARRAY_CONTAINS({schIdListStr}, c.id, true)";
                     await foreach (var itemsr in _azureCosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: schBaseQueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemsr.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemsr.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -607,7 +607,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     schBaseQueryText = $"SELECT c.id FROM c where ARRAY_CONTAINS({schIdListStr}, c.id, true)";
                     await foreach (var itemsr in _azureCosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: schBaseQueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"VirtualBase") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemsr.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemsr.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -629,7 +629,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                         string schCsv2QueryText = $"SELECT c.shortCode, c.name, c.countryName, c.provinceName, c.cityName, c.distName, c.address FROM c where ARRAY_CONTAINS({csv2SchIdListStr}, c.shortCode, true)";
                         await foreach (var item in _azureCosmosClientCsv2CnRead.GetContainer("Core", "School").GetItemQueryStreamIteratorSql(queryText: schCsv2QueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("base") }))
                         {
-                            using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(item.Content);
                             if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -984,7 +984,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var query = $"SELECT * FROM c WHERE c.year = {y} AND c.dateUnit = 'month' AND c.tmid != 'alltmid'";
                 await foreach (var itemcr in _azureCosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("TmidAnalysis") }))
                 {
-                    var json = await JsonDocument.ParseAsync(itemcr.ContentStream);
+                    var json = await JsonDocument.ParseAsync(itemcr.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 9 - 9
TEAMModelOS.SDK/Models/Service/BI/BIStats.cs

@@ -1,7 +1,7 @@
 using Microsoft.Azure.Cosmos;
 using Azure.Storage.Blobs;
 using MathNet.Numerics.LinearAlgebra.Double;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -69,7 +69,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var resStsInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year}-{scId}", new PartitionKey("Statistics"));
                 if (resStsInfo.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(resStsInfo.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(resStsInfo.Content);
                     statsInfo = fileJson.ToObject<StatsInfo>();
                     if (string.IsNullOrEmpty(statsInfo.schoolId))
                     {
@@ -81,7 +81,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     var resLastStsInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year - 1}-{scId}", new PartitionKey("Statistics"));
                     if (resLastStsInfo.Status == 200)
                     {
-                        using var fileJson = await JsonDocument.ParseAsync(resLastStsInfo.ContentStream);
+                        using var fileJson = await JsonDocument.ParseAsync(resLastStsInfo.Content);
                         statsInfo = fileJson.ToObject<StatsInfo>();
                         statsInfo.id = $"{dateOff.Year}-{scId}";
                         statsInfo.year = dateOff.Year;
@@ -150,7 +150,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                         var resLastStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year - 1}-{scId}", new PartitionKey("Statistics"));
                         if (resLastStats.Status == 200)
                         {
-                            using var fileJson = await JsonDocument.ParseAsync(resLastStats.ContentStream);
+                            using var fileJson = await JsonDocument.ParseAsync(resLastStats.Content);
                             lastStats = fileJson.ToObject<StatsInfo>();
                             lastLesson = DenseMatrix.OfColumns(new List<List<double>>() { lastStats.lesson.year });
                             lastInter = DenseMatrix.OfColumns(new List<List<double>>() { lastStats.lesson.yearInters });
@@ -188,7 +188,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                         //var resLast = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{lTermDayS.Year}-{scId}", new PartitionKey("Statistics"));
                         //if (resLast.Status == 200)
                         //{
-                        //    using var fileJson = await JsonDocument.ParseAsync(resLast.ContentStream);
+                        //    using var fileJson = await JsonDocument.ParseAsync(resLast.Content);
                         //    lastStats = fileJson.ToObject<StatsInfo>();
                         //}
 
@@ -331,7 +331,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                             var resLastStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year - 1}-{scId}", new PartitionKey("Statistics"));
                             if (resLastStats.Status == 200)
                             {
-                                using var fileJson = await JsonDocument.ParseAsync(resLastStats.ContentStream);
+                                using var fileJson = await JsonDocument.ParseAsync(resLastStats.Content);
                                 lastStats = fileJson.ToObject<StatsInfo>();
                                 lastAct = DenseMatrix.OfColumns(new List<List<double>>() { lastStats.activity.year });
                             }
@@ -461,7 +461,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var resStats = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year}-{school.id}", new PartitionKey("Statistics"));
                 if (resStats.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(resStats.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(resStats.Content);
                     statsInfo = fileJson.ToObject<StatsInfo>();
                 }
                 else
@@ -522,7 +522,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var resBiRel = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(school.id, new PartitionKey("BIRel"));
                 if (resBiRel.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(resBiRel.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(resBiRel.Content);
                     bIRelation = fileJson.ToObject<BIRelation>();
                 }
                 else
@@ -636,7 +636,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                             var lastSts = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dateOff.Year - 1}-{item.schoolId}", new PartitionKey("Statistics"));
                             if (lastSts.Status == 200)
                             {
-                                using var fileJson = await JsonDocument.ParseAsync(lastSts.ContentStream);
+                                using var fileJson = await JsonDocument.ParseAsync(lastSts.Content);
                                 lastStatsInfo = fileJson.ToObject<StatsInfo>();
                                 item.schoolId = lastStatsInfo.schoolId;
                                 item.year = dateOff.Year;

+ 1 - 1
TEAMModelOS.SDK/Models/Service/BI/BIStatsNotice.cs

@@ -44,7 +44,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var resStsInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync($"{dt}-{id}", new PartitionKey("StatsNotice"));
                 if (resStsInfo.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(resStsInfo.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(resStsInfo.Content);
                     statsNotice = fileJson.ToObject<StatsNotice>();
                 }
                 else

+ 5 - 5
TEAMModelOS.SDK/Models/Service/BI/CosmosQueryHelper.cs

@@ -25,7 +25,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 string managerSql = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId, c.id, c.name FROM c WHERE ARRAY_CONTAINS(c.roles, '{roles}', true) AND c.pk = 'Teacher' AND c.status = 'join' AND c.code = 'Teacher-{schoolId}'";
                 await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: managerSql, requestOptions: new QueryRequestOptions() { }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                     {
                         SchoolTeacherRoles str = new()
@@ -57,7 +57,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
             //string schoolSql = $"SELECT DISTINCT REPLACE(c.code,'Teacher-','') AS schoolId,c.code,c.roles,c.id,c.name From c where ARRAY_CONTAINS(c.roles,'assist',true) AND c.status = 'join' AND c.id='{tmdId}'";
             //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: schoolSql, requestOptions: new QueryRequestOptions() { }))
             //{
-            //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+            //    using var json = await JsonDocument.ParseAsync(item.Content);
             //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
             //    {
             //        schoolIds.Add(obj.GetProperty("schoolId").GetString());
@@ -110,7 +110,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
             List<string> ids = new();
             await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", container).GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: !string.IsNullOrEmpty(code) ? new QueryRequestOptions() { PartitionKey = new PartitionKey(code) } : new QueryRequestOptions() { }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 {
                     ids.Add(obj.GetProperty(single).GetString());
@@ -137,7 +137,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
 
             //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey(code) }))
             //{
-            //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+            //    using var json = await JsonDocument.ParseAsync(item.Content);
             //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
             //    {
             //        schoolIds.Add(obj.GetProperty("id").GetString());
@@ -173,7 +173,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 //string sqlTxt = $"select c.id from c where ARRAY_CONTAINS(c.roles,'{rolesName}',true) and c.status = 'join'";
                 //await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() {PartitionKey =new PartitionKey($"Teacher-{school}") }))
                 //{
-                //    using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                 //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                 //    {
                 //        teachers.Add(obj.GetProperty("id").GetString());

+ 2 - 2
TEAMModelOS.SDK/Models/Service/BI/LessonStatisWay.cs

@@ -27,7 +27,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 {
                     await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonRecord-{sc}") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -45,7 +45,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     string sqlTecTxt = $"select count(c.id) from c where c.id='{sc}'";
                     await foreach (var itemTeac in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIteratorSql(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonRecord") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(itemTeac.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(itemTeac.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt32() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelOS.SDK/Models/Service/BI/ProductUseRecordService.cs

@@ -28,7 +28,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
 
                 if (resUseRecord.Status == 200)
                 {
-                    using var fileJson = await JsonDocument.ParseAsync(resUseRecord.ContentStream);
+                    using var fileJson = await JsonDocument.ParseAsync(resUseRecord.Content);
                     productUseRecord = fileJson.ToObject<ProductUseRecord>();
                 }
                 else

+ 1 - 1
TEAMModelOS.SDK/Models/Service/BIStatsWay/SchoolStatsWay.cs

@@ -220,7 +220,7 @@ namespace TEAMModelOS.SDK.Models.Service.BIStatsWay
                 string serialQueryText = $"SELECT * FROM c WHERE c.dataType = 'serial' AND ARRAY_CONTAINS({serialPermitJsonStr}, c.prodCode)";
                 await foreach (var itemsr in db.GetItemQueryStreamIteratorSql(queryText: serialQueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(itemsr.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(itemsr.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         deviceForCoreService uuidForCore;

+ 1 - 1
TEAMModelOS.SDK/Models/Service/BIStatsWay/StudyStatsWay.cs

@@ -31,7 +31,7 @@ namespace TEAMModelOS.SDK.Models.Service.BIStatsWay
             var responSett = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{school.areaId}", new PartitionKey("AreaSetting"));
             if (responSett.Status == 200)
             {
-                using var fileJson = await JsonDocument.ParseAsync(responSett.ContentStream);
+                using var fileJson = await JsonDocument.ParseAsync(responSett.Content);
                 setting = fileJson.ToObject<AreaSetting>();
 
             }

+ 5 - 5
TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -23,7 +23,7 @@ namespace TEAMModelOS.SDK
             List<ExpertDto> expertTasks = new List<ExpertDto>();
             ActivityExpert activityExpert = null;
 
-            Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync($"{_activityId}", new PartitionKey("ActivityExpert"));
+            ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync($"{_activityId}", new PartitionKey("ActivityExpert"));
             if (response.Status == 200)
             {
                 bool change = false;
@@ -140,7 +140,7 @@ namespace TEAMModelOS.SDK
                 }
 
                 Contest contest = null;
-                Azure.Response contestResponse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId, new PartitionKey("Contest"));
+                ResponseMessage contestResponse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId, new PartitionKey("Contest"));
                 if (contestResponse.Status==200)
                 {
                     contest = JsonDocument.Parse(contestResponse.Content).RootElement.ToObject<Contest>();
@@ -181,7 +181,7 @@ namespace TEAMModelOS.SDK
 
         public static async Task<List<ActivityScoreLevel>> ActivityScores (AzureCosmosFactory _azureCosmos,JsonElement _activityId,string teacherId= null) {
             List<ActivityScoreLevel> scoreLevels = new List<ActivityScoreLevel>();
-            Azure.Response responseContest = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId.GetString(), new PartitionKey("Contest"));
+            ResponseMessage responseContest = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId.GetString(), new PartitionKey("Contest"));
             if (responseContest.Status == 200)
             {
 
@@ -1068,7 +1068,7 @@ namespace TEAMModelOS.SDK
             //代码顺序不能动
             var checkReult = CheckReviewRule(reviewRule, contest);
             if (checkReult.invalidCode==200) {
-                await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).UpsertItemAsync(reviewRule, new Azure.Cosmos.PartitionKey(reviewRule.code));
+                await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).UpsertItemAsync(reviewRule, new PartitionKey(reviewRule.code));
                 if (reviewRuleTree.upsertAsTemplate==1)
                 {
                     reviewRule.code="ReviewRule-template";
@@ -1077,7 +1077,7 @@ namespace TEAMModelOS.SDK
                     reviewRule.scoreRule = reviewRuleTree.scoreRule;
                     reviewRule.distribute = reviewRuleTree.distribute;
                     reviewRule.scoreDetail = reviewRuleTree.scoreDetail;
-                    await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).UpsertItemAsync(reviewRule, new Azure.Cosmos.PartitionKey(reviewRule.code));
+                    await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Normal).UpsertItemAsync(reviewRule, new PartitionKey(reviewRule.code));
                 }
             }
             return (reviewRule,checkReult.invalidCode,checkReult.msg);

+ 1 - 1
TEAMModelOS.SDK/Models/Service/Common/ActivityStudentService.cs

@@ -515,7 +515,7 @@ namespace TEAMModelOS.SDK.Services
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, containerId).GetItemQueryStreamIteratorSql(querySchool, continuationToken: token,
                 requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey(PartitionKey) }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelOS.SDK/Models/Service/Common/BlobService.cs

@@ -75,7 +75,7 @@ namespace TEAMModelOS.SDK.Services
                         //await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT sum(c.size) as size FROM c ",
                         //    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{name}") }))
                         //{
-                        //    var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        //    var json = await JsonDocument.ParseAsync(item.Content);
                         //    foreach (var elmt in json.RootElement.GetProperty("Documents").EnumerateArray())
                         //    {
                         //        if (elmt.TryGetProperty("size", out JsonElement _size) && _size.ValueKind.Equals(JsonValueKind.Number))

+ 1 - 1
TEAMModelOS.SDK/Models/Service/Common/SyllabusService.cs

@@ -25,7 +25,7 @@ namespace TEAMModelOS.SDK.Services
             HashSet<Syllabus> syllabuses= new HashSet<Syllabus>();
             string tbname = scope.Equals("school", StringComparison.OrdinalIgnoreCase) ? Constant.School : Constant.Teacher;
             await foreach (var item in azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).GetItemQueryIteratorSql<Syllabus>(queryText: $"select value(c) from c where c.volumeId='{volumeId}'",
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Syllabus-{code}") })) {
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Syllabus-{code}") })) {
                 syllabuses.Add(item);
             }
             Volume volume = await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).ReadItemAsync<Volume>($"{volumeId}", new PartitionKey($"Volume-{code}"));

+ 5 - 5
TEAMModelOS.SDK/Models/Service/Common/TeacherService.cs

@@ -77,9 +77,9 @@ namespace TEAMModelOS.Services
                         if (statusNow.Equals("join"))
                         {
                             var sctch = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(id, new PartitionKey($"Teacher-{sc.schoolId}"));
-                            if (sctch.Status == 200 && sctch != null && sctch.ContentStream != null)
+                            if (sctch.Status == 200 && sctch != null && sctch.Content != null)
                             {
-                                var jsonDoc = await JsonDocument.ParseAsync(sctch.ContentStream);
+                                var jsonDoc = await JsonDocument.ParseAsync(sctch.Content);
                                 SchoolTeacher schoolTeacher = jsonDoc.RootElement.ToObject<SchoolTeacher>();
                                 if (schoolTeacher.name == null || schoolTeacher.picture == null || !schoolTeacher.name.Equals($"{name}") || !schoolTeacher.picture.Equals($"{picture}"))
                                 {
@@ -348,9 +348,9 @@ namespace TEAMModelOS.Services
                                 schoolExtobj.area = area;
                             }
                             var sctch = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(id, new PartitionKey($"Teacher-{sc.schoolId}"));
-                            if (sctch.Status == 200 && sctch != null && sctch.ContentStream != null)
+                            if (sctch.Status == 200 && sctch != null && sctch.Content != null)
                             {
-                                var jsonDoc = await JsonDocument.ParseAsync(sctch.ContentStream);
+                                var jsonDoc = await JsonDocument.ParseAsync(sctch.Content);
                                 SchoolTeacher schoolTeacher = jsonDoc.RootElement.ToObject<SchoolTeacher>();
                                 sc.roles=schoolTeacher.roles;
                                 if (schoolTeacher.name == null || schoolTeacher.picture == null || !schoolTeacher.name.Equals($"{name}") || !schoolTeacher.picture.Equals($"{picture}"))
@@ -462,7 +462,7 @@ namespace TEAMModelOS.Services
             List<object> courses = new List<object>();
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: $"select value(c) from c WHERE c.creatorId = '{id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CourseBase") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 1 - 1
TEAMModelOS.SDK/Models/Service/ErrorItemsService.cs

@@ -21,7 +21,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 Dictionary<string, List<string>> schStuDic = new Dictionary<string, List<string>>();
                 await foreach (var item in _azureCosmosClient.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIteratorSql(queryText: "SELECT c.id, c.schoolId FROM c WHERE (NOT IS_DEFINED(c.graduate) OR c.graduate = 0) AND IS_DEFINED(c.schoolId) AND CONTAINS(c.code, 'Base-')", null))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 5 - 5
TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -43,7 +43,7 @@ namespace TEAMModelOS.SDK.Models.Service
             List<string> correctIds = new List<string>();
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: $"select c.id from c where c.cid = '{id}' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CorrectTask-{tId}") }))
             {
-                using var jsonTask = await JsonDocument.ParseAsync(item.ContentStream);
+                using var jsonTask = await JsonDocument.ParseAsync(item.Content);
                 if (jsonTask.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var accounts = jsonTask.RootElement.GetProperty("Documents").EnumerateArray();
@@ -71,7 +71,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 /*List<string> classIds = new();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"select c.id from c where c.year = {gradeId} and c.pk = 'Class' and c.periodId = '{periodId}' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{schooCode}") }))
                 {
-                    using var jsonTask = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var jsonTask = await JsonDocument.ParseAsync(item.Content);
                     if (jsonTask.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = jsonTask.RootElement.GetProperty("Documents").EnumerateArray();
@@ -94,7 +94,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(schooCode.ToString(), new PartitionKey($"Base"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         sc = json.ToObject<School>();
                     }*/
                     StringBuilder stringBuilder = new($"select value(c) from c where c.startTime >= {stime} and c.startTime < {etime} and c.progress = 'finish' and c.period.id = '{periodId}'");
@@ -306,7 +306,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: stringBuilder.ToString(), continuationToken: token, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout }))
                 {
 
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -316,7 +316,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     }
                     if (iscontinuation)
                     {
-                        token = item.GetContinuationToken();
+                        token = item.ContinuationToken;
                         break;
                     }
 

+ 6 - 6
TEAMModelOS.SDK/Models/Service/FixDataService.cs

@@ -55,7 +55,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 //await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: scquery, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
                 //{
 
-                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                //    using var json = await JsonDocument.ParseAsync(item.Content);
                 //    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 //    {
                 //        var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -117,7 +117,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         var sresponse = await client.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync(study.id, new PartitionKey($"StudyRecord-{id}"));
                         if (sresponse.Status == 200)
                         {
-                            var json = await JsonDocument.ParseAsync(sresponse.ContentStream);
+                            var json = await JsonDocument.ParseAsync(sresponse.Content);
                             StudyRecord record = json.ToObject<StudyRecord>();
                             if (record.status == 1)
                             {
@@ -187,7 +187,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         }
                     }
                     string url = await StudyService.GenPdf(id, areaId, cname, sname, gname, stringBuilder.ToString(), _converter, _azureStorage, _dingDing);
-                    Azure.Response teacherTrainRes = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(id, new PartitionKey($"TeacherTrain-{code}"));
+                    ResponseMessage teacherTrainRes = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(id, new PartitionKey($"TeacherTrain-{code}"));
                     if (teacherTrainRes.Status == 200)
                     {
                         TeacherTrain teacherTrain = JsonDocument.Parse(teacherTrainRes.Content).RootElement.Deserialize<TeacherTrain>();
@@ -358,7 +358,7 @@ namespace TEAMModelOS.SDK.Models.Service
                                 url += ".HTEX";
                             }
                             Bloblog bloblog = new Bloblog { id = Guid.NewGuid().ToString(), code = $"Bloblog-{name}", pk = "Bloblog", time = now, url = url, size = urlsSize != null && urlsSize.HasValue ? urlsSize.Value : 0, type = prefix };
-                            await client.GetContainer(Constant.TEAMModelOS, tb).UpsertItemAsync(bloblog, new Azure.Cosmos.PartitionKey(bloblog.code));
+                            await client.GetContainer(Constant.TEAMModelOS, tb).UpsertItemAsync(bloblog, new PartitionKey(bloblog.code));
                         }
                     }
                 }
@@ -371,7 +371,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         {
                             var urlsSize = await ContainerClient.GetBlobsSize(item);
                             Bloblog bloblog = new Bloblog { id = Guid.NewGuid().ToString(), code = $"Bloblog-{name}", pk = "Bloblog", time = now, url = item, size = urlsSize != null && urlsSize.HasValue ? urlsSize.Value : 0, type = prefix };
-                            await client.GetContainer(Constant.TEAMModelOS, tb).UpsertItemAsync(bloblog, new Azure.Cosmos.PartitionKey(bloblog.code));
+                            await client.GetContainer(Constant.TEAMModelOS, tb).UpsertItemAsync(bloblog, new PartitionKey(bloblog.code));
                         }
                     }
                 }
@@ -638,7 +638,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"SELECT value(c) FROM c where c.pk = 'Exam' and c.publish = '0'" ))
                 {
 
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 16 - 16
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -472,14 +472,14 @@ namespace TEAMModelOS.SDK
             if (!string.IsNullOrEmpty(school))
             {
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<GroupList>(queryText: queryNo,
-                requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList-{school}") }))
+                requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
                 {
                      data = await JoinList(_azureRedis, item, userid, type, school,year,seatNo,_client:_client);
                     break;
                 }
             }
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<GroupList>(queryText: queryNo,
-                          requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList") }))
+                          requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList") }))
             {
 
                 if (item.joinLock == 0) {
@@ -878,9 +878,9 @@ namespace TEAMModelOS.SDK
                         if (list.scope.Equals("school"))
                         {
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: queryNo,
-                                    requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"{list.code}") }))
+                                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{list.code}") }))
                             {
-                                using var jsonNo = await JsonDocument.ParseAsync(item.ContentStream);
+                                using var jsonNo = await JsonDocument.ParseAsync(item.Content);
                                 if (jsonNo.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                 {
                                     var accounts = jsonNo.RootElement.GetProperty("Documents").EnumerateArray();
@@ -893,9 +893,9 @@ namespace TEAMModelOS.SDK
                             }
                         }
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: queryNo,
-                                requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey("GroupList") }))
+                                requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("GroupList") }))
                         {
-                            using var jsonNo = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var jsonNo = await JsonDocument.ParseAsync(item.Content);
                             if (jsonNo.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 var accounts = jsonNo.RootElement.GetProperty("Documents").EnumerateArray();
@@ -986,7 +986,7 @@ namespace TEAMModelOS.SDK
                             List<GroupListDto> schoolList = new List<GroupListDto>();
 
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<GroupListDto>(queryText: $"select {SummarySql} from c where c.id in ({sql})",
-                                    requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList-{school}") }))
+                                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
                             {
                                 schoolList.Add(item);
                             }
@@ -1002,7 +1002,7 @@ namespace TEAMModelOS.SDK
                                 //搜寻没有关联学生的行政班
                                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<GroupListDto>(queryText:
                                     $"select   c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.teacher.id as leader ,c.graduate from c where c.id in ({insql})",
-                                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Class-{school}") }))
+                                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{school}") }))
                                 {
                                     ///行政班(学生搜寻classId动态返回)class
                                     GroupListDto group = new GroupListDto
@@ -1051,7 +1051,7 @@ namespace TEAMModelOS.SDK
                         List<GroupListDto> privateList = new List<GroupListDto>();
                         sql = string.Join(",", classes.Select(x => $"'{x}'"));
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<GroupListDto>(queryText: $"select {SummarySql} from c where c.id in ({sql})",
-                               requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList") }))
+                               requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList") }))
                         {
                             privateList.Add(item);
                             //if (string.IsNullOrWhiteSpace(school))
@@ -1270,7 +1270,7 @@ namespace TEAMModelOS.SDK
                         List<RGroupList> schoolList = new List<RGroupList>();
                         string queryText = $"select value(c) from c where c.id in ({sql})";
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<RGroupList>(queryText: queryText,
-                                requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList-{school}") }))
+                                requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
                         {
                             schoolList.Add(item);
                         }
@@ -1284,7 +1284,7 @@ namespace TEAMModelOS.SDK
                         {
                             sql = string.Join(",", classes.Select(x => $"'{x}'"));
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryIteratorSql<Student>(queryText: $"select value(c) from c where c.classId in ({sql})",
-                                requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Base-{school}") }))
+                                requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{school}") }))
                             {
                                 //graduate传入的状态>=0 表示指定状态查询,且传入的状态与数据库的状态一致。
                                 if (graduate >= 0)
@@ -1310,7 +1310,7 @@ namespace TEAMModelOS.SDK
                             //搜寻没有关联学生的行政班
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School")
                                 .GetItemQueryIteratorSql<RGroupList>(queryText: $"select  c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.teacher.id as leader ,c.graduate   from c where c.id in ({insql})",
-                                    requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Class-{school}") }))
+                                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{school}") }))
                             {
                                 ///行政班(学生搜寻classId动态返回)class
                                 List<RMember> smembers = new List<RMember>();
@@ -1360,7 +1360,7 @@ namespace TEAMModelOS.SDK
                         List<RGroupList> privateList = new List<RGroupList>();
                         sql = string.Join(",", classes.Select(x => $"'{x}'"));
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<RGroupList>(queryText: $"select value(c) from c where c.id in ({sql})",
-                               requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList") }))
+                               requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList") }))
                         {
                             privateList.Add(item);
                             //if (string.IsNullOrWhiteSpace(school))
@@ -1404,7 +1404,7 @@ namespace TEAMModelOS.SDK
                         string insql = string.Join(",", sqlList.Select(x => $"'{x}'"));
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").
                             GetItemQueryIteratorSql<RGroupList>(queryText: $"select c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.teacher.id as leader  ,c.graduate from c where c.id in ({insql})",
-                                  requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Class-{school}") }))
+                                  requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{school}") }))
                         {
                             ///行政班(学生搜寻classId动态返回)class
                             List<RMember> smembers = students.Where(x => x.classId.Equals(item.id))
@@ -1601,7 +1601,7 @@ namespace TEAMModelOS.SDK
                 {
                     List<RGroupList> groupLists = new List<RGroupList>();
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<RGroupList>(queryText: sql.ToString(),
-                    requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList-{school}") }))
+                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
                     {
                         groupLists.Add(item);
                     }
@@ -1660,7 +1660,7 @@ namespace TEAMModelOS.SDK
             {
                 List<RGroupList> groupLists = new List<RGroupList>();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<RGroupList>(queryText: sql.ToString(),
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList") }))
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList") }))
                 {
                     groupLists.Add(item);
                     //if (string.IsNullOrWhiteSpace(school))

+ 18 - 18
TEAMModelOS.SDK/Models/Service/IESActivityService.cs

@@ -30,7 +30,7 @@ namespace TEAMModelOS.SDK
                 if (groupChange.scope.Equals("school", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(groupChange.school))
                 {
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<MQActivity>(queryText: query,
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"{type}-{groupChange.school}") }))
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{groupChange.school}") }))
                     {
                         datas.Add(item);
                     }
@@ -48,7 +48,7 @@ namespace TEAMModelOS.SDK
                             $" and (( array_contains(c.classes,'{groupChange.listid}')) or ( array_contains(c.stuLists,'{groupChange.listid}')))";
                         //  $" and A1 in('{groupChange.listid}') ";
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<MQActivity>(queryText: queryTech,
-                            requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"{type}-{techer.id}") }))
+                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{techer.id}") }))
                         {
                             datas.Add(item);
                         }
@@ -57,7 +57,7 @@ namespace TEAMModelOS.SDK
                 if (groupChange.scope.Equals("private", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(groupChange.creatorId))
                 {
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<MQActivity>(queryText: query,
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"{type}-{groupChange.creatorId}") }))
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{groupChange.creatorId}") }))
                     {
                         datas.Add(item);
                     }
@@ -100,7 +100,7 @@ namespace TEAMModelOS.SDK
                         if (groupChange.scope.Equals("school"))
                         {
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(queryText: $"select value(c) from c where c.examId = '{activity.id}'",
-                            requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{groupChange.school}") }))
+                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{groupChange.school}") }))
                             {
                                 classResults.Add(item);
                             }
@@ -108,7 +108,7 @@ namespace TEAMModelOS.SDK
                         else
                         {
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(queryText: $"select value(c) from c where c.examId = '{activity.id}'",
-                               requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{groupChange.creatorId}") }))
+                               requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{groupChange.creatorId}") }))
                             {
                                 classResults.Add(item);
                             }
@@ -330,7 +330,7 @@ namespace TEAMModelOS.SDK
             if (!string.IsNullOrWhiteSpace(groupChange.creatorId)) {
               
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<Course>(queryText: query,
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Course-{groupChange.creatorId}") }))
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{groupChange.creatorId}") }))
                 {
                     courses.Add(item);
                 }
@@ -338,7 +338,7 @@ namespace TEAMModelOS.SDK
             if (!string.IsNullOrWhiteSpace(groupChange.school))
             {
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<Course>(queryText: query,
-                    requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Course-{groupChange.school}") }))
+                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{groupChange.school}") }))
                 {
                     courses.Add(item);
                 }
@@ -346,7 +346,7 @@ namespace TEAMModelOS.SDK
             //if (groupChange.scope.Equals("school") && !string.IsNullOrEmpty(groupChange.school))
             //{
             //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<Course>(queryText: query,
-            //        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Course-{groupChange.school}") }))
+            //        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{groupChange.school}") }))
             //    {
             //        courses.Add(item);
             //    }
@@ -354,7 +354,7 @@ namespace TEAMModelOS.SDK
             //if (groupChange.scope.Equals("private") && !string.IsNullOrEmpty(groupChange.creatorId))
             //{
             //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIteratorSql<Course>(queryText: query,
-            //        requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Course-{groupChange.creatorId}") }))
+            //        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{groupChange.creatorId}") }))
             //    {
             //        courses.Add(item);
             //    }
@@ -367,7 +367,7 @@ namespace TEAMModelOS.SDK
                 //学生新加入名单的
                 foreach (Member member in groupChange.stujoin)
                 {
-                    Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{member.code.Replace("Base-", "")}-{member.id}"));
+                    ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{member.code.Replace("Base-", "")}-{member.id}"));
                     if (response.Status == 200)
                     {
                         StuCourse stuCourse = JsonDocument.Parse(response.Content).RootElement.Deserialize<StuCourse>();
@@ -452,7 +452,7 @@ namespace TEAMModelOS.SDK
                 {
                     try
                     {
-                        Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{member.id}"));
+                        ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{member.id}"));
                         if (response.Status == 200)
                         {
                             StuCourse stuCourse = JsonDocument.Parse(response.Content).RootElement.Deserialize<StuCourse>();
@@ -529,7 +529,7 @@ namespace TEAMModelOS.SDK
                 foreach (var delStu in groupChange.stuleave)
                 {
                     try {
-                        Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{delStu.code.Replace("Base-", "")}-{delStu.id}"));
+                        ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{delStu.code.Replace("Base-", "")}-{delStu.id}"));
                         if (response.Status == 200)
                         {
                             StuCourse stuCourse = JsonDocument.Parse(response.Content).RootElement.Deserialize<StuCourse>();
@@ -552,7 +552,7 @@ namespace TEAMModelOS.SDK
                 {
                     try
                     {
-                        Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{delTmd.id}"));
+                        ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(course.id, new PartitionKey($"StuCourse-{delTmd.id}"));
                         if (response.Status == 200)
                         {
                             StuCourse stuCourse = JsonDocument.Parse(response.Content).RootElement.Deserialize<StuCourse>();
@@ -647,8 +647,8 @@ namespace TEAMModelOS.SDK
             MQActivity activity = null;
             try
             {
-                var aactivity = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync(id, new Azure.Cosmos.PartitionKey(code));
-                using var da = await JsonDocument.ParseAsync(aactivity.ContentStream);
+                var aactivity = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync(id, new PartitionKey(code));
+                using var da = await JsonDocument.ParseAsync(aactivity.Content);
                 activity = da.ToObject<MQActivity>();
             }
             catch (CosmosException)
@@ -669,7 +669,7 @@ namespace TEAMModelOS.SDK
                         var response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(activity.id, new PartitionKey($"Activity-{tmdid.id}"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             StuActivity stu = json.ToObject<StuActivity>();
                             stu.id = activity.id;
                             stu.scode = activity.code;
@@ -696,7 +696,7 @@ namespace TEAMModelOS.SDK
                         var response = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(activity.id, new PartitionKey($"Activity-{activity.school}-{student.id}"));
                         if (response.Status == 200)
                         {
-                            using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(response.Content);
                             StuActivity stu = json.ToObject<StuActivity>();
                             stu.id = activity.id;
                             stu.scode = activity.code;
@@ -875,7 +875,7 @@ namespace TEAMModelOS.SDK
                 School school = null;
                 if (!string.IsNullOrEmpty(activityList.school))
                 {
-                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(activityList.school, new Azure.Cosmos.PartitionKey("Base"));
+                    school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(activityList.school, new PartitionKey("Base"));
                     list.school = school.id;
                     list.standard = school.standard;
                 }

+ 3 - 3
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -402,7 +402,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         string oid = $"{dataSemester.studyYear}-{dataSemester.currSemester.id}-{record.stuid}";
                         string ocode = $"OverallEducation-{school}";
                         var student = studentsBase.Find(stu => stu.id.Equals(x.id));
-                        Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, Constant.Student).ReadItemStreamAsync(oid, new PartitionKey(ocode));
+                        ResponseMessage response = await client.GetContainer(Constant.TEAMModelOS, Constant.Student).ReadItemStreamAsync(oid, new PartitionKey(ocode));
                         OverallEducation overallEducation = null;
                         if (response.Status != 200)
                         {
@@ -586,7 +586,7 @@ namespace TEAMModelOS.SDK.Models.Service
             if (lessonRecord.scope.Equals("school"))
             {
                 SchoolSetting setting = null;
-                Azure.Response schoolSetting = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(school, new PartitionKey("SchoolSetting"));
+                ResponseMessage schoolSetting = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(school, new PartitionKey("SchoolSetting"));
                 School schoolBase = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>(school, new PartitionKey("Base"));
                 if (schoolSetting.Status == 200)
                 {
@@ -1106,7 +1106,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     var response = await client.GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(data.tmdid.ToString(), new PartitionKey(code));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         LessonCount count = json.ToObject<LessonCount>();
 
                         count.tCount[day - 1] += lessonDis.disTCount;

+ 3 - 3
TEAMModelOS.SDK/Models/Service/OpenApiService.cs

@@ -1,6 +1,6 @@
 using Azure;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -63,7 +63,7 @@ namespace TEAMModelOS.SDK
                 var response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(bizId, new PartitionKey("BizConfig"));
                 if (response.Status == 200)
                 {
-                    using var resJson = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var resJson = await JsonDocument.ParseAsync(response.Content);
                     Business bizConfig = resJson.ToObject<Business>();
                     schools = bizConfig.schools;
                 }
@@ -346,7 +346,7 @@ namespace TEAMModelOS.SDK
                    .GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, continuationToken: continuationToken,
                    requestOptions: new QueryRequestOptions() { MaxItemCount = pageCount, PartitionKey = new PartitionKey(code) }))
                 {
-                    using var jsonData = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var jsonData = await JsonDocument.ParseAsync(item.Content);
                     if (jsonData.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in jsonData.RootElement.GetProperty("Documents").EnumerateArray())

+ 3 - 3
TEAMModelOS.SDK/Models/Service/SchoolService.cs

@@ -256,7 +256,7 @@ namespace TEAMModelOS.SDK
                     }
                 }
 
-                Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(teacher.id, new PartitionKey($"Teacher-{schoolInfo.id}"));
+                ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(teacher.id, new PartitionKey($"Teacher-{schoolInfo.id}"));
                 if (response.Status != 200)
                 {
                     schoolTeacher = new SchoolTeacher
@@ -277,7 +277,7 @@ namespace TEAMModelOS.SDK
                 }
                 else
                 {
-                    JsonElement data = JsonDocument.Parse(response.ContentStream).RootElement;
+                    JsonElement data = JsonDocument.Parse(response.Content).RootElement;
                     schoolTeacher = data.ToObject<SchoolTeacher>();
                     schoolTeacher.status = "join";
                     schoolTeacher.name = schoolInfo.name;
@@ -289,7 +289,7 @@ namespace TEAMModelOS.SDK
                 string sql = "select distinct  value(c.id) from c where array_contains(c.roles,'admin')";
                 List<string> ids = new List<string>();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<string>(queryText: sql,
-                                requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Teacher-{school}") }))
+                                requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{school}") }))
                 {
                     ids.Add(item);
                 }

+ 10 - 10
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -1833,7 +1833,7 @@ namespace TEAMModelOS.SDK
                        { PartitionKey = new PartitionKey($"Base-{schoolId}") }))
                 {
                     continuationToken = item.GetContinuationToken();
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1858,7 +1858,7 @@ namespace TEAMModelOS.SDK
                    requestOptions: new QueryRequestOptions()
                    { PartitionKey = new PartitionKey($"Class-{schoolId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var classrooms = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1988,7 +1988,7 @@ namespace TEAMModelOS.SDK
                        { PartitionKey = new PartitionKey($"Base-{schoolId}"), MaxItemCount = -1 }))
                 {
                     continuationToken = item.GetContinuationToken();
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         List<(string id, string name, string picture, int year, string no, List<StudentGuardian> guardians)> students = new List<(string id, string name, string picture, int year, string no, List<StudentGuardian> guardians)>();
@@ -2200,7 +2200,7 @@ namespace TEAMModelOS.SDK
                 await foreach (Response item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School")
                     .GetItemQueryStreamIteratorSql(queryText: queryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{schoolId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         JsonElement.ArrayEnumerator accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -2345,7 +2345,7 @@ namespace TEAMModelOS.SDK
                                 queryText: queryText,
                                 requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{schoolId}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     JsonElement.ArrayEnumerator docs = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -2433,7 +2433,7 @@ namespace TEAMModelOS.SDK
                     await foreach (Response item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School")
                         .GetItemQueryStreamIteratorSql(queryText: queryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{schoolId}") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             var classInfos = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -2564,7 +2564,7 @@ namespace TEAMModelOS.SDK
                                 var response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Student").ReadItemStreamAsync(id.GetString(), new PartitionKey($"Base-{schoolId}"));
                                 if (response.Status == 200)
                                 {
-                                    var rjson = await JsonDocument.ParseAsync(response.ContentStream);
+                                    var rjson = await JsonDocument.ParseAsync(response.Content);
                                     rjson.RootElement.TryGetProperty("salt", out JsonElement _salt);
                                     salt = $"{_salt}";
                                 }
@@ -2696,7 +2696,7 @@ namespace TEAMModelOS.SDK
                                 queryText: queryText,
                                 requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{schoolId}") }))
                         {
-                            using var json = await JsonDocument.ParseAsync(responseItem.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(responseItem.Content);
                             if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -3088,7 +3088,7 @@ namespace TEAMModelOS.SDK
             await foreach (Response item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Student")
                 .GetItemQueryStreamIteratorSql(queryText: queryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{schoolId}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var classInfos = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -3123,7 +3123,7 @@ namespace TEAMModelOS.SDK
 
                 if (response.Status != (int)HttpStatusCode.OK) return null;
 
-                using Stream stream = response.ContentStream;
+                using Stream stream = response.Content;
                 var jsonDoc = await JsonDocument.ParseAsync(stream);
                 var emumObject = jsonDoc.RootElement.EnumerateObject();
                 var period = jsonDoc.RootElement.GetProperty("period").EnumerateArray();

+ 1 - 1
TEAMModelOS.SDK/Models/Service/SystemService.cs

@@ -344,7 +344,7 @@ IES Morning Report:
                     {
                         if (tzt.Hour==sendTime_am)
                         {
-                            Azure .Response response =   await  _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(homeworkId, new Azure.Cosmos.PartitionKey($"Homework-{tid}"));
+                            Azure .Response response =   await  _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(homeworkId, new PartitionKey($"Homework-{tid}"));
                             if (response.Status==200) { 
                                 Homework homework= JsonDocument.Parse(response.Content).RootElement.ToObject<Homework>();
                                 List<string > classes= new List<string>();

+ 1 - 1
TEAMModelOS.SDK/Models/Service/Third/Sc/ScYxptModel.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

+ 3 - 3
TEAMModelOS.SDK/Models/Service/Third/ThirdService.cs

@@ -125,7 +125,7 @@ namespace TEAMModelOS.SDK.Models
                             StringBuilder queryText = new StringBuilder($"SELECT distinct value(c) FROM c where c.type='yxtrain'");
                             List<GroupList> yxtrain = new List<GroupList>();
                             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<GroupList>(queryText: queryText.ToString(),
-                            requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList-{scSchool.schoolCode}") }))
+                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{scSchool.schoolCode}") }))
                             {
                                 yxtrain.Add(item);
                             }
@@ -672,7 +672,7 @@ namespace TEAMModelOS.SDK.Models
                     var response = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync(activityId.ToString(), new PartitionKey($"Exam-{code}"));
                     if (response.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         info = json.ToObject<ExamInfo>();
                     }
                     List<ExamClassResult> classResults = new();
@@ -847,7 +847,7 @@ namespace TEAMModelOS.SDK.Models
                 School sc = new();
                 if (schresponse.Status == 200)
                 {
-                    using var schjson = await JsonDocument.ParseAsync(schresponse.ContentStream);
+                    using var schjson = await JsonDocument.ParseAsync(schresponse.Content);
                     sc = schjson.ToObject<School>();
                 }
                 var period = sc.period.Where(x => x.id.Equals(info.period.id)).FirstOrDefault();

+ 1 - 1
TEAMModelOS.SDK/Models/Service/Third/Xkw/XkwOAuthModel.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/BIOptLog.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/ChangeRecord.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/IESLogin.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/Lesson.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Newtonsoft.Json;
 using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/OpenApi.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/OptLog.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 
 namespace TEAMModelOS.SDK.Models.Table
 {    

+ 1 - 1
TEAMModelOS.SDK/Models/Table/SchoolSetting.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using Newtonsoft.Json;
 using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/SchoolYear.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;

+ 1 - 1
TEAMModelOS.SDK/Models/Table/ShortUrl.cs

@@ -1,4 +1,4 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;

+ 1 - 1
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -35,7 +35,7 @@
 		<PackageReference Include="PinYinConverterCore" Version="1.0.2" />
 		<PackageReference Include="StackExchange.Redis" Version="2.8.0" />
 		<!--<PackageReference Include="SvgNet" Version="3.3.6" />-->
-		<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="2.0.0-preview" />
+		<PackageReference Include="Microsoft.Table" Version="2.0.0-preview" />
 		<!--<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />-->
 		<PackageReference Include="NPinyin.Core" Version="3.0.0" />
 		<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />

+ 8 - 8
TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -1820,7 +1820,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        var query = $"select c.id,c.name,c.subjectId,c.studentScores,c.studentIds,c.paper,c.classes from c where c.examId =  '{id}' ";
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamResult>(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamResult-{id}") }))
         //        {
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1836,7 +1836,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(queryText: queryClass, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{code}") }))
         //        {
         //            examClassResults.Add(item);
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1881,14 +1881,14 @@ namespace TEAMModelOS.Controllers.Analysis
         //            var sresponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(s, new PartitionKey($"Class-{code}"));
         //            if (sresponse.Status == 200)
         //            {
-        //                using var json = await JsonDocument.ParseAsync(sresponse.ContentStream);
+        //                using var json = await JsonDocument.ParseAsync(sresponse.Content);
         //                Class classroom = json.ToObject<Class>();
         //                classes.Add(new { name = classroom.name, id = s });
         //                //初始化参考人数
         //                int count = 0;
         //                //处理班级学生名单
         //                List<Student> students = new List<Student>();
-        //                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryIteratorSql<Student>(queryText: $"select c.id from c where c.classId = '{classroom.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Base-{code}") }))
+        //                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryIteratorSql<Student>(queryText: $"select c.id from c where c.classId = '{classroom.id}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{code}") }))
         //                {
         //                    students.Add(item);
         //                }
@@ -2545,7 +2545,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        var query = $"select c.id,c.name,c.subjectId,c.studentScores,c.studentIds,c.paper,c.classes from c where c.examId =  '{id}' ";
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamResult>(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamResult-{id}") }))
         //        {
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -2561,7 +2561,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(queryText: queryClass, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{code}") }))
         //        {
         //            examClassResults.Add(item);
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -3368,7 +3368,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        var query = $"select c.id,c.name,c.subjectId,c.studentScores,c.studentIds,c.paper,c.classes from c where c.examId =  '{id}' ";
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamResult>(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamResult-{id}") }))
         //        {
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -3384,7 +3384,7 @@ namespace TEAMModelOS.Controllers.Analysis
         //        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIteratorSql<ExamClassResult>(queryText: queryClass, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{code}") }))
         //        {
         //            examClassResults.Add(item);
-        //            /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //            /*using var json = await JsonDocument.ParseAsync(item.Content);
         //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //            {
         //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())

+ 4 - 4
TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -342,7 +342,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     var sresponse = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(classId, new PartitionKey($"Class-{code}"));
                     if (sresponse.Status == 200)
                     {
-                        using var json = await JsonDocument.ParseAsync(sresponse.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(sresponse.Content);
                         classroom = json.ToObject<Class>();
 
                     }*/
@@ -1541,7 +1541,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 var response = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemStreamAsync(id.ToString(), new PartitionKey($"Exam-{code}"));
                 if (response.Status == 200)
                 {
-                    using var cJson = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var cJson = await JsonDocument.ParseAsync(response.Content);
                     info = cJson.ToObject<ExamInfo>();
                 }
                 else {
@@ -1702,7 +1702,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(code.ToString(), new PartitionKey($"Base"));
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     school = json.ToObject<School>();
                 }
                 //School school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(code.ToString(), new PartitionKey($"Base"));
@@ -1885,7 +1885,7 @@ namespace TEAMModelOS.Controllers.Analysis
         public async Task<string> getGId(int cyear, string periodId, string code)
         {
             var client = _azureCosmos.GetCosmosClient();
-            School sc = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(code, new Azure.Cosmos.PartitionKey("Base"));
+            School sc = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(code, new PartitionKey("Base"));
             string gradeId = "";
             foreach (Period period in sc.period)
             {

+ 3 - 3
TEAMModelOS/Controllers/Analysis/ArtAnalysisController.cs

@@ -52,7 +52,7 @@ namespace TEAMModelOS.Controllers.Analysis
                  await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"SELECT  top 1 *  FROM c where c.period.id ='{period}' order by c.createTime  ",
                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Art-{code}") }))
                  {
-                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                     using var json = await JsonDocument.ParseAsync(item.Content);
                      foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                      {
                          arts.Add(obj.ToObject<ArtEvaluation>());
@@ -103,7 +103,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Student).GetItemQueryStreamIteratorSql
                     (queryText: queryScore, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey($"ArtResult-{artId}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -430,7 +430,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 List<(string name, List<string> kno)> blocks = new();
                 if (response.Status == 200)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     School sc = json.ToObject<School>();
                     var subjects = sc.period.Where(p => p.id.Equals(pId)).Select(x => x.subjects);
                     foreach (var sj in subjects)

+ 15 - 15
TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -93,7 +93,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 List<string> ids = new();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT c.id FROM c where c.status = 'join'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -124,7 +124,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double studentCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as stus FROM c where c.periodId = '{pId}' and (c.graduate = 0 OR IS_DEFINED(c.graduate) = false) ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -140,7 +140,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double itemCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as items FROM c where c.periodId = '{pId}' and c.pid = null and c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -156,7 +156,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double paperCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as papers FROM c where c.periodId = '{pId}' and c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -171,7 +171,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double voteCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as votes FROM c where c.periodId = '{pId}' and c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Vote-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -186,7 +186,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double surveyCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as surveys FROM c where c.periodId = '{pId}' and c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Survey-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -201,7 +201,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 double homeworkCount = 0;
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: $"SELECT count(1) as works FROM c where c.periodId = '{pId}' and c.scope = 'school' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Homework-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -218,9 +218,9 @@ namespace TEAMModelOS.Controllers.Analysis
 
                 var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(code.GetString(), new PartitionKey($"Base"));
                 School sc = new School();
-                if (response.Status == 200)
+                if (response.StatusCode == HttpStatusCode.OK)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(response.Content);
                     sc = json.ToObject<School>();
                 }
 
@@ -384,7 +384,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 string serialQueryText = $"SELECT * FROM c WHERE c.dataType = 'serial' AND ARRAY_CONTAINS({serialPermitJsonStr}, c.prodCode)";
                 await foreach (var itemsr in db.GetItemQueryStreamIteratorSql(queryText: serialQueryText, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Product-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(itemsr.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(itemsr.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         deviceForCoreService uuidForCore;
@@ -677,9 +677,9 @@ namespace TEAMModelOS.Controllers.Analysis
                     var endtime = DateTimeOffset.Parse(est).GetUTCTime(TimeZone).ToUnixTimeMilliseconds();
                     var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(code.GetString(), new PartitionKey($"Base"));
                     School sc = new School();
-                    if (response.Status == 200)
+                    if (response.StatusCode == HttpStatusCode.OK)
                     {
-                        using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(response.Content);
                         sc = json.ToObject<School>();
                     }
                     List<(string time, double count)> counts = new()
@@ -1150,7 +1150,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 var queryClass = $"select c.id,c.source,c.scope from c where c.school = '{code}' and c.pk = 'Exam' and c.startTime >= {stime} and c.endTime <= {etime}";
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: queryClass))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1202,7 +1202,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(
                     queryText: sql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonRecord-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1242,7 +1242,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 List<string> sIds = new();
                 await foreach (var item in client.GetContainer("TEAMModelOS", source).GetItemQueryStreamIteratorSql(queryText: $"select c.id from c where c.pk = '{pk}' and c.periodId = '{pId}'"))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();

+ 20 - 20
TEAMModelOS/Controllers/Both/CourseBaseController.cs

@@ -160,7 +160,7 @@ namespace TEAMModelOS.Controllers.Both
                             }
                             string tbname = $"{scope}".Equals("school", StringComparison.OrdinalIgnoreCase) ? Constant.School : Constant.Teacher;
                             string partitionKey = $"{scope}".Equals("school", StringComparison.OrdinalIgnoreCase) ? $"CourseBase-{_code}" : "CourseBase";
-                            Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, tbname).DeleteItemStreamAsync(_id.ToString(), new PartitionKey(partitionKey));
+                            var response = await client.GetContainer(Constant.TEAMModelOS, tbname).DeleteItemStreamAsync(_id.ToString(), new PartitionKey(partitionKey));
                             //需要联动删除排课
                             string taskCode = $"{scope}".Equals("school", StringComparison.OrdinalIgnoreCase) ? $"CourseTask-{_code}": "CourseTask";
                             string taskSql = $"select value c from c where c.courseId='{_id}'";
@@ -174,7 +174,7 @@ namespace TEAMModelOS.Controllers.Both
                             {
                                 await client.GetContainer(Constant.TEAMModelOS, tbname).DeleteItemsStreamAsync(courseTasks.Select(x => x.id).ToList(), taskCode);
                             }
-                            return Ok(new { code = response.Status });
+                            return Ok(new { code = response.StatusCode });
                         }
                     case bool when $"{grant_type}".Equals("import-base", StringComparison.OrdinalIgnoreCase) && $"{scope}".Equals("school", StringComparison.OrdinalIgnoreCase):
                         {
@@ -491,10 +491,10 @@ namespace TEAMModelOS.Controllers.Both
                                 List<GroupListDto> groups = new List<GroupListDto>();
                                 string taskCode = $"CourseTask-{school}";
                                 string taskId = $"{studyYear}-{semesterId}-{_courseId}";
-                                Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                 bool has_schedule = false;
                                 CourseTask courseTask = default;
-                                if (response.Status == 200)
+                                if (response.StatusCode == System.Net.HttpStatusCode.OK)
                                 {
                                     courseTask=JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
                                     if (courseTask != null && courseTask.schedules.IsNotEmpty())
@@ -587,9 +587,9 @@ namespace TEAMModelOS.Controllers.Both
                             {
                                 string taskCode = $"CourseTask";
                                 string taskId = $"{_courseId}";
-                                Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                 CourseTask courseTask = default;
-                                if (response.Status == 200)
+                                if (response.StatusCode == System.Net.HttpStatusCode.OK)
                                 {
                                     courseTask = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
                                 }
@@ -670,8 +670,8 @@ namespace TEAMModelOS.Controllers.Both
                                     return Ok(new { invalidCode = 16 });//学期不存在
                                 }
                                 CourseBase courseBase = null;
-                                Azure.Response responseBase = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync($"{_courseId.ToString()}", new PartitionKey($"CourseBase-{school}"));
-                                if (responseBase.Status == 200)
+                                ResponseMessage  responseBase = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync($"{_courseId.ToString()}", new PartitionKey($"CourseBase-{school}"));
+                                if (responseBase.StatusCode == System.Net.HttpStatusCode.OK)
                                 {
                                     courseBase = JsonDocument.Parse(responseBase.Content).RootElement.ToObject<CourseBase>();
                                 }
@@ -679,8 +679,8 @@ namespace TEAMModelOS.Controllers.Both
                                 {
                                     return Ok(new { invalidCode = 1 });//课程不存在
                                 }
-                                Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
-                                if (response.Status == 200)
+                                ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                if (response.StatusCode == System.Net.HttpStatusCode.OK)
                                 {
                                     courseTask = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
                                 }
@@ -782,7 +782,7 @@ namespace TEAMModelOS.Controllers.Both
                                 string taskId = $"{_courseId}";
                                 CourseTask courseTask = null;
                                 CourseBase courseBase = null;
-                                Azure.Response responseBase = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync($"{_courseId.ToString()}", new PartitionKey($"CourseBase"));
+                                ResponseMessage responseBase = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync($"{_courseId.ToString()}", new PartitionKey($"CourseBase"));
                                 if (responseBase.Status == 200)
                                 {
                                     courseBase = JsonDocument.Parse(responseBase.Content).RootElement.ToObject<CourseBase>();
@@ -791,7 +791,7 @@ namespace TEAMModelOS.Controllers.Both
                                 {
                                     return Ok(new { invalidCode = 1 });//课程不存在
                                 }
-                                Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                 if (response.Status == 200)
                                 {
                                     courseTask = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
@@ -955,7 +955,7 @@ namespace TEAMModelOS.Controllers.Both
                                         CourseTask courseTask = courseTasks.Where(z => z.id.Equals(taskId) && z.code.Equals(taskCode)).FirstOrDefault();
                                         if (courseTask == null)
                                         {
-                                            Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                            ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                             if (response.Status == 200)
                                             {
                                                 courseTask = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
@@ -1101,7 +1101,7 @@ namespace TEAMModelOS.Controllers.Both
                                         CourseTask courseTask = courseTasks.Where(z => z.id.Equals(taskId) && z.code.Equals(taskCode)).FirstOrDefault();
                                         if (courseTask == null)
                                         {
-                                            Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                            ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                             if (response.Status == 200)
                                             {
                                                 courseTask = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();
@@ -1583,7 +1583,7 @@ namespace TEAMModelOS.Controllers.Both
                                 CourseTask courseTask = courseTasks.FirstOrDefault(z => z.id.Equals(taskId) && z.code.Equals(taskCode));
                                 if (courseTask == null)
                                 {
-                                    Azure.Response courseTaskResponse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
+                                    ResponseMessage courseTaskResponse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(taskId, new PartitionKey(taskCode));
                                     if (courseTaskResponse.Status == 200)
                                     {
                                         courseTask = JsonDocument.Parse(courseTaskResponse.Content).RootElement.ToObject<CourseTask>();
@@ -2322,7 +2322,7 @@ namespace TEAMModelOS.Controllers.Both
                     //当前学年
                     var semester = SchoolService.GetSemester(period, DateTimeOffset.Now.ToUnixTimeMilliseconds());
                  
-                    Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(course.id, new PartitionKey($"CourseBase-{school.id}"));
+                    ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(course.id, new PartitionKey($"CourseBase-{school.id}"));
                     if (response.Status==200) {
                         CourseBase courseBase = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseBase>();
                         if (courseBase!= null) {
@@ -2550,7 +2550,7 @@ namespace TEAMModelOS.Controllers.Both
                                 {
                                     string id = $"{semester.studyYear}-{semester.currSemester.id}-{item.id}";
                                     string code = $"CourseTask-{school.id}";
-                                    Azure.Response responseTask=  await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(id, new PartitionKey(code));
+                                    ResponseMessage responseTask=  await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(id, new PartitionKey(code));
                                     CourseTask courseTask = null;
                                     if (responseTask.Status==200)
                                     {
@@ -2658,7 +2658,7 @@ namespace TEAMModelOS.Controllers.Both
                     }
                     var semester = SchoolService.GetSemester(period,time: "2023-07-01");
                     CourseBase courseBase = null;
-                    Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(course.id, new PartitionKey($"CourseBase-{school.id}"));
+                    ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemStreamAsync(course.id, new PartitionKey($"CourseBase-{school.id}"));
                     if (response.Status==200)
                     {
                         courseBase = JsonDocument.Parse(response.Content).RootElement.ToObject<CourseBase>();
@@ -2964,7 +2964,7 @@ namespace TEAMModelOS.Controllers.Both
                 foreach (var course in teacherCourses)
                 {
                     CourseBase courseBase = null;
-                    Azure.Response responseCourse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(course.id, new PartitionKey("CourseBase"));
+                    ResponseMessage responseCourse = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(course.id, new PartitionKey("CourseBase"));
                     if (responseCourse.Status==200)
                     {
                         courseBase= JsonDocument.Parse(responseCourse.Content).RootElement.ToObject<CourseBase>();
@@ -3007,7 +3007,7 @@ namespace TEAMModelOS.Controllers.Both
                         string code = $"CourseTask";
                         CourseTask courseTask = null;
                         //处理之前迁移过,的排课任务,但是又新增了新的排课,防止 新的排课被覆盖.
-                        Azure.Response response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(id, new PartitionKey(code));
+                        ResponseMessage response = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(id, new PartitionKey(code));
                         if (response.Status==200)
                         {
                             courseTask= JsonDocument.Parse(response.Content).RootElement.ToObject<CourseTask>();

+ 20 - 20
TEAMModelOS/Controllers/Both/CourseController.cs

@@ -364,7 +364,7 @@ namespace TEAMModelOS.Controllers
                 List<Schedule> teachers = new();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code}") }))
                 {
-                    using var jsonCheck = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var jsonCheck = await JsonDocument.ParseAsync(item.Content);
                     if (jsonCheck.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         foreach (var obj in jsonCheck.RootElement.GetProperty("Documents").EnumerateArray())
@@ -383,7 +383,7 @@ namespace TEAMModelOS.Controllers
                     List<Schedule> courses = new();
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: queryClass, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code}") }))
                     {
-                        using var jsonCheck = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var jsonCheck = await JsonDocument.ParseAsync(item.Content);
                         if (jsonCheck.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in jsonCheck.RootElement.GetProperty("Documents").EnumerateArray())
@@ -458,7 +458,7 @@ namespace TEAMModelOS.Controllers
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: sql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code.GetString()}") }))
                     {
                         //continuationToken = item.GetContinuationToken();
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -475,7 +475,7 @@ namespace TEAMModelOS.Controllers
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code.GetString()}") }))
                     {
                         //continuationToken = item.GetContinuationToken();
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -496,7 +496,7 @@ namespace TEAMModelOS.Controllers
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{schoolId.GetString()}") }))
                         {
                             //continuationToken = item.GetContinuationToken();
-                            using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                            using var json = await JsonDocument.ParseAsync(item.Content);
                             if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                             {
                                 foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -555,7 +555,7 @@ namespace TEAMModelOS.Controllers
 
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code.GetString()}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -590,7 +590,7 @@ namespace TEAMModelOS.Controllers
                     var querySchool = $"select distinct c.code,c.id,c.no,c.name,c.scope from c join A0 in c.schedule where A0.teacherId = '{code}'";
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{schoolId.GetString()}") }))
                     {
-                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -620,7 +620,7 @@ namespace TEAMModelOS.Controllers
                             var queryClass = $"select c.id ,c.name from c where c.id in ({string.Join(",", schedules.Select(o => $"'{o.classId}'"))})";
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: queryClass, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{schoolId.GetString()}") }))
                             {
-                                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                                using var json = await JsonDocument.ParseAsync(item.Content);
                                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                                 {
                                     var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -781,7 +781,7 @@ namespace TEAMModelOS.Controllers
                             var response = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(schedule.teacherId, new PartitionKey("Base"));
                             if (response.Status == 200)
                             {
-                                using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                                using var json = await JsonDocument.ParseAsync(response.Content);
                                 Teacher teacher = json.ToObject<Teacher>();
                                 scheduleExtobj.teacherName = teacher.name;
                             }
@@ -1038,7 +1038,7 @@ namespace TEAMModelOS.Controllers
         //    AzureCosmosQuery cosmosDbQuery = SQLHelper.GetSQL(dict, sql);
         //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CourseManagement-{code}") }))
         //    {
-        //        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //        using var json = await JsonDocument.ParseAsync(item.Content);
         //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //        {
         //            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1061,7 +1061,7 @@ namespace TEAMModelOS.Controllers
         //    var query = $"select c.code,c.id,c.name,A0.course.id courseId,A0.course.name courseName ,A0.course.notice notice ,A1,c.scope,c.teacher from c  join A0  in c.courses join A1  in A0.teachers where A1.id = '{id}' ";
         //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CourseManagement-{code}") }))
         //    {
-        //        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //        using var json = await JsonDocument.ParseAsync(item.Content);
         //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //        {
         //            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1120,7 +1120,7 @@ namespace TEAMModelOS.Controllers
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(
                                     queryText: $"select c.id,c.name from c where c.id in ({ string.Join(",", teacherIds.Select(o => $"'{o}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1189,7 +1189,7 @@ namespace TEAMModelOS.Controllers
         //    AzureCosmosQuery cosmosDbQuery = SQLHelper.GetSQL(dict, sql);
         //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"CourseManagement-{code}") }))
         //    {
-        //        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+        //        using var json = await JsonDocument.ParseAsync(item.Content);
         //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
         //        {
         //            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1273,7 +1273,7 @@ namespace TEAMModelOS.Controllers
                                 var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(classSimple.id, new PartitionKey($"Class-{classSimple.code}"));
                                 if (response.Status == 200)
                                 {
-                                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
+                                    using var json = await JsonDocument.ParseAsync(response.Content);
                                     Class cla = json.ToObject<Class>();
                                     Class newCla = new Class();
                                     newCla.id = cla.id;
@@ -1337,7 +1337,7 @@ namespace TEAMModelOS.Controllers
             var query = $"select c.code,c.id,c.name,c.subjectId,c.periodId,c.scope,c.notice,c.classes from c ";
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{id}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
@@ -1375,7 +1375,7 @@ namespace TEAMModelOS.Controllers
             var query = $"select distinct c.scope,A0.stulist id from c join A0 in c.schedule where A0.teacherId = '{id}'";
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{id}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1394,7 +1394,7 @@ namespace TEAMModelOS.Controllers
             var querySchool = $"select distinct c.scope,A0.classId id from c join A0 in c.schedule where A0.teacherId = '{id}'";
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIteratorSql(queryText: querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{id}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1414,7 +1414,7 @@ namespace TEAMModelOS.Controllers
             //var queryBySchool = $"select distinct c.id,c.name,c.scope from c  join A0  in c.courses join A1  in A0.teachers where A1.id = '{id}' ";
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1432,7 +1432,7 @@ namespace TEAMModelOS.Controllers
             }
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(queryText: querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{code}") }))
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                using var json = await JsonDocument.ParseAsync(item.Content);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                 {
                     var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();
@@ -1455,7 +1455,7 @@ namespace TEAMModelOS.Controllers
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIteratorSql(
                                     queryText: $"select c.id,c.name from c where c.id in ({string.Join(",", classIds.Select(o => $"'{o}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Class-{code}") }))
                 {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    using var json = await JsonDocument.ParseAsync(item.Content);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                     {
                         var accounts = json.RootElement.GetProperty("Documents").EnumerateArray();

+ 0 - 0
TEAMModelOS/Controllers/Both/GroupListController.cs


Some files were not shown because too many files changed in this diff