From 3a529cb55f7b409fa2e018c9d1b8096527947c9f Mon Sep 17 00:00:00 2001 From: youngq Date: Wed, 13 Nov 2024 15:47:12 +0800 Subject: [PATCH] 1 --- WGShare.API/AntDeploy.json | 4 ++-- WGShare.API/Controllers/Frontend/UserController.cs | 6 ++---- WGShare.Domain/DTOs/User/UserSignInListDto.cs | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WGShare.API/AntDeploy.json b/WGShare.API/AntDeploy.json index 83bbf8a..20d2005 100644 --- a/WGShare.API/AntDeploy.json +++ b/WGShare.API/AntDeploy.json @@ -115,11 +115,11 @@ "DockerConfig": { "Prot": "5192:5192", "AspNetCoreEnv": "", - "LastEnvName": "marking001", + "LastEnvName": "29dev", "RemoveDaysFromPublished": "10", "WorkDir": "", "Volume": "", - "Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai", + "Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai", "EnvPairList": [ { "EnvName": "29dev", diff --git a/WGShare.API/Controllers/Frontend/UserController.cs b/WGShare.API/Controllers/Frontend/UserController.cs index a49bb7d..5917d40 100644 --- a/WGShare.API/Controllers/Frontend/UserController.cs +++ b/WGShare.API/Controllers/Frontend/UserController.cs @@ -322,7 +322,7 @@ namespace WGShare.API.Controllers.Frontend [HttpPost("import/signin-list")] - public async Task ImportSigninList([FromForm] IFormFile file) + public async Task ImportSigninList([FromForm] IFormFile file) { using var stream = file.OpenReadStream(); var rows = stream.Query().ToList(); @@ -358,9 +358,7 @@ namespace WGShare.API.Controllers.Frontend tran.CommitTran(); } - - - return; + return Ok((isSuccess: true, url: "", msg: "导入成功")); } } } diff --git a/WGShare.Domain/DTOs/User/UserSignInListDto.cs b/WGShare.Domain/DTOs/User/UserSignInListDto.cs index e8c8712..df37b68 100644 --- a/WGShare.Domain/DTOs/User/UserSignInListDto.cs +++ b/WGShare.Domain/DTOs/User/UserSignInListDto.cs @@ -11,6 +11,7 @@ namespace WGShare.Domain.DTOs.User { public string Id { get; set; } + public string UId { get; set; } public string SignInName { get; set; }