update

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2310.25</Version>
-		<AssemblyVersion>5.2310.25.1</AssemblyVersion>
-		<FileVersion>5.2310.25.1</FileVersion>
+		<Version>5.2311.1</Version>
+		<AssemblyVersion>5.2311.1.1</AssemblyVersion>
+		<FileVersion>5.2311.1.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2310.25</Version>
-		<AssemblyVersion>5.2310.25.1</AssemblyVersion>
-		<FileVersion>5.2310.25.1</FileVersion>
+		<Version>5.2311.1</Version>
+		<AssemblyVersion>5.2311.1.1</AssemblyVersion>
+		<FileVersion>5.2311.1.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.2310.25</Version>
-    <AssemblyVersion>5.2310.25.1</AssemblyVersion>
-    <FileVersion>5.2310.25.1</FileVersion>
+    <Version>5.2311.1</Version>
+    <AssemblyVersion>5.2311.1.1</AssemblyVersion>
+    <FileVersion>5.2311.1.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -659,6 +659,7 @@ namespace TEAMModelOS.Controllers
                                 groupLists.Add(new GroupListGrp(item, groupName));
                             }
                         }
+                        long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
                         return Ok(new { groupLists });
                     }
                 case bool when $"{opt}".Equals("teach", StringComparison.OrdinalIgnoreCase):
@@ -852,6 +853,10 @@ namespace TEAMModelOS.Controllers
                                 }
                                 courseGroupLists.Add(courseGroupList);
                             }
+                            long now =  DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                            foreach (var groups in courseGroupLists) {
+                                groups.groups.RemoveAll(z => z.expire>0 && z.expire<now);
+                            }
                             return Ok(new { groupLists = courseGroupLists });
                         }
                     }

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -843,6 +843,8 @@ namespace TEAMModelOS.Controllers
                                 return Ok(new { code = 1, msg = "活动不存在" });
                             }
                         }
+             
+                
                 }
             } catch (Exception ex)
             {
@@ -859,9 +861,6 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         [HttpPost("login-portal")]
         public async Task<IActionResult> LoginPortal(JsonElement request) {
-            string msg = "";
-          
-            int code = -1;
             string tmdid = null;
             if (!request.TryGetProperty("route", out JsonElement _route)) return BadRequest();
             request.TryGetProperty("ticket", out JsonElement _ticket);

TEAMModelOS/TEAMModelOS.csproj

@@ -74,11 +74,11 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2310.25</Version>
-    <AssemblyVersion>5.2310.25.1</AssemblyVersion>
-    <FileVersion>5.2310.25.1</FileVersion>
+    <Version>5.2311.1</Version>
+    <AssemblyVersion>5.2311.1.1</AssemblyVersion>
+    <FileVersion>5.2311.1.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2310.25.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2311.1.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2310.25.1"
+    "Version": "5.2311.1.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2310.25.1"
+    "Version": "5.2311.1.1"
   },
   "Azure": {
     "Storage": {