CrazyIter_Bin 2 年之前
父节点
当前提交
e991632b62

+ 0 - 2
TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -270,7 +270,6 @@ namespace TEAMModelOS.SDK
                 var mbm = members.Find(y => y.id.Equals(x.id));
                 if (mbm != null)
                 {
-                    x.groupName = mbm?.groupName;
                     x.name = !string.IsNullOrWhiteSpace(x.name) ? x.name : mbm?.name;
                     x.nickname = mbm?.nickname;
                     x.picture = mbm?.picture;
@@ -359,7 +358,6 @@ namespace TEAMModelOS.SDK
                     x.name = !string.IsNullOrWhiteSpace(x.name) ? x.name : mbm?.name;
                     x.nickname = mbm?.nickname;
                     x.picture = mbm?.picture;
-                    x.groupName = mbm?.groupName;
                 }
             });
 

+ 8 - 6
TEAMModelOS/Controllers/OpenApi/OpenApiService.cs

@@ -36,6 +36,7 @@ using DocumentFormat.OpenXml.VariantTypes;
 using static TEAMModelOS.Controllers.CourseController;
 using System.IdentityModel.Tokens.Jwt;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
+using Microsoft.OData.UriParser;
 
 namespace TEAMModelOS.Controllers
 {
@@ -1757,19 +1758,20 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         public static async Task<ResponseData<dynamic>> GetLoginStuInfo(AzureCosmosFactory _azureCosmos, DingDing _dingDing, Option _option, string bizId, string school, JsonElement json)
         {
+            if (!json.TryGetProperty("idToken", out JsonElement _idToken)) return new ResponseData<dynamic>() { code = RespondCode.ParamsError, msg = "idToken参数错误", data = null };
+            JwtSecurityToken jwt = new($"{_idToken}");
+            var iss = jwt.Payload.Iss;
+            var stuId = jwt.Payload.Sub;
+            var scId = jwt.Payload.Azp;
             try
             {
                 var client = _azureCosmos.GetCosmosClient();
-                if (!json.TryGetProperty("idToken", out JsonElement _idToken)) return new ResponseData<dynamic>() { code = RespondCode.ParamsError, msg = "idToken参数错误", data = null };
+             
                 //if (!string.IsNullOrWhiteSpace($"{_idToken}") && JwtAuthExtension.ValidateApiToken($"{_idToken}", _option.JwtSecretKey))
                 //{
                 //    JwtSecurityToken jwt = new($"{_idToken}");
                 //}
                 OStudent student = new();
-                JwtSecurityToken jwt = new($"{_idToken}");
-                var iss = jwt.Payload.Iss;
-                var stuId = jwt.Payload.Sub;
-                var scId = jwt.Payload.Azp;
                 jwt.Payload.TryGetValue("name", out object stuName);
                 jwt.Payload.TryGetValue("picture", out object stuPicture);
                 if(!jwt.Payload.TryGetValue("scope", out object scope)) return new ResponseData<dynamic>() { code = RespondCode.ParamsError, msg = "参数错误:scope", data = null };
@@ -1821,7 +1823,7 @@ namespace TEAMModelOS.Controllers
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"OpenApi,{Environment.GetEnvironmentVariable("Option:Location")} OpenApiService/GetLoginStuInfo()   参数:stu:{_stuId},school:{school},json:{json.ToJsonString()} \n  {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
+                await _dingDing.SendBotMsg($"OpenApi,{Environment.GetEnvironmentVariable("Option:Location")} OpenApiService/GetLoginStuInfo()   参数:stu:{stuId},school:{school},json:{json.ToJsonString()} \n  {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
                 return new ResponseData<dynamic>() { code = RespondCode.Error, msg = "服务器错误" };
             }