浏览代码

优化班级名单接口 成员信息中的学生性别字段,暂时是空值,待优化

Li 2 年之前
父节点
当前提交
a89de93242

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

@@ -142,8 +142,8 @@ namespace TEAMModelOS.Filter
                         string iss = jwt.Payload.Iss; //iss 检查jwt是否是测试站,正式站的授权key 
                         string tokenScope = jwt.Claims.FirstOrDefault(claim => claim.Type.Equals("scope"))?.Value;
                         //访问的jwt的tokenScope 是否与访问的接口一致。
-                        //if (tokenScope.Equals(scope))
-                        //{
+                        if (tokenScope.Equals(scope))
+                        {
 
                             var keys = OpenApiJtwIssuer.OpenApiJtw签发者.GetDescriptionText().Split(',');
                             string issuer = "";
@@ -175,8 +175,8 @@ namespace TEAMModelOS.Filter
                             {
                                 issuer = keys[3];
                             }
-                            //if (iss.Equals(issuer))
-                            //{
+                            if (iss.Equals(issuer))
+                            {
                                 //aud  受众
                                 id = jwt.Payload.Sub;//主题,又是应用APP,或者企业id 
                                 jti = jwt.Payload.Jti;//jwt唯一标识
@@ -303,12 +303,12 @@ namespace TEAMModelOS.Filter
                                     {
                                     }
                                 }
-                        //    }
-                        //}
-                        //else
-                        //{
-                        //    msg = "token的scope与接口的业务类型不匹配!"; code = 401008;
-                        //}
+                            }
+                        }
+                        else
+                        {
+                            msg = "token的scope与接口的业务类型不匹配!"; code = 401008;
+                        }
                     }
                     else
                     {

+ 4 - 0
TEAMModelOS.SDK/Models/Cosmos/Common/GroupList.cs

@@ -208,6 +208,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public string groupName { get; set; }
         public string nickname { get; set; }
+        /// <summary>
+        /// 性别 M( male,男) F (female 女)  N(secret 保密) 
+        /// </summary>
+        public string gender { get; set; }
         //补充毕业
         //0在校,1毕业 
         public int graduate { get; set; } = 0;

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

@@ -1281,6 +1281,7 @@ namespace TEAMModelOS.SDK
                                 y.picture = student?.picture;
                                 y.classId = student?.classId;
                                 y.graduate = student.graduate;
+                                y.gender = student.gender;
                                 y.year = student.year;
                                 x.grades.Add(student.year);
                             }

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

@@ -238,6 +238,7 @@ namespace TEAMModelOS.SDK
                         code = $"TeacherTrain-{school}",
                         tmdid = x,
                         nickname = member.nickname,
+                        
                         name = member.name,
                         picture = member.picture,
                         school = school,