浏览代码

升级包

懒得勤快 3 年之前
父节点
当前提交
0c0920d0e8

+ 15 - 8
Masuit.LuceneEFCore.SearchEngine/LuceneIndexSearcher.cs

@@ -93,17 +93,24 @@ namespace Masuit.LuceneEFCore.SearchEngine
             var terms = CutKeywords(keywords);
             foreach (var term in terms)
             {
-                if (term.StartsWith("\""))
+                try
                 {
-                    finalQuery.Add(parser.Parse(term.Trim('"')), Occur.MUST);
+                    if (term.StartsWith("\""))
+                    {
+                        finalQuery.Add(parser.Parse(term.Trim('"')), Occur.MUST);
+                    }
+                    else if (term.StartsWith("-"))
+                    {
+                        finalQuery.Add(parser.Parse(term), Occur.MUST_NOT);
+                    }
+                    else
+                    {
+                        finalQuery.Add(parser.Parse(term.Replace("~", "") + "~"), Occur.SHOULD);
+                    }
                 }
-                else if (term.StartsWith("-"))
+                catch (ParseException)
                 {
-                    finalQuery.Add(parser.Parse(term), Occur.MUST_NOT);
-                }
-                else
-                {
-                    finalQuery.Add(parser.Parse(term.Replace("~", "") + "~"), Occur.SHOULD);
+                    finalQuery.Add(parser.Parse(Regex.Replace(term, @"\p{P}|\p{S}", "")), Occur.SHOULD);
                 }
             }
             return finalQuery;

+ 1 - 1
Masuit.LuceneEFCore.SearchEngine/Masuit.LuceneEFCore.SearchEngine.csproj

@@ -41,7 +41,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
     </ItemGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">