Warr 3 lat temu
rodzic
commit
f5b34c002b

+ 32 - 0
.gitignore

@@ -108,3 +108,35 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+
+#Ignore thumbnails created by Windows
+Thumbs.db
+#Ignore files built by Visual Studio
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+.vs/
+#Nuget packages folder
+packages/

+ 1 - 4
generator/CodeGeneratorStandardModule/DOPropAutoGenerator.cs

@@ -20,8 +20,7 @@ namespace CodeGeneratorStandardModule
             sourceBD.AppendLine("   public class DOProps");
             sourceBD.AppendLine("   {");
 
-            string[] files = Directory.GetFiles(@"D:\Code\Wing\AppWorkerCenter\ServiceModules\WingCloudMongoDB\Repositories\DO", "*.cs");
-            //File.AppendAllText("D:\\Generator.log",$"Find cods file {files.Length} count\r\n");
+            string[] files = Directory.GetFiles(@"D:\Code\WingModules\WingMongoDBModule\src\Repositories\DO", "*.cs");
             sourceBD.AppendLine($"      public class BaseProps");
             sourceBD.AppendLine("       {");
             sourceBD.AppendLine($"          public const string Id = \"Id\";");
@@ -32,7 +31,6 @@ namespace CodeGeneratorStandardModule
             foreach (var file in files)
             {
                 var code = File.ReadAllText(file);
-                //File.AppendAllText("D:\\Generator.log", code+"\r\n");
                 if (!string.IsNullOrWhiteSpace(code))
                 {
                     var matchs = Regex.Match(code, @"[\s]+class*[\s]+([0-1a-zA-Z]*)");
@@ -55,7 +53,6 @@ namespace CodeGeneratorStandardModule
             sourceBD.AppendLine("   }");
             sourceBD.AppendLine("}");
             context.AddSource("DOPropAuto.cs", SourceText.From(sourceBD.ToString(), Encoding.UTF8));
-            //File.WriteAllText("D:\\MyCode.cs", sourceBD.ToString());
         }
     }
 }

+ 36 - 17
src/Driver/MongoRepertoryCenter.cs

@@ -74,7 +74,7 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="data"></param>
-        public string InsertOne<T>(MongoTable data) where T : class, IMongoBaseData
+        public async Task<string> InsertOneAsync<T>(MongoTable data) where T : class, IMongoBaseData
         {
             var dataType = typeof(T);
             var props = dataType.GetProperties();
@@ -112,7 +112,7 @@ namespace WingCloudMongoDB.Mongodb.Driver
             {
                 throw new Exception($"{result.FirstOrDefault().Key} is duplicate key,value is {result.FirstOrDefault().Value}");
             }
-            collect.InsertOne(data);
+            await collect.InsertOneAsync(data);
             return data.Id;
         }
 
@@ -123,10 +123,15 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="id"></param>
-        public void DeleteOne<T>(string key,string value) where T : class, IMongoBaseData
+        public async Task<bool> DeleteOneAsync<T>(string key,string value) where T : class, IMongoBaseData
         {
             var collect = GetCollection<T>();
-            collect.DeleteOne(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value == value));
+            var result = await collect.DeleteOneAsync(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value == value));
+            if (result.DeletedCount > 0)
+            {
+                return true;
+            }
+            return false;
         }
 
         /// <summary>
@@ -135,11 +140,12 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// <typeparam name="T"></typeparam>
         /// <param name="id"></param>
         /// <param name="data"></param>
-        public void Update<T>(string key, string value, MongoTable data) where T : class, IMongoBaseData
+        public async Task<bool> Update<T>(string key, string value, MongoTable data) where T : class, IMongoBaseData
         {
             var collect = GetCollection<T>();
             var update = Builders<MongoTable>.Update.Set(f => f.BaseData, data.BaseData).Set(f => f.ExtendsData, data.ExtendsData);
-            collect.UpdateOne(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value == value), update);
+            var result = await collect.UpdateOneAsync(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value == value), update);
+            return result.ModifiedCount > 0;
         }
 
         /// <summary>
