bugfix: 文件上传时,folder不传会产生null路径

main
陈伟 2 months ago
parent 6cba07cfa0
commit 0c559db1cb

@ -1,4 +1,5 @@
using System.Text; using System.Text;
using Castle.Core.Internal;
using Infrastructure; using Infrastructure;
using Infrastructure.CloudSdk.wayline; using Infrastructure.CloudSdk.wayline;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -249,7 +250,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{ {
return await _app.DeleteTask(id); return await _app.DeleteTask(id);
} }
/// <summary> /// <summary>
/// 根据flightId查询指令拍摄图片 /// 根据flightId查询指令拍摄图片
/// </summary> /// </summary>
@ -258,10 +259,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[AllowAnonymous] [AllowAnonymous]
public async Task<Response<string>> GetTaskPicList(string flightId,long timestamp) public async Task<Response<string>> GetTaskPicList(string flightId, long timestamp)
{ {
return await _app.GetTaskPicList(flightId,timestamp); return await _app.GetTaskPicList(flightId, timestamp);
} }
#endregion #endregion
#region 航线管理 #region 航线管理
@ -356,6 +358,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{ {
return await _app.DeleteAirLine(id); return await _app.DeleteAirLine(id);
} }
/// <summary> /// <summary>
/// 上传航线文件 /// 上传航线文件
/// </summary> /// </summary>
@ -364,11 +367,16 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <returns></returns> /// <returns></returns>
[HttpPost("upload")] [HttpPost("upload")]
[AllowAnonymous] [AllowAnonymous]
public async Task<IActionResult> UploadXmlFile(IFormFile xmlFile,string folder) public async Task<IActionResult> UploadXmlFile(IFormFile xmlFile, string folder)
{ {
if (xmlFile == null || xmlFile.Length == 0) if (xmlFile == null || xmlFile.Length == 0)
return BadRequest("文件为空"); return BadRequest("文件为空");
var path = await _app.UploadFile(xmlFile,folder); if (string.IsNullOrEmpty(folder))
{
folder = "";
}
var path = await _app.UploadFile(xmlFile, folder);
return Ok(new { message = "上传成功", path }); return Ok(new { message = "上传成功", path });
} }
/*/// <summary> /*/// <summary>

Loading…
Cancel
Save