CrazyIter_Bin 3 lat temu
rodzic
commit
d1e32fd07d

+ 3 - 3
TEAMModeBI/Controllers/BISchool/BatchAreaController.cs

@@ -308,7 +308,7 @@ namespace TEAMModeBI.Controllers.BISchool
                     batchCopyFile.codeKey = partitionCode;
                     batchCopyFile.tmdName = $"{_tmdName}";
                     var messageBatchCopyFile = new ServiceBusMessage(batchCopyFile.ToJsonString());
-                    messageBatchCopyFile.ApplicationProperties.Add("name", "CopyStandardFile");
+                    messageBatchCopyFile.ApplicationProperties.Add("name", "AsbCopyStandardFile");
                     var activeTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(activeTask, messageBatchCopyFile);
 
@@ -434,7 +434,7 @@ namespace TEAMModeBI.Controllers.BISchool
                         batchCopyFile.codeKey = partitionCode;
                         batchCopyFile.tmdName = $"{_tmdName}";
                         var messageBatchCopyFile = new ServiceBusMessage(batchCopyFile.ToJsonString());
-                        messageBatchCopyFile.ApplicationProperties.Add("name", "CopyStandardFile");
+                        messageBatchCopyFile.ApplicationProperties.Add("name", "AsbCopyStandardFile");
                         var activeTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                         await _serviceBus.GetServiceBusClient().SendMessageAsync(activeTask, messageBatchCopyFile);  //执行复制操作
 
@@ -628,7 +628,7 @@ namespace TEAMModeBI.Controllers.BISchool
                 batchCopyFile.codeKey = partitionCode;
                 batchCopyFile.tmdName = $"{_tmdName}";
                 var messageBatchCopyFile = new ServiceBusMessage(batchCopyFile.ToJsonString());
-                messageBatchCopyFile.ApplicationProperties.Add("name", "CopyStandardFile");   //Function暂时还未写
+                messageBatchCopyFile.ApplicationProperties.Add("name", "AsbCopyStandardFile");   //Function暂时还未写
                 var activeTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(activeTask, messageBatchCopyFile);  //先执行删除操作,在执行复制
 

+ 13 - 37
TEAMModelFunction/MonitorServicesBus.cs

@@ -48,7 +48,7 @@ namespace TEAMModelFunction
             _notificationService = notificationService;
             _configuration = configuration;
         }