@@ -206,7 +212,7 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// <param name="key"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        public T FindOne<T>(string key, string value) where T : class, IMongoBaseData
+        public async Task<T> FindOneAsync<T>(string key, string value) where T : class, IMongoBaseData
         {
             var collect = GetCollection<T>();
             var filter = Builders<MongoTable>.Filter.Empty;
@@ -227,8 +233,8 @@ namespace WingCloudMongoDB.Mongodb.Driver
                         Builders<MongoDataItem>.Filter.Regex(q => q.Value, $".*{value}.*")
                 )
             ));
-            var userInfo = collect.Find(filter).FirstOrDefault();
-            return (T)userInfo?.BaseData;
+            var userInfo = await collect.FindAsync(filter);
+            return (T)userInfo.Current.FirstOrDefault()?.BaseData;
         }
 
         /// <summary>
@@ -238,10 +244,16 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// <param name="key"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        public List<MongoTable> LikeFind<T>(string key, string value) where T : class, IMongoBaseData
+        public async Task<List<MongoTable>> LikeFindAsync<T>(string key, string value) where T : class, IMongoBaseData
         {
+            var response = new List<MongoTable>();
             var collect = GetCollection<T>();
-            return collect.Find(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value.ToUpper().IndexOf(value.ToUpper()) > -1)).ToList();
+            var cursor = await collect.FindAsync(f => f.QueryData.QueryItems.Any(q => q.Key == key && q.Value.ToUpper().IndexOf(value.ToUpper()) > -1));
+            while (await cursor.MoveNextAsync())
+            {
+                response.AddRange(cursor.Current);
+            }
+            return response;
         }
 
         /// <summary>
@@ -250,7 +262,7 @@ namespace WingCloudMongoDB.Mongodb.Driver
         /// <typeparam name="T"></typeparam>
         /// <param name="request"></param>
         /// <returns></returns>
-        public PageCollection<T> GetPage<T>(PageRequest request) where T : class, IMongoBaseData
+        public async Task<PageCollection<T>> GetPageAsync<T>(PageRequest request) where T : class, IMongoBaseData
         {
             var collect = GetCollection<T>();
             List<FilterDefinition<MongoTable>> definitionList = new List<FilterDefinition<MongoTable>>();
@@ -272,14 +284,21 @@ namespace WingCloudMongoDB.Mongodb.Driver
             {
                 function = Builders<MongoTable>.Filter.And(definitionList.ToArray());
             }
-            var query = collect.Find(function);
-            var pageQuery = query.Skip((request.CurrentPage-1)*request.PageSize).Limit(request.PageSize);
-            var data = pageQuery.ToList();
+            var response = new List<MongoTable>();
+            var count = await collect.CountDocumentsAsync(function);
+            var cursor = await collect.FindAsync(function, new FindOptions<MongoTable> { NoCursorTimeout = true, BatchSize = request.PageSize });
+            var cursorPage = request.CurrentPage - 1;
+            int eachPageIndex = 0;
+            while (eachPageIndex <= cursorPage)
+            {
+                await cursor.MoveNextAsync();
+                response.AddRange(cursor.Current);
+            }
             var pageCollection = new PageCollection<T>();
             pageCollection.CurrentPage = request.CurrentPage;
             pageCollection.PageSize = request.PageSize;
-            pageCollection.DataCount = data.Count;
-            pageCollection.PageData = data.Select(f=>f.BaseData as T).ToList();
+            pageCollection.DataCount = (int)count;
+            pageCollection.PageData = response.Select(f=>f.BaseData as T).ToList();
             return pageCollection;
         }
 

+ 13 - 13
src/Repositories/BaseRepository.cs

@@ -20,23 +20,23 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="data"></param>
         /// <param name="extensionData"></param>
-        public string InsertOne(T data, string extensionData)
+        public async Task<string> InsertOneAsync(T data, string extensionData)
         {
             var table = new MongoTable();
             table.BaseData = data;
             table.ExtendsData = extensionData;
             table.PlatformData = new MongoPlatform();
             table.QueryData = new MongoQuery();
-            return RepositoriesCenter.Single.InsertOne<T>(table);
+            return await RepositoriesCenter.Single.InsertOneAsync<T>(table);
         }
 
         /// <summary>
         /// Delete by id
         /// </summary>
         /// <param name="id"></param>
