From 31e7fb3f6a0418e0a6573358fb2d85bc712b5e10 Mon Sep 17 00:00:00 2001 From: joinsang Date: Sun, 24 Feb 2019 20:01:14 +0900 Subject: [PATCH] =?utf8?q?=ED=94=84=EB=A1=A0=ED=8A=B8=20=ED=85=8C=EB=A7=88?= =?utf8?q?=EC=83=89=20=EB=B3=80=EA=B2=BD=20=EC=A0=84=EC=B2=B4=EC=A0=81?= =?utf8?q?=EC=9D=B8=20=ED=86=A4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 분홍빛 > 회색 --- ZipProject/Controllers/WebZipController.cs | 5 +- ZipProject/Models/ZipModel.cs | 6 + ZipProject/Views/Shared/_Layout.cshtml | 4 +- ZipProject/Views/WebZip/Index.cshtml | 10 +- ZipProject/Views/WebZip/partial_zip.cshtml | 6 +- .../Views/WebZip/partial_zip_help.cshtml | 3 + ZipProject/_publish/ZipProject.Views.dll | Bin 68096 -> 68096 bytes ZipProject/_publish/ZipProject.Views.pdb | Bin 5188 -> 5188 bytes ZipProject/_publish/ZipProject.dll | Bin 26624 -> 26624 bytes ZipProject/_publish/ZipProject.pdb | Bin 2880 -> 2916 bytes .../_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 + .../_publish/wwwroot/Language/en.json | 5 +- .../_publish/wwwroot/Language/kr.json | 5 +- ZipProject/_publish/wwwroot/css/site.css | 93 +- ZipProject/_publish/wwwroot/js/Zip/Index.js | 19 +- ZipProject/wwwroot/css/site.css | 93 +- ZipProject/wwwroot/js/Zip/Index.js | 19 +- 20 files changed, 5376 insertions(+), 122 deletions(-) create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.deps.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.runtimeconfig.json create mode 100644 ZipProject/_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/wwwroot/lib/jquery/.bower.json diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs index e0070ca..e78cd92 100644 --- a/ZipProject/Controllers/WebZipController.cs +++ b/ZipProject/Controllers/WebZipController.cs @@ -1,4 +1,5 @@ -using System.Diagnostics; +using System.Threading; +using System.Diagnostics; using System; using System.Collections.Generic; using System.Linq; @@ -12,7 +13,6 @@ using Newtonsoft.Json.Linq; namespace ZipProject.Controllers { public class WebZipController : Controller { - private readonly ISession session; public WebZipController (IHttpContextAccessor httpContextAccessor) { @@ -56,6 +56,7 @@ namespace ZipProject.Controllers { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } + } } \ No newline at end of file diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs index 6d388d3..eb1105f 100644 --- a/ZipProject/Models/ZipModel.cs +++ b/ZipProject/Models/ZipModel.cs @@ -53,6 +53,8 @@ namespace ZipProject { using (var fileStream = new FileStream (fullpath, FileMode.Create)) { files[i].CopyTo (fileStream); } + FileStream f= new FileStream("", FileMode.Open); + } } @@ -68,15 +70,19 @@ namespace ZipProject { string path = this.SaveFiles (keypair, dirList, files); MemoryStream memoryStream= new MemoryStream(); + using (ZipFile zip = new ZipFile ()) { zip.AddDirectory (path); zip.Name = dirList[0]; zip.Save(memoryStream); } + + this.RemoveFiles (path); return memoryStream; } + } } \ No newline at end of file diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml index ff7e1a2..bf5b5ea 100644 --- a/ZipProject/Views/Shared/_Layout.cshtml +++ b/ZipProject/Views/Shared/_Layout.cshtml @@ -38,7 +38,7 @@ @@ -63,7 +63,7 @@ @**@ -
+
@RenderBody()
diff --git a/ZipProject/Views/WebZip/Index.cshtml b/ZipProject/Views/WebZip/Index.cshtml index 3809b62..1564567 100644 --- a/ZipProject/Views/WebZip/Index.cshtml +++ b/ZipProject/Views/WebZip/Index.cshtml @@ -19,15 +19,15 @@
-
+ style="border: 0px solid lightgray; overflow-x: auto; white-space: nowrap; text-align: left; padding: 0; background-color: #f9f9f9f9; + border-radius: 10px;">
sdfsdf
@@ -77,7 +77,7 @@
  • -
    sdflsdfklj +