From: jocloud <dhkq92@icloud.com>
Date: Thu, 21 May 2020 13:35:41 +0000 (+0000)
Subject: 퍼블리시 환경 재 세팅 및 컨트롤러에 STATIC 메소드 정의
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=e799c09e0b8db87cfb254bdb07787a1de637df22;p=ZipProject.git

퍼블리시 환경 재 세팅 및 컨트롤러에 STATIC 메소드 정의
---

diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs
index 02eac29..b37a0be 100644
--- a/ZipProject/Controllers/WebZipController.cs
+++ b/ZipProject/Controllers/WebZipController.cs
@@ -13,78 +13,128 @@ using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 using ZipProject.Models;
 
-namespace ZipProject.Controllers {
-  public class WebZipController : Controller {
+namespace ZipProject.Controllers
+{
+  public class WebZipController : Controller
+  {
     private readonly ISession session;
 
-    public WebZipController (IHttpContextAccessor httpContextAccessor) {
+    public WebZipController(IHttpContextAccessor httpContextAccessor)
+    {
       this.session = httpContextAccessor.HttpContext.Session;
     }
 
     // GET: /<controller>/
-    public IActionResult Index (string partial_name) {
-      if (string.IsNullOrEmpty (HttpContext.Session.GetString ("lang"))) {
-        session.SetString ("lang", "kr");
+    public IActionResult Index(string partial_name)
+    {
+      if (string.IsNullOrEmpty(HttpContext.Session.GetString("lang")))
+      {
+        session.SetString("lang", "kr");
       }
 
-      if (string.IsNullOrEmpty (partial_name))
+      if (string.IsNullOrEmpty(partial_name))
         ViewData["partial_page"] = "partial_zip";
       else
         ViewData["partial_page"] = partial_name;
-      return View ();
+      return View();
     }
 
-    public IActionResult En () {
-      session.SetString ("lang", "en");
-      return Redirect ("/");
+    public IActionResult En()
+    {
+      session.SetString("lang", "en");
+      return Redirect("/");
     }
 
-    public IActionResult Kr () {
-      session.SetString ("lang", "kr");
-      return Redirect ("/");
+    public IActionResult Kr()
+    {
+      session.SetString("lang", "kr");
+      return Redirect("/");
     }
 
     //파일업로드 사이즈 3GB (3(GB) * 1024(MB) * 1024(KB) * 1024(byte))
-    [RequestSizeLimit (3221225472)]
-    public ActionResult FileUpload (string dirList, List<IFormFile> files, string fileKeyPair, string format, string uuid) {
-      JObject keyPair_FileDir = JObject.Parse (fileKeyPair);
+    [RequestSizeLimit(3221225472)]
+    public ActionResult FileUpload(string dirList, List<IFormFile> files, string fileKeyPair, string format, string uuid)
+    {
+      JObject keyPair_FileDir = JObject.Parse(fileKeyPair);
       Console.WriteLine(dirList);
-      Dictionary<string, object> data = new Dictionary<string, object> ();
-      ZipModel zipModel = new ZipModel ();
+      Dictionary<string, object> data = new Dictionary<string, object>();
+      ZipModel zipModel = new ZipModel();
 
-      Dictionary<string, string> test= new Dictionary<string, string> ();
+      Dictionary<string, string> test = new Dictionary<string, string>();
 
-      string[] listDir = dirList.Split (',');
+      string[] listDir = dirList.Split(',');
       string filename = listDir[0] + "." + format;
 
-      zipModel.SetParam (keyPair_FileDir, listDir, files, uuid, uuid);
-      zipModel.MakeZip ();
+      zipModel.SetParam(keyPair_FileDir, listDir, files, uuid, uuid);
+      zipModel.MakeZip();
 
-      return Json ("");
+      return Json("");
     }
 
-    public async Task<ActionResult> FileUploadProgress (string uuid) {
-      SimpleLongPolling longPolling = new SimpleLongPolling (uuid);
-      var msg = await longPolling.WaitAsync ();
-      return Json (msg);
+    public async Task<ActionResult> FileUploadProgress(string uuid)
+    {
+      SimpleLongPolling longPolling = new SimpleLongPolling(uuid);
+      var msg = await longPolling.WaitAsync();
+      return Json(msg);
     }
 
-    public ActionResult DownloadZip (string uuid) {
-      string path = Environment.CurrentDirectory + "/wwwroot/zipfiles/" + uuid + ".zip";
-      byte[] file = System.IO.File.ReadAllBytes (path);
-      System.IO.File.Delete (path);
-      return File (file, "application/zip");
+    public ActionResult DownloadZip(string uuid)
+    {
+      string path;
+#if !DEBUG
+      path = Environment.CurrentDirectory + "/release/netcoreapp2.1/publish/wwwroot/zipfiles/" + uuid + ".zip";
+#else
+      path = Environment.CurrentDirectory + "/wwwroot/zipfiles/" + uuid + ".zip";
+#endif
+      byte[] file = System.IO.File.ReadAllBytes(path);
+      System.IO.File.Delete(path);
+      return File(file, "application/zip");
     }
 
-    public ActionResult tst () {
+    public ActionResult tst()
+    {
       double now = 1;
       double per = 1;
-      now = now + (int) 1;
-      return Json (per == (int) 1);
+      now = now + (int)1;
+      return Json(per == (int)1);
     }
 
-    public ActionResult Error () {
-      return View (new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+    public ActionResult Error()
+    {
+      return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+    }
+
+    [HttpGet("/static/{name}")]
+    public IActionResult Static(string name)
+    {
+      string path;
+      string re_name = name.Replace(":", "/");
+      string type = re_name.Split('.')[re_name.Split('.').Count() - 1];
+      string content_type;
+      Dictionary<string, string> pair = new Dictionary<string, string>(){
+        {"css", "text/css"},
+        {"js", "text/javascript"},
+        {"json", "application/json"},
+        {"etc", "Multipart/related"}
+      };
+
+      try
+      {
+        content_type = pair[type];
+      }
+      catch (KeyNotFoundException)
+      {
+        content_type = pair["etc"];
+      }
+
+#if !DEBUG
+      path = Environment.CurrentDirectory + "/release/netcoreapp2.1/publish/wwwroot/" + re_name;
+#else
+      path = Environment.CurrentDirectory + "/wwwroot/" + re_name;
+#endif
+
+      byte[] file = System.IO.File.ReadAllBytes(path);
+      return File(file, content_type, "StaticFile");
     }
 
   }
diff --git a/ZipProject/Models/LanguagePack.cs b/ZipProject/Models/LanguagePack.cs
index 9549928..6c8babd 100644
--- a/ZipProject/Models/LanguagePack.cs
+++ b/ZipProject/Models/LanguagePack.cs
@@ -8,11 +8,11 @@ namespace ZipProject.Models {
     public static string GetText (string lang, string id) {
 
       #if !DEBUG
-        string path = Environment.CurrentDirectory + "release/netcoreapp2.1/publish/wwwroot/Language/" + lang + ".json";
+        string path = Environment.CurrentDirectory + "/release/netcoreapp2.1/publish/wwwroot/Language/" + lang + ".json";
       #else
         string path = Environment.CurrentDirectory + "/wwwroot/Language/" + lang + ".json";
       #endif
-      
+
       string json = File.OpenText (path).ReadToEnd ();
 
       dynamic result = JsonConvert.DeserializeObject<dynamic> (json);
diff --git a/ZipProject/Program.cs b/ZipProject/Program.cs
index 8a75a99..acc4dc8 100644
--- a/ZipProject/Program.cs
+++ b/ZipProject/Program.cs
@@ -8,20 +8,23 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace ZipProject {
-  public class Program {
-    public static void Main (string[] args) {
+namespace ZipProject
+{
+  public class Program
+  {
+    public static void Main(string[] args)
+    {
       string port;
-      #if !DEBUG //published
-        port= "5001";
-      #else //debug
-        port= "9999";
-      #endif
-      CreateWebHostBuilder (args).UseUrls ("http://localhost:" + port).Build ().Run ();
+#if !DEBUG //published
+      port= "5001";
+#else //debug
+      port = "9999";
+#endif
+      CreateWebHostBuilder(args).UseUrls("http://localhost:" + port).Build().Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder (string[] args) =>
-      WebHost.CreateDefaultBuilder (args)
-      .UseStartup<Startup> ();
+    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+      WebHost.CreateDefaultBuilder(args)
+      .UseStartup<Startup>();
   }
 }
\ No newline at end of file
diff --git a/ZipProject/Startup.cs b/ZipProject/Startup.cs
index 231c935..9cb0b59 100644
--- a/ZipProject/Startup.cs
+++ b/ZipProject/Startup.cs
@@ -46,11 +46,15 @@ namespace ZipProject {
       app.UseCookiePolicy ();
       app.UseSession ();
       app.UseStatusCodePages ("text/plain", "status code page, status code: {0}");
-
       app.UseMvc (routes => {
         routes.MapRoute (
           name: "default",
-          template: "{controller=WebZip}/{action=Index}/{id?}");
+          template: "{controller=WebZip}/{action=Index}/{id?}"
+        );
+        // routes.MapRoute(
+        //   name: "static",
+        //   template: "static/{controller=WebZip}/{action=Static}/{name?}"
+        // );
       });
 
     }
diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml
index 3019ee3..6e2fea8 100644
--- a/ZipProject/Views/Shared/_Layout.cshtml
+++ b/ZipProject/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
   <meta charset="utf-8" />
@@ -15,28 +15,29 @@
   <link rel="canonical" href="https://wabiey.com">
   <title>@ViewData["Title"]</title>
 
-  <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-  <link rel="stylesheet" href="~/css/site.css" asp-append-version="true"/>
+  <link rel="stylesheet" href="/static/lib:bootstrap:dist:css:bootstrap.css" />
+  <link rel="stylesheet" href="/static/css:site.css" asp-append-version="true"/>
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous" asp-append-version="true">
   <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
-        asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+        asp-fallback-href="/static/lib:bootstrap:dist:css:bootstrap.min.css"
         asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
 
 
   <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.3.1.min.js"
-          asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+          asp-fallback-src="/static/lib:jquery:dist:jquery.min.js"
           asp-fallback-test="window.jQuery"
           crossorigin="anonymous"
           integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT">
   </script>
   <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
-          asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+          asp-fallback-src="/static/lib:bootstrap:dist:js:bootstrap.min.js"
           asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
           crossorigin="anonymous"
           integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
   </script>
-  <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-  <script src="~/js/site.js" asp-append-version="true"></script>
+  
+  <script src="/static/lib:bootstrap:dist:js:bootstrap.js"></script>
+  <script src="/static/js:site.js" asp-append-version="true"></script>
   <script src="https://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
   <style>
     .navbar-default {
@@ -50,7 +51,7 @@
     var _Language;
     $.ajax({
       type: "get",
-      url: "/Language/"+lang+".json",
+      url: "/static/Language:"+lang+".json",
       async: false,
       cache: false
     }).done(function(data){
@@ -66,7 +67,7 @@
     });
   </script>
 </head>
-<body>
+<body oncontextmenu= "return false;" onselectstart= "return false;" ondragstart= "return false;">
 
   <!-- navbar -->
   <partial name="_Navbar" />
diff --git a/ZipProject/Views/Shared/_Navbar.cshtml b/ZipProject/Views/Shared/_Navbar.cshtml
index f2db693..4939700 100644
--- a/ZipProject/Views/Shared/_Navbar.cshtml
+++ b/ZipProject/Views/Shared/_Navbar.cshtml
@@ -14,7 +14,7 @@
         <span class="icon-bar"></span>
       </button>
       <span class="navbar-brand" style="padding: 4px;">
-        <a href=""><img src="~/images/logo.png" class="webzip-navlogo" alt="logo"/></a>
+        <a href=""><img src="/static/images:logo.png" class="webzip-navlogo" alt="logo"/></a>
       </span>
     </div>
     <div class="collapse navbar-collapse webzip-navbar">
diff --git a/ZipProject/Views/WebZip/Index.cshtml b/ZipProject/Views/WebZip/Index.cshtml
index 6d8c9cd..0edb0f5 100644
--- a/ZipProject/Views/WebZip/Index.cshtml
+++ b/ZipProject/Views/WebZip/Index.cshtml
@@ -48,7 +48,7 @@
     var partial_page= "@ViewData["partial_page"]";
 </script>
   
-  <script src="~/js/Zip/Index.js" asp-append-version="true"></script>
+  <script src="/static/js:Zip:Index.js" asp-append-version="true"></script>
 
 <!-- #region 모바일 클릭, 더블클릭, 드래그(메뉴소환) 이벤트 -->
   <script>
diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index 007dcf0..d20bdc6 100644
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -10,7 +10,7 @@
     display: none;
     z-index:    2000;
     background: rgba( 255, 255, 255, .8 )
-    url('/images/spinner.gif')
+    url('/static/images:spinner.gif')
     50% 50%
     no-repeat;
     text-align: center;
@@ -102,4 +102,4 @@
   var folder_open= "▼";
   var folder= "▶";
 </script>
-<script src="~/js/Zip/partial_zip.js" asp-append-version="true"></script>
\ No newline at end of file
+<script src="/static/js:Zip:partial_zip.js" asp-append-version="true"></script>
\ No newline at end of file
diff --git a/ZipProject/nohup.out b/ZipProject/nohup.out
new file mode 100644
index 0000000..be56767
--- /dev/null
+++ b/ZipProject/nohup.out
@@ -0,0 +1,32 @@
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-/home/dhkq92/.nicezip/release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-/home/dhkq92/.nicezip/release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-/home/dhkq92/.nicezip/release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
+
+Unhandled Exception: System.ArgumentException: The content root '/home/dhkq92/.publish/nicezip/nicezip_sources/ZipProject/release/netcoreapp2.1/publish/wwwroot' does not exist.
+Parameter name: contentRootPath
+   at Microsoft.AspNetCore.Hosting.Internal.HostingEnvironmentExtensions.Initialize(IHostingEnvironment hostingEnvironment, String contentRootPath, WebHostOptions options)
+   at Microsoft.AspNetCore.Hosting.WebHostBuilder.BuildCommonServices(AggregateException& hostingStartupErrors)
+   at Microsoft.AspNetCore.Hosting.WebHostBuilder.Build()
+   at ZipProject.Program.Main(String[] args) in /home/dhkq92/.publish/nicezip/nicezip_sources/ZipProject/Program.cs:line 26
diff --git a/ZipProject/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/ZipProject/wwwroot/lib/bootstrap/dist/css/bootstrap.css
index d08d771..7f6eaa9 100644
--- a/ZipProject/wwwroot/lib/bootstrap/dist/css/bootstrap.css
+++ b/ZipProject/wwwroot/lib/bootstrap/dist/css/bootstrap.css
@@ -8189,4 +8189,3 @@ button.close {
         display: none !important;
     }
 }
-/*# sourceMappingURL=bootstrap.css.map */
diff --git a/buildrelease b/buildrelease
deleted file mode 100755
index c92721a..0000000
--- a/buildrelease
+++ /dev/null
@@ -1,3 +0,0 @@
-
-cd ZipProject
-dotnet publish --configuration ../../../nicezip/release
diff --git a/nohup.out b/nohup.out
new file mode 100644
index 0000000..1a5b7e6
--- /dev/null
+++ b/nohup.out
@@ -0,0 +1,5 @@
+Could not execute because the specified command or file was not found.
+Possible reasons for this include:
+  * You misspelled a built-in dotnet command.
+  * You intended to execute a .NET Core program, but dotnet-release/netcoreapp2.1/ZipProject.dll does not exist.
+  * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH.
diff --git a/release_publish b/release_publish
new file mode 100755
index 0000000..105be8c
--- /dev/null
+++ b/release_publish
@@ -0,0 +1,5 @@
+
+cd ZipProject
+dotnet publish --configuration ../../../release
+cd ../../
+./runserver