1

TEAMModelOS.SDK/Extension/JwtAuth/JwtAuthExtension.cs

@@ -78,7 +78,6 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth
             //自定义授权
             services.AddAuthorization(auth =>
             {
-                auth.AddPolicy("Admin", policy => policy.RequireRole("Admin,Root,SchoolAdmin,Teacher").Build());
                 auth.AddPolicy("Bearer", new AuthorizationPolicyBuilder()
                     .AddAuthenticationSchemes(JwtBearerDefaults.AuthenticationScheme)
                     .RequireAuthenticatedUser()

TEAMModelOS.SDK/Helper/Common/StringHelper/HtmlHelper.cs

@@ -47,7 +47,7 @@ namespace TEAMModelOS.SDK.Helper.Common.StringHelper
         }
 
         /// <summary>
-        /// 从html获取文本及img的url  去掉其他标签的干扰。以获取更准确的sha1校验值
+        /// 从html获取文本及img的url  去掉其他标签的干扰，空格。以获取更准确的sha1校验值
         /// </summary>
         /// <param name="html"></param>
         /// <returns></returns>
@@ -56,7 +56,7 @@ namespace TEAMModelOS.SDK.Helper.Common.StringHelper
             HtmlDocument doc = new HtmlDocument();
             doc.LoadHtml(html);
             List<string> urls = GetHtmlImageUrlList(html);
-            StringBuilder builder = new StringBuilder(doc.DocumentNode.InnerText);
+            StringBuilder builder = new StringBuilder(doc.DocumentNode.InnerText.Replace("&nbsp;", ""));
             if (urls.IsNotEmpty())
             {
                 foreach (string url in urls)

TEAMModelOS.Service/Evaluation/Implements/HtmlAnalyzeService.cs

@@ -133,7 +133,7 @@ namespace TEAMModelOS.Service.Evaluation.Implements
                 string RegexStr = ComposeStart + "([\\s\\S]*?)" + ComposeEnd;
                 Match mt = Regex.Match(html, RegexStr);
                 exercise.Question= HtmlHelper.DoUselessTag(mt.Value.Replace(ComposeStart,"").Replace(ComposeEnd,""));
-                string testinfo = Regex.Replace(html, RegexStr, "").Replace(ComposeTag,"【");
+                string testinfo = Regex.Replace(html, RegexStr, "").Replace(ComposeTag,CompleteStart);
                 //获取综合题的材料加每个小题的sha1Code
                 string testQs= HtmlHelper.DoTextImg(exercise.Question);
                 List<ExerciseDto> dtos =  AnalyzeWordAsync(testinfo, Lang);
@@ -286,7 +286,7 @@ namespace TEAMModelOS.Service.Evaluation.Implements
                     {
                         nbsp += "&nbsp;";
                     }
-                    ReplaceDto replaceDto = new ReplaceDto { oldstr = "【" + an + "】", newstr = "<underline data=\"" + index + "\"><u>" + nbsp + "</u></underline>" };
+                    ReplaceDto replaceDto = new ReplaceDto { oldstr = CompleteStart + an + CompleteEnd, newstr = "<underline data=\"" + index + "\"><u>" + nbsp + "</u></underline>" };
                     replaces.Add(replaceDto);
                     ans.Add(an);
                     m = m.NextMatch();