CrazyIter_Bin 9 ماه پیش
والد
کامیت
2988b5538d

+ 2 - 2
TEAMModelBI/Controllers/BITest/TestController.cs

@@ -1435,7 +1435,7 @@ namespace TEAMModelBI.Controllers.BITest
                 //https://teammodelos.blob.core.chinacloudapi.cn/0-public/pie-borderRadius.html
                 //https://teammodelos.blob.core.chinacloudapi.cn/0-public/pie-borderRadius.html
                 string publishUrl = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={HttpUtility.UrlEncode(retn.saveUrls.First(), Encoding.UTF8)}&time={HttpUtility.UrlEncode(datetime.AddHours(8).ToString("yyyy年MM月dd日 HH时"), Encoding.UTF8)}";
                 string publishUrl = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={HttpUtility.UrlEncode(retn.saveUrls.First(), Encoding.UTF8)}&time={HttpUtility.UrlEncode(datetime.AddHours(8).ToString("yyyy年MM月dd日 HH时"), Encoding.UTF8)}";
                 string ulrs = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={retn.saveUrls.First()}&time={datetime.AddHours(8).ToString("yyyy年MM月dd日 HH时")}";
                 string ulrs = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={retn.saveUrls.First()}&time={datetime.AddHours(8).ToString("yyyy年MM月dd日 HH时")}";
-                string ulr = $"http://cdhabook.teammodel.cn:8805/screen/screenshot-png?width=1920&height=1450&url={HttpUtility.UrlEncode(ulrs, Encoding.UTF8)}&delay=6000";
+                string ulr = $"http://52.130.252.100:8805/screen/screenshot-png?width=1920&height=1450&url={HttpUtility.UrlEncode(ulrs, Encoding.UTF8)}&delay=6000";
                 string image = "";
                 string image = "";
 
 
                 try
                 try
@@ -1472,7 +1472,7 @@ namespace TEAMModelBI.Controllers.BITest
                     //一天的统计
                     //一天的统计
                     string dayPublishUrl = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={HttpUtility.UrlEncode(dayRetn.saveUrls.First(), Encoding.UTF8)}&time={HttpUtility.UrlEncode(pastTime.ToString("yyyy年MM月dd日"), Encoding.UTF8)}";
                     string dayPublishUrl = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={HttpUtility.UrlEncode(dayRetn.saveUrls.First(), Encoding.UTF8)}&time={HttpUtility.UrlEncode(pastTime.ToString("yyyy年MM月dd日"), Encoding.UTF8)}";
                     string dayUrls = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={dayRetn.saveUrls.First()}&time={pastTime.ToString("yyyy年MM月dd日")}";
                     string dayUrls = $"https://teammodelos.blob.core.chinacloudapi.cn/0-public/api-count.html?url={dayRetn.saveUrls.First()}&time={pastTime.ToString("yyyy年MM月dd日")}";
-                    string dayUrl = $"http://cdhabook.teammodel.cn:8805/screen/screenshot-png?width=1920&height=1450&url={HttpUtility.UrlEncode(dayUrls, Encoding.UTF8)}&delay=6000";
+                    string dayUrl = $"http://52.130.252.100:8805/screen/screenshot-png?width=1920&height=1450&url={HttpUtility.UrlEncode(dayUrls, Encoding.UTF8)}&delay=6000";
                     string dayImage = "";
                     string dayImage = "";
 
 
                     string dayStr = await _httpClient.CreateClient().GetStringAsync(dayUrl);
                     string dayStr = await _httpClient.CreateClient().GetStringAsync(dayUrl);

+ 2 - 2
TEAMModelBI/Filter/RequestAuditFilter.cs

@@ -194,14 +194,14 @@ namespace TEAMModelOS.Filter
                 var httpclient = _httpClient.CreateClient();
                 var httpclient = _httpClient.CreateClient();
                 httpclient.Timeout=  TimeSpan.FromSeconds(10);
                 httpclient.Timeout=  TimeSpan.FromSeconds(10);
 #if DEBUG
 #if DEBUG
