diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index c31b93e..c6c8299 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -17,6 +17,8 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Furion.RemoteRequest.Extensions; +using Microsoft.AspNetCore.Hosting; namespace Ewide.NbzsZheliban.Service { @@ -26,11 +28,12 @@ namespace Ewide.NbzsZheliban.Service private readonly ISqlSugarRepository repository; private readonly SqlSugarClient db; private readonly IJsonSerializerProvider _jsonSerializer; - public DataService(ISqlSugarRepository sqlSugarRepository, IJsonSerializerProvider jsonSerializer) + public DataService(ISqlSugarRepository sqlSugarRepository, IJsonSerializerProvider jsonSerializer, IHostingEnvironment hostingEnvironment) { repository = sqlSugarRepository; db = repository.Context; _jsonSerializer = jsonSerializer; + this._hostingEnvironment = hostingEnvironment; } /// @@ -330,22 +333,26 @@ namespace Ewide.NbzsZheliban.Service throw Oops.Oh("ID错误"); } if (string.IsNullOrEmpty(XyFile)) - throw Oops.Oh("未上传附件"); + throw Oops.Oh(-2001, "无附件"); var pics = new List(); - var nbzs_file_path = App.Configuration["nbzs_file_path"]; + //var nbzs_file_path = App.Configuration["nbzs_file_path"]; var nbzs_domain = App.Configuration["nbzs_domain"]; - var filePath = nbzs_file_path + XyFile; + var current_domain = App.Configuration["current_domain"]; + + var filePath = GetCurrentRootPath() + XyFile; var pdfFile = new FileInfo(filePath); if (File.Exists(pdfFile.Directory + "\\lock")) { var picCount = pdfFile.Directory.GetFiles(pdfFile.Name + "-*.jpg").Length; for (int i = 0; i < picCount; i++) { - pics.Add(nbzs_domain + XyFile + "-" + i + ".jpg"); + pics.Add(current_domain + XyFile + "-" + i + ".jpg"); } } else { + var s = (nbzs_domain + XyFile).GetAsStreamAsync().Result; + StreamToFile(s, XyFile); MagickReadSettings settings = new MagickReadSettings(); settings.Density = new Density(400, 400); //设置质量 using (MagickImageCollection images = new MagickImageCollection()) @@ -359,7 +366,7 @@ namespace Ewide.NbzsZheliban.Service image.Format = MagickFormat.Jpg; var imagename = filePath + "-" + i + ".jpg"; image.Write(imagename); - pics.Add(nbzs_domain + XyFile + "-" + i + ".jpg"); + pics.Add(current_domain + XyFile + "-" + i + ".jpg"); if (i == 0) { File.WriteAllText(pdfFile.Directory.FullName + "\\lock", "lock"); @@ -368,11 +375,47 @@ namespace Ewide.NbzsZheliban.Service } catch (Exception ex) { - throw Oops.Oh(ex.Message); + //throw Oops.Oh(ex.Message); + throw Oops.Oh(-2002, "无附件文件[" + nbzs_domain + XyFile + "]"); } } } - return new { pics, pdf = nbzs_domain + XyFile }; + return new { pics, pdf = current_domain + XyFile }; + } + private readonly IHostingEnvironment _hostingEnvironment; + private string GetCurrentRootPath() + { + return _hostingEnvironment.WebRootPath; + //return Path.GetDirectoryName(this.GetType().Assembly.Location); + } + private string StreamToFile(Stream s, string filename) + { + var d = GetCurrentRootPath() + filename; + FileInfo f = new(d); + if (!f.Directory.Exists) + f.Directory.Create(); + using (MemoryStream stmMemory = new MemoryStream()) + { + byte[] buffer = new byte[s.Length]; + int i; + //将字节逐个放入到Byte中 + while ((i = s.Read(buffer, 0, buffer.Length)) > 0) + { + stmMemory.Write(buffer, 0, i); + } + var fileBytes = stmMemory.ToArray();//文件流Byte,需要文件流可直接return,不需要下面的保存代码 + stmMemory.Close(); + using (MemoryStream m = new(fileBytes)) + { + using (FileStream fs = new(d, FileMode.OpenOrCreate)) + { + m.WriteTo(fs); + fs.Close(); + } + m.Close(); + } + } + return d; } /// /// 分布评估详细 diff --git a/Ewide.NbzsZheliban/Service/TestService.cs b/Ewide.NbzsZheliban/Service/TestService.cs index 8235b27..d67bf5c 100644 --- a/Ewide.NbzsZheliban/Service/TestService.cs +++ b/Ewide.NbzsZheliban/Service/TestService.cs @@ -38,5 +38,7 @@ namespace Ewide.NbzsZheliban { return await repository.Ado.GetDataTableAsync("select * from TCodeScore"); ; } + + } } diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll index 08082e0..9e09f42 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb index 518c718..58a18fa 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index d5d52f1..d025712 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb index 2b2b25d..f6bf229 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 5a98834..107b208 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll index fdbb475..6a2cc6f 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb index 5a928bf..f0581ad 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 69543b5..8774c44 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index c3eadb3..f9fb45a 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index d5d52f1..d025712 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb index 2b2b25d..f6bf229 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 5a98834..107b208 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index 071af5b..3f7e7e1 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index fdbb475..6a2cc6f 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb index 5a928bf..f0581ad 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 69543b5..8774c44 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/README.md b/README.md index be9735b..a08d125 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,6 @@ http://118.178.224.202:3000/ewide/zsxt_nbzs_h5 https://mapi.zjzwfw.gov.cn/web/mgop/gov-open/zj/2001833218/reserved/index.html#/?1=1&ticket= 部署命令 -dotnet DockerRelease.dll --urls=http://*:9002 --ip="127.0.0.1" --port=9001 +dotnet DockerRelease.dll --urls=http://*:9001 --ip="127.0.0.1" --port=9001 dotnet DockerRelease.dll --urls=http://*:9002 --ip="127.0.0.1" --port=9003 -dotnet DockerRelease.dll --urls=http://*:9002 --ip="127.0.0.1" --port=9003 \ No newline at end of file +dotnet DockerRelease.dll --urls=http://*:9003 --ip="127.0.0.1" --port=9003 \ No newline at end of file diff --git a/framework/Api/Ewide.Web.Entry/appsettings.json b/framework/Api/Ewide.Web.Entry/appsettings.json index 9a0f748..248ee94 100644 --- a/framework/Api/Ewide.Web.Entry/appsettings.json +++ b/framework/Api/Ewide.Web.Entry/appsettings.json @@ -34,7 +34,9 @@ }, "AllowedHosts": "*", "nbzs_file_path": "D:\\1_发布程序", - "nbzs_domain": "https://zsxt.nbzs.org.cn", + "nbzs_domain-bak": "https://zsxt.nbzs.org.cn", + "nbzs_domain": "http://118.178.224.202:2258/", + "current_domain": "http://localhost:5566/", "CorsAccessorSettings": { "PolicyName": "自定义跨域策略名", "WithOrigins": [ "http://localhost:8080", "https://mapi.zjzwfw.gov.cn" ] diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf new file mode 100644 index 0000000..83b0169 Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-0.jpg b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-0.jpg new file mode 100644 index 0000000..11ab628 Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-0.jpg differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-1.jpg b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-1.jpg new file mode 100644 index 0000000..926df3f Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-1.jpg differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-2.jpg b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-2.jpg new file mode 100644 index 0000000..382bc29 Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/b531ed51-ba5a-46d8-b1d4-32e6bacc756e.pdf-2.jpg differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/lock b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/lock new file mode 100644 index 0000000..19104f1 --- /dev/null +++ b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/dcab4081-9af7-4d30-ad2b-f14f0a8af3c5/Resident/lock @@ -0,0 +1 @@ +lock \ No newline at end of file