update

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/ListChange.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.SDK.Models
-{
-    public class ListChange
-    {
-        /// <summary>
-        /// 醍摩豆学生名单加入的成员
-        /// </summary>
-        public List<string> tmdjoin { get; set; } = new List<string>();
-        /// <summary>
-        /// 醍摩豆学生名单离开的成员
-        /// </summary>
-        public List<string> tmdhleave { get; set; } = new List<string>();
-        /// <summary>
-        /// 学校学生名单加入的成员
-        /// </summary>
-        public List<Students> stujoin { get; set; } = new List<Students>();
-        /// <summary>
-        /// 学校学生名单离开的成员
-        /// </summary>
-        public List<Students> stuleave { get; set; } = new List<Students>();
-
-        /// <summary>
-        /// 学校教师名单加入的成员
-        /// </summary>
-        public List<string> tchjoin { get; set; } = new List<string>();
-        /// <summary>
-        /// 学校教师名单离开的成员
-        /// </summary>
-        public List<string> tchleave { get; set; } = new List<string>();
-        public string listid { get; set; }
-        /// <summary>
-        /// 分区
-        /// </summary>
-        public string scope { get; set; }
-        public string originCode { get; set; }
-        public string school { get; set; }
-        public string creatorId { get; set; }
-        public string type { get; set; }
-       
-    }
-}

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -580,8 +580,20 @@ namespace TEAMModelOS.SDK
                 List<RMember> rmembers = new List<RMember>();
                 groupLists.ForEach(y => {
                     (string id, List<string> grpids) = groupids.Find(x => x.Item1.Equals(y.id));
-                    var gpmember=y.members.FindAll(x=>!string.IsNullOrEmpty(x.groupName) &&  grpids.Contains(x.groupName));
+                    var gpmember = y.members.FindAll(x => !string.IsNullOrEmpty(x.groupName) && grpids.Contains(x.groupName));
+                    if (  grpids.Contains("default")) 
+                    {
+                        var gpmemberdft = y.members.FindAll(x => string.IsNullOrWhiteSpace(x.groupName));
+                        if (gpmember.IsNotEmpty())
+                        {
+                            gpmember.AddRange(gpmemberdft);
+                        }
+                        else {
+                            gpmember = gpmemberdft;
+                        }
+                    }
                     y.members = gpmember;
+
                 });
                 var gpgpmembers =   groupLists.SelectMany(x => x.members).ToList();
                 List<RMember> tmdids = gpgpmembers.FindAll(x => x.type == 1).Where((x, i) => gpgpmembers.FindAll(x => x.type == 1).FindIndex(n => n.id.Equals(x.id)) == i).ToList();

TEAMModelOS.SDK/Models/Table/OpenApi.cs

@@ -102,6 +102,36 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public string type { get; set; }
     }
+   
+    public class DefaultApp : CosmosEntity
+    {
+        /// <summary>
+        /// 0禁用，1正常，2 token封禁
+        /// </summary>
+        public int status { get; set; }
+
+        public DefaultApp()
+        {
+            pk = "OpenApp";
+        }
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string icon { get; set; }
+        /// <summary>
+        /// 应用名称
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 应用描述
+        /// </summary>
+        public string descr { get; set; }
+        /// <summary>
+        /// 授权信息
+        /// </summary>
+        public List<int> auths { get; set; } = new List<int>();
+    }
+    
     public class OpenApp : CosmosEntity {
         /// <summary>
         /// 图标

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -517,8 +517,24 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             if (!json.TryGetProperty("ids", out JsonElement ids)) return BadRequest();
             json.TryGetProperty("schoolId", out JsonElement schoolId);
+            json.TryGetProperty("groupNames", out JsonElement groupNames);
+            List<Dictionary<string, List<string>>> groupLists = null;
+            if (groupNames.ValueKind.Equals(JsonValueKind.Array)) {
+                groupLists = groupNames.ToObject<List<Dictionary<string, List<string>>>>();
+            }
+            List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
+            if ( groupLists.Count > 0)
+            {
+                foreach (var gp in groupLists)
+                {
+                    foreach (KeyValuePair<string, List<string>> pp in gp)
+                    {
+                        ps.Add((pp.Key, pp.Value));
+                    }
+                }
+            }
             List<string> listids = ids.ToObject<List<string>>();
-            (List < RMember > members,List < RGroupList > groups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{schoolId}");
+            (List < RMember > members,List < RGroupList > groups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{schoolId}", ps);
             return Ok(new { groups, members });
         }
         /// <summary>

TEAMModelOS/Controllers/System/CoreController.cs

@@ -65,6 +65,7 @@ namespace TEAMModelOS.Controllers
         [RequestSizeLimit(100_000_000)] //最大100m左右
         public async Task<IActionResult> RandomCode(JsonElement request)
         {
+          
             if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();//学校编码 或者醍摩豆id
             string _num09 = "123456789";
             string no = $"{Utils.CreatSaltString(6, _num09)}";
@@ -79,10 +80,13 @@ namespace TEAMModelOS.Controllers
         [RequestSizeLimit(100_000_000)] //最大100m左右
         public async Task<IActionResult> SystemInfo(JsonElement request)
         {
-
+            Type attr = this.GetType();
+            string currentDirectory = Path.GetDirectoryName(attr.Assembly.Location);
+            Assembly assembly = Assembly.LoadFrom( $"{currentDirectory}\\TEAMModelOS.dll");
+            var description= assembly.GetCustomAttribute<AssemblyDescriptionAttribute>().Description;
             //var v1 = Assembly.GetEntryAssembly().GetName().Version;
             //var v2 = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
-            var description = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyDescriptionAttribute>().Description;
+           // var description = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyDescriptionAttribute>().Description;
             var version = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
             long nowtime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             //Console.WriteLine($"Assembly.GetEntryAssembly().GetName().Version: " +

TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -1401,7 +1401,7 @@ namespace TEAMModelOS.Controllers
                     }
                     else
                     {
-                        teacher.schools = new List<Teacher.TeacherSchool> { new Teacher.TeacherSchool { schoolId = school.id,areaId=area.id,picture=school.picture, name = school.name, status = "join" ,time= now } };
+                        teacher.schools = new List<Teacher.TeacherSchool> { new Teacher.TeacherSchool { schoolId = school.id,areaId=school.areaId,picture=school.picture, name = school.name, status = "join" ,time= now } };
                     }
                 }
                 await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReplaceItemAsync(teacher, tmdid, new PartitionKey($"Base"));

TEAMModelOS/TEAMModelOS.csproj

@@ -32,8 +32,8 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
     <Version>5.2203.11</Version>
-    <AssemblyVersion>5.2203.11.1</AssemblyVersion>
-    <FileVersion>5.2203.11.1</FileVersion>
+    <AssemblyVersion>5.2203.11.2</AssemblyVersion>
+    <FileVersion>5.2203.11.2</FileVersion>
     <Description>TEAMModelOS(IES5)版本更新。</Description>
     <PackageReleaseNotes>6.0版本说明</PackageReleaseNotes>
   </PropertyGroup>