调整ItemCondQueue

TEAMModelFunction/MonitorServicesBus.cs

@@ -389,7 +389,7 @@ namespace TEAMModelFunction
         }
 
         [FunctionName("ItemCond")]
-        public async Task ItemCond([ServiceBusTrigger("itemcond", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task ItemCond([ServiceBusTrigger("%Azure:ServiceBus:ItemCondQueue%", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {

TEAMModelFunction/local.settings.json

@@ -12,6 +12,7 @@
     "Azure:Redis:ConnectionString": "106.12.23.251:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240",
     "Azure:ServiceBus:ActiveTask": "dep-active-task",
     "Azure:ServiceBus:NoticeTask": "dep-notice-task",
+    "Azure:ServiceBus:ItemCondQueue": "dep-itemcond",
     "Option:Location": "China-Dep",
     "FUNCTIONS_WORKER_RUNTIME": "dotnet"
   }  

TEAMModelOS/Controllers/Item/ItemController.cs

@@ -91,7 +91,7 @@ namespace TEAMModelOS.Controllers
         [HttpPost("upsert-all")]
         public async Task<IActionResult> UpsertAll(JsonElement request)
         {
-
+            var ItemCondQueue = _configuration.GetValue<string>("Azure:ServiceBus:ItemCondQueue");
             var client = _azureCosmos.GetCosmosClient();
             if (!request.TryGetProperty("itemInfos", out JsonElement items)) return BadRequest();
             if (!request.TryGetProperty("option", out JsonElement option)) return BadRequest();
@@ -166,7 +166,7 @@ namespace TEAMModelOS.Controllers
                     }
                 }
                 var messageBlobItemCond = new ServiceBusMessage(itemCondDtos.ToJsonString());
-                await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                 return Ok(new {   });
             }
             catch (Exception ex)
@@ -187,6 +187,7 @@ namespace TEAMModelOS.Controllers
             if (!request.TryGetProperty("option", out JsonElement option)) return BadRequest();
             try
             {
+                var ItemCondQueue = _configuration.GetValue<string>("Azure:ServiceBus:ItemCondQueue");
                 ItemInfo itemInfo;
                 itemInfo = item.ToObject<ItemInfo>();
                 itemInfo.size = await _azureStorage.GetBlobContainerClient(itemInfo.code).GetBlobsSize($"item/{itemInfo.id}");
@@ -212,14 +213,14 @@ namespace TEAMModelOS.Controllers
                         {
                             ItemCondDto itemCondDto = new ItemCondDto { newItem = itemInfo, key = "ItemCond", filed = itemInfo.code.Replace("Item-", ""), scope = "private" };
                             var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                            await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                            await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                             itemInfo = await client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync(itemInfo, new PartitionKey($"{itemInfo.code}"));
                         }
                         else
                         {
                             ItemCondDto itemCondDto = new ItemCondDto { newItem = itemInfo, key = $"ItemCond-{itemInfo.code.Replace("Item-", "")}", filed = itemInfo.periodId, scope = "school" };
                             var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                            await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                            await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                             itemInfo = await client.GetContainer(Constant.TEAMModelOS, "School").CreateItemAsync(itemInfo, new PartitionKey($"{itemInfo.code}"));
                           
                         }
@@ -239,7 +240,7 @@ namespace TEAMModelOS.Controllers
                         ItemInfo olditemInfo = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<ItemInfo>(itemInfo.id, new PartitionKey($"{itemInfo.code}"));
                         ItemCondDto itemCondDto = new ItemCondDto { newItem = itemInfo,odlItem=olditemInfo, key = "ItemCond", filed = itemInfo.code.Replace("Item-", ""), scope = "private" };
                         var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                        await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                        await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                         itemInfo = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(itemInfo, itemInfo.id, new PartitionKey($"{itemInfo.code}"));
 
                     }
@@ -252,7 +253,7 @@ namespace TEAMModelOS.Controllers
                         ItemInfo olditemInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<ItemInfo>( itemInfo.id, new PartitionKey($"{itemInfo.code}"));
                         ItemCondDto itemCondDto = new ItemCondDto { newItem = itemInfo,odlItem=olditemInfo, key = $"ItemCond-{itemInfo.code.Replace("Item-", "")}", filed = itemInfo.periodId, scope = "school" };
                         var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                        await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                        await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                         itemInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync(itemInfo, itemInfo.id, new PartitionKey($"{itemInfo.code}"));
 
                     }
@@ -365,6 +366,7 @@ namespace TEAMModelOS.Controllers
         {
             try
             {
+                var ItemCondQueue = _configuration.GetValue<string>("Azure:ServiceBus:ItemCondQueue");
                 if (!request.TryGetProperty("id", out JsonElement id)) return BadRequest();
                 if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 if (!request.TryGetProperty("scope", out JsonElement scope)) return BadRequest();
@@ -381,7 +383,7 @@ namespace TEAMModelOS.Controllers
                     ItemInfo itemInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<ItemInfo>(id.ToString(), new PartitionKey($"{code}"));
                     ItemCondDto itemCondDto = new ItemCondDto {  odlItem = itemInfo, key = $"ItemCond-{itemInfo.code.Replace("Item-", "")}", filed = itemInfo.periodId, scope = "school" };
                     var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                    await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                    await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                     var response = await client.GetContainer(Constant.TEAMModelOS, "School").DeleteItemStreamAsync(id.ToString(), new PartitionKey($"{code}"));
                     return Ok(new { code = response.Status });
                 }
@@ -390,7 +392,7 @@ namespace TEAMModelOS.Controllers
                     ItemInfo olditemInfo = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<ItemInfo>($"{id}", new PartitionKey($"{code}"));
                     ItemCondDto itemCondDto = new ItemCondDto {  odlItem = olditemInfo, key = "ItemCond", filed = olditemInfo.code.Replace("Item-", ""), scope = "private" };
                     var messageBlobItemCond = new ServiceBusMessage(itemCondDto.ToJsonString());
-                    await _serviceBus.GetServiceBusClient().SendMessageAsync("itemcond", messageBlobItemCond);
+                    await _serviceBus.GetServiceBusClient().SendMessageAsync(ItemCondQueue, messageBlobItemCond);
                     var response = await client.GetContainer(Constant.TEAMModelOS, "Teacher").DeleteItemStreamAsync(id.ToString(), new PartitionKey($"{code}"));
                     return Ok(new { code = response.Status });
                 }

TEAMModelOS/appsettings.Development.json

@@ -36,7 +36,8 @@
     "ServiceBus": {
       "ConnectionString": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc=",
       "ActiveTask": "dep-active-task",
-      "NoticeTask": "dep-notice-task"
+      "NoticeTask": "dep-notice-task",
+      "ItemCondQueue": "dep-itemcond"
     }
   },
   "HaBookAuth": {