-        public void Delete(string key,string value)
+        public async Task<bool> DeleteAsync(string key,string value)
         {
-            RepositoriesCenter.Single.DeleteOne<T>(key, value);
+            return await RepositoriesCenter.Single.DeleteOneAsync<T>(key, value);
         }
 
         /// <summary>
@@ -44,11 +44,11 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="id"></param>
         /// <param name="data"></param>
-        public void Update(string key, string value, T data)
+        public async Task<bool> UpdateAsync(string key, string value, T data)
         {
             var table = new MongoTable();
             table.BaseData = data;
-            RepositoriesCenter.Single.Update<T>(key, value, table);
+            return await RepositoriesCenter.Single.Update<T>(key, value, table);
         }
 
         /// <summary>
@@ -56,7 +56,7 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="updateKey"></param>
         /// <returns></returns>
-        public async Task UpdateQueryData(string updateKey)
+        public async Task UpdateQueryDataAsync(string updateKey)
         {
             await RepositoriesCenter.Single.UpdateQueryDataAsync<T>(updateKey);
         }
@@ -66,9 +66,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public T FindOne(string key, string value)
+        public async Task<T> FindOneAsync(string key, string value)
         {
-            return RepositoriesCenter.Single.FindOne<T>(key, value);
+            return await RepositoriesCenter.Single.FindOneAsync<T>(key, value);
         }
 
         /// <summary>
@@ -76,9 +76,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public List<MongoTable> FindLikeAll(string key, string value)
+        public async Task<List<MongoTable>> FindLikeAllAsync(string key, string value)
         {
-            return RepositoriesCenter.Single.LikeFind<T>(key, value);
+            return await RepositoriesCenter.Single.LikeFindAsync<T>(key, value);
         }
 
         /// <summary>
@@ -86,9 +86,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="pageRequest"></param>
         /// <returns></returns>
-        public PageCollection<T> GetPages(PageRequest pageRequest)
+        public async Task<PageCollection<T>> GetPages(PageRequest pageRequest)
         {
-            return RepositoriesCenter.Single.GetPage<T>(pageRequest);
+            return await RepositoriesCenter.Single.GetPageAsync<T>(pageRequest);
         }
 
         private static void InitializationDB()

+ 2 - 2
src/Repositories/OrganizationRepository.cs

@@ -8,9 +8,9 @@ namespace WingCloudMongoDB.Repositories
     public class OrganizationRepository : BaseRepository<OrganizationDO>
     {
         //以下可自定义查询
-        public OrganizationDO GetOrganizationByCode(string code)
+        public async Task<OrganizationDO> GetOrganizationByCodeAsync(string code)
         {
-            return RepositoriesCenter.Single.FindOne<OrganizationDO>(DOProps.OrganizationDOProps.OrganizationCode, code);
+            return await RepositoriesCenter.Single.FindOneAsync<OrganizationDO>(DOProps.OrganizationDOProps.OrganizationCode, code);
         }
     }
 }

+ 4 - 3
src/Repositories/RegionRepository.cs

@@ -1,12 +1,13 @@
-using WingCloudMongoDB.Repositories.DO;
+using System.Threading.Tasks;
+using WingCloudMongoDB.Repositories.DO;
 
 namespace WingCloudMongoDB.Repositories
 {
     public class RegionRepository : BaseRepository<RegionDO>
     {
-        public RegionDO GetRegionByCode(string code)
+        public async Task<RegionDO> GetRegionByCode(string code)
         {
-            return RepositoriesCenter.Single.FindOne<RegionDO>(DOProps.RegionDOProps.RegionCode, code);
+            return await RepositoriesCenter.Single.FindOneAsync<RegionDO>(DOProps.RegionDOProps.RegionCode, code);
         }
     }
 }

+ 5 - 6
src/Repositories/RemedicalRepository.cs

@@ -14,11 +14,10 @@ namespace WingCloudMongoDB.Repositories
         /// Delete by user id
         /// </summary>
         /// <param name="id"></param>
