合并冲突

TEAMModelOS.SDK/Models/Cosmos/School/Course.cs

@@ -53,7 +53,6 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 创建者的id 
         /// </summary>
-       
         public string creatorId { get; set; }
         /// <summary>
         /// 学校编码或教师tmdid

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -353,8 +353,6 @@ namespace TEAMModelOS.Controllers
                 string school_code = $"{_school_code}";
                 var jwt = new JwtSecurityToken(id_token.GetString());
                 var id = jwt.Payload.Sub;
-
-                (string ip, string region) = await LoginService.LoginIp(HttpContext, _searcher);
                 var client = _azureCosmos.GetCosmosClient();
 
                 //權限token
@@ -537,14 +535,6 @@ namespace TEAMModelOS.Controllers
                 //TODO JJ，更新Token时，在取得学校资讯时，没有传入schoolId
                 var auth_token = JwtAuthExtension.CreateAuthToken(_option.HostName, id, name?.ToString(), picture?.ToString(), _option.JwtSecretKey, Website: "IES", scope: Constant.ScopeTeacher, schoolID: school_code.ToString(), areaId: currAreaId, standard: school_base.standard, roles: roles.ToArray(), permissions: permissions.ToArray(), expire: 1);
 
-                //用户在线记录
-                try
-                {
-                    _ = _httpTrigger.RequestHttpTrigger(new { school = school_code.ToString(), scope = $"{Constant.ScopeTeacher}", id = $"{id}", ip = $"{ip}", expire = 1 }, _option.Location, "online-record");
-                }
-                catch { }
-
-
                 //取得班级
                 List<object> school_classes = new List<object>();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator