From: joinsang Date: Sun, 24 Feb 2019 11:01:14 +0000 (+0900) Subject: 프론트 테마색 변경 전체적인 톤 변경 X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=31e7fb3f6a0418e0a6573358fb2d85bc712b5e10;p=ZipProject.git 프론트 테마색 변경 전체적인 톤 변경 분홍빛 > 회색 --- 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 +