Merge branch 'master' of http://gitlab.oytour.com/viitto/eduspider

EduSpider.Repository/CommentRepository.cs

@@ -57,6 +57,21 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @KeyWords4 ",nameof(RB_Comment_Extend.KeyWords));
                     parameters.Add("KeyWords4", "%数学%");
                 }
+                if (query.KeyWords.Contains("物理"))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @KeyWords5 ", nameof(RB_Comment_Extend.KeyWords));
+                    parameters.Add("KeyWords5", "%物理%");
+                }
+                if (query.KeyWords.Contains("英语"))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @KeyWords6 ", nameof(RB_Comment_Extend.KeyWords));
+                    parameters.Add("KeyWords6", "%英语%");
+                }
+                if (query.KeyWords.Contains("语文"))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @KeyWords7 ", nameof(RB_Comment_Extend.KeyWords));
+                    parameters.Add("KeyWords7", "%语文%");
+                }
             }
             if (query.CommentTimes > 0)
             {
@@ -70,7 +85,7 @@ WHERE 1=1
             //强制匹配关键词
             if (query.IsMatchKeyWords == 1)
             {
-                if (parameters != null && parameters.ParameterNames.Count()>0)
+                if (parameters != null && parameters.ParameterNames.Count()>=2)
                 {
                     list = base.Get<RB_Comment_Extend>(builder.ToString(), parameters).ToList();
                 }

EduSpider.Repository/StuHomeWorkRepository.cs

@@ -452,7 +452,14 @@ WHERE 1=1
         {
             double seconds = (endTime - startTime).TotalSeconds;
             Random rnd = new();
-            var newSeconds = rnd.Next(0, Convert.ToInt32(seconds));
+            var newSeconds =1;
+            try
+            {
+                newSeconds = rnd.Next(0, Convert.ToInt32(seconds));
+            }
+            catch { 
+            
+            }
             return newSeconds;
         }
 

EduSpider.WebApi/Properties/PublishProfiles/FolderProfile.pubxml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>G:\Publish\jinjie_publish</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net5.0</TargetFramework>
-    <ProjectGuid>f0a5853b-7aa9-43bf-8e81-98b65f44a269</ProjectGuid>
-    <SelfContained>false</SelfContained>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

EduSpider.WebApi/Startup.cs

@@ -65,7 +65,7 @@ namespace EduSpider.WebApi
                 "http://localhost:7100",
                 "http://localhost:7200",
                 "http://localhost:8181",
-                "https://edu.kookaku.com",
+                "https://edu.kookaku.com"
             };
             var ArrayStr = ConfigHelper.GetAppsettings("corsArray");
             if (!string.IsNullOrWhiteSpace(ArrayStr))

EduSpider/Spiders/ClassInRule/QuestionManager.cs

@@ -247,6 +247,8 @@ namespace EduSpider.Spiders.ClassInRule
                                             JObject lastObj = JObject.Parse(sItem.ToString());
                                             var tempCream = lastObj.GetString("scoreRate").Replace("%", "");
                                             tempCream = tempCream == "-" ? "0" : tempCream;
+                                            var tempStatus = lastObj.GetInt("stStatus");
+                                            tempStatus = tempStatus == 0 ? 0 : (tempStatus == 6 ? 2 : 1);
                                             list.Add(new RB_Stu_HomeWork()
                                             {
                                                 stu_homework_id = Int64.Parse($"{homework_id}{lastObj.GetInt("studentId")}"),
@@ -272,7 +274,7 @@ namespace EduSpider.Spiders.ClassInRule
                                                 score_p = Convert.ToDecimal(tempCream)/100,
                                                 score_type = 5,
                                                 show_time = ConvertHelper.UnixToDateTime(lastObj.GetInt("endTime")),
-                                                status = lastObj.GetInt("stStatus"),
+                                                status = tempStatus,
                                                 stu_homework_share_key = string.Empty,
                                                 student_account = lastObj.GetString("studentAccount"),
                                                 student_name = lastObj.GetString("studentName"),