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.2407.17</Version>
-		<AssemblyVersion>5.2407.17.1</AssemblyVersion>
-		<FileVersion>5.2407.17.1</FileVersion>
+		<Version>5.2407.24</Version>
+		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
+		<FileVersion>5.2407.24.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.Function/IESTimerTrigger.cs

@@ -60,8 +60,8 @@ namespace TEAMModelOS.Function
                 // if (local.Contains("Test")||local.Contains("Dep"))
                 {
 
-                    int am = 9;
-                    int pm = 20;
+                    int am = 8;
+                    int pm = 11;
                     //int am = DateTimeOffset.Now.Hour;
                     //int pm = DateTimeOffset.Now.Hour;
                     var url = Environment.GetEnvironmentVariable("HaBookAuth:CoreAPI");

TEAMModelOS.Function/TEAMModelOS.Function.csproj

@@ -5,9 +5,9 @@
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>5.2407.17</Version>
-	<AssemblyVersion>5.2407.17.1</AssemblyVersion>
-	<FileVersion>5.2407.17.1</FileVersion>
+	<Version>5.2407.24</Version>
+	<AssemblyVersion>5.2407.24.1</AssemblyVersion>
+	<FileVersion>5.2407.24.1</FileVersion>
 	<PackageId>TEAMModelOS.FunctionV4</PackageId>
 	<Authors>teammodel</Authors>
 	<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/Models/Service/KnowledgeService.cs

@@ -21,7 +21,9 @@ namespace TEAMModelOS.SDK.Models.Service
             foreach (var node in tree)
             {
                 points.Add(node.name);
-                blocks.Add(new Block { name=node.name, source=2, points=  node.children!=null ? node.children.Select(x => x.name).ToList() : new List<string>() });
+                if (!node.children.IsNotEmpty()) {
+                    blocks.Add(new Block { name=node.name, source=2, points=  node.children!=null ? node.children.Select(x => x.name).Distinct().ToList() : new List<string>() });
+                }
                 node.pid=knowledge.id;
                 node.allcids= KnowledgeService.GetChildIds(node, points, blocks);
             }

TEAMModelOS.SDK/Models/Service/SystemService.cs

@@ -344,6 +344,7 @@ Hello {tmdname}, here is the summary report of the homework tasks you have poste
                 {
                     sendTime_pm = pm;
                 }
+
                 string lang = teacher.lang;
                 var tzt = now.GetGMTTime((int)teacher.timezone);
                 if (string.IsNullOrWhiteSpace(teacher.lang)) 
@@ -407,7 +408,9 @@ Hello {tmdname}, here is the summary report of the homework tasks you have poste
                             homeworkCount++;
                         }
                     }
+
                 }
+                await dingDing.SendBotMsg($"{teacher.name},{homework_submit_today.ToJsonString()},pm:{pm},am:{am},tztH:{tzt.Hour},sendPm:{sendTime_pm},sendAm:{sendTime_am}", GroupNames.成都开发測試群組);
                 foreach (var homeworksm in homework_submit) 
                 {
                  

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>5.2407.17</Version>
-		<AssemblyVersion>5.2407.17.1</AssemblyVersion>
-		<FileVersion>5.2407.17.1</FileVersion>
+		<Version>5.2407.24</Version>
+		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
+		<FileVersion>5.2407.24.1</FileVersion>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 	</PropertyGroup>
 

TEAMModelOS/TEAMModelOS.csproj

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

TEAMModelOS/appsettings.json

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