-        public void DeleteByToken(string recordId)
+        public async Task<bool> DeleteByToken(string recordId)
         {
-            
-            var storageInfo = RepositoriesCenter.Single.FindOne<RemedicalDO>(DOProps.RemedicalDOProps.RecordId, recordId);
-            RepositoriesCenter.Single.DeleteOne<RemedicalDO>(DOProps.RemedicalDOProps.Id, storageInfo.Id);
+            var storageInfo = RepositoriesCenter.Single.FindOneAsync<RemedicalDO>(DOProps.RemedicalDOProps.RecordId, recordId);
+            return await RepositoriesCenter.Single.DeleteOneAsync<RemedicalDO>(DOProps.RemedicalDOProps.Id, storageInfo.Id.ToString());
         }
 
         /// <summary>
@@ -26,9 +25,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="reportId"></param>
         /// <returns></returns>
-        public RemedicalDO GetRemedicalByRecordId(string recordId)
+        public async Task<RemedicalDO> GetRemedicalByRecordId(string recordId)
         {
-            return RepositoriesCenter.Single.FindOne<RemedicalDO>(DOProps.RemedicalDOProps.RecordId, recordId);
+            return await RepositoriesCenter.Single.FindOneAsync<RemedicalDO>(DOProps.RemedicalDOProps.RecordId, recordId);
         }
     }
 }

+ 9 - 8
src/Repositories/ReportRepository.cs

@@ -1,4 +1,5 @@
-using WingCloudMongoDB.Repositories.DO;
+using System.Threading.Tasks;
+using WingCloudMongoDB.Repositories.DO;
 
 namespace WingCloudMongoDB.Repositories
 {
@@ -8,10 +9,10 @@ namespace WingCloudMongoDB.Repositories
         /// Delete by user id
         /// </summary>
         /// <param name="id"></param>
-        public void DeleteByToken(string token)
+        public async Task<bool> DeleteByToken(string token)
         {
-            var storageInfo = RepositoriesCenter.Single.FindOne<ReportInfoDO>(DOProps.ReportInfoDOProps.ReportCode, token);
-            RepositoriesCenter.Single.DeleteOne<ReportInfoDO>(DOProps.ReportInfoDOProps.Id, storageInfo.Id);
+            var storageInfo = RepositoriesCenter.Single.FindOneAsync<ReportInfoDO>(DOProps.ReportInfoDOProps.ReportCode, token);
+            return await RepositoriesCenter.Single.DeleteOneAsync<ReportInfoDO>(DOProps.ReportInfoDOProps.Id, storageInfo.Id.ToString());
         }
 
         /// <summary>
@@ -19,9 +20,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public ReportInfoDO GetReport(string Id)
+        public async Task<ReportInfoDO> GetReport(string Id)
         {
-            return RepositoriesCenter.Single.FindOne<ReportInfoDO>(DOProps.ReportInfoDOProps.Id, Id);
+            return await RepositoriesCenter.Single.FindOneAsync<ReportInfoDO>(DOProps.ReportInfoDOProps.Id, Id);
         }
 
         /// <summary>
@@ -29,9 +30,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="reportCode"></param>
         /// <returns></returns>
-        public ReportInfoDO GetReportByCode(string reportCode)
+        public async Task<ReportInfoDO> GetReportByCode(string reportCode)
         {
-            return RepositoriesCenter.Single.FindOne<ReportInfoDO>(DOProps.ReportInfoDOProps.ReportCode, reportCode);
+            return await RepositoriesCenter.Single.FindOneAsync<ReportInfoDO>(DOProps.ReportInfoDOProps.ReportCode, reportCode);
         }
     }
 }

+ 9 - 9
src/Repositories/StorageRepository.cs

@@ -12,10 +12,10 @@ namespace WingCloudMongoDB.Repositories
         /// Delete by user id
         /// </summary>
         /// <param name="id"></param>
-        public void DeleteByToken(string token)
+        public async Task<bool> DeleteByTokenAsync(string token)
         {
-            var storageInfo = RepositoriesCenter.Single.FindOne<StorageInfoDO>("Token", token);
-            RepositoriesCenter.Single.DeleteOne<StorageInfoDO>("Id",storageInfo.Id);
+            var storageInfo = await RepositoriesCenter.Single.FindOneAsync<StorageInfoDO>("Token", token);
+            return await RepositoriesCenter.Single.DeleteOneAsync<StorageInfoDO>("Id",storageInfo.Id);
         }
 
         /// <summary>