-                var response = await httpclient.PostAsJsonAsync("http://cdhabook.teammodel.cn:8806/api/http-log", data);
+                var response = await httpclient.PostAsJsonAsync("http://52.130.252.100:8806/api/http-log", data);
                 //if (response.StatusCode==HttpStatusCode.OK) 
                 //if (response.StatusCode==HttpStatusCode.OK) 
                 //{
                 //{
                 //    string result =   await response.Content.ReadAsStringAsync();
                 //    string result =   await response.Content.ReadAsStringAsync();
 
 
                 //}
                 //}
 #else
 #else
-            _=  httpclient.PostAsJsonAsync("http://cdhabook.teammodel.cn:8806/api/http-log",data);
+            _=  httpclient.PostAsJsonAsync("http://52.130.252.100:8806/api/http-log",data);
 #endif
 #endif
                 //   _ = _httpTrigger.RequestHttpTrigger(data, "China", "http-log");
                 //   _ = _httpTrigger.RequestHttpTrigger(data, "China", "http-log");
             }
             }

+ 3 - 3
TEAMModelBI/TEAMModelBI.csproj

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

+ 183 - 122
TEAMModelOS.Extension/HTEX.Test/Controllers/LessonRecordController.cs

@@ -59,6 +59,31 @@ namespace HTEX.Test.Controllers
 
 
             #endregion
             #endregion
         }
         }
