diff --git a/Server/Git/AbstractGit.cs b/Server/Git/AbstractGit.cs index d5b6783..31df408 100644 --- a/Server/Git/AbstractGit.cs +++ b/Server/Git/AbstractGit.cs @@ -1,4 +1,5 @@ using LibGit2Sharp; +using Newtonsoft.Json.Linq; using NLog; using Server.System; using System.Diagnostics; @@ -64,9 +65,9 @@ namespace Server.Git RedirectStandardOutput = true, RedirectStandardError = true, UseShellExecute = false, - CreateNoWindow = true + CreateNoWindow = true, + EnvironmentVariables = { ["GIT_ASKPASS"] = "echo" } }; - using (Process process = new Process { StartInfo = psi }) { process.Start(); @@ -91,7 +92,7 @@ namespace Server.Git using (StreamWriter writer = new StreamWriter(repositoryPath + "\\excel.json")) { writer.Write(excel); - Console.WriteLine($"파일이 저장되었습니다 : {repositoryPath + "\\excel.json"}"); + Console.WriteLine($"save file : {repositoryPath + "\\excel.json"}"); } diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs index 1d75ffb..502c004 100644 --- a/Server/Git/ExcelSQL.cs +++ b/Server/Git/ExcelSQL.cs @@ -105,6 +105,10 @@ namespace Server.Git query += "("; for (int m = 0; m < sheets[n].variable.Count; m++) { + if (m != 0) + { + query += ", "; + } switch (sheets[n].type[m]) { case "int": @@ -119,10 +123,6 @@ namespace Server.Git query += $"'{((DateTime)pair.Value[sheets[n].variable[m]]).ToString("yyyy-MM-dd HH:mm:ss")}'"; break; } - if(m != sheets[n].variable.Count -1) - { - query += ", "; - } } query += ")"; } diff --git a/Server/NLog.config b/Server/NLog.config index a758250..be95943 100644 --- a/Server/NLog.config +++ b/Server/NLog.config @@ -15,6 +15,6 @@ - + diff --git a/Server/Program.cs b/Server/Program.cs index 293a3d6..4d27ce1 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -3,6 +3,7 @@ using Server.System; var builder = WebApplication.CreateBuilder(args); var app = builder.Build(); + // ʱȭ ProtocolProcessor.Init(); // ʱȭ @@ -16,4 +17,4 @@ app.MapPost("/git", GItWebhook.Process); //app.MapPost("/update", GItWebhook.Process); -app.Run(); +app.Run("https://0.0.0.0:4860"); diff --git a/Server/System/Statics.cs b/Server/System/Statics.cs index 6e6d35e..95068a1 100644 --- a/Server/System/Statics.cs +++ b/Server/System/Statics.cs @@ -5,13 +5,13 @@ #region Dev #if DEBUG public static readonly string SQL_URL = "Host=myHost;Port=myPort;Username=myUsername;Password=myPassword;Database=myDatabase;"; - public static readonly string EXCEL_SQL_URL = "Host=myHost;Port=myPort;Username=myUsername;Password=myPassword;Database=myDatabase;"; + public static readonly string EXCEL_SQL_URL = "Host=192.168.0.2;Port=5432;Username=pandoli365;Password=GZtIYmBUmeWVvOX;Database=project_thewar;"; #endif #endregion //비공계 프로젝트의 경우 아래와같이 작성해주세요 //"https://username:password@www.example.com/"; - public static readonly string remoteUrl = "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 PATTERN = "[^a-zA-Z0-9가-힣 ]"; diff --git a/Server/appsettings.json b/Server/appsettings.json index 50f91df..db3eefa 100644 --- a/Server/appsettings.json +++ b/Server/appsettings.json @@ -1,8 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Trace", - "Microsoft.AspNetCore": "Trace" + "Default": "Information", + "Microsoft.AspNetCore": "Information" } }, "AllowedHosts": "0.0.0.0;localhost" diff --git a/Server/obj/Debug/.DS_Store b/Server/obj/Debug/.DS_Store deleted file mode 100644 index 04ad432..0000000 Binary files a/Server/obj/Debug/.DS_Store and /dev/null differ diff --git a/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache b/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache index 3d2b19f..3fe81bd 100644 --- a/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache +++ b/Server/obj/Debug/net6.0/Server.AssemblyInfoInputs.cache @@ -1 +1 @@ -24a19a338571d06fa5670dc4c5fa352c3d517153 +90c736faeb404bd17e67340076dc1d19aa41e7b022d0ca71cdcf518271c7ee76 diff --git a/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig b/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig index 452b32f..8ab6ddb 100644 --- a/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/obj/Debug/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig @@ -5,12 +5,15 @@ 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 = E:\git\CsServer\Server\ +build_property.ProjectDir = C:\Users\김민서\git\thewar_server\Server\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = E:\git\CsServer\Server +build_property.MSBuildProjectDirectory = C:\Users\김민서\git\thewar_server\Server build_property._RazorSourceGeneratorDebug = diff --git a/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache b/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache deleted file mode 100644 index fea32bf..0000000 Binary files a/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Server/obj/Debug/net6.0/Server.dll b/Server/obj/Debug/net6.0/Server.dll index 03d3ae7..abec0cf 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/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/Server/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs new file mode 100644 index 0000000..ed92695 --- /dev/null +++ b/Server/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")] diff --git a/Server/obj/Release/net6.0/Server.AssemblyInfo.cs b/Server/obj/Release/net6.0/Server.AssemblyInfo.cs new file mode 100644 index 0000000..5bc7d7e --- /dev/null +++ b/Server/obj/Release/net6.0/Server.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 +// +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Server")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Server")] +[assembly: System.Reflection.AssemblyTitleAttribute("Server")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// MSBuild WriteCodeFragment 클래스에서 생성되었습니다. + diff --git a/Server/obj/Release/net6.0/Server.AssemblyInfoInputs.cache b/Server/obj/Release/net6.0/Server.AssemblyInfoInputs.cache new file mode 100644 index 0000000..62da36d --- /dev/null +++ b/Server/obj/Release/net6.0/Server.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +de626008ab478696095f5a4f76d8453fba4715bb09e02c38b06b445dbfb1ddc9 diff --git a/Server/obj/Release/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig b/Server/obj/Release/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..8ab6ddb --- /dev/null +++ b/Server/obj/Release/net6.0/Server.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,19 @@ +is_global = true +build_property.TargetFramework = net6.0 +build_property.TargetPlatformMinVersion = +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.RazorLangVersion = 6.0 +build_property.SupportLocalizedComponentNames = +build_property.GenerateRazorMetadataSourceChecksumAttributes = +build_property.MSBuildProjectDirectory = C:\Users\김민서\git\thewar_server\Server +build_property._RazorSourceGeneratorDebug = diff --git a/Server/obj/Release/net6.0/Server.GlobalUsings.g.cs b/Server/obj/Release/net6.0/Server.GlobalUsings.g.cs new file mode 100644 index 0000000..025530a --- /dev/null +++ b/Server/obj/Release/net6.0/Server.GlobalUsings.g.cs @@ -0,0 +1,17 @@ +// +global using global::Microsoft.AspNetCore.Builder; +global using global::Microsoft.AspNetCore.Hosting; +global using global::Microsoft.AspNetCore.Http; +global using global::Microsoft.AspNetCore.Routing; +global using global::Microsoft.Extensions.Configuration; +global using global::Microsoft.Extensions.DependencyInjection; +global using global::Microsoft.Extensions.Hosting; +global using global::Microsoft.Extensions.Logging; +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Net.Http.Json; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Server/obj/Release/net6.0/Server.assets.cache b/Server/obj/Release/net6.0/Server.assets.cache new file mode 100644 index 0000000..2ca2bfb Binary files /dev/null and b/Server/obj/Release/net6.0/Server.assets.cache differ diff --git a/Server/obj/staticwebassets.pack.sentinel b/Server/obj/staticwebassets.pack.sentinel new file mode 100644 index 0000000..cbbfd04 --- /dev/null +++ b/Server/obj/staticwebassets.pack.sentinel @@ -0,0 +1,133 @@ +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0