-        [FunctionName("Exam")]
+        [FunctionName("AsbExam")]
          public async Task Exam([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "exam", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -73,7 +73,7 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("Vote")]
+        [FunctionName("AsbVote")]
         public async Task Vote([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "vote", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -97,7 +97,7 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("Correct")]
+        [FunctionName("AsbCorrect")]
         public async Task Correct([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "correct", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -121,7 +121,7 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("Survey")]
+        [FunctionName("AsbSurvey")]
         public async Task Survey([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "survey", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -145,7 +145,7 @@ namespace TEAMModelFunction
                 await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-ServiceBus,SurveyBus()\n{ex.Message}\n{ex.StackTrace}\n{msg}", GroupNames.醍摩豆服務運維群組);
             }
         }
-        [FunctionName("Homework")]
+        [FunctionName("AsbHomework")]
         public async Task Homework([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "homework", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -168,7 +168,7 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("Study")]
+        [FunctionName("AsbStudy")]
         public async Task Study([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "study", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -192,7 +192,7 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("ExamLite")]
+        [FunctionName("AsbExamLite")]
         public async Task ExamLite([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "examlite", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -216,37 +216,13 @@ namespace TEAMModelFunction
             }
 
         }
-        [FunctionName("Blob")]
-        public async Task Blob([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "blob", Connection = "Azure:ServiceBus:ConnectionString")] string msg) {
-            try
-            {
-               //11 await _dingDing.SendBotMsg($"ServiceBus,Blob(){msg}", GroupNames.醍摩豆服務運維群組);
-                var jsonMsg = JsonDocument.Parse(msg);
-                if(jsonMsg.RootElement.TryGetProperty("name", out JsonElement name)&& name.ValueKind==JsonValueKind.String)
-                {
-                    var client = _azureStorage.GetBlobContainerClient($"{name}");
-                    var size = await client.GetBlobsCatalogSize();
-                    await _azureRedis.GetRedisClient(8).HashSetAsync($"Blob:Record", new RedisValue($"{name}"), new RedisValue($"{long.Parse($"{size.Item1}")}"));
-                    foreach (var key in size.Item2.Keys)
-                    {
-                        await _azureRedis.GetRedisClient(8).SortedSetRemoveAsync($"Blob:Catalog:{name}", key);
-                        await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Blob:Catalog:{name}", key, size.Item2[key].HasValue ? size.Item2[key].Value : 0);
-                    }
-                    //await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-ServiceBus,Blob() 容器:{name}使用:{size.Item1},文件分类:{size.Item2.ToJsonString()}",
-                    //        GroupNames.成都开发測試群組);
-                }
-            }
-            catch (Exception ex)
-            {
-                await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-ServiceBus,Blob()\n{ex.Message}\n{ex.StackTrace}\n{msg}", GroupNames.醍摩豆服務運維群組);
-            }
-        }
+        
         /// <summary>
         /// 根据容器的根目录刷新redis并获取redis的最新使用情况
         /// </summary>
         /// <param name="msg"></param>
         /// <returns></returns>
-        [FunctionName("BlobRoot")]
+        [FunctionName("AsbBlobRoot")]
         public async Task BlobRoot([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "blobroot", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -368,7 +344,7 @@ namespace TEAMModelFunction
         ///// </data>
         /// <param name="msg"></param>
         /// <returns></returns>
-        [FunctionName("TeacherTrainChange")]
+        [FunctionName("AsbTeacherTrainChange")]
         public async Task TeacherTrainChange([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "teacher-train-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg) {
             try {
                
@@ -496,7 +472,7 @@ namespace TEAMModelFunction
         ///// </data>
         /// <param name="msg"></param>
         /// <returns></returns>
-        [FunctionName("GroupChange")]
+        [FunctionName("AsbGroupChange")]
         public async Task GroupChange([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "group-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             var client = _azureCosmos.GetCosmosClient();
@@ -535,7 +511,7 @@ namespace TEAMModelFunction
                 await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-GroupChange-GroupChange\n{ex.Message}\n{ex.StackTrace}\n{msg}", GroupNames.成都开发測試群組);
             }
         }
-        [FunctionName("ItemCond")]
+        [FunctionName("AsbItemCond")]
         public async Task ItemCond([ServiceBusTrigger("%Azure:ServiceBus:ItemCondQueue%", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
@@ -751,7 +727,7 @@ namespace TEAMModelFunction
         /// </summary>
         /// <param name="msg"></param>
         /// <returns></returns>
-        [FunctionName("CopyStandardFile")]
+        [FunctionName("AsbCopyStandardFile")]
         public async Task BatchCopyBlob([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "copy-standard-file", Connection = "Azure:ServiceBus:ConnectionString")] string msg) 
         {
             try

+ 2 - 2
TEAMModelFunction/TriggerCorrect.cs

@@ -49,7 +49,7 @@ namespace TEAMModelFunction
                 {
                     case "pending":
                         var messageCorrect = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                        messageCorrect.ApplicationProperties.Add("name", "Correct");
+                        messageCorrect.ApplicationProperties.Add("name", "AsbCorrect");
                         if (correctRecords.Count > 0)
                         {
                             long start = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageCorrect, DateTimeOffset.FromUnixTimeMilliseconds(tdata.stime));
@@ -331,7 +331,7 @@ namespace TEAMModelFunction
                             }
                         }
                         var messageCorrectEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                        messageCorrectEnd.ApplicationProperties.Add("name", "Correct");
+                        messageCorrectEnd.ApplicationProperties.Add("name", "AsbCorrect");
                         if (correctRecords.Count > 0)
                         {
                             long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageCorrectEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

+ 3 - 3
TEAMModelFunction/TriggerExam.cs

@@ -73,7 +73,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var message = new ServiceBusMessage(new { id = input.Id, progress = "going", code = code }.ToJsonString());
-                            message.ApplicationProperties.Add("name", "Exam");
+                            message.ApplicationProperties.Add("name", "AsbExam");
                             if (records.Count > 0)
                             {
                                 await _serviceBus.GetServiceBusClient().cancelMessage(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), records[0].sequenceNumber);
@@ -122,7 +122,7 @@ namespace TEAMModelFunction
 
                                 //};
                                 //var messageBlob = new ServiceBusMessage(notice.ToJsonString());
-                                //messageBlob.ApplicationProperties.Add("name", "Notice");
+                                //messageBlob.ApplicationProperties.Add("name", "AsbNotice");
                                 //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageBlob);
                                 #endregion
                                 if (examClassResults.Count == 0)
@@ -297,7 +297,7 @@ namespace TEAMModelFunction
                             {
                                 // 发送信息通知
                                 var messageEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = code }.ToJsonString());
-                                messageEnd.ApplicationProperties.Add("name", "Exam");
+                                messageEnd.ApplicationProperties.Add("name", "AsbExam");
                                 if (records.Count > 0)
                                 {
                                     long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageEnd, DateTimeOffset.FromUnixTimeMilliseconds(etime));

+ 2 - 2
TEAMModelFunction/TriggerExamLite.cs

@@ -51,7 +51,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var messageWork = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                            messageWork.ApplicationProperties.Add("name", "ExamLite");
+                            messageWork.ApplicationProperties.Add("name", "AsbExamLite");
                             if (changeRecords.Count > 0)
                             {
                                 await _serviceBus.GetServiceBusClient().cancelMessage(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), changeRecords[0].sequenceNumber);
@@ -127,7 +127,7 @@ namespace TEAMModelFunction
                             await ActivityService.SaveStuActivity(client, _dingDing, null, null, tchActivities);
                             await StatisticsService.SendServiceBus(list, _configuration, _serviceBus);
                             var messageWorkEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                            messageWorkEnd.ApplicationProperties.Add("name", "ExamLite");
+                            messageWorkEnd.ApplicationProperties.Add("name", "AsbExamLite");
                             if (changeRecords.Count > 0)
                             {
                                 long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageWorkEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

+ 2 - 2
TEAMModelFunction/TriggerHomework.cs

@@ -52,7 +52,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var messageWork = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                            messageWork.ApplicationProperties.Add("name", "Homework");
+                            messageWork.ApplicationProperties.Add("name", "AsbHomework");
                             if (changeRecords.Count > 0)
                             {
                                 await _serviceBus.GetServiceBusClient().cancelMessage(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), changeRecords[0].sequenceNumber);
@@ -185,7 +185,7 @@ namespace TEAMModelFunction
                             await ActivityService.SaveStuActivity(client, _dingDing, stuActivities, tmdActivities, tchActivities);
                             await StatisticsService.SendServiceBus(list, _configuration, _serviceBus);
                             var messageWorkEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                            messageWorkEnd.ApplicationProperties.Add("name", "Homework");
+                            messageWorkEnd.ApplicationProperties.Add("name", "AsbHomework");
                             if (changeRecords.Count > 0)
                             {
                                 long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageWorkEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

+ 2 - 2
TEAMModelFunction/TriggerStudy.cs

@@ -51,7 +51,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var messageWork = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                            messageWork.ApplicationProperties.Add("name", "Study");
+                            messageWork.ApplicationProperties.Add("name", "AsbStudy");
                             if (changeRecords.Count > 0)
                             {
                                 await _serviceBus.GetServiceBusClient().cancelMessage(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), changeRecords[0].sequenceNumber);
@@ -128,7 +128,7 @@ namespace TEAMModelFunction
                                 await ActivityService.SaveStuActivity(client, _dingDing, null, null, tchActivities);
                                 await StatisticsService.SendServiceBus(list, _configuration, _serviceBus);
                                 var messageWorkEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                                messageWorkEnd.ApplicationProperties.Add("name", "Study");
+                                messageWorkEnd.ApplicationProperties.Add("name", "AsbStudy");
                                 if (changeRecords.Count > 0)
                                 {
                                     long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageWorkEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

+ 3 - 3
TEAMModelFunction/TriggerSurvey.cs

@@ -59,7 +59,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var messageSurvey = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                            messageSurvey.ApplicationProperties.Add("name", "Survey");
+                            messageSurvey.ApplicationProperties.Add("name", "AsbSurvey");
                             if (changeRecords.Count > 0)
                             {
                                 await _serviceBus.GetServiceBusClient().cancelMessage(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), changeRecords[0].sequenceNumber);
@@ -209,14 +209,14 @@ namespace TEAMModelFunction
 
                             //};
                             //var messageBlob = new ServiceBusMessage(notice.ToJsonString());
-                            //messageBlob.ApplicationProperties.Add("name", "Notice");
+                            //messageBlob.ApplicationProperties.Add("name", "AsbNotice");
                             //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageBlob);
                             #endregion
 #if DEBUG
                             await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}问卷调查{tdata.id}写入完成!", GroupNames.成都开发測試群組);
 #endif
                             var messageSurveyEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                            messageSurveyEnd.ApplicationProperties.Add("name", "Survey");
+                            messageSurveyEnd.ApplicationProperties.Add("name", "AsbSurvey");
                             if (changeRecords.Count > 0)
                             {
                                 long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageSurveyEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

+ 3 - 3
TEAMModelFunction/TriggerVote.cs

@@ -58,7 +58,7 @@ namespace TEAMModelFunction
                     {
                         case "pending":
                             var messageVote = new ServiceBusMessage(new { id = input.Id, progress = "going", code = tdata.code }.ToJsonString());
-                            messageVote.ApplicationProperties.Add("name", "Vote");
+                            messageVote.ApplicationProperties.Add("name", "AsbVote");
                             if (voteRecords.Count > 0)
                             {
                                 long start = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVote, DateTimeOffset.FromUnixTimeMilliseconds(tdata.stime));
@@ -221,11 +221,11 @@ namespace TEAMModelFunction
                             //};
 
                             //var messageBlob = new ServiceBusMessage(notice.ToJsonString());
-                            //messageBlob.ApplicationProperties.Add("name", "Notice");
+                            //messageBlob.ApplicationProperties.Add("name", "AsbNotice");
                             //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:NoticeTask"), messageBlob);
                             #endregion
                             var messageVoteEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = tdata.code }.ToJsonString());
-                            messageVoteEnd.ApplicationProperties.Add("name", "Vote");
+                            messageVoteEnd.ApplicationProperties.Add("name", "AsbVote");
                             if (voteRecords.Count > 0)
                             {
                                 long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.etime));

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

@@ -226,7 +226,7 @@ namespace TEAMModelOS.SDK
                     || change.tchjoin.Count != 0 || change.tchleave.Count != 0)
                 {
                     var messageChange = new ServiceBusMessage(change.ToJsonString());
-                    messageChange.ApplicationProperties.Add("name", "GroupChange");
+                    messageChange.ApplicationProperties.Add("name", "AsbGroupChange");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageChange);
                 }

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

@@ -27,7 +27,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 work.size = await _azureStorage.GetBlobContainerClient(work.school).GetBlobsSize($"homework/{work.id}");
                 messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "insert", root = $"homework/{work.id}", name = $"{work.school}" }.ToJsonString());
 
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 work.recordUrl = $"/homework/{work.id}/record.json";

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

@@ -101,7 +101,7 @@ namespace TEAMModelOS.SDK
                     statistics = list.statistics
                 };
                 var messageChange = new ServiceBusMessage(change.ToJsonString());
-                messageChange.ApplicationProperties.Add("name", "TeacherTrainChange");
+                messageChange.ApplicationProperties.Add("name", "AsbTeacherTrainChange");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageChange);
             }
         }

+ 3 - 3
TEAMModelOS/Controllers/Common/ExamController.cs

@@ -184,7 +184,7 @@ namespace TEAMModelOS.Controllers
                         request.size = await _azureStorage.GetBlobContainerClient(request.creatorId).GetBlobsSize($"exam/{request.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "insert", root = $"exam/{request.id}", name = request.creatorId }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     int n = 0;
@@ -217,7 +217,7 @@ namespace TEAMModelOS.Controllers
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"exam/{request.id}", name = request.creatorId }.ToJsonString());
 
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     request.progress = info.progress;
@@ -265,7 +265,7 @@ namespace TEAMModelOS.Controllers
                 await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, code.ToString(), new List<string> { $"exam/{id}" });
                 //通知评测删除信息
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"exam/{id}", name = $"{code}" }.ToJsonString());
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 //删除阅卷配置

