From 5ac3e67660e7c326a483e3c0b20116ab5b3f51f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 28 May 2025 15:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRepository/IRepository.cs | 7 ++++--- .../Repository/Repository.cs | 9 +++++---- .../Repository/Uow/Uow.cs | 4 ++-- .../Properties/launchSettings.json | 4 ++-- API/Wood.Admin.WebApi/Startup.cs | 7 +++---- .../Controllers/RecurringJobOutPageController.cs | 16 +++++++++++++--- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/API/TaskManager.EntityFramework/IRepository/IRepository.cs b/API/TaskManager.EntityFramework/IRepository/IRepository.cs index ef47734..e6cfd74 100644 --- a/API/TaskManager.EntityFramework/IRepository/IRepository.cs +++ b/API/TaskManager.EntityFramework/IRepository/IRepository.cs @@ -1,4 +1,5 @@ -using System; +using Serilog; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; @@ -11,11 +12,11 @@ namespace TaskManager.EntityFramework { public interface IRepository where TEntity : BaseEntity { - Task GetByIdAsync(int id); + Task GetByIdAsync(long id); Task> GetAllAsync(); Task AddAsync(TEntity entity); Task UpdateAsync(TEntity entity); - Task DeleteAsync(int id); + Task DeleteAsync(long id); Task> GetPagedAsync(PagingParams pagingParams); diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs index 196a0fd..f145dfe 100644 --- a/API/TaskManager.EntityFramework/Repository/Repository.cs +++ b/API/TaskManager.EntityFramework/Repository/Repository.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Serilog; using System; using System.Collections.Generic; using System.Linq; @@ -19,16 +20,16 @@ namespace TaskManager.EntityFramework.Repository public class Repository : IRepository where TEntity : BaseEntity { - private readonly DbContext _context; + private readonly JobDbContext _context; private readonly DbSet _dbSet; - public Repository(DbContext context) + public Repository(JobDbContext context) { _context = context; _dbSet = context.Set(); } - public async Task GetByIdAsync(int id) + public async Task GetByIdAsync(long id) { return await _dbSet.FindAsync(id); } @@ -53,7 +54,7 @@ namespace TaskManager.EntityFramework.Repository await _context.SaveChangesAsync(); } - public async Task DeleteAsync(int id) + public async Task DeleteAsync(long id) { var entity = await _dbSet.FindAsync(id); if (entity != null) diff --git a/API/TaskManager.EntityFramework/Repository/Uow/Uow.cs b/API/TaskManager.EntityFramework/Repository/Uow/Uow.cs index 4540751..4176fc8 100644 --- a/API/TaskManager.EntityFramework/Repository/Uow/Uow.cs +++ b/API/TaskManager.EntityFramework/Repository/Uow/Uow.cs @@ -17,10 +17,10 @@ namespace TaskManager.EntityFramework.Repository public class TaskUnitOfWork : ITaskUnitOfWork { - private readonly DbContext _context; + private readonly JobDbContext _context; private readonly Dictionary _repositories = new(); - public TaskUnitOfWork(DbContext context) + public TaskUnitOfWork(JobDbContext context) { _context = context; } diff --git a/API/Wood.Admin.WebApi/Properties/launchSettings.json b/API/Wood.Admin.WebApi/Properties/launchSettings.json index 0c2a01b..fc4667a 100644 --- a/API/Wood.Admin.WebApi/Properties/launchSettings.json +++ b/API/Wood.Admin.WebApi/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:8888", + "applicationUrl": "http://localhost:7629", "sslPort": 0 } }, @@ -16,7 +16,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:8888" + "applicationUrl": "http://localhost:7629" } } } \ No newline at end of file diff --git a/API/Wood.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index fa255b8..96a8f93 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -74,10 +74,9 @@ namespace Wood.Admin.WebApi services.AddHttpClient(); - services.AddTransient(); - services.AddTransient(); - - services.AddTransient(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); // 配置 DbContext 使用 SQL Server 连接字符串 services.AddDbContext(options => diff --git a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs index 132b1d2..cee23ec 100644 --- a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs @@ -8,11 +8,13 @@ using TaskManager.Contracts.Dtos; using TaskManager.Controllers; using TaskManager.Entity; using TaskManager.EntityFramework; -using TaskManager.EntityFramework; + using TaskManager.EntityFramework.Repository; namespace TaskManager.Controllers { + //[ApiController] + //[Route("api/[controller]")] public class RecurringJobOutPageController : RecurringJobBaseController where T : CherryReadBaseEntity, new() where ToutputDetial : CherryReadBaseEntityDto { @@ -232,9 +234,17 @@ namespace TaskManager.Controllers } [HttpPut("{id}")] - public async Task Update(int id, T entity) + public async Task Update(T entity) { - if (id != entity.UId) return BadRequest(); + var _first=await _repository.GetByIdAsync(entity.UId); + if (_first == null) + { + return BadRequest(); + } + + + + await _repository.UpdateAsync(entity); return NoContent();