작업내역 최신화

This commit is contained in:
김민서 2023-11-23 13:24:00 +09:00
parent 4ba2eb7cf9
commit d552071cb1
18 changed files with 218 additions and 16 deletions

View File

@ -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"}");
}

View File

@ -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 += ")";
}

View File

@ -15,6 +15,6 @@
</targets>
<rules>
<logger name="*" minlevel="Info" writeTo="logfile" />
<logger name="*" minlevel="Debug" writeTo="logfile" />
</rules>
</nlog>

View File

@ -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");

View File

@ -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가-힣 ]";

View File

@ -1,8 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Trace",
"Microsoft.AspNetCore": "Trace"
"Default": "Information",
"Microsoft.AspNetCore": "Information"
}
},
"AllowedHosts": "0.0.0.0;localhost"

Binary file not shown.

View File

@ -1 +1 @@
24a19a338571d06fa5670dc4c5fa352c3d517153
90c736faeb404bd17e67340076dc1d19aa41e7b022d0ca71cdcf518271c7ee76

View File

@ -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 =

Binary file not shown.

View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]

View File

@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 도구를 사용하여 생성되었습니다.
// 런타임 버전:4.0.30319.42000
//
// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
// 이러한 변경 내용이 손실됩니다.
// </auto-generated>
//------------------------------------------------------------------------------
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 클래스에서 생성되었습니다.

View File

@ -0,0 +1 @@
de626008ab478696095f5a4f76d8453fba4715bb09e02c38b06b445dbfb1ddc9

View File

@ -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 =

View File

@ -0,0 +1,17 @@
// <auto-generated/>
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;

Binary file not shown.

View File

@ -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