update 登录统计。

TEAMModelOS.SDK/Models/Service/Common/TeacherService.cs

@@ -299,258 +299,7 @@ namespace TEAMModelOS.Services
             };
         }
 
-        public static async Task<TeacherInfo> GetTeacherInfo(AzureCosmosFactory _azureCosmos, Teacher teacher, string name, string picture, string id, AzureStorageFactory _azureStorage, Option _option)
-        {
-            List<object> schools = new List<object>();
-            List<AreaDto> areas = new List<AreaDto>();
-            List<Area> areasd = new List<Area>();
-            string defaultschool = null;
-            //TODO 取得Teacher 個人相關數據(課程清單、虛擬教室清單、歷史紀錄清單等)，學校數據另外API處理，多校切換時不同
-            var client = _azureCosmos.GetCosmosClient();
-            int total = 0;
-            int tsize = 0;
-            try
-            {
-                if (teacher == null)
-                {
-                    teacher = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<Teacher>(id, new PartitionKey("Base"));
-                    teacher.name = $"{name}";
-                    teacher.picture = $"{picture}";
-                }
-                else
-                {
-                    name = teacher.name;
-                    picture = teacher.picture;
-                    id = teacher.id;
-                }
-                ///教师的个人空间
-                tsize = teacher.size;
-                ///教师的总空间 包含 个人空间和学校赠送的空间累加
-                total = teacher.size;
-                //areas = teacher.areas;
-                if (teacher.areas.IsNotEmpty())
-                {
-                    foreach (var areat in teacher.areas)
-                    {
-                        try
-                        {
-                            Area area = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<Area>($"{areat.areaId}", new PartitionKey("Base-Area"));
-                            areasd.Add(area);
-                            AreaSetting setting = null;
-                            try
-                            {
-                                setting = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<AreaSetting>($"{areat.areaId}", new PartitionKey("AreaSetting"));
-                            }
-                            catch (CosmosException ex)
-                            {
-                                setting = null;
-                            }
-                            int access = 0;
-                            if (setting != null && !string.IsNullOrWhiteSpace(setting.accessConfig))
-                            {
-                                access = 1;
-                            }
-                            if (setting != null)
-                            {
-                                setting.accessConfig = null;
-                            }
-                            areas.Add(new AreaDto { areaId = area.id, name = area.name, standard = area.standard, standardName = area.standardName, setting = setting, access = access });
-                        }
-                        catch (CosmosException)
-                        {
-                            //数据库捞不到数据
-                            continue;
-                        }
-                    }
-                }
-                //检查是否有加入学校，如果加入学校，则当个人空间size是0G的时候，则免费获得一个G空间，但无论加入多少个学校，只能获取一次 1G的免费空间。没有加入学校则默认0G空间,除非自己购买空间
-                if (teacher.schools.IsNotEmpty())
-                {
-                    foreach (var sc in teacher.schools)
-                    {
-                        string statusNow = sc.status != null ? sc.status : "";
-                        if (statusNow.Equals("join") || statusNow.Equals("invite") || statusNow.Equals("request"))
-                        {
-                            dynamic schoolExtobj = new ExpandoObject();
-                            // var schoolJson = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{sc.schoolId}", new PartitionKey("Base"));
-                            //var school = await JsonDocument.ParseAsync(schoolJson.ContentStream);
-                            schoolExtobj.schoolId = sc.schoolId;
-                            schoolExtobj.name = sc.name;
-                            schoolExtobj.status = sc.status;
-                            schoolExtobj.time = sc.time;
-                            schoolExtobj.picture = sc.picture;
-                            schoolExtobj.areaId = $"{sc.areaId}";
-                            Area area = null;
-                            int access = 0;
-                            if (!string.IsNullOrEmpty($"{sc.areaId}"))
-                            {
-
-                                try
-                                {
-
-                                    area = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<Area>($"{sc.areaId}", new PartitionKey("Base-Area"));
-                                    AreaSetting setting = null;
-                                    try
-                                    {
-                                        setting = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<AreaSetting>($"{area.id}", new PartitionKey("AreaSetting"));
-                                    }
-                                    catch (CosmosException ex)
-                                    {
-                                        setting = null;
-                                    }
-
-                                    if (setting != null && !string.IsNullOrWhiteSpace(setting.accessConfig))
-                                    {
-                                        access = 1;
-                                    }
-                                    areasd.Add(area);
-
-                                }
-                                catch (CosmosException)
-                                {
-                                    area = null;
-                                }
-                            }
-                            if (area != null)
-                            {
-                                schoolExtobj.area = new { area.name, area.id, area.institution, area.provName, area.code, area.cityCode, area.cityName, area.standard, area.provCode, area.pk, access };
-
-                            }
-                            else
-                            {
-                                schoolExtobj.area = area;
-                            }
-                            var sctch = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(id, new PartitionKey($"Teacher-{sc.schoolId}"));
-                            if (sctch.Status == 200)
-                            {
-                                var jsonDoc = await JsonDocument.ParseAsync(sctch.ContentStream);
-                                SchoolTeacher schoolTeacher = jsonDoc.RootElement.ToObject<SchoolTeacher>();
-                                schoolTeacher.name = $"{name}";
-                                schoolTeacher.picture = $"{picture}";
-                                await client.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync(schoolTeacher, id, new PartitionKey($"Teacher-{sc.schoolId}"));
-                                if (jsonDoc.RootElement.TryGetProperty("size", out JsonElement _size) && _size.ValueKind.Equals(JsonValueKind.Number))
-                                {
-                                    total += _size.GetInt32();
-                                    schoolExtobj.size = _size.GetInt32();
-                                }
-                                else { schoolExtobj.size = 0; }
-                            }
-                            else
-                            {
-                                schoolExtobj.size = 0;
-                            }
-                            if (statusNow.Equals("join"))
-                            {
-                                //初始化
-                                await TmdUserService.JoinSchool(client, teacher.id, teacher.picture, teacher.name, sc.schoolId, sc.name);
-                            }
-                            schools.Add(schoolExtobj);
-                        }
-                    }
-                    //如果包含任何申请，邀请，加入学校的记录 且个人空间未分配2G  则默认分配个人空间至2G.
-                    if (teacher.size < 2 && teacher.schools.Count > 0)
-                    {
-                        teacher.size = 2;
-                    }
-                    //如果未包含任何申请，邀请，加入学校的记录 且 个人空间没有分配1G 则默认赠送一个G 
-                    if (teacher.schools.Count == 0 && teacher.size < 1)
-                    {
-                        teacher.size = 1;
-                    }
-                }
-                if (string.IsNullOrEmpty(teacher.defaultSchool) && teacher.schools.IsNotEmpty())
-                {
-                    var tech = teacher.schools.FindAll(x => x.status.Equals("join"));
-                    if (tech.IsNotEmpty())
-                    {
-                        teacher.defaultSchool = teacher.schools[0].schoolId;
-                    }
-                }
-                await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<Teacher>(teacher, id, new PartitionKey("Base"));
-                //預設學校ID
-                defaultschool = teacher.defaultSchool;
-            }
-            catch (CosmosException ex)
-            {
-                if (ex.Status == 404)
-                {
-                    //如果沒有，則初始化Teacher基本資料到Cosmos
-                    teacher = new Teacher
-                    {
-                        createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                        id = id,
-                        pk = "Base",
-                        code = "Base",
-                        name = name?.ToString(),
-                        picture = picture?.ToString(),
-                        //创建账号并第一次登录IES5则默认赠送1G
-                        size = 1,
-                        defaultSchool = null,
-                        schools = new List<Teacher.TeacherSchool>(),
-                    };
-                    var container = _azureStorage.GetBlobContainerClient(id);
-                    await container.CreateIfNotExistsAsync(PublicAccessType.None); //嘗試創建Teacher私有容器，如存在則不做任何事，保障容器一定存在
-                    teacher = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<Teacher>(teacher, new PartitionKey("Base"));
-                    total = teacher.size;
-                    tsize = teacher.size;
-                }
-            }
-            //私人課程
-            List<object> courses = new List<object>();
-            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryStreamIterator(queryText: $"select value(c) from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{id}") }))
-            {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-                {
-                    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-                    {
-                        courses.Add(obj.ToObject<object>());
-                    }
-                }
-            }
-
-
-            List<string> roles = new List<string>() { "teacher" };
-            Area areaa = null;
-            if (areas.Count > 0)
-            {
-                roles.Add("area");
-                if (!string.IsNullOrEmpty($"{areas[0]}"))
-                {
-
-                    try
-                    {
-                        areaa = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemAsync<Area>($"{areas[0].areaId}", new PartitionKey("Base-Area"));
-                    }
-                    catch (CosmosException)
-                    {
-                        areaa = null;
-                    }
-                }
-            }
-            //換取AuthToken，提供給前端
-            var auth_token = JwtAuthExtension.CreateAuthToken(_option.HostName, id, name?.ToString(), picture?.ToString(), _option.JwtSecretKey, Website: "IES", scope: Constant.ScopeTeacher, standard: areaa != null ? areaa.standard : "", roles: roles.ToArray(), expire: 1);
-            //取得Teacher Blob 容器位置及SAS 
-            await _azureStorage.GetBlobContainerClient(id).CreateIfNotExistsAsync(PublicAccessType.None); //嘗試創建Teacher私有容器，如存在則不做任何事，保障容器一定存在
-            var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(id, BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
-            var (osblob_uri, osblob_sas) = roles.Contains("area") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
-            return new TeacherInfo
-            {
-                auth_token = auth_token,
-                blob_uri = blob_uri,
-                blob_sas = blob_sas,
-                schools = schools,
-                defaultschool = defaultschool,
-                courses = courses,
-                total = total,
-                osblob_sas = osblob_sas,
-                osblob_uri = osblob_uri,
-                tsize = tsize,
-                areas = areas,
-                teacher = teacher
-            };
-        }
-    }
+       }
     public record AreaDto
     {
         //areaId = area.id, name = area.name, area.standard, area.standardName

TEAMModelOS.SDK/Models/Service/LoginService.cs

@@ -13,8 +13,19 @@ namespace TEAMModelOS.SDK.Models.Service
 {
     public static class LoginService
     {
-
-        public static List<LoginInfo> DoLoginInfo(List<LoginInfo> loginInfos, long expire, long now, string school, string scope, string id, string ip, string region)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="loginInfos"></param>
+        /// <param name="expire"></param>
+        /// <param name="now"></param>
+        /// <param name="school"></param>
+        /// <param name="scope">Teacher Student  TmdUser</param>
+        /// <param name="id"></param>
+        /// <param name="ip"></param>
+        /// <param name="region"></param>
+        /// <returns></returns>
+        public static async Task<List<LoginInfo>> DoLoginInfo(List<LoginInfo> loginInfos, long expire, long now, string school, string scope, string id, string ip, string region)
         {
             if (loginInfos.Any())
             {
@@ -29,6 +40,23 @@ namespace TEAMModelOS.SDK.Models.Service
             {
                 loginInfos = new List<LoginInfo> { new LoginInfo { expire = expire, ip = ip, time = now } };
             }
+            if (!string.IsNullOrWhiteSpace(school)) {
+                //Login:School:School_ID:Teacher:20220506   value 15   1
+                //await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Login:School:{school}:20220506", "15",1);
+
+                //await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Login:School:{school}:20220506", "15", 1);
+            }
+            //Login:IES:20220506
+
+            //var counts = _azureRedis.GetRedisClient(8).SortedSetRangeByScoreWithScores($"Vote:Count:{vote.id}");
+            //List<dynamic> countcds = new List<dynamic>();
+            //if (counts != null && counts.Length > 0)
+            //{
+            //    foreach (var count in counts)
+            //    {
+            //        countcds.Add(new { code = count.Element.ToString(), count = (int)count.Score });
+            //    }
+            //}
             return loginInfos;
         }
 

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -29,6 +29,7 @@ using Microsoft.AspNetCore.Authorization;
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using System.Text;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace TEAMModelOS.Controllers
 {
@@ -255,6 +256,7 @@ namespace TEAMModelOS.Controllers
         [HttpPost("get-teacher-info")]
         public async Task<IActionResult> GetTeacherInfo(JsonElement request)
         {
+            string domain = HttpContext?.Request?.Host.Host;
             if (!request.TryGetProperty("id_token", out JsonElement id_token)) return BadRequest();
             var jwt = new JwtSecurityToken(id_token.GetString());
             //TODO 此驗證IdToken先簡單檢查，後面需向Core ID新API，驗證Token
@@ -275,8 +277,19 @@ namespace TEAMModelOS.Controllers
                     //未设置的的采用系统设置的默认值30
                     lessonLimit = Constant.private_lesson_limit;
                 }
+                var table = _azureStorage.GetCloudTableClient().GetTableReference("IESOAuth");
+                List<string> Codes = new List<string>();
+                if (!string.IsNullOrWhiteSpace(id))
+                {
+                    Codes.Add($" Code {QueryComparisons.Equal} '{id}' ");
+                }
+                string qurey = $"PartitionKey {QueryComparisons.Equal} 'OAuthShow' and Domain {QueryComparisons.Equal} '{domain}' and ( { string.Join(" or ", Codes)} )  ";
+                var result = await table.ExecuteQuerySegmentedAsync(new TableQuery<OAuthShow>().Where(qurey), null);
+                List<OAuthShow> shows = result.Results;
+
                 return Ok(new
                 {
+                    privateShows = shows?.FindAll(x => x.Scope.Equals("private")).Select(x => new { x.Type, x.Status, x.Scope, x.Code }),
                     location = _option.Location,
                     teacherInfo.auth_token,
                     teacherInfo.blob_uri,
@@ -314,6 +327,7 @@ namespace TEAMModelOS.Controllers
         [HttpPost("get-school-info")]
         public async Task<IActionResult> GetSchoolInfo(JsonElement request)
         {
+            string domain = HttpContext?.Request?.Host.Host;
             try
             {
                 if (!request.TryGetProperty("id_token", out JsonElement id_token)) return BadRequest();
@@ -569,8 +583,36 @@ namespace TEAMModelOS.Controllers
                     //未设置的的采用系统设置的默认值30
                     lessonLimit = Constant.private_lesson_limit;
                 }
+                var table = _azureStorage.GetCloudTableClient().GetTableReference("IESOAuth");
+                List<string> Codes = new List<string>();
+                if (!string.IsNullOrWhiteSpace(id))
+                {
+                    Codes.Add($" Code {QueryComparisons.Equal} '{id}' ");
+                }
+                if (!string.IsNullOrWhiteSpace(school_code))
+                {
+                    Codes.Add($" Code {QueryComparisons.Equal} '{school_code}' ");
+                }
+                if (!string.IsNullOrWhiteSpace(currAreaId))
+                {
+                    Codes.Add($" Code {QueryComparisons.Equal} '{currAreaId}' ");
+                }
+                string qurey = $"PartitionKey {QueryComparisons.Equal} 'OAuthShow' and Domain {QueryComparisons.Equal} '{domain}' and ( { string.Join(" or ", Codes)} )  ";
+                var result = await table.ExecuteQuerySegmentedAsync(new TableQuery<OAuthShow>().Where(qurey), null);
+                List<OAuthShow> shows = result.Results;
+                List<OAuthShow> schoolShow = new List<OAuthShow>();
+                var schoolShows = shows?.Where(y => !y.Scope.Equals("private"));
+                if (schoolShows.Any())
+                {
+                    schoolShows.ToList().ForEach(y => { y.Scope = "school"; y.Code = school_code; });
+                    schoolShows.GroupBy(x => $"{x.Type}{x.Scope}").Select(s => new { key = s.Key, list = s.ToList() }).ToList().ForEach(z => {
+                        schoolShow.Add(z.list.First());
+                    });
+                }
                 return Ok(new
                 {
+                    privateShows = shows?.FindAll(x => x.Scope.Equals("private")).Select(x => new { x.Type, x.Status, x.Scope, x.Code }),
+                    schoolShows = schoolShow.Select(x => new { x.Type, x.Status, x.Scope, x.Code }),
                     auth_token,
                     blob_uri,
                     blob_sas,

TEAMModelOS/Controllers/Third/OAuth2Controller.cs

@@ -105,39 +105,39 @@ namespace TEAMModelOS.Controllers.Third
             var table = _azureStorage.GetCloudTableClient().GetTableReference("IESOAuth");
 
 
-            List<string> RowKeys = new List<string>();
-            if (!string.IsNullOrWhiteSpace(tmdid))
-            {
-                RowKeys.Add($" Code {QueryComparisons.Equal} '{tmdid}' ");
-            }
-            if (!string.IsNullOrWhiteSpace(school))
-            {
-                RowKeys.Add($" Code {QueryComparisons.Equal} '{school}' ");
-            }
-            if (!string.IsNullOrWhiteSpace(area))
-            {
-                RowKeys.Add($" Code {QueryComparisons.Equal} '{area}' ");
-            }
+            //List<string> Codes = new List<string>();
+            //if (!string.IsNullOrWhiteSpace(tmdid))
+            //{
+            //    Codes.Add($" Code {QueryComparisons.Equal} '{tmdid}' ");
+            //}
+            //if (!string.IsNullOrWhiteSpace(school))
+            //{
+            //    Codes.Add($" Code {QueryComparisons.Equal} '{school}' ");
+            //}
+            //if (!string.IsNullOrWhiteSpace(area))
+            //{
+            //    Codes.Add($" Code {QueryComparisons.Equal} '{area}' ");
+            //}
 
-            string qurey = $"PartitionKey {QueryComparisons.Equal} 'OAuthShow'  and ( { string.Join(" or ", RowKeys)} )  ";
+            //string qurey = $"PartitionKey {QueryComparisons.Equal} 'OAuthShow' and Domain {QueryComparisons.Equal} '{domain}' and ( { string.Join(" or ", Codes)} )  ";
 
-            var result = await table.ExecuteQuerySegmentedAsync(new TableQuery<OAuthShow>().Where(qurey), null);
-            List<OAuthShow> shows = result.Results;
-            List<OAuthShow> schoolShow = new List<OAuthShow>();
-            var schoolShows = shows?.Where(y => !y.Scope.Equals("private"));
-            if (schoolShows.Any())
-            {
-                schoolShows.ToList().ForEach(y => { y.Scope = "school"; y.Code = school; });
-                schoolShows.GroupBy(x => $"{x.Type}{x.Scope}").Select(s => new { key = s.Key, list = s.ToList() }).ToList().ForEach(z => {
-                    schoolShow.Add(z.list.First());
-                });
-            }
+            //var result = await table.ExecuteQuerySegmentedAsync(new TableQuery<OAuthShow>().Where(qurey), null);
+            //List<OAuthShow> shows = result.Results;
+            //List<OAuthShow> schoolShow = new List<OAuthShow>();
+            //var schoolShows = shows?.Where(y => !y.Scope.Equals("private"));
+            //if (schoolShows.Any())
+            //{
+            //    schoolShows.ToList().ForEach(y => { y.Scope = "school"; y.Code = school; });
+            //    schoolShows.GroupBy(x => $"{x.Type}{x.Scope}").Select(s => new { key = s.Key, list = s.ToList() }).ToList().ForEach(z => {
+            //        schoolShow.Add(z.list.First());
+            //    });
+            //}
             List<OAuthUser> authUsers = await table.FindListByDict<OAuthUser>(new Dictionary<string, object>() { { "RowKey", tmdid }, { "Domain", domain } });
             return Ok(new
             {
                 auth = authUsers.Select(x => new { type = x.Type, tmdid = x.RowKey, time = x.Time }),
-                privateShows = shows?.FindAll(x => x.Scope.Equals("private")).Select(x => new { x.Type, x.Status, x.Scope, x.Code }),
-                schoolShows = schoolShow.Select(x => new { x.Type, x.Status, x.Scope, x.Code })
+                //privateShows = shows?.FindAll(x => x.Scope.Equals("private")).Select(x => new { x.Type, x.Status, x.Scope, x.Code }),
+                //schoolShows = schoolShow.Select(x => new { x.Type, x.Status, x.Scope, x.Code })
             });
         }
     }