diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index 0a26c01..bb2c4ec 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -22,6 +22,7 @@ using Quartz.Logging; using SqlSugar; using sun.security.x509; using System.Drawing.Printing; +using System.Runtime.InteropServices; using System.Security.AccessControl; using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; using static javax.jws.soap.SOAPBinding; @@ -2755,9 +2756,9 @@ namespace _24Hour.Controllers.Common if (System.IO.File.Exists(filename)) { - filename = filename.Replace(@"\\",@"\"); + filename = filename.Replace(@"\\", @"\"); var data = System.IO.Path.Combine(Environment.CurrentDirectory, "wwwroot"); - if (filename.Contains(data)==false) + if (filename.Contains(data) == false) { return BadRequest(); } @@ -2796,7 +2797,7 @@ namespace _24Hour.Controllers.Common var fname = $@"{file.FileName}"; var hzname = $"{Path.GetExtension(fname)}"; - + if (AllowedExtensions.Contains(hzname.ToLower()) == false) { outParm.IsSucceed = false; @@ -2850,8 +2851,8 @@ namespace _24Hour.Controllers.Common { Result result = new Result(); - var urlpath = file.Replace("/", @"\"); - var path = Path.Combine(Environment.CurrentDirectory, "wwwroot" + urlpath); + var urlpath = file.Split('/'); + var path = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath)); if (System.IO.File.Exists(path)) { var str = Elight.Utility.Encrypt.DataEncryption.Decryptiones(path); @@ -2875,11 +2876,13 @@ namespace _24Hour.Controllers.Common { try { + var islinux = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux); //根据输入url获取base64值 var getstr = (string s) => { - var urlpath = s.Replace("/", @"\"); - var path = Path.Combine(Environment.CurrentDirectory, "wwwroot" + urlpath); + var urlpath = s.Split('/'); + + var path = Path.Combine(Environment.CurrentDirectory, "wwwroot" , Path.Combine(urlpath)); if (System.IO.File.Exists(path)) { return Elight.Utility.Encrypt.DataEncryption.Decryptiones(path); @@ -2892,19 +2895,20 @@ namespace _24Hour.Controllers.Common //根据输入url获取文件是否存在 var getexist = (string s) => { - var urlpath = s.Replace("/", @"\"); - var path = Path.Combine(Environment.CurrentDirectory, "wwwroot" + urlpath); + + var urlpath = s.Split('/'); + var path = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath)); return System.IO.File.Exists(path); }; var data = file.Select(x => new { Item = x, IsExist = getexist(x), - BaseStr = getstr(x) + BaseStr = getstr(x), + }); result.IsSucceed = true; result.result = data; - } catch {