+        [HttpPost("read")]
+        public async Task<IActionResult> Read(JsonElement json) 
+        {
+            string m = await System.IO.File.ReadAllTextAsync("C:\\Users\\CrazyIter\\Downloads\\m.json");
+            string p = await System.IO.File.ReadAllTextAsync("C:\\Users\\CrazyIter\\Downloads\\p.json");
+            List<ItemInfo> mlist=m.ToObject<List<ItemInfo>>();
+            List<ItemInfo> plist=p.ToObject<List<ItemInfo>>();
+            var km = mlist.Where(x=> x.knowledge.IsNotEmpty()).SelectMany(x => x.knowledge).Distinct();
+            var kp = plist.Where(x=> x.knowledge.IsNotEmpty()).SelectMany(x => x.knowledge).Distinct();
+            List<CodeLong> cp = new List<CodeLong>();
+            foreach (var item in kp)
+            {
+                var count = plist.Where(x => x.knowledge.Contains(item)).Count();
+                cp.Add(new CodeLong() { code = item, value = count });
+            }
+            List<CodeLong> cm = new List<CodeLong>();
+            foreach (var item in km)
+            {
+               var count =  mlist.Where(x => x.knowledge.Contains(item)).Count();
+               cm.Add(new CodeLong() { code = item, value = count });
+            }
+          
+
+            return Ok(new { cm,cp });
+        }
         [HttpPost("process-history")]
         [HttpPost("process-history")]
         public async Task<IActionResult> ProcessHistory(JsonElement json)
         public async Task<IActionResult> ProcessHistory(JsonElement json)
         {
         {
@@ -185,7 +210,7 @@ namespace HTEX.Test.Controllers
         /// <param name="lessonRecord"></param>
         /// <param name="lessonRecord"></param>
         /// <param name="lessonBase"></param>
         /// <param name="lessonBase"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public (LessonBase lessonBase, List<StudentLessonData> studentLessonDatas) GetBaseData(LessonRecord lessonRecord, LessonBase lessonBase)
+        private (LessonBase lessonBase, List<StudentLessonData> studentLessonDatas) GetBaseData(LessonRecord lessonRecord, LessonBase lessonBase)
         {
         {
             //处理学生定位数据
             //处理学生定位数据
             List<StudentLessonData> studentLessonDatas = new List<StudentLessonData>();
             List<StudentLessonData> studentLessonDatas = new List<StudentLessonData>();
@@ -215,131 +240,39 @@ namespace HTEX.Test.Controllers
         /// <param name="lessonBase"></param>
         /// <param name="lessonBase"></param>
         /// <param name="irsDatas"></param>
         /// <param name="irsDatas"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async Task<List<StudentLessonData>> GetIRSData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<IRSData> irsDatas, List<StudentLessonData> studentLessonDatas)
+        private async Task<List<StudentLessonData>> GetIRSData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<IRSData> irsDatas, List<StudentLessonData> studentLessonDatas)
         {
         {
             List<string> interactTypes = new List<string>() { "PopQuesLoad", "ReAtmpAnsStrt", "BuzrAns", "BuzrLoad", "PickupResult" };
             List<string> interactTypes = new List<string>() { "PopQuesLoad", "ReAtmpAnsStrt", "BuzrAns", "BuzrLoad", "PickupResult" };
             //去重页面
             //去重页面
-            var enventsInteract = timeLineData.events.Where(x => interactTypes.Contains(x.Event)).GroupBy(x => x.Pgid)
-                .Select(x => new { key = x.Key, list = x.ToList() });
-            foreach (var item in enventsInteract)
+            var enventsInteract = timeLineData.events.Where(x => interactTypes.Contains(x.Event)).GroupBy(x => x.Pgid) .Select(x => new { key = x.Key, list = x.ToList() });
+
+            if (enventsInteract!= null)
             {
             {
-                var irsDataPages = irsDatas.Where(y => item.key.Equals(y.pageID));
-                foreach (var irsDataPage in irsDataPages)
+                var keys = enventsInteract.Select(x => x.key).ToList();
+
+                foreach (var item in enventsInteract)
                 {
                 {
-                    //检查是否设置正确答案。
-                    var answers = irsDataPage.question?["exercise"]?["answer"]?.ToJsonString().ToObject<List<string>>();
-                    var scoreNode = irsDataPage.question?["exercise"]?["score"];
-                    double score = 0;
-                    if (scoreNode!=null)
+                    ProcessIRSPageData(irsDatas, studentLessonDatas, item);
+                }
+                //处理其他,评测类型的互动,因为有可能不会记录在TimeLine.json中
+                var envents_other = timeLineData.events.Where(x => !keys.Contains(x.Pgid)).GroupBy(x => x.Pgid)  .Select(x => new { key = x.Key, list = x.ToList() });
+                if (envents_other!=null)
+                {
+                    foreach (var item in envents_other)
                     {
                     {
-                        double.TryParse(scoreNode.ToString(), out score);
+                        ProcessIRSPageData(irsDatas, studentLessonDatas, item);
                     }
                     }
-                    string interactType = string.Empty;
-
-                    if (irsDataPage.clientAnswers.IsNotEmpty())
-                    {
-
-                        //第一个list是几轮,一次作答,二次作答, 第二个list是学生的下标, 第三个list是 答案
-                        List<List<List<string>>> clientAnswers = new List<List<List<string>>>();
-                        foreach (var key in irsDataPage.clientAnswers.Keys)
-                        {
-                            clientAnswers.Add(irsDataPage.clientAnswers[key]);
-                        }
-                        // 获取第一个列表的长度作为比较基准
-                        int firstListLength = clientAnswers.First().Count;
-                        bool isSameLength = true;
-                        // 遍历剩余的列表并检查它们的长度是否与第一个列表相同
-                        foreach (var innerList in clientAnswers.Skip(1))
-                        {
-                            if (innerList.Count != firstListLength)
-                            {
-                                isSameLength = false;
-                                break;
-                            }
-                        }
-                        //并检查学生集合的长度是否与第一个列表相同
-                        if (!isSameLength  && studentLessonDatas.Count()==firstListLength)
-                        {
-                            //有设置答案
-                            if (answers.IsNotEmpty())
-                            {
-                                for (int index = 0; index< clientAnswers[0].Count; index++)
-                                {
-                                    //index  代表学生下标
-                                    List<InteractRecord> interactRecords = new List<InteractRecord>();
-                                    if (clientAnswers.Count==1)
-                                    {
-                                        //即问即答
-                                        interactType = "PopQuesLoad";
-                                        var ans0 = clientAnswers[0][index];
-                                        var IS0 = GetInteractResultHasAnswer(answers, ans0);
-                                        interactRecords.Add(new InteractRecord()
-                                        {
-                                            status = IS0,
-                                            interactType= interactType
-                                        });
-                                    }
-                                    if (clientAnswers.Count==2)
-                                    {
-                                        //二次作答
-                                        interactType="ReAtmpAnsStrt";
-                                        var ans1 = clientAnswers[1][index];
-                                        var IS1 = GetInteractResultHasAnswer(answers, ans1);
-                                        interactRecords.Add(new InteractRecord()
-                                        {
-                                            status = IS1,
-                                            interactType= interactType
-                                        });
-                                    }
-                                    if (clientAnswers.Count>2)
-                                    {
-                                        //三次作答
-                                        interactType="TeAtmpAnsStrt";
-                                        var ans2 = clientAnswers[2][index];
-                                        var IS2 = GetInteractResultHasAnswer(answers, ans2);
-                                        interactRecords.Add(new InteractRecord()
-                                        {
-                                            status = IS2,
-                                            interactType= interactType
-                                        });
-                                    }
-                                    studentLessonDatas[index].interactRecords.AddRange(interactRecords);
-                                }
-                            }
-                        }
-                    }
-                    //是否抢权作答的模式
-                    if (irsDataPage.isBuzz)
+                }
+            }
+            else 
+            {
+                //处理其他,评测类型的互动,因为有可能不会记录在TimeLine.json中
+                var envents_other = timeLineData.events.GroupBy(x => x.Pgid) .Select(x => new { key = x.Key, list = x.ToList() });
+                if (envents_other!=null)
+                {
+                    foreach (var item in envents_other)
                     {
                     {
-                        interactType = "BuzrAns";
-                        //处理参与抢权的
-                        Dictionary<string, InteractRecord> buzzParticipants = new Dictionary<string, InteractRecord>();
-                        foreach (var buzzParticipant in irsDataPage.buzzParticipants)
-                        {
-                            var studentData = studentLessonDatas.Find(x => x.seatID!.Equals(buzzParticipant));
-                            if (studentData != null)
-                            {
-                                buzzParticipants[buzzParticipant]=new InteractRecord() { status = InteractStatus.T1, interactType= interactType };
-                            }
-                        }
-                        //处理抢权成功的
-                        foreach (var buzzClient in irsDataPage.buzzClients)
-                        {
-                            buzzParticipants[buzzClient]=new InteractRecord() { status = InteractStatus.TT, interactType= interactType };
-                        }
-                        foreach (var studentLessonData in studentLessonDatas)
-                        {
-                            if (buzzParticipants.ContainsKey(studentLessonData.seatID!))
-                            {
-                                //处理已经有抢权结果的数据
-                                studentLessonData.interactRecords.Add(buzzParticipants[studentLessonData.seatID!]);
-                            }
-                            else
-                            {
-                                //处理未参与抢权的
-                                studentLessonData.interactRecords.Add(new InteractRecord() { status = InteractStatus.T0, interactType = interactType });
-                            }
-                        }
+                        ProcessIRSPageData(irsDatas, studentLessonDatas, item);
                     }
                     }
                 }
                 }
             }
             }
@@ -367,6 +300,134 @@ namespace HTEX.Test.Controllers
             return studentLessonDatas;
             return studentLessonDatas;
         }
         }
 
 
+        private static void ProcessIRSPageData(List<IRSData> irsDatas, List<StudentLessonData> studentLessonDatas, dynamic item)
+        {
+            var irsDataPages = irsDatas.Where(y => item.key.Equals(y.pageID));
+            foreach (var irsDataPage in irsDataPages)
+            {
+                //检查是否设置正确答案。
+                var answers = irsDataPage.question?["exercise"]?["answer"]?.ToJsonString().ToObject<List<string>>();
+                var _objective = irsDataPage.question?["exercise"]?["objective"];
+                var scoreNode = irsDataPage.question?["exercise"]?["score"];
+                double score = 0;
+                bool objective = false;
+                if (_objective!=null) { 
+                    objective = _objective.GetValue<bool>();
+                }
+                if (scoreNode!=null)
+                {
+                    double.TryParse(scoreNode.ToString(), out score);
+                }
+                string interactType = string.Empty;
+
+                if (irsDataPage.clientAnswers.IsNotEmpty())
+                {
+
+                    //第一个list是几轮,一次作答,二次作答, 第二个list是学生的下标, 第三个list是 答案
+                    List<List<List<string>>> clientAnswers = new List<List<List<string>>>();
+                    foreach (var key in irsDataPage.clientAnswers.Keys)
+                    {
+                        clientAnswers.Add(irsDataPage.clientAnswers[key]);
+                    }
+                    // 获取第一个列表的长度作为比较基准
+                    int firstListLength = clientAnswers.First().Count;
+                    bool isSameLength = true;
+                    // 遍历剩余的列表并检查它们的长度是否与第一个列表相同
+                    foreach (var innerList in clientAnswers.Skip(1))
+                    {
+                        if (innerList.Count != firstListLength)
+                        {
+                            isSameLength = false;
+                            break;
+                        }
+                    }
+                    //并检查学生集合的长度是否与第一个列表相同
+                    if (!isSameLength  && studentLessonDatas.Count()==firstListLength)
+                    {
+                        //有设置答案
+                        if (answers.IsNotEmpty())
+                        {
+                            for (int index = 0; index< clientAnswers[0].Count; index++)
+                            {
+                                //index  代表学生下标
+                                List<InteractRecord> interactRecords = new List<InteractRecord>();
+                                if (clientAnswers.Count==1)
+                                {
+                                    //即问即答
+                                    interactType = "PopQuesLoad";
+                                    var ans0 = clientAnswers[0][index];
+                                    var IS0 = GetInteractResultHasAnswer(answers, ans0);
+                                    interactRecords.Add(new InteractRecord()
+                                    {
+                                        status = IS0,
+                                        interactType= interactType
+                                    });
+                                }
+                                if (clientAnswers.Count==2)
+                                {
+                                    //二次作答
+                                    interactType="ReAtmpAnsStrt";
+                                    var ans1 = clientAnswers[1][index];
+                                    var IS1 = GetInteractResultHasAnswer(answers, ans1);
+                                    interactRecords.Add(new InteractRecord()
+                                    {
+                                        status = IS1,
+                                        interactType= interactType
+                                    });
+                                }
+                                if (clientAnswers.Count>2)
+                                {
+                                    //三次作答
+                                    interactType="TeAtmpAnsStrt";
+                                    var ans2 = clientAnswers[2][index];
+                                    var IS2 = GetInteractResultHasAnswer(answers, ans2);
+                                    interactRecords.Add(new InteractRecord()
+                                    {
+                                        status = IS2,
+                                        interactType= interactType
+                                    });
+                                }
+                                studentLessonDatas[index].interactRecords.AddRange(interactRecords);
+                            }
+                        }
+                    }
+                }
+                //是否抢权作答的模式
+                if (irsDataPage.isBuzz)
+                {
+                    interactType = "BuzrAns";
+                    //处理参与抢权的
+                    Dictionary<string, InteractRecord> buzzParticipants = new Dictionary<string, InteractRecord>();
+                    foreach (var buzzParticipant in irsDataPage.buzzParticipants)
+                    {
+                        var studentData = studentLessonDatas.Find(x => x.seatID!.Equals(buzzParticipant));
+                        if (studentData != null)
+                        {
+                            buzzParticipants[buzzParticipant]=new InteractRecord() { status = InteractStatus.T1, interactType= interactType };
+                        }
+                    }
+                    //处理抢权成功的
+                    foreach (var buzzClient in irsDataPage.buzzClients)
+                    {
+                        buzzParticipants[buzzClient]=new InteractRecord() { status = InteractStatus.TT, interactType= interactType };
+                    }
+                    foreach (var studentLessonData in studentLessonDatas)
+                    {
+                        if (buzzParticipants.ContainsKey(studentLessonData.seatID!))
+                        {
+                            //处理已经有抢权结果的数据
+                            studentLessonData.interactRecords.Add(buzzParticipants[studentLessonData.seatID!]);
+                        }
+                        else
+                        {
+                            //处理未参与抢权的
+                            studentLessonData.interactRecords.Add(new InteractRecord() { status = InteractStatus.T0, interactType = interactType });
+                        }
+                    }
+                }
+            }
+        }
+
         private static InteractStatus GetInteractResultHasAnswer(List<string>? answers, List<string> ans0)
         private static InteractStatus GetInteractResultHasAnswer(List<string>? answers, List<string> ans0)
         {
         {
             InteractStatus status = InteractStatus.T0;
             InteractStatus status = InteractStatus.T0;
@@ -424,7 +485,7 @@ namespace HTEX.Test.Controllers
         /// <param name="coworkDatas"></param>
         /// <param name="coworkDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async Task<dynamic> GetExamData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<ExamData> examDatas, List<StudentLessonData> studentLessonDatas) 
+        private async Task<dynamic> GetExamData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<ExamData> examDatas, List<StudentLessonData> studentLessonDatas) 
         {
         {
             foreach (var examData in examDatas) 
             foreach (var examData in examDatas) 
             {
             {
@@ -468,7 +529,7 @@ namespace HTEX.Test.Controllers
         /// <param name="coworkDatas"></param>
         /// <param name="coworkDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async Task<dynamic> GetCoworkData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<CoworkData> coworkDatas, List<StudentLessonData> studentLessonDatas)
+        private async Task<dynamic> GetCoworkData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<CoworkData> coworkDatas, List<StudentLessonData> studentLessonDatas)
         {
         {
             return Ok(lessonRecord);
             return Ok(lessonRecord);
         }
         }
@@ -482,7 +543,7 @@ namespace HTEX.Test.Controllers
         /// <param name="taskDatas"></param>
         /// <param name="taskDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async Task<dynamic> GetTaskData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<TaskData> taskDatas, List<StudentLessonData> studentLessonDatas)
+        private async Task<dynamic> GetTaskData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<TaskData> taskDatas, List<StudentLessonData> studentLessonDatas)
         {
         {
             return Ok(lessonRecord);
             return Ok(lessonRecord);
         }
         }
@@ -496,7 +557,7 @@ namespace HTEX.Test.Controllers
         /// <param name="smartRatingDatas"></param>
         /// <param name="smartRatingDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <param name="studentLessonDatas"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public async Task<dynamic> GetSmartRatingData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<SmartRatingData> smartRatingDatas, List<StudentLessonData> studentLessonDatas)
+        private async Task<dynamic> GetSmartRatingData(LessonRecord lessonRecord, LessonBase lessonBase, TimeLineData timeLineData, List<SmartRatingData> smartRatingDatas, List<StudentLessonData> studentLessonDatas)
         {
         {
             return Ok(lessonRecord);
             return Ok(lessonRecord);
         }
         }

+ 3 - 3
TEAMModelOS.Function/TEAMModelOS.Function.csproj

@@ -5,9 +5,9 @@
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Nullable>enable</Nullable>
-	<Version>5.2408.28</Version>
-	<AssemblyVersion>5.2408.28.1</AssemblyVersion>
-	<FileVersion>5.2408.28.1</FileVersion>
+	<Version>5.2409.4</Version>
+	<AssemblyVersion>5.2409.4.1</AssemblyVersion>
+	<FileVersion>5.2409.4.1</FileVersion>
 	<PackageId>TEAMModelOS.FunctionV4</PackageId>
 	<PackageId>TEAMModelOS.FunctionV4</PackageId>
 	<Authors>teammodel</Authors>
 	<Authors>teammodel</Authors>
 	<Company>醍摩豆(成都)信息技术有限公司</Company>
 	<Company>醍摩豆(成都)信息技术有限公司</Company>

+ 3 - 3
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>5.2408.28</Version>
-		<AssemblyVersion>5.2408.28.1</AssemblyVersion>
-		<FileVersion>5.2408.28.1</FileVersion>
+		<Version>5.2409.4</Version>
+		<AssemblyVersion>5.2409.4.1</AssemblyVersion>
+		<FileVersion>5.2409.4.1</FileVersion>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 	</PropertyGroup>
 	</PropertyGroup>
 
 

+ 2 - 2
TEAMModelOS/Filter/RequestAuditFilter.cs

@@ -222,12 +222,12 @@ namespace TEAMModelOS.Filter
                 var httpclient=    _httpClient.CreateClient();
                 var httpclient=    _httpClient.CreateClient();
                 httpclient.Timeout=  TimeSpan.FromSeconds(10); 
                 httpclient.Timeout=  TimeSpan.FromSeconds(10); 
 //#if DEBUG
 //#if DEBUG
-//                var  response = await httpclient.PostAsJsonAsync("http://cdhabook.teammodel.cn:8806/api/http-log", data);
+//                var  response = await httpclient.PostAsJsonAsync("http://52.130.252.100:8806/api/http-log", data);
 
 
 //#else
 //#else
           
           
 //#endif
 //#endif
-                _=  httpclient.PostAsJsonAsync("http://cdhabook.teammodel.cn:8806/api/http-log", data);
+                _=  httpclient.PostAsJsonAsync("http://52.130.252.100:8806/api/http-log", data);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

+ 4 - 4
TEAMModelOS/TEAMModelOS.csproj

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

+ 1 - 1
TEAMModelOS/appsettings.Development.json

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

+ 1 - 1
TEAMModelOS/appsettings.json

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