精简代码

Masuit.LuceneEFCore.SearchEngine/Extensions/DocumentExtension.cs

@@ -12,7 +12,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Extensions
         /// <param name="key">键</param>
         /// <param name="t">类型</param>
         /// <returns></returns>
-        public static object Get(this Document doc, string key, Type t)
+        internal static object Get(this Document doc, string key, Type t)
         {
             string value = doc.Get(key);
             return t switch
@@ -26,36 +26,10 @@ namespace Masuit.LuceneEFCore.SearchEngine.Extensions
                 _ when t.IsAssignableFrom(typeof(char)) => char.TryParse(value, out var v) ? v : 0,
                 _ when t.IsAssignableFrom(typeof(byte)) => byte.TryParse(value, out var v) ? v : 0,
                 _ when t.IsAssignableFrom(typeof(bool)) => bool.TryParse(value, out var v) && v,
-                _ when t.IsAssignableFrom(typeof(DateTime)) => DateTime.TryParse(value, out var v) ? v : throw new Exception(value + "日期时间格式不正确"),
+                _ when t.IsAssignableFrom(typeof(DateTime)) => DateTime.Parse(value),
                 _ when t.BaseType == typeof(Enum) => Enum.Parse(t, value),
                 _ => Convert.ChangeType(value, t)
             };
         }
-
-        /// <summary>
-        /// 获取文档的值
-        /// </summary>
-        /// <param name="doc">Lucene文档</param>
-        /// <param name="key">键</param>
-        /// <returns></returns>
-        public static object Get<T>(this Document doc, string key)
-        {
-            string value = doc.Get(key);
-            return typeof(T) switch
-            {
-                _ when typeof(T).IsAssignableFrom(typeof(string)) => value,
-                _ when typeof(T).IsAssignableFrom(typeof(int)) => int.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(long)) => long.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(double)) => double.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(float)) => float.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(decimal)) => decimal.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(char)) => char.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(byte)) => byte.TryParse(value, out var v) ? v : 0,
-                _ when typeof(T).IsAssignableFrom(typeof(bool)) => bool.TryParse(value, out var v) && v,
-                _ when typeof(T).IsAssignableFrom(typeof(DateTime)) => DateTime.TryParse(value, out var v) ? v : throw new Exception(value + "日期时间格式不正确"),
-                _ when typeof(T).BaseType == typeof(Enum) => Enum.Parse(typeof(T), value),
-                _ => Convert.ChangeType(value, typeof(T))
-            };
-        }
     }
 }

Masuit.LuceneEFCore.SearchEngine/Extensions/StringHelpers.cs

@@ -12,7 +12,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Extensions
         /// <param name="s"></param>
         /// <param name="chars"></param>
         /// <returns></returns>
-        public static string RemoveCharacters(this string s, IEnumerable<char> chars)
+        internal static string RemoveCharacters(this string s, IEnumerable<char> chars)
         {
             return string.IsNullOrEmpty(s) ? string.Empty : new string(s.Where(c => !chars.Contains(c)).ToArray());
         }
@@ -22,7 +22,7 @@ namespace Masuit.LuceneEFCore.SearchEngine.Extensions
         /// </summary>
         /// <param name="html">源html</param>
         /// <returns></returns>
-        public static string RemoveHtmlTag(this string html)
+        internal static string RemoveHtmlTag(this string html)
         {
             var strText = Regex.Replace(html, "<[^>]+>", "");
             strText = Regex.Replace(strText, "&[^;]+;", "");

Masuit.LuceneEFCore.SearchEngine/Linq/LinqExtension.cs

@@ -16,23 +16,11 @@ namespace Masuit.LuceneEFCore.SearchEngine.Linq
         /// <param name="left">左条件</param>
         /// <param name="right">右条件</param>
         /// <returns>新表达式</returns>
-        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> left, Expression<Func<T, bool>> right)
+        internal static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> left, Expression<Func<T, bool>> right)
         {
             return CombineLambdas(left, right, ExpressionType.AndAlso);
         }
 
-        /// <summary>
-        /// 或连接
-        /// </summary>
-        /// <typeparam name="T">类型</typeparam>
-        /// <param name="left">左条件</param>
-        /// <param name="right">右条件</param>
-        /// <returns>新表达式</returns>
-        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> left, Expression<Func<T, bool>> right)
-        {
-            return CombineLambdas(left, right, ExpressionType.OrElse);
-        }
-
         private static Expression<Func<T, bool>> CombineLambdas<T>(this Expression<Func<T, bool>> left, Expression<Func<T, bool>> right, ExpressionType expressionType)
         {
             if (IsExpressionBodyConstant(left))

Masuit.LuceneEFCore.SearchEngine/Masuit.LuceneEFCore.SearchEngine.xml

@@ -13,14 +13,6 @@
             <param name="t">类型</param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.LuceneEFCore.SearchEngine.Extensions.DocumentExtension.Get``1(Lucene.Net.Documents.Document,System.String)">
-            <summary>
-            获取文档的值
-            </summary>
-            <param name="doc">Lucene文档</param>
-            <param name="key">键</param>
-            <returns></returns>
-        </member>
         <member name="M:Masuit.LuceneEFCore.SearchEngine.Extensions.ServiceCollectionExtension.AddSearchEngine``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,Masuit.LuceneEFCore.SearchEngine.LuceneIndexerOptions)">
             <summary>
             依赖注入
@@ -356,15 +348,6 @@
             <param name="right">右条件</param>
             <returns>新表达式</returns>
         </member>
-        <member name="M:Masuit.LuceneEFCore.SearchEngine.Linq.LinqExtension.Or``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
-            <summary>
-            或连接
-            </summary>
-            <typeparam name="T">类型</typeparam>
-            <param name="left">左条件</param>
-            <param name="right">右条件</param>
-            <returns>新表达式</returns>
-        </member>
         <member name="T:Masuit.LuceneEFCore.SearchEngine.LuceneIndexableBaseEntity">
             <summary>
             需要被索引的实体基类