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

# Conflicts:
#	EduSpider.WebApi/Startup.cs

EduSpider.Services/ExamService.cs

@@ -124,7 +124,7 @@ namespace EduSpider.Services
                 }),
                 ModuleList = sExamModel?.ScoreList.GroupBy(x => new { x.KnowledgePoint }).Take(8).Select(x => new
                 {
-                    Module = x.Key.KnowledgePoint,
+                    Module = x.Key.KnowledgePoint.Length > 5 ? x.Key.KnowledgePoint.Substring(0, 6) + ".." : x.Key.KnowledgePoint,
                     Score = x.Sum(y => y.QScore),
                     ScoreRate = Math.Round(x.Sum(y => y.Score) / x.Sum(y => y.QScore), 2, MidpointRounding.AwayFromZero),
                     AvgScoreRate = Math.Round(x.Sum(y => y.AvgScore) / x.Sum(y => y.QScore), 2, MidpointRounding.AwayFromZero),

EduSpider.WebApi/Startup.cs

@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using System.Collections.Generic;
+using System.Linq;
 using VTX.FW.Config;
 using VTX.FW.Filter;
 using VTX.FW.Helper;
@@ -69,7 +70,15 @@ namespace EduSpider.WebApi
             var ArrayStr = ConfigHelper.GetAppsettings("corsArray");
             if (!string.IsNullOrWhiteSpace(ArrayStr))
             {
-                corsArray.AddRange(JsonHelper.Deserialize<List<string>>(ArrayStr));
+                var accesslist = ArrayStr.Split(',');
+                foreach (var item in accesslist)
+                {
+                    if (!string.IsNullOrEmpty(item))
+                    {
+                        corsArray.Add(item);
+                    }
+                }
+                corsArray = corsArray.Distinct().ToList();
             }
             return corsArray;
         }

EduSpider.WebApi/appsettings.json

@@ -8,19 +8,7 @@
   },
   "AllowedHosts": "*",
   //
-  "corsArray": [
-    "http://localhost",
-    "http://localhost:7100",
-    "http://192.168.10.214:7100",
-    "http://localhost:7200",
-    "http://192.168.10.214:7200",
-    "http://localhost:8081",
-    "http://localhost:8080",
-    "http://localhost:8181",
-    "http://localhost:8182",
-    "http://localhost:8082",
-    "http://localhost:7302"
-  ],
+  "corsArray": "https://edu.kookaku.com",
   //ַ
   "ConnectionStrings": {
     "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_think;CharSet=utf8mb4; Convert Zero Datetime=true; ",