@@ -23,9 +23,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public StorageInfoDO FindOneByFileName(string name)
+        public async Task<StorageInfoDO> FindOneByFileNameAsync(string name)
         {
-            return RepositoriesCenter.Single.FindOne<StorageInfoDO>("FileName", name);
+            return await RepositoriesCenter.Single.FindOneAsync<StorageInfoDO>("FileName", name);
         }
 
         /// <summary>
@@ -33,9 +33,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public List<MongoTable> FindAllByFileName(string name)
+        public async Task<List<MongoTable>> FindAllByFileNameAsync(string name)
         {
-            return RepositoriesCenter.Single.LikeFind<StorageInfoDO>("FileName", name);
+            return await RepositoriesCenter.Single.LikeFindAsync<StorageInfoDO>("FileName", name);
         }
 
         /// <summary>
@@ -43,9 +43,9 @@ namespace WingCloudMongoDB.Repositories
         /// </summary>
         /// <param name="token"></param>
         /// <returns></returns>
-        public StorageInfoDO FindStorageRoute(string token)
+        public async Task<StorageInfoDO> FindStorageRouteAsync(string token)
         {
-            var storageInfo = RepositoriesCenter.Single.FindOne<StorageInfoDO>("Token", token);
+            var storageInfo = await RepositoriesCenter.Single.FindOneAsync<StorageInfoDO>("Token", token);
             return storageInfo;
         }
     }

+ 6 - 5
src/Repositories/UsersRepository.cs

@@ -1,18 +1,19 @@
-using WingCloudMongoDB.Repositories.DO;
+using System.Threading.Tasks;
+using WingCloudMongoDB.Repositories.DO;
 
 namespace WingCloudMongoDB.Repositories
 {
     public class UsersRepository : BaseRepository<UserInfoDO>
     {
         private const string UserName = "UserName";
-        public UserInfoDO FindUserByName(string name)
+        public async Task<UserInfoDO> FindUserByName(string name)
         {
-            return FindOne(UserName, name);
+            return await FindOneAsync(UserName, name);
         }
 
-        public UserInfoDO DeleteUserById(string name)
+        public async Task<bool> DeleteUserByCode(string userCode)
         {
-            return FindOne(UserName, name);
+            return await DeleteAsync("UserCode", userCode);
         }
     }
 }

+ 4 - 3
src/Service/OrganizationDBService.cs

@@ -1,22 +1,23 @@
 using AppFramework.Entity.Page;
