diff --git a/Server/Git/AbstractGit.cs b/Server/Git/AbstractGit.cs index 31df408..e6b5b41 100644 --- a/Server/Git/AbstractGit.cs +++ b/Server/Git/AbstractGit.cs @@ -89,10 +89,10 @@ namespace Server.Git } //json 저장 - using (StreamWriter writer = new StreamWriter(repositoryPath + "\\excel.json")) + using (StreamWriter writer = new StreamWriter(repositoryPath + @"\excel.json")) { writer.Write(excel); - Console.WriteLine($"save file : {repositoryPath + "\\excel.json"}"); + Console.WriteLine($"save file : {repositoryPath + @"\excel.json"}"); } diff --git a/Server/Program.cs b/Server/Program.cs index 4d27ce1..192b1bf 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -17,4 +17,4 @@ app.MapPost("/git", GItWebhook.Process); //app.MapPost("/update", GItWebhook.Process); -app.Run("https://0.0.0.0:4860"); +app.Run(STATICS.URL); diff --git a/Server/System/Statics.cs b/Server/System/Statics.cs index c09ac84..c821df1 100644 --- a/Server/System/Statics.cs +++ b/Server/System/Statics.cs @@ -13,6 +13,7 @@ //"https://username:password@www.example.com/"; public static readonly string remoteUrl = "https://manager:BQNl01bJJF0wn9R@gitea.pandoli365.com/Team.thewar/thewar_excel.git"; + public static readonly string URL = "https://0.0.0.0:4860"; public static readonly string PATTERN = "[^a-zA-Z0-9가-힣 ]"; } diff --git a/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache b/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache index 3fe81bd..3d2b19f 100644 --- a/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache +++ b/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache @@ -1 +1 @@ -90c736faeb404bd17e67340076dc1d19aa41e7b022d0ca71cdcf518271c7ee76 +24a19a338571d06fa5670dc4c5fa352c3d517153 diff --git a/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig b/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig index 8ab6ddb..53f708c 100644 --- a/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig @@ -5,15 +5,12 @@ build_property.UsingMicrosoftNETSdkWeb = true build_property.ProjectTypeGuids = build_property.InvariantGlobalization = build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Server build_property.RootNamespace = Server -build_property.ProjectDir = C:\Users\김민서\git\thewar_server\Server\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\git\thewar_server\Server\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = C:\Users\김민서\git\thewar_server\Server +build_property.MSBuildProjectDirectory = E:\git\thewar_server\Server build_property._RazorSourceGeneratorDebug = diff --git a/Server/obj/Debug/net6.0/Server.assets.cache b/Server/obj/Debug/net6.0/Server.assets.cache index 147e0f7..e1d1596 100644 Binary files a/Server/obj/Debug/net6.0/Server.assets.cache and b/Server/obj/Debug/net6.0/Server.assets.cache differ diff --git a/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache b/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache new file mode 100644 index 0000000..67db3b2 Binary files /dev/null and b/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache differ diff --git a/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt b/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt index c5d083d..219a9a4 100644 --- a/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt +++ b/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt @@ -138,3 +138,55 @@ E:\git\CsServer\Server\bin\Debug\net6.0\System.Diagnostics.DiagnosticSource.dll E:\git\CsServer\Server\bin\Debug\net6.0\System.Text.Encodings.Web.dll E:\git\CsServer\Server\bin\Debug\net6.0\System.Text.Json.dll E:\git\CsServer\Server\bin\Debug\net6.0\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\NLog.config +E:\git\thewar_server\Server\bin\Debug\net6.0\appsettings.Development.json +E:\git\thewar_server\Server\bin\Debug\net6.0\appsettings.json +E:\git\thewar_server\Server\bin\Debug\net6.0\Server.exe +E:\git\thewar_server\Server\bin\Debug\net6.0\Server.deps.json +E:\git\thewar_server\Server\bin\Debug\net6.0\Server.runtimeconfig.json +E:\git\thewar_server\Server\bin\Debug\net6.0\Server.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\Server.pdb +E:\git\thewar_server\Server\bin\Debug\net6.0\Aspose.Cells.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\LibGit2Sharp.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\Microsoft.Extensions.Logging.Abstractions.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\Newtonsoft.Json.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\NLog.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\Npgsql.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\SkiaSharp.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\System.Diagnostics.DiagnosticSource.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\System.Security.Cryptography.Pkcs.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\System.Text.Encodings.Web.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\System.Text.Json.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-arm\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-arm64\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-musl-arm\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-musl-arm64\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-musl-x64\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\linux-x64\native\libgit2-e632535.so +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\osx-arm64\native\libgit2-e632535.dylib +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\osx-x64\native\libgit2-e632535.dylib +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-arm64\native\git2-e632535.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-x64\native\git2-e632535.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-x86\native\git2-e632535.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\osx\native\libSkiaSharp.dylib +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-arm64\native\libSkiaSharp.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-x64\native\libSkiaSharp.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win-x86\native\libSkiaSharp.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Security.Cryptography.Pkcs.dll +E:\git\thewar_server\Server\bin\Debug\net6.0\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.csproj.AssemblyReference.cache +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.GeneratedMSBuildEditorConfig.editorconfig +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.AssemblyInfoInputs.cache +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.AssemblyInfo.cs +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.csproj.CoreCompileInputs.cache +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.MvcApplicationPartsAssemblyInfo.cache +E:\git\thewar_server\Server\obj\Debug\net6.0\staticwebassets.build.json +E:\git\thewar_server\Server\obj\Debug\net6.0\staticwebassets.development.json +E:\git\thewar_server\Server\obj\Debug\net6.0\scopedcss\bundle\Server.styles.css +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.csproj.CopyComplete +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.dll +E:\git\thewar_server\Server\obj\Debug\net6.0\refint\Server.dll +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.pdb +E:\git\thewar_server\Server\obj\Debug\net6.0\Server.genruntimeconfig.cache +E:\git\thewar_server\Server\obj\Debug\net6.0\ref\Server.dll diff --git a/Server/obj/Debug/net6.0/Server.dll b/Server/obj/Debug/net6.0/Server.dll index abec0cf..67d8555 100644 Binary files a/Server/obj/Debug/net6.0/Server.dll and b/Server/obj/Debug/net6.0/Server.dll differ diff --git a/Server/obj/Debug/net6.0/Server.genruntimeconfig.cache b/Server/obj/Debug/net6.0/Server.genruntimeconfig.cache index 3b698c1..4108d2f 100644 --- a/Server/obj/Debug/net6.0/Server.genruntimeconfig.cache +++ b/Server/obj/Debug/net6.0/Server.genruntimeconfig.cache @@ -1 +1 @@ -5a972d05249776184d6dd56cb42ed98944f2aa1f +4195893466b54871aa56fed0dcf29a4c086a651e diff --git a/Server/obj/Debug/net6.0/ref/Server.dll b/Server/obj/Debug/net6.0/ref/Server.dll index a90568d..50b8e6f 100644 Binary files a/Server/obj/Debug/net6.0/ref/Server.dll and b/Server/obj/Debug/net6.0/ref/Server.dll differ diff --git a/Server/obj/Debug/net6.0/refint/Server.dll b/Server/obj/Debug/net6.0/refint/Server.dll index a90568d..50b8e6f 100644 Binary files a/Server/obj/Debug/net6.0/refint/Server.dll and b/Server/obj/Debug/net6.0/refint/Server.dll differ diff --git a/Server/obj/Server.csproj.nuget.dgspec.json b/Server/obj/Server.csproj.nuget.dgspec.json index 7a5491a..b73adda 100644 --- a/Server/obj/Server.csproj.nuget.dgspec.json +++ b/Server/obj/Server.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "E:\\git\\CsServer\\Server\\Server.csproj": {} + "E:\\git\\thewar_server\\Server\\Server.csproj": {} }, "projects": { - "E:\\git\\CsServer\\Server\\Server.csproj": { + "E:\\git\\thewar_server\\Server\\Server.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\git\\CsServer\\Server\\Server.csproj", + "projectUniqueName": "E:\\git\\thewar_server\\Server\\Server.csproj", "projectName": "Server", - "projectPath": "E:\\git\\CsServer\\Server\\Server.csproj", + "projectPath": "E:\\git\\thewar_server\\Server\\Server.csproj", "packagesPath": "C:\\Users\\acst0\\.nuget\\packages\\", - "outputPath": "E:\\git\\CsServer\\Server\\obj\\", + "outputPath": "E:\\git\\thewar_server\\Server\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Server/obj/project.assets.json b/Server/obj/project.assets.json index e60f862..b19e42d 100644 --- a/Server/obj/project.assets.json +++ b/Server/obj/project.assets.json @@ -1059,11 +1059,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\git\\CsServer\\Server\\Server.csproj", + "projectUniqueName": "E:\\git\\thewar_server\\Server\\Server.csproj", "projectName": "Server", - "projectPath": "E:\\git\\CsServer\\Server\\Server.csproj", + "projectPath": "E:\\git\\thewar_server\\Server\\Server.csproj", "packagesPath": "C:\\Users\\acst0\\.nuget\\packages\\", - "outputPath": "E:\\git\\CsServer\\Server\\obj\\", + "outputPath": "E:\\git\\thewar_server\\Server\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Server/obj/project.nuget.cache b/Server/obj/project.nuget.cache index 11347c7..2178076 100644 --- a/Server/obj/project.nuget.cache +++ b/Server/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "mqjrT0psY1bh5pPYuFvVGksqVDGIb9h3wRTl0WKT65Jvc3vVnbn6gASe/F71xdFwk7B4tkYfnfbGzX7I7bZYhQ==", + "dgSpecHash": "rmOGIrjysUmIXZZXlx+fCFreA/KIsZagFh6iQEbEXoCTOEnT94cXsoiG+Q9euhQebHgNQ1rFxgpN4Brwy3sLDg==", "success": true, - "projectFilePath": "E:\\git\\CsServer\\Server\\Server.csproj", + "projectFilePath": "E:\\git\\thewar_server\\Server\\Server.csproj", "expectedPackageFiles": [ "C:\\Users\\acst0\\.nuget\\packages\\aspose.cells\\23.11.0\\aspose.cells.23.11.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\libgit2sharp\\0.28.0\\libgit2sharp.0.28.0.nupkg.sha512", diff --git a/Server/obj/staticwebassets.pack.sentinel b/Server/obj/staticwebassets.pack.sentinel index cbbfd04..74e06dc 100644 --- a/Server/obj/staticwebassets.pack.sentinel +++ b/Server/obj/staticwebassets.pack.sentinel @@ -131,3 +131,5 @@ 2.0 2.0 2.0 +2.0 +2.0