diff --git a/Server/Git/AbstractGit.cs b/Server/Git/AbstractGit.cs index 92cc796..7f75f0e 100644 --- a/Server/Git/AbstractGit.cs +++ b/Server/Git/AbstractGit.cs @@ -99,10 +99,10 @@ namespace Server.Git //초기세팅일 경우 데이터를 받아오고 아닐경우 데이터를저장 if(ProtocolProcessor.version == "") { - string versionFilePath = Path.Combine(repositoryPath, @"/version.txt"); + string versionFilePath = Path.Combine(repositoryPath + @"/version"); if (File.Exists(versionFilePath)) { - using (StreamReader reader = new StreamReader(repositoryPath + @"/version.txt")) + using (StreamReader reader = new StreamReader(repositoryPath + @"/version")) { ProtocolProcessor.version = reader.ReadToEnd(); } @@ -116,7 +116,7 @@ namespace Server.Git } else { - using (StreamWriter writer = new StreamWriter(repositoryPath + @"/version.txt")) + using (StreamWriter writer = new StreamWriter(repositoryPath + @"/version")) { writer.Write(ProtocolProcessor.version); logger.Info("saveVersion"); diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs index 2101837..7ba2fca 100644 --- a/Server/Git/ExcelSQL.cs +++ b/Server/Git/ExcelSQL.cs @@ -70,6 +70,9 @@ namespace Server.Git case "int": newTableQuery += $"{sheets[n].variable[m]} INT "; break; + case "float": + newTableQuery += $"{sheets[n].variable[m]} FLOAT4 "; + break; case "string": newTableQuery += $"{sheets[n].variable[m]} VARCHAR(255) "; break; @@ -77,6 +80,7 @@ namespace Server.Git newTableQuery += $"{sheets[n].variable[m]} INT2 "; break; case "text": + case "json": newTableQuery += $"{sheets[n].variable[m]} TEXT "; break; case "time": @@ -121,6 +125,7 @@ namespace Server.Git break; case "string": case "text": + case "json": query += $"'{pair.Value[sheets[n].variable[m]]}'"; break; case "time": diff --git a/Server/System/GItWebhook.cs b/Server/System/GItWebhook.cs index ebc05ce..3214241 100644 --- a/Server/System/GItWebhook.cs +++ b/Server/System/GItWebhook.cs @@ -7,6 +7,8 @@ namespace Server.System { private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); + public static bool isUpdate = false; + public static Thread thread; private static AbstractGit git; @@ -14,7 +16,12 @@ namespace Server.System public static string Process(HttpContext context) { - //TODO 아무때나 호출되지 않게 만들기 + isUpdate = !isUpdate; + if (isUpdate) + { + return successResp.ToJson(); + } + string Response; try { diff --git a/Server/obj/Debug/net6.0/Server.dll b/Server/obj/Debug/net6.0/Server.dll index 3408f0f..f98f3b8 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/ref/Server.dll b/Server/obj/Debug/net6.0/ref/Server.dll index 3c5e51e..6a8bf30 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 3c5e51e..6a8bf30 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/staticwebassets.pack.sentinel b/Server/obj/staticwebassets.pack.sentinel index 1b8a711..dc5bd2e 100644 --- a/Server/obj/staticwebassets.pack.sentinel +++ b/Server/obj/staticwebassets.pack.sentinel @@ -139,3 +139,6 @@ 2.0 2.0 2.0 +2.0 +2.0 +2.0