+using AppFramework.JsonRpc.Driver;
 using System.Threading.Tasks;
 using WingCloudMongoDB.Entity.Request;
 using WingCloudMongoDB.Repositories;
 
 namespace WingCloudMongoDB.Service
 {
-    public class OrganizationDBService : IOrganizationDBService
+    public class OrganizationDBService :  BaseRpcService, IOrganizationDBService
     {
         private OrganizationRepository _orgRepository = new OrganizationRepository();
 
         public async Task<dynamic> CreateOrganization(CreateOrganizationDBRequest request)
         {
-            return await Task.FromResult(_orgRepository.InsertOne(request.Info, request.ExtensionData));
+            return await _orgRepository.InsertOneAsync(request.Info, request.ExtensionData);
         }
 
         public async Task<dynamic> GetOrganizationDetailAsync(GetOrganizationDBRequest request)
         {
-            return await Task.FromResult(_orgRepository.GetOrganizationByCode(request.OrganizationCode));
+            return await _orgRepository.GetOrganizationByCodeAsync(request.OrganizationCode);
         }
 
         public async Task<dynamic> GetOrganizationPageAsync(PageRequest request)

+ 3 - 2
src/Service/RegionDBService.cs

@@ -1,17 +1,18 @@
 using AppFramework.Entity.Page;
+using AppFramework.JsonRpc.Driver;
 using System.Threading.Tasks;
 using WingCloudMongoDB.Entity.Request;
 using WingCloudMongoDB.Repositories;
 
 namespace WingCloudMongoDB.Service
 {
-    public class RegionDBService : IRegionDBService
+    public class RegionDBService :  BaseRpcService, IRegionDBService
     {
         private RegionRepository _regionRepository = new RegionRepository();
 
         public async Task<dynamic> CreateRegion(CreateRegionDBRequest request)
         {
-            return await Task.FromResult(_regionRepository.InsertOne(request.Info, request.ExtensionData));
+            return await Task.FromResult(_regionRepository.InsertOneAsync(request.Info, request.ExtensionData));
         }
 
         public async Task<dynamic> GetRegionDetailAsync(GetRegionDBRequest request)

+ 1 - 1
src/Service/RemedicalDBService.cs

@@ -12,7 +12,7 @@ namespace WingCloudMongoDB.Service
 
         public async Task<dynamic> CreateRemedicalInfo(CreateRemedicalDBRequest request)
         {
-            return await Task.FromResult(_reportRepository.InsertOne(request.Info, request.ExtensionData));
+            return await Task.FromResult(_reportRepository.InsertOneAsync(request.Info, request.ExtensionData));
         }
 
         public async Task<dynamic> GetRemedicalDetailAsync(GetRemedicalDetailDBRequest request)

+ 1 - 1
src/Service/ReportDBService.cs

@@ -26,7 +26,7 @@ namespace WingCloudMongoDB.Service
         /// <returns></returns>
         public async Task<dynamic> UploadReportAsync(UploadReportDBRequest request)
         {
-            return await Task.FromResult(_reportRepository.InsertOne(request.ReportInfoDO, request.ExtensionData));
+            return await Task.FromResult(_reportRepository.InsertOneAsync(request.ReportInfoDO, request.ExtensionData));
         }
     }
 }

+ 3 - 3
src/Service/StorageDBService.cs

@@ -16,7 +16,7 @@ namespace WingCloudMongoDB.Service
         /// <returns></returns>
         public async Task<dynamic> GetStorageRouteAsync(string token)
         {
-            return await Task.FromResult(_storageRepository.FindStorageRoute(token));
+            return await Task.FromResult(_storageRepository.FindStorageRouteAsync(token));
         }
 
         /// <summary>
@@ -26,7 +26,7 @@ namespace WingCloudMongoDB.Service
         /// <returns></returns>
         public async Task<dynamic> RemoveAsync(string token)
         {
-            _storageRepository.DeleteByToken(token);
+            await _storageRepository.DeleteByTokenAsync(token);
             return await Task.FromResult(true);
         }
 
@@ -45,7 +45,7 @@ namespace WingCloudMongoDB.Service
                 FileName = fileName,
                 StorageRoute = storageRoute
             };
-            _storageRepository.InsertOne(storageInfo, string.Empty);
+            await _storageRepository.InsertOneAsync(storageInfo, string.Empty);
             return await Task.FromResult(true);
         }
     }

+ 3 - 4
src/Service/UserDBService.cs

@@ -16,7 +16,7 @@ namespace WingCloudMongoDB.Service
         /// <param name="extensionData"></param>
         public async Task<dynamic> InsertUserAsync(UserInfoDO userInfoDO, string extensionData)
         {
-            var result = _usersRepositories.InsertOne(userInfoDO, extensionData);
+            var result = _usersRepositories.InsertOneAsync(userInfoDO, extensionData);
             return await Task.FromResult(result);
         }
 
@@ -36,8 +36,7 @@ namespace WingCloudMongoDB.Service
         /// <param name="id">User Id</param>
         public async Task<dynamic> DeleteUserByIdAsync(string id)
         {
-            _usersRepositories.DeleteUserById(id);
-            return await Task.FromResult(true);
+            return await _usersRepositories.DeleteAsync("Id",id);
         }
 
         /// <summary>
@@ -47,7 +46,7 @@ namespace WingCloudMongoDB.Service
         /// <param name="data"></param>
         public async Task<dynamic> UpdateUserAsync(string id, UserInfoDO data)
         {
-            _usersRepositories.Update("Id",id, data);
+            await _usersRepositories.UpdateAsync("Id",id, data);
             return await Task.FromResult(true);
         }
     }