+ 3 - 3
TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -113,7 +113,7 @@ namespace TEAMModelOS.Controllers.Learn
                         homework.size = await _azureStorage.GetBlobContainerClient(homework.creatorId).GetBlobsSize($"homework/{homework.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "insert", root = $"homework/{homework.id}", name = $"{homework.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     homework.recordUrl = $"/homework/{homework.id}/record.json";
@@ -138,7 +138,7 @@ namespace TEAMModelOS.Controllers.Learn
                         homework.size = await _azureStorage.GetBlobContainerClient(homework.creatorId).GetBlobsSize($"homework/{homework.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"homework/{homework.id}", name = $"{homework.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     if (response.Status == 200)
@@ -377,7 +377,7 @@ namespace TEAMModelOS.Controllers.Learn
                     await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, $"{__code}".Replace("Homework-", ""), new List<string> { Path.Combine("homework", homeworkd.id) + "/" });
                     //通知删除信息
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"homework/{homeworkd.id}", name = $"{__code}" }.ToJsonString());
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     await _dingDing.SendBotMsg($"{_option.Location}-作业活动【{homeworkd.name}-{homeworkd.id}】被删除", GroupNames.成都开发測試群組);

+ 3 - 3
TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -110,7 +110,7 @@ namespace TEAMModelOS.Controllers
                         request.size = await _azureStorage.GetBlobContainerClient(request.creatorId).GetBlobsSize($"survey/{request.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "insert", root = $"survey/{request.id}", name = $"{request.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     request.recordUrl = $"/survey/{request.id}/record.json";
@@ -135,7 +135,7 @@ namespace TEAMModelOS.Controllers
                         request.size = await _azureStorage.GetBlobContainerClient(request.creatorId).GetBlobsSize($"survey/{request.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"survey/{request.id}", name = $"{request.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     if (response.Status == 200)
@@ -393,7 +393,7 @@ namespace TEAMModelOS.Controllers
                     await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, $"{code}".Replace("Survey-", ""), new List<string> { Path.Combine("survey" , survey.id)+"/" });
                     //通知删除信息
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"survey/{survey.id}", name = $"{code}" }.ToJsonString());
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     await _dingDing.SendBotMsg($"{_option.Location}-问卷调查【{survey.name}-{survey.id}】被删除", GroupNames.成都开发測試群組);

+ 3 - 3
TEAMModelOS/Controllers/Common/VoteController.cs

@@ -96,7 +96,7 @@ namespace TEAMModelOS.Controllers
                         request.size = await _azureStorage.GetBlobContainerClient(request.creatorId).GetBlobsSize($"vote/{request.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "insert", root = $"vote/{request.id}", name = $"{request.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     string url = $"/vote/{request.id}/record.json";
@@ -121,7 +121,7 @@ namespace TEAMModelOS.Controllers
                         request.size = await _azureStorage.GetBlobContainerClient(request.creatorId).GetBlobsSize($"vote/{request.id}");
                         messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"vote/{request.id}", name = $"{request.creatorId}" }.ToJsonString());
                     }
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     if (response.Status == 200)
@@ -363,7 +363,7 @@ namespace TEAMModelOS.Controllers
                     await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, $"{code}".Replace("Vote-",""), new List<string> { $"vote/{vote.id}" });
                     //通知删除信息
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"vote/{vote.id}", name = $"{code}" }.ToJsonString());
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
 

+ 5 - 5
TEAMModelOS/Controllers/Core/BlobController.cs

@@ -386,7 +386,7 @@ namespace TEAMModelOS.Controllers.Core
                 }
                 if (!string.IsNullOrEmpty(u)) {
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = u, name = $"{_cntr}" }.ToJsonString()); ;
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 }
@@ -529,7 +529,7 @@ namespace TEAMModelOS.Controllers.Core
                 }
                 root.ToList().ForEach(async x => {
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = x, name = $"{name}" }.ToJsonString()); ;
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 });
@@ -578,7 +578,7 @@ namespace TEAMModelOS.Controllers.Core
                     u = !string.IsNullOrEmpty(uls[0]) ? uls[0] : uls[1];
                 }
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = u, name = $"{blobContainerName}" }.ToJsonString()); ;
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 return Ok(new { status });
@@ -636,7 +636,7 @@ namespace TEAMModelOS.Controllers.Core
                     u = !string.IsNullOrEmpty(uls[0]) ? uls[0] : uls[1];
                 }
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = u, name = $"{blobContainerName}" }.ToJsonString()); ;
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 return Ok(new { status });
@@ -751,7 +751,7 @@ namespace TEAMModelOS.Controllers.Core
                     }
                     root.ToList().ForEach(async x => {
                         var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = x, name = $"{blobContainerName}" }.ToJsonString()); ;
-                        messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                        messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                         var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                         await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     });

+ 3 - 3
TEAMModelOS/Controllers/Item/ItemController.cs

@@ -216,7 +216,7 @@ namespace TEAMModelOS.Controllers
                     itemInfo.ttl = -1;
                     itemInfo.size = await _azureStorage.GetBlobContainerClient(itemInfo.code).GetBlobsSize($"item/{itemInfo.id}");
                     var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"item/{itemInfo.id}", name = $"{itemInfo.code}" }.ToJsonString());
-                    messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                    messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     if (option.ToString().Equals("insert"))
@@ -336,7 +336,7 @@ namespace TEAMModelOS.Controllers
                 itemInfo = item.ToObject<ItemInfo>();
                 itemInfo.size = await _azureStorage.GetBlobContainerClient(itemInfo.code).GetBlobsSize($"item/{itemInfo.id}");
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"item/{itemInfo.id}", name = $"{itemInfo.code}" }.ToJsonString());
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 if (option.ToString().Equals("insert"))
@@ -546,7 +546,7 @@ namespace TEAMModelOS.Controllers
                 await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, code.ToString().Replace("Item-",""),new List<string> { $"item/{id}" });
                 //通知删除信息
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"item/{id}", name = code.ToString().Replace("Item-", "") }.ToJsonString());
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                 if (scope.ToString().Equals("school"))

+ 2 - 2
TEAMModelOS/Controllers/Paper/PaperController.cs

@@ -63,7 +63,7 @@ namespace TEAMModelOS.Controllers
             await _azureStorage.GetBlobServiceClient().DeleteBlobs(_dingDing, code.ToString().Replace("Paper-",""), new List<string> { $"paper/{id}" });
             //通知删除信息
             var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "delete", root = $"paper/{id}", name = code.ToString().Replace("Paper-", "")}.ToJsonString());
-            messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+            messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
             var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
             await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
             if (scope.ToString().Equals("school"))
@@ -219,7 +219,7 @@ namespace TEAMModelOS.Controllers
             paper.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             paper.size = await _azureStorage.GetBlobContainerClient(paper.code).GetBlobsSize($"paper/{paper.id}");
             var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "update", root = $"paper/{paper.id}", name = $"{paper.code}" }.ToJsonString());
-            messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+            messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
             var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
             await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
             paper.code = "Paper-" + paper.code;

+ 6 - 6
TEAMModelOS/Controllers/School/CourseController.cs

@@ -98,7 +98,7 @@ namespace TEAMModelOS.Controllers
                             courseChange.addClass = course.schedule.Select(x => x.classId).ToList();
                             courseChange.addList = course.schedule.Select(x => x.stulist).ToList();
                             var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                            messageBlob.ApplicationProperties.Add("name", "Course");
+                            messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                             var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                             await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                             course = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").CreateItemAsync(course, new PartitionKey($"Course-{code}"));
@@ -117,7 +117,7 @@ namespace TEAMModelOS.Controllers
                             courseChange.addClass = course.schedule.Select(x => x.classId).ToList();
                             courseChange.addList = course.schedule.Select(x => x.stulist).ToList();
                             var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                            messageBlob.ApplicationProperties.Add("name", "Course");
+                            messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                             var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                             await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                             course = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync(course, new PartitionKey($"Course-{code}"));
@@ -173,7 +173,7 @@ namespace TEAMModelOS.Controllers
                         courseChange.delList = delLst;
                         course = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync(course, course.id, new PartitionKey($"Course-{code}"));
                         var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                        messageBlob.ApplicationProperties.Add("name", "Course");
+                        messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                         var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                         await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     }
@@ -223,7 +223,7 @@ namespace TEAMModelOS.Controllers
                         courseChange.delList = delLst;
                         course = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(course, course.id, new PartitionKey($"Course-{code}"));
                         var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                        messageBlob.ApplicationProperties.Add("name", "Course");
+                        messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                         var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                         await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     }
@@ -641,7 +641,7 @@ namespace TEAMModelOS.Controllers
                     courseChange.delClass = course.schedule.Select(x => x.classId).ToList();
                     courseChange.delList = course.schedule.Select(x => x.stulist).ToList();
                     var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                    messageBlob.ApplicationProperties.Add("name", "Course");
+                    messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     await client.GetContainer(Constant.TEAMModelOS, "School").DeleteItemStreamAsync(id.ToString(), new PartitionKey($"Course-{code}"));
@@ -653,7 +653,7 @@ namespace TEAMModelOS.Controllers
                     courseChange.delClass = course.schedule.Select(x => x.classId).ToList();
                     courseChange.delList = course.schedule.Select(x => x.stulist).ToList();
                     var messageBlob = new ServiceBusMessage(courseChange.ToJsonString()); ;
-                    messageBlob.ApplicationProperties.Add("name", "Course");
+                    messageBlob.ApplicationProperties.Add("name", "AsbCourse");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);
                     await client.GetContainer(Constant.TEAMModelOS, "Teacher").DeleteItemStreamAsync(id.ToString(), new PartitionKey($"Course-{code}"));

+ 1 - 1
TEAMModelOS/Controllers/School/GroupListController.cs

@@ -808,7 +808,7 @@ namespace TEAMModelOS.Controllers
                 change.type = groupList.type;
                 if (change.tmdleave.IsNotEmpty() || change.tchleave.IsNotEmpty() || change.stuleave.IsNotEmpty()) {
                     var messageChange = new ServiceBusMessage(change.ToJsonString());
-                    messageChange.ApplicationProperties.Add("name", "GroupChange");
+                    messageChange.ApplicationProperties.Add("name", "AsbGroupChange");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageChange);
                 }

+ 2 - 2
TEAMModelOS/Controllers/School/StudentController.cs

@@ -135,7 +135,7 @@ namespace TEAMModelOS.Controllers
                                     if (change.stujoin.Count != 0 || change.stuleave.Count != 0)
                                     {
                                         var messageChange = new ServiceBusMessage(change.ToJsonString());
-                                        messageChange.ApplicationProperties.Add("name", "GroupChange");
+                                        messageChange.ApplicationProperties.Add("name", "AsbGroupChange");
                                         var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                                         await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageChange);
                                     }
@@ -725,7 +725,7 @@ namespace TEAMModelOS.Controllers
                 if ( change.stujoin.Count != 0 || change.stuleave.Count != 0)
                 {
                     var messageChange = new ServiceBusMessage(change.ToJsonString());
-                    messageChange.ApplicationProperties.Add("name", "GroupChange");
+                    messageChange.ApplicationProperties.Add("name", "AsbGroupChange");
                     var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageChange);
                 }

+ 1 - 1
TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -240,7 +240,7 @@ namespace TEAMModelOS.Controllers
                 info.size = await _azureStorage.GetBlobContainerClient(school.ToString()).GetBlobsSize($"exam/{id}");
                 var messageBlob = new ServiceBusMessage(new { id = Guid.NewGuid().ToString(), progress = "annotation", root = $"exam/{id}", name = school }.ToJsonString());
 
-                messageBlob.ApplicationProperties.Add("name", "BlobRoot");
+                messageBlob.ApplicationProperties.Add("name", "AsbBlobRoot");
                 var ActiveTask = _configuration.GetValue<string>("Azure:ServiceBus:ActiveTask");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(ActiveTask, messageBlob);*/
                 return Ok(new { classResult });

+ 6 - 6
TEAMModelOS/appsettings.Development.json

@@ -21,16 +21,16 @@
   },
   "Azure": {
     "Storage": {
-      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn"
-      //"ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
+      //"ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn"
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
     },
     "Cosmos": {
-      "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
-      //"ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
+      //"ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
+      "ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
     },
     "Redis": {
-      "ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"
-      //"ConnectionString": "CoreRedisCN.redis.cache.chinacloudapi.cn:6380,password=LyJWP1ORJdv+poXWofAF97lhCEQPg1wXWqvtzXGXQuE=,ssl=True,abortConnect=False"
+      //"ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"
+      "ConnectionString": "CoreRedisCN.redis.cache.chinacloudapi.cn:6380,password=LyJWP1ORJdv+poXWofAF97lhCEQPg1wXWqvtzXGXQuE=,ssl=True,abortConnect=False"
     },
     "ServiceBus": {
       "ConnectionString": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc=",