修正删除的bug

src/Masuit.MyBlogs.Core/Controllers/AdvertisementController.cs

@@ -96,7 +96,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [HttpPost("{id}"), HttpGet("{id}"), MyAuthorize]
         public async Task<IActionResult> Delete(int id)
         {
-            bool b = await AdsService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await AdsService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功" : "删除失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/CommentController.cs

@@ -287,7 +287,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public ActionResult Delete(int id)
         {
-            var b = CommentService.DeleteByIdSaved(id);
+            var b = CommentService.DeleteById(id);
             return ResultData(null, b, b ? "删除成功！" : "删除失败！");
         }
 

src/Masuit.MyBlogs.Core/Controllers/DonateController.cs

@@ -23,7 +23,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         /// <param name="page"></param>
         /// <param name="size"></param>
         /// <returns></returns>
-        public ActionResult GetPageData([Range(1, int.MaxValue, ErrorMessage = "页码必须大于0")]int page = 1, [Range(1, 50, ErrorMessage = "页大小必须在0到50之间")]int size = 15)
+        public ActionResult GetPageData([Range(1, int.MaxValue, ErrorMessage = "页码必须大于0")] int page = 1, [Range(1, 50, ErrorMessage = "页大小必须在0到50之间")] int size = 15)
         {
             var list = DonateService.GetPages(page, size, d => true, d => d.DonateTime, false);
             return Ok(list);
@@ -58,7 +58,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         /// <returns></returns>
         public ActionResult Delete(int id)
         {
-            bool b = DonateService.DeleteByIdSaved(id);
+            bool b = DonateService.DeleteById(id);
             return ResultData(null, b, b ? "删除成功！" : "删除失败！");
         }
     }

src/Masuit.MyBlogs.Core/Controllers/LinksController.cs

@@ -159,7 +159,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> Delete(int id)
         {
-            bool b = await LinksService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await LinksService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功！" : "删除失败！");
         }
 

src/Masuit.MyBlogs.Core/Controllers/MiscController.cs

@@ -133,7 +133,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> Delete(int id)
         {
-            bool b = await MiscService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await MiscService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功" : "删除失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/MsgController.cs

@@ -253,7 +253,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public ActionResult Delete(int id)
         {
-            var b = LeaveMessageService.DeleteByIdSaved(id);
+            var b = LeaveMessageService.DeleteById(id);
             return ResultData(null, b, b ? "删除成功！" : "删除失败！");
         }
 
@@ -313,7 +313,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> DeleteMsg(int id)
         {
-            bool b = await MessageService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await MessageService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "站内消息删除成功！" : "站内消息删除失败！");
         }
 

src/Masuit.MyBlogs.Core/Controllers/NoticeController.cs

@@ -104,7 +104,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> Delete(int id)
         {
-            bool b = await NoticeService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await NoticeService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功" : "删除失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/PostController.cs

@@ -913,7 +913,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> DeleteHistory(int id)
         {
-            bool b = await PostHistoryVersionService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await PostHistoryVersionService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "历史版本文章删除成功！" : "历史版本文章删除失败！");
         }
 
@@ -938,7 +938,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                 history.Post.Seminar.Add(s);
             }
             bool b = await SearchEngine.SaveChangesAsync() > 0;
-            await PostHistoryVersionService.DeleteByIdSavedAsync(id);
+            await PostHistoryVersionService.DeleteByIdAsync(id);
             return ResultData(null, b, b ? "回滚成功" : "回滚失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/SearchController.cs

@@ -125,7 +125,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [HttpPost, MyAuthorize]
         public async Task<ActionResult> Delete(int id)
         {
-            bool b = await SearchDetailsService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await SearchDetailsService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功！" : "删除失败！");
         }
     }

src/Masuit.MyBlogs.Core/Controllers/SeminarController.cs

@@ -109,7 +109,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [MyAuthorize]
         public async Task<ActionResult> Delete(int id)
         {
-            bool b = await SeminarService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await SeminarService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功" : "删除失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/ShareController.cs

@@ -46,7 +46,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [HttpPost]
         public async Task<ActionResult> Remove(int id)
         {
-            bool b = await FastShareService.DeleteByIdSavedAsync(id) > 0;
+            bool b = await FastShareService.DeleteByIdAsync(id) > 0;
             return ResultData(null, b, b ? "删除成功" : "删除失败");
         }
 

src/Masuit.MyBlogs.Core/Controllers/UserController.cs

@@ -123,7 +123,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [ProducesResponseType((int)HttpStatusCode.OK)]
         public async Task<IActionResult> Delete(int id)
         {
-            await UserInfoService.DeleteByIdSavedAsync(id);
+            await UserInfoService.DeleteByIdAsync(id);
             return ResultData(null);
         }
 

src/Masuit.MyBlogs.Core/Infrastructure/Repository/BaseRepository.cs

@@ -740,6 +740,16 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Repository
             return DataContext.Set<T>().Where(t => t.Id == id).Delete() > 0;
         }
 
+        /// <summary>
+        /// 根据ID删除实体
+        /// </summary>
+        /// <param name="id">实体id</param>
+        /// <returns>删除成功</returns>
+        public virtual Task<int> DeleteByIdAsync(int id)
+        {
+            return DataContext.Set<T>().Where(t => t.Id == id).DeleteAsync();
+        }
+
         /// <summary>
         /// 删除实体
         /// </summary>

src/Masuit.MyBlogs.Core/Infrastructure/Repository/Interface/IBaseRepository.cs

@@ -545,6 +545,13 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Repository.Interface
         /// <returns>删除成功</returns>
         bool DeleteById(int id);
 
+        /// <summary>
+        /// 根据ID删除实体
+        /// </summary>
+        /// <param name="id">实体id</param>
+        /// <returns>删除成功</returns>
+        Task<int> DeleteByIdAsync(int id);
+
         /// <summary>
         /// 删除实体
         /// </summary>

src/Masuit.MyBlogs.Core/Infrastructure/Services/BaseService.cs

@@ -739,26 +739,14 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
             return BaseDal.DeleteById(id);
         }
 
-        /// <summary>
-        /// 根据ID删除实体并保存
-        /// </summary>
-        /// <param name="id">实体id</param>
-        /// <returns>删除成功</returns>
-        public virtual bool DeleteByIdSaved(int id)
-        {
-            BaseDal.DeleteById(id);
-            return SaveChanges() > 0;
-        }
-
         /// <summary>
         /// 根据ID删除实体并保存（异步）
         /// </summary>
         /// <param name="id">实体id</param>
         /// <returns>删除成功</returns>
-        public virtual Task<int> DeleteByIdSavedAsync(int id)
+        public virtual Task<int> DeleteByIdAsync(int id)
         {
-            BaseDal.DeleteById(id);
-            return SaveChangesAsync();
+            return BaseDal.DeleteByIdAsync(id);
         }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Infrastructure/Services/CategoryService.cs

@@ -40,7 +40,7 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
                 moveCat.PostHistoryVersion.Add(p);
             }
 
-            bool b = await DeleteByIdSavedAsync(id) > 0;
+            bool b = await DeleteByIdAsync(id) > 0;
             return b;
         }
     }

src/Masuit.MyBlogs.Core/Infrastructure/Services/Interface/IBaseService.cs

@@ -543,19 +543,12 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services.Interface
         /// <returns>删除成功</returns>
         bool DeleteById(int id);
 
-        /// <summary>
-        /// 根据ID删除实体并保存
-        /// </summary>
-        /// <param name="id">实体id</param>
-        /// <returns>删除成功</returns>
-        bool DeleteByIdSaved(int id);
-
         /// <summary>
         /// 根据ID删除实体并保存（异步）
         /// </summary>
         /// <param name="id">实体id</param>
         /// <returns>删除成功</returns>
-        Task<int> DeleteByIdSavedAsync(int id);
+        Task<int> DeleteByIdAsync(int id);
 
         /// <summary>
         /// 删除实体并保存
@@ -748,6 +741,6 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services.Interface
         List<T> this[Expression<Func<T, bool>> where] => GetQuery(where).ToList();
         public static T operator +(IBaseService<T> left, T right) => left.AddEntitySaved(right);
         public static bool operator -(IBaseService<T> left, T right) => left.DeleteEntitySaved(right);
-        public static bool operator -(IBaseService<T> left, int id) => left.DeleteByIdSaved(id);
+        public static bool operator -(IBaseService<T> left, int id) => left.DeleteById(id);
     }
 }

src/Masuit.MyBlogs.Core/Infrastructure/Services/PostService.cs

@@ -188,9 +188,9 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
         /// </summary>
         /// <param name="id">实体id</param>
         /// <returns>删除成功</returns>
-        public override bool DeleteByIdSaved(int id)
+        public override bool DeleteById(int id)
         {
-            base.DeleteById(id);
+            DeleteEntity(GetById(id));
             return SearchEngine.SaveChanges() > 0;
         }
 
@@ -210,7 +210,7 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
         /// </summary>
         /// <param name="id">实体id</param>
         /// <returns>删除成功</returns>
-        public override Task<int> DeleteByIdSavedAsync(int id)
+        public override Task<int> DeleteByIdAsync(int id)
         {
             base.DeleteById(id);
             return SearchEngine.SaveChangesAsync();