From fc342702105ea24dc393169a6c3c0d15203ef6fc Mon Sep 17 00:00:00 2001 From: joinsang Date: Mon, 25 Feb 2019 21:32:37 +0900 Subject: [PATCH] =?utf8?q?=ED=94=84=EB=A1=A0=ED=8A=B8=20=EC=9D=B4=EA=B2=83?= =?utf8?q?=EC=A0=80=EA=B2=83=20=EB=A7=8E=EC=9D=B4=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 압축파일명 인코딩 수정하다가 못했음 --- ZipProject/Models/ZipModel.cs | 32 +- ZipProject/Program.cs | 15 +- ZipProject/Views/Shared/_Navbar.cshtml | 3 +- ZipProject/Views/WebZip/Index.cshtml | 18 +- ZipProject/Views/WebZip/partial_zip.cshtml | 62 +- .../Views/WebZip/partial_zip_help.cshtml | 17 +- ZipProject/_publish/ZipProject.Views.dll | Bin 70144 -> 72192 bytes ZipProject/_publish/ZipProject.Views.pdb | Bin 5172 -> 5440 bytes ZipProject/_publish/ZipProject.dll | Bin 26624 -> 27648 bytes ZipProject/_publish/ZipProject.pdb | Bin 2900 -> 3076 bytes .../_publish/_publish/ZipProject.deps.json | 5151 +++++++++++++++++ .../_publish/ZipProject.runtimeconfig.json | 12 + .../_publish/_publish/ZipProject.deps.json | 5151 +++++++++++++++++ .../_publish/ZipProject.runtimeconfig.json | 12 + .../wwwroot/lib/jquery-validation/.bower.json | 41 + .../_publish/wwwroot/lib/jquery/.bower.json | 26 + .../wwwroot/lib/jquery-validation/.bower.json | 41 + .../_publish/wwwroot/lib/jquery/.bower.json | 26 + .../_publish/wwwroot/Language/kr.json | 5 +- .../_publish/wwwroot/Language/kr.json | 13 +- .../_publish/wwwroot/Language/en.json | 13 +- .../_publish/wwwroot/Language/kr.json | 13 +- ZipProject/_publish/wwwroot/Language/en.json | 11 +- ZipProject/_publish/wwwroot/Language/kr.json | 11 +- ZipProject/_publish/wwwroot/css/site.css | 1 + .../_publish/wwwroot/images/spinner.gif | Bin 0 -> 2608 bytes .../_publish/wwwroot/js/Zip/partial_zip.js | 145 +- ZipProject/wwwroot/Language/en.json | 11 +- ZipProject/wwwroot/Language/kr.json | 11 +- ZipProject/wwwroot/css/site.css | 1 + ZipProject/wwwroot/images/banner1.svg | 1 - ZipProject/wwwroot/images/banner2.svg | 1 - ZipProject/wwwroot/images/banner3.svg | 1 - ZipProject/wwwroot/images/spinner.gif | Bin 0 -> 2608 bytes ZipProject/wwwroot/js/Zip/partial_zip.js | 145 +- 35 files changed, 10809 insertions(+), 181 deletions(-) create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.deps.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.runtimeconfig.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.deps.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.runtimeconfig.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery-validation/.bower.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery/.bower.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery-validation/.bower.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery/.bower.json create mode 100644 ZipProject/_publish/wwwroot/images/spinner.gif delete mode 100644 ZipProject/wwwroot/images/banner1.svg delete mode 100644 ZipProject/wwwroot/images/banner2.svg delete mode 100644 ZipProject/wwwroot/images/banner3.svg create mode 100644 ZipProject/wwwroot/images/spinner.gif diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs index dc2e3c2..97a5756 100644 --- a/ZipProject/Models/ZipModel.cs +++ b/ZipProject/Models/ZipModel.cs @@ -1,7 +1,8 @@ -using System.Linq; +using System.Text; using System; using System.Collections.Generic; using System.IO; +using System.Linq; using Ionic.Zip; using Microsoft.AspNetCore.Http; using Newtonsoft.Json.Linq; @@ -33,12 +34,12 @@ namespace ZipProject { path += "/"; Directory.CreateDirectory (path); - for (int i=1; i < dirList.Length; i++){ - string dirpath= path+ dirList[i]; + for (int i = 1; i < dirList.Length; i++) { + string dirpath = path + dirList[i]; exist = Directory.Exists (dirpath); - if (!exist){ - Directory.CreateDirectory(dirpath); + if (!exist) { + Directory.CreateDirectory (dirpath); } } @@ -60,23 +61,32 @@ namespace ZipProject { } private void RemoveFiles (string path) { - Directory.Delete(path, true); + Directory.Delete (path, true); } public MemoryStream MakeZip (JObject keypair, string[] dirList, List files) { string path = this.SaveFiles (keypair, dirList, files); + DirectoryInfo di = new DirectoryInfo(path); + FileInfo[] infos = di.GetFiles(); + string[] filesinfo = new string[infos.Length]; + + //파일인코딩 변경 ㅠㅠ + for (int i = 0; i < infos.Length; i++) + { + filesinfo[i] = infos[i].FullName; + } + byte[] b = null; + string d = null; + //여기까지 - MemoryStream memoryStream= new MemoryStream(); - + MemoryStream memoryStream = new MemoryStream (); using (ZipFile zip = new ZipFile ()) { zip.AddDirectory (path); zip.Name = dirList[0]; - zip.Save(memoryStream); + zip.Save (memoryStream); } - - this.RemoveFiles (path); return memoryStream; diff --git a/ZipProject/Program.cs b/ZipProject/Program.cs index 1a2bfd3..844fcfa 100644 --- a/ZipProject/Program.cs +++ b/ZipProject/Program.cs @@ -13,13 +13,16 @@ namespace ZipProject public class Program { public static void Main(string[] args) - { + { CreateWebHostBuilder(args).UseUrls("http://localhost:5001").Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseKestrel(options => { + options.Limits.MaxRequestBodySize= null; + }); } } \ No newline at end of file diff --git a/ZipProject/Views/Shared/_Navbar.cshtml b/ZipProject/Views/Shared/_Navbar.cshtml index 41ec671..15bc04d 100644 --- a/ZipProject/Views/Shared/_Navbar.cshtml +++ b/ZipProject/Views/Shared/_Navbar.cshtml @@ -14,8 +14,7 @@ - @**@ - +
diff --git a/ZipProject/Views/WebZip/Index.cshtml b/ZipProject/Views/WebZip/Index.cshtml index cf59863..7e0ce7a 100644 --- a/ZipProject/Views/WebZip/Index.cshtml +++ b/ZipProject/Views/WebZip/Index.cshtml @@ -17,6 +17,14 @@ @LanguagePack.GetText(lang, "bodyIntroduce") +
+
+ +
+
+ +
+
-
-
-
-
- -
-
- 구글애드센스 -
-
@section Scripts{