移除不必要的钉钉通知。

TEAMModelFunction/MonitorServicesBus.cs

@@ -131,8 +131,8 @@ namespace TEAMModelFunction
                         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.成都开发測試群組);
+                    //await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-ServiceBus,Blob() 容器:{name}使用:{size.Item1}，文件分类：{size.Item2.ToJsonString()}",
+                    //        GroupNames.成都开发測試群組);
                 }
             }
             catch (Exception ex)

TEAMModelOS.SDK/Models/Service/StuListService.cs

@@ -59,7 +59,7 @@ namespace TEAMModelFunction
                         datas.Add(item);
                     }
                 }
-                await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更：涉及活动类型变更的 \n{datas.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+              //  await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更：涉及活动类型变更的 \n{datas.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                 foreach (MQActivity activity in datas)
                 {
                     //已经完结的不再允许加入
@@ -91,7 +91,7 @@ namespace TEAMModelFunction
                             taskStatus = -1,
                             classIds = classes
                         };
-                        await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+                     //   await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                         await client.GetContainer(Constant.TEAMModelOS, "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                     }//tmd新加入的
                     foreach (string tmdid in stuListChange.tmdjoin)
@@ -116,7 +116,7 @@ namespace TEAMModelFunction
                             taskStatus = -1,
                             classIds = classes
                         }; 
-                        await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+                      //  await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                         await client.GetContainer(Constant.TEAMModelOS, "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                     }
                     foreach (Students students in stuListChange.stuleave)
@@ -171,7 +171,7 @@ namespace TEAMModelFunction
                     courses.Add(item);
                 }
             }
-            await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 需要处理的课程\n{courses.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+           // await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 需要处理的课程\n{courses.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
             //2.获取课程的id 并尝试添加或移除对应的学生课程记录StuCourse。
             foreach (var course in courses)
             {
@@ -191,7 +191,7 @@ namespace TEAMModelFunction
                         stulist = new List<string> { stuListChange.listid },
                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
                     };
-                    await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 新建课程中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+                   // await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 新建课程中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                     await client.GetContainer(Constant.TEAMModelOS, "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                 }
                 //tmd新加入的
@@ -210,7 +210,7 @@ namespace TEAMModelFunction
                         stulist= new List<string> { stuListChange .listid},
                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
                     };
-                    await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 新建课程中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+                   // await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixStuCourse\n名单发生变更 新建课程中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                     await client.GetContainer(Constant.TEAMModelOS, "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                 }
                 //移除名单的。 在点击相关的课程，再去二次校验是否存在，不存在则再去删除。

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -91,7 +91,7 @@ namespace TEAMModelOS.Controllers.Client
                                 var schoolJson = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{obj.GetProperty("schoolId")}", new PartitionKey("Base"));
                                 var school = await JsonDocument.ParseAsync(schoolJson.ContentStream);
                                 schoolExtobj.schoolId = obj.GetProperty("schoolId");
-                                schoolExtobj.name = obj.GetProperty("name");
+                                schoolExtobj.name = school.RootElement.GetProperty("name");
                                 schoolExtobj.status = obj.GetProperty("status");
                                 schoolExtobj.picture = school.RootElement.GetProperty("picture");
                                 schools.Add(schoolExtobj);

TEAMModelOS/Controllers/Core/BlobController.cs

@@ -66,7 +66,7 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("public-upload")]
-        //[AuthToken(Roles = "teacher,admin")]
+        [AuthToken(Roles = "teacher,admin")]
         [RequestSizeLimit(102_400_000_00)] //最大10000m左右
         public async Task<IActionResult> PublicUpload([FromForm] IFormFile file)
         {
@@ -736,7 +736,7 @@ namespace TEAMModelOS.Controllers.Core
             List<string> paths = new List<string>();
             //文件的容器
             if (!json.TryGetProperty("cntr", out JsonElement _cntr)) return BadRequest();
-            //业务存取类型 exam,vote,survey,item,paper,syllabus,records,content(doc,image,res,video,audio,other),thum,train,temp,jyzx
+            //业务存取类型 exam,vote,survey,item,paper,syllabus,records,avatar,content(doc,image,res,video,audio,other),thum,train,temp,jyzx
             if (!json.TryGetProperty("type", out JsonElement _type)) return BadRequest();
             //文件前缀prefix
             switch (true)
@@ -772,6 +772,7 @@ namespace TEAMModelOS.Controllers.Core
                     || $"{_type}".Equals("thum", StringComparison.OrdinalIgnoreCase)
                     || $"{_type}".Equals("temp", StringComparison.OrdinalIgnoreCase)
                     || $"{_type}".Equals("jyzx", StringComparison.OrdinalIgnoreCase)
+                    || $"{_type}".Equals("avatar", StringComparison.OrdinalIgnoreCase)
                     || $"{_type}".Equals("train", StringComparison.OrdinalIgnoreCase):
                     break;
                 default:

TEAMModelOS/Controllers/School/NoticeController.cs

@@ -191,11 +191,11 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        [AuthToken(Roles = "admin,teacher")]
+       // [AuthToken(Roles = "admin",Permissions = "teacher-upd")]
         public async Task<IActionResult> Delete(JsonElement request) {
             try
             {
-                var (userid, _, _, school) = HttpContext.GetAuthTokenInfo();
+               // var (userid, _, _, school) = HttpContext.GetAuthTokenInfo();
                 if (!request.TryGetProperty("id", out JsonElement id)) return BadRequest();
                 if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 var client = _azureCosmos.GetCosmosClient();

TEAMModelOS/Controllers/Syllabus/ShareController.cs

@@ -73,10 +73,18 @@ namespace TEAMModelOS.Controllers
 
             try {
                 var client = _azureCosmos.GetCosmosClient();
+                Syllabus syllabusD = null;
                 //需要判断id== req.issuer  才能进行授权操作
                 if (request.scope.Equals("school"))
                 {
-                    Syllabus syllabusD = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.school}"));
+                    try {
+                          syllabusD = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.school}"));
+                    } catch (CosmosException ex) {
+                        if (ex.Status == 404) {
+                            await _dingDing.SendBotMsg($"OS，{_option.Location}，teacher/share/to\n{ex.Message}{ex.StackTrace}{request.ToJsonString()}", GroupNames.成都开发測試群組);
+                            return Ok(new { code = 404 });
+                        }
+                    }
                     if (request.opt .Equals("del"))
                     {
                         if (syllabusD.auth.IsNotEmpty())
@@ -133,13 +141,21 @@ namespace TEAMModelOS.Controllers
                             var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
                         }
                         await client.GetContainer(Constant.TEAMModelOS, "School").UpsertItemAsync<Syllabus>(syllabus, new PartitionKey($"Syllabus-{request.school}"));
-
-
                     }
                 }
                 else if (request.scope.Equals("private"))
                 {
-                    Syllabus syllabusD = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.issuer}"));
+                    try { 
+                      syllabusD = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.issuer}"));
+                    }
+                    catch (CosmosException ex)
+                    {
+                        if (ex.Status == 404)
+                        {
+                            await _dingDing.SendBotMsg($"OS，{_option.Location}，teacher/share/to\n{ex.Message}{ex.StackTrace}{request.ToJsonString()}", GroupNames.成都开发測試群組);
+                            return Ok(new { code = 404 });
+                        }
+                    }
                     if (request.opt .Equals("del"))
                     {
                         if (syllabusD.auth.IsNotEmpty())