diff --git a/Server/Git/AbstractGit.cs b/Server/Git/AbstractGit.cs index 38b2e80..5d599d4 100644 --- a/Server/Git/AbstractGit.cs +++ b/Server/Git/AbstractGit.cs @@ -22,15 +22,19 @@ namespace Server.Git { restart: isRestart = false; + logger.Info("Pull"); Pull(); if (isRestart) goto restart; + logger.Info("ChangeScript"); string excel = ChangeScript(); if (isRestart) goto restart; + logger.Info("Push"); Push(excel); if (isRestart) goto restart; + logger.Info("DataSet"); DataSet(); } @@ -95,7 +99,9 @@ namespace Server.Git //압축 //string EncryptoExcel = crypto.Compress(excel); //암호화 + logger.Info("old data : \n" + ProtocolProcessor.cryptoData); ProtocolProcessor.cryptoData = crypto.Compress(excel); + logger.Info("new data : \n" + ProtocolProcessor.cryptoData); // 스테이징 RepositorySet("add .", repositoryPath); @@ -167,7 +173,7 @@ namespace Server.Git /// public void DataSet() { - int index = -1; + int index; index = sheets.FindIndex(n => n.name == Statics.equipmentExcel.sheetName); if(index != -1) diff --git a/Server/Program.cs b/Server/Program.cs index ab5d358..62ce2a4 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -4,15 +4,15 @@ var builder = WebApplication.CreateBuilder(args); var app = builder.Build(); // ʱȭ -ProtocolProcessor.Init(); +//ProtocolProcessor.Init(); // ʱȭ -GItWebhook.Init(); +//GItWebhook.Init(); //http -app.MapPost("/", ProtocolProcessor.Process); +//app.MapPost("/", ProtocolProcessor.Process); //git ٿ -app.MapPost("/git", GItWebhook.Process); +//app.MapPost("/git", GItWebhook.Process); //app.MapPost("/update", GItWebhook.Process); @@ -22,4 +22,10 @@ app.MapPost("/git", GItWebhook.Process); //app.MapPost("/spin/random", Spin.Random); //#endif + +app.MapGet("/update", (HttpContext context) => { + ProtocolProcessor.cryptoData = (new Random()).Next().ToString(); + return ProtocolProcessor.cryptoData; +}); + app.Run(Statics.URL); diff --git a/Server/System/SystemMain.cs b/Server/System/SystemMain.cs index 4918b04..0657286 100644 --- a/Server/System/SystemMain.cs +++ b/Server/System/SystemMain.cs @@ -113,11 +113,13 @@ namespace Server.System { if (thread.ThreadState == ThreadState.Stopped) { + logger.Info("new excel update"); thread = new Thread(git.Init); thread.Start(); } else if (thread.ThreadState == ThreadState.WaitSleepJoin || thread.ThreadState == ThreadState.Running) { + logger.Info("new excel restart"); git.isRestart = true; } }