From 06407e013aeb7cf346352542dfbd4cc207622d92 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <1247017146@qq.com> Date: 星期一, 18 十一月 2024 10:30:55 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 62 ++++++++++++++++++++---------- 1 files changed, 41 insertions(+), 21 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" index 3e3820d..6e4397e 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" @@ -8,7 +8,9 @@ using WIDESEA_IInboundService; using WIDESEA_IOutboundService; using WIDESEA_ITaskInfoService; +using System.IO; using WIDESEA_Model.Models; +using System; namespace WIDESEA_WMSServer.Controllers { @@ -20,7 +22,7 @@ private readonly IOutboundService _outboundService; private readonly ITaskService _taskService; - public PDAController(ITaskService taskService, IInboundService inboundService,IOutboundService outboundService) + public PDAController(ITaskService taskService, IInboundService inboundService, IOutboundService outboundService) { _inboundService = inboundService; _outboundService = outboundService; @@ -51,19 +53,35 @@ return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo); } - //[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous] - //public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput) - //{ - - // //return PDAOperate.UploadApp(Request.Form.Files.ToList()); - //} + [HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous] + public async Task<WebResponseContent> UploadApk(IEnumerable<IFormFile> fileInput) + { + // 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶 + if (fileInput == null || !fileInput.Any()) + { + return WebResponseContent.Instance.Error("鏂囦欢鏈笂浼�"); + } + + var formFile = fileInput.First(); + var uploadFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "Upload"); + Directory.CreateDirectory(uploadFolder); + + var fileName = $"WMS-PDA.apk"; + var filePath = Path.Combine(uploadFolder, fileName); + + using (var stream = new FileStream(filePath, FileMode.Create)) + { + await formFile.CopyToAsync(stream); + } + return WebResponseContent.Instance.OK("鏂囦欢涓婁紶鎴愬姛"); ; + } [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous] public WebResponseContent GetPDAVersion(string version) { try { - string versionPDA = AppSettings.Configuration["PDAVersion"]; + string versionPDA = AppSettings.Configuration["PDAVersion"]; if (Convert.ToInt32(versionPDA) > Convert.ToInt32(version)) return WebResponseContent.Instance.OK(data: true); else return WebResponseContent.Instance.OK(data: false); @@ -74,18 +92,20 @@ } } - //[HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous] - //public virtual ActionResult DownLoadApp() - //{ - // string path = $"Upload/App/".MapPath(); - // if (!Directory.Exists(path)) Directory.CreateDirectory(path); - // path += "WMS-PDA.apk"; - // byte[] fileBytes = System.IO.File.ReadAllBytes(path); - // return File( - // fileBytes, - // System.Net.Mime.MediaTypeNames.Application.Octet, - // System.IO.Path.GetFileName(path) - // ); - //} + [HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous] + public virtual ActionResult DownLoadApp() + { + var filename = "WMS-PDA.apk"; + var filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot/Upload", filename); + + var memory = new MemoryStream(); + using (var stream = new FileStream(filePath, FileMode.Open)) + { + stream.CopyTo(memory); + } + memory.Position = 0; + var ext = Path.GetExtension(filePath).ToLowerInvariant(); + return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath)); + } } } -- Gitblit v1.9.3