Refactor ConfigService;

dotnetcore · Jan 3, 2024 · 4a6d8ee · 4a6d8ee
1 parent e37858c
commit 4a6d8ee
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 74 deletions.
diff --git a/src/AgileConfig.Server.Data.Freesql/FreesqlRepository.cs b/src/AgileConfig.Server.Data.Freesql/FreesqlRepository.cs
@@ -3,7 +3,6 @@
 using FreeSql;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 
@@ -12,8 +11,14 @@ namespace AgileConfig.Server.Data.Freesql
     public class FreesqlRepository<T, T1> : IRepository<T, T1> where T : class, IEntity<T1>
     {
         private readonly IBaseRepository<T> _repository;
+
+        private readonly IFreeSqlFactory _freeSqlFactory;
+
+        protected IFreeSqlFactory FreeSqlFactory => _freeSqlFactory;
+
         public FreesqlRepository(IFreeSqlFactory freeFactory)
         {
+            _freeSqlFactory = freeFactory;
             _repository = freeFactory.Create().GetRepository<T>();
         }
 
@@ -86,7 +91,7 @@ private Expression<Func<T, object>> Sort(string defaultSortField)
                 }
                 var parameter = Expression.Parameter(typeof(T), "__q");
                 var memberExpress = Expression.Property(parameter, property);
-                return Expression.Lambda<Func<T,object>>(memberExpress, parameter);
+                return Expression.Lambda<Func<T, object>>(memberExpress, parameter);
             }
             return defaultSort;
         }

diff --git a/src/AgileConfig.Server.IService/IServiceInfoService.cs b/src/AgileConfig.Server.IService/IServiceInfoService.cs
@@ -1,6 +1,7 @@
 using AgileConfig.Server.Data.Entity;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 
 namespace AgileConfig.Server.IService
@@ -23,6 +24,8 @@ public interface IServiceInfoService: IDisposable
 
         Task<string> ServicesMD5Cache();
 
+        Task<List<ServiceInfo>> QueryAsync(Expression<Func<ServiceInfo, bool>> exp);
+
         void ClearCache();
     }
 }