diff --git a/Server/Git/ExcelManager.cs b/Server/Git/ExcelManager.cs index 363019d..a9e5ebb 100644 --- a/Server/Git/ExcelManager.cs +++ b/Server/Git/ExcelManager.cs @@ -4,28 +4,29 @@ using NLog; namespace Server.Git { + public class sheet + { + string _name; + public string name { get { return _name; } } + List _variable; + public List variable { get { return _variable; } } + List _type; + public List type { get { return _type; } } + Dictionary> _dicViewer; + public Dictionary> dicViewer { get { return _dicViewer; } } + + public sheet(string name, List variable, List type, Dictionary> dicViewer) + { + this._name = name; + this._variable = variable; + this._type = type; + this._dicViewer = dicViewer; + } + } class ExcelManager { private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); - public class sheet - { - string _name; - public string name { get { return _name; } } - List _variable; - public List variable { get { return _variable; } } - List _type; - public List type { get { return _type; } } - Dictionary> _dicViewer; - public Dictionary> dicViewer { get { return _dicViewer; } } - public sheet(string name, List variable, List type, Dictionary> dicViewer) - { - this._name = name; - this._variable = variable; - this._type = type; - this._dicViewer = dicViewer; - } - } List _sheets; public List sheets { get { return _sheets; } } diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs new file mode 100644 index 0000000..1d75ffb --- /dev/null +++ b/Server/Git/ExcelSQL.cs @@ -0,0 +1,150 @@ +using Microsoft.AspNetCore.Http; +using Npgsql; +using Server.SQL; +using Server.System; +using System.Globalization; + +namespace Server.Git +{ + public class ExcelSQL + { + List sheets; + + public ExcelSQL(List sheets) + { + this.sheets = sheets; + } + + public void DataUpdate() + { + using (NpgsqlConnection connection = new NpgsqlConnection(STATICS.EXCEL_SQL_URL)) + { + try + { + // 데이터베이스 연결 열기 + connection.Open(); + + // 쿼리 작성 및 실행 + //모든 쿼리 삭제 + string query; + string header1 = "CREATE TABLE IF NOT EXISTS excel."; + string header2 = "INSERT INTO excel."; + string newTableQuery; + string tableDatas; + #region 모든 테이블 삭제 + query = "DROP SCHEMA excel CASCADE;" + + "CREATE SCHEMA excel AUTHORIZATION manager;"; + ExecuteNonQuery(connection, query); + #endregion + #region 테이블 세팅 + query = ""; + for (int n = 0; n < sheets.Count; n++) + { + //초기화 + newTableQuery = ""; + tableDatas = "("; + + #region 신규 테이블 생성 + newTableQuery += header1; + newTableQuery += sheets[n].name + "("; + for (int m = 0; m < sheets[n].variable.Count; m++) + { + if (sheets[n].type[m] == "long" && sheets[n].variable[m] == "index") + { + newTableQuery += "index SERIAL PRIMARY KEY"; + tableDatas += "index"; + continue; + } + if (m != 0) + { + newTableQuery += ",\n"; + tableDatas += ", "; + } + + switch (sheets[n].type[m]) + { + case "int": + newTableQuery += $"{sheets[n].variable[m]} INT "; + break; + case "string": + newTableQuery += $"{sheets[n].variable[m]} VARCHAR(255) "; + break; + case "enum": + newTableQuery += $"{sheets[n].variable[m]} INT2 "; + break; + case "text": + newTableQuery += $"{sheets[n].variable[m]} TEXT "; + break; + case "time": + newTableQuery += $"{sheets[n].variable[m]} timestamp "; + break; + } + tableDatas += sheets[n].variable[m]; + } + newTableQuery += ");\n"; + tableDatas += ") VALUES "; + bool isStart = true; + query += newTableQuery; + + #endregion + #region 신규 테이블 데이터 올리기 + + query += header2; + query += sheets[n].name; + query += tableDatas; + foreach(KeyValuePair> pair in sheets[n].dicViewer) + { + if (isStart) + { + isStart = !isStart; + } + else + { + query += ", "; + } + query += "("; + for (int m = 0; m < sheets[n].variable.Count; m++) + { + switch (sheets[n].type[m]) + { + case "int": + case "enum": + query += $"{pair.Value[sheets[n].variable[m]]}"; + break; + case "string": + case "text": + query += $"'{pair.Value[sheets[n].variable[m]]}'"; + break; + case "time": + 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 += ")"; + } + #endregion + } + ExecuteNonQuery(connection, query); + + #endregion + } + catch (Exception ex) + { + Console.WriteLine($"Error: {ex.Message}"); + } + } + } + private void ExecuteNonQuery(NpgsqlConnection connection, string query) + { + using (NpgsqlCommand command = new NpgsqlCommand(query, connection)) + { + Console.WriteLine(query); + command.ExecuteNonQuery(); + } + } + } +} diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 4288efe..fce72fe 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -15,13 +15,13 @@ namespace Server.Git List fileList = GetFiles(repositoryPath, ".xlsx"); Dictionary>> sheetList = new Dictionary>>(); - + List sheets = null; for (int n = 0; n < fileList.Count; n++) { ExcelManager em = new ExcelManager(fileList[n]); if (em.Play()) { - List sheets = em.sheets; + sheets = em.sheets; for (int m = 0; m < sheets.Count; m++) { sheetList.Add(sheets[m].name, sheets[m].dicViewer); @@ -35,13 +35,14 @@ namespace Server.Git } excel = JsonConvert.SerializeObject(sheetList); - - - //db에 데이터를올리는것은 이곳에 작성할 예정 - - - - + //현재 서버는 PostgreSQL기준으로 쿼리를 생성하는 코드와 패키지가 세팅되어 있습니다 이점 참고바랍니다 + //추가로 해당 기능을 사용하려면 서버에 excel이라는 스키마가 존재하여야 합니다. + if (sheets != null) + { + ExcelSQL sql = new ExcelSQL(sheets); + sql.DataUpdate(); + } + } } } \ No newline at end of file diff --git a/Server/Server.csproj b/Server/Server.csproj index 06b4f92..13f7ac0 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -11,6 +11,7 @@ + diff --git a/Server/System/Statics.cs b/Server/System/Statics.cs index 4b5ac2f..1da03e6 100644 --- a/Server/System/Statics.cs +++ b/Server/System/Statics.cs @@ -4,13 +4,14 @@ { #region Dev #if DEBUG - public static readonly string SQL_URL = "Server=myServerAddress;Port=myPort;Database=myDatabase;Uid=myUsername;Pwd=myPassword;"; -#endif + 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;"; + #endif #endregion //비공계 프로젝트의 경우 아래와같이 작성해주세요 //"https://username:password@www.example.com/"; - public static readonly string remoteUrl = "https://www.example.com"; + public static readonly string remoteUrl = "https://username:password@www.example.com/"; public static readonly string PATTERN = "[^a-zA-Z0-9가-힣 ]"; diff --git a/Server/obj/Debug/net6.0/Server.assets.cache b/Server/obj/Debug/net6.0/Server.assets.cache index c946a69..147e0f7 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 index 07583fc..fea32bf 100644 Binary files a/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache and b/Server/obj/Debug/net6.0/Server.csproj.AssemblyReference.cache differ diff --git a/Server/obj/Debug/net6.0/Server.csproj.CoreCompileInputs.cache b/Server/obj/Debug/net6.0/Server.csproj.CoreCompileInputs.cache index 1dfdffb..4d51c9b 100644 --- a/Server/obj/Debug/net6.0/Server.csproj.CoreCompileInputs.cache +++ b/Server/obj/Debug/net6.0/Server.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d882a30783b347e0385e4792c4e197dd727824a4 +e06c50d31a8c60a25c1a22bc641412d14691fe3a diff --git a/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt b/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt index 1bea4fc..c5d083d 100644 --- a/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt +++ b/Server/obj/Debug/net6.0/Server.csproj.FileListAbsolute.txt @@ -131,3 +131,10 @@ E:\git\CsServer\Server\bin\Debug\net6.0\runtimes\win-arm64\native\libSkiaSharp.d E:\git\CsServer\Server\bin\Debug\net6.0\runtimes\win-x64\native\libSkiaSharp.dll E:\git\CsServer\Server\bin\Debug\net6.0\runtimes\win-x86\native\libSkiaSharp.dll E:\git\CsServer\Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Security.Cryptography.Pkcs.dll +E:\git\CsServer\Server\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +E:\git\CsServer\Server\bin\Debug\net6.0\Microsoft.Extensions.Logging.Abstractions.dll +E:\git\CsServer\Server\bin\Debug\net6.0\Npgsql.dll +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 diff --git a/Server/obj/Debug/net6.0/Server.dll b/Server/obj/Debug/net6.0/Server.dll index b30a297..03d3ae7 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.pdb b/Server/obj/Debug/net6.0/Server.pdb index 9dd4b48..dc4812f 100644 Binary files a/Server/obj/Debug/net6.0/Server.pdb and b/Server/obj/Debug/net6.0/Server.pdb differ diff --git a/Server/obj/Debug/net6.0/ref/Server.dll b/Server/obj/Debug/net6.0/ref/Server.dll index bd05fd2..a90568d 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 bd05fd2..a90568d 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 d4cbc18..7a5491a 100644 --- a/Server/obj/Server.csproj.nuget.dgspec.json +++ b/Server/obj/Server.csproj.nuget.dgspec.json @@ -59,6 +59,10 @@ "Newtonsoft.Json": { "target": "Package", "version": "[13.0.3, )" + }, + "Npgsql": { + "target": "Package", + "version": "[8.0.0, )" } }, "imports": [ diff --git a/Server/obj/Server.csproj.nuget.g.targets b/Server/obj/Server.csproj.nuget.g.targets index 35a7576..bf75a7a 100644 --- a/Server/obj/Server.csproj.nuget.g.targets +++ b/Server/obj/Server.csproj.nuget.g.targets @@ -1,2 +1,7 @@  - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/Server/obj/project.assets.json b/Server/obj/project.assets.json index 7ed26d9..e60f862 100644 --- a/Server/obj/project.assets.json +++ b/Server/obj/project.assets.json @@ -91,6 +91,41 @@ } } }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": { + "type": "package", + "compile": { + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + }, + "compile": { + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} + } + }, "Microsoft.NETCore.Platforms/3.1.0": { "type": "package", "compile": { @@ -126,6 +161,25 @@ } } }, + "Npgsql/8.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0" + }, + "compile": { + "lib/net6.0/Npgsql.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/Npgsql.dll": { + "related": ".xml" + } + } + }, "SkiaSharp/2.88.6": { "type": "package", "dependencies": { @@ -181,6 +235,25 @@ } } }, + "System.Diagnostics.DiagnosticSource/8.0.0": { + "type": "package", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "compile": { + "lib/net6.0/System.Diagnostics.DiagnosticSource.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/System.Diagnostics.DiagnosticSource.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "System.Formats.Asn1/6.0.0": { "type": "package", "compile": { @@ -197,6 +270,22 @@ "buildTransitive/netcoreapp3.1/_._": {} } }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "type": "package", + "compile": { + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/netcoreapp3.1/_._": {} + } + }, "System.Security.Cryptography.Pkcs/6.0.3": { "type": "package", "dependencies": { @@ -243,6 +332,51 @@ "rid": "win" } } + }, + "System.Text.Encodings.Web/8.0.0": { + "type": "package", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "compile": { + "lib/net6.0/System.Text.Encodings.Web.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/System.Text.Encodings.Web.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + }, + "runtimeTargets": { + "runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll": { + "assetType": "runtime", + "rid": "browser" + } + } + }, + "System.Text.Json/8.0.0": { + "type": "package", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0" + }, + "compile": { + "lib/net6.0/System.Text.Json.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net6.0/System.Text.Json.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/System.Text.Json.targets": {} + } } } }, @@ -325,6 +459,111 @@ "runtimes/win-x86/native/git2-e632535.dll" ] }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": { + "sha512": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "type": "package", + "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.Abstractions.targets", + "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg.sha512", + "microsoft.extensions.dependencyinjection.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.0": { + "sha512": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "type": "package", + "path": "microsoft.extensions.logging.abstractions/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "analyzers/dotnet/roslyn3.11/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn3.11/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn4.0/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn4.4/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "buildTransitive/net461/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/net462/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.xml", + "microsoft.extensions.logging.abstractions.8.0.0.nupkg.sha512", + "microsoft.extensions.logging.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.NETCore.Platforms/3.1.0": { "sha512": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==", "type": "package", @@ -396,6 +635,29 @@ "nlog.nuspec" ] }, + "Npgsql/8.0.0": { + "sha512": "Qiz74U+O7Mv4knrsXgKVYGJjgwoziK+aMFZqz7PtKR3vyGIhZA0tnW6HoUnL3X+YqtmVuhmoKkN8LDWEHMxPbw==", + "type": "package", + "path": "npgsql/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "README.md", + "lib/net6.0/Npgsql.dll", + "lib/net6.0/Npgsql.xml", + "lib/net7.0/Npgsql.dll", + "lib/net7.0/Npgsql.xml", + "lib/net8.0/Npgsql.dll", + "lib/net8.0/Npgsql.xml", + "lib/netstandard2.0/Npgsql.dll", + "lib/netstandard2.0/Npgsql.xml", + "lib/netstandard2.1/Npgsql.dll", + "lib/netstandard2.1/Npgsql.xml", + "npgsql.8.0.0.nupkg.sha512", + "npgsql.nuspec", + "postgresql.png" + ] + }, "SkiaSharp/2.88.6": { "sha512": "wdfeBAQrEQCbJIRgAiargzP1Uy+0grZiG4CSgBnhAgcJTsPzlifIaO73JRdwIlT3TyBoeU9jEqzwFUhl4hTYnQ==", "type": "package", @@ -518,6 +780,35 @@ "skiasharp.nativeassets.win32.nuspec" ] }, + "System.Diagnostics.DiagnosticSource/8.0.0": { + "sha512": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "type": "package", + "path": "system.diagnostics.diagnosticsource/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.Diagnostics.DiagnosticSource.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/System.Diagnostics.DiagnosticSource.targets", + "lib/net462/System.Diagnostics.DiagnosticSource.dll", + "lib/net462/System.Diagnostics.DiagnosticSource.xml", + "lib/net6.0/System.Diagnostics.DiagnosticSource.dll", + "lib/net6.0/System.Diagnostics.DiagnosticSource.xml", + "lib/net7.0/System.Diagnostics.DiagnosticSource.dll", + "lib/net7.0/System.Diagnostics.DiagnosticSource.xml", + "lib/net8.0/System.Diagnostics.DiagnosticSource.dll", + "lib/net8.0/System.Diagnostics.DiagnosticSource.xml", + "lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll", + "lib/netstandard2.0/System.Diagnostics.DiagnosticSource.xml", + "system.diagnostics.diagnosticsource.8.0.0.nupkg.sha512", + "system.diagnostics.diagnosticsource.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.Formats.Asn1/6.0.0": { "sha512": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==", "type": "package", @@ -541,6 +832,31 @@ "useSharedDesignerContext.txt" ] }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "sha512": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "type": "package", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.targets", + "buildTransitive/netcoreapp3.1/_._", + "lib/net461/System.Runtime.CompilerServices.Unsafe.dll", + "lib/net461/System.Runtime.CompilerServices.Unsafe.xml", + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll", + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.xml", + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll", + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.xml", + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll", + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.xml", + "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", + "system.runtime.compilerservices.unsafe.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.Security.Cryptography.Pkcs/6.0.3": { "sha512": "18UT1BdZ4TYFBHk/wuq7JzCdE3X75z81X+C2rXqIlmEnC21Pm60spGV/dKQSzbyomstqYE33EuN5hfnC86VFxA==", "type": "package", @@ -617,6 +933,114 @@ "useSharedDesignerContext.txt", "version.txt" ] + }, + "System.Text.Encodings.Web/8.0.0": { + "sha512": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "type": "package", + "path": "system.text.encodings.web/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.Text.Encodings.Web.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/System.Text.Encodings.Web.targets", + "lib/net462/System.Text.Encodings.Web.dll", + "lib/net462/System.Text.Encodings.Web.xml", + "lib/net6.0/System.Text.Encodings.Web.dll", + "lib/net6.0/System.Text.Encodings.Web.xml", + "lib/net7.0/System.Text.Encodings.Web.dll", + "lib/net7.0/System.Text.Encodings.Web.xml", + "lib/net8.0/System.Text.Encodings.Web.dll", + "lib/net8.0/System.Text.Encodings.Web.xml", + "lib/netstandard2.0/System.Text.Encodings.Web.dll", + "lib/netstandard2.0/System.Text.Encodings.Web.xml", + "runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll", + "runtimes/browser/lib/net6.0/System.Text.Encodings.Web.xml", + "runtimes/browser/lib/net7.0/System.Text.Encodings.Web.dll", + "runtimes/browser/lib/net7.0/System.Text.Encodings.Web.xml", + "runtimes/browser/lib/net8.0/System.Text.Encodings.Web.dll", + "runtimes/browser/lib/net8.0/System.Text.Encodings.Web.xml", + "system.text.encodings.web.8.0.0.nupkg.sha512", + "system.text.encodings.web.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "System.Text.Json/8.0.0": { + "sha512": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "type": "package", + "path": "system.text.json/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "analyzers/dotnet/roslyn3.11/cs/System.Text.Json.SourceGeneration.dll", + "analyzers/dotnet/roslyn3.11/cs/cs/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/de/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/es/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/fr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/it/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ja/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ko/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pl/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pt-BR/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ru/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/tr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hans/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hant/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/System.Text.Json.SourceGeneration.dll", + "analyzers/dotnet/roslyn4.0/cs/cs/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/de/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/es/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/fr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/it/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ja/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ko/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pl/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pt-BR/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ru/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/tr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hans/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hant/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/System.Text.Json.SourceGeneration.dll", + "analyzers/dotnet/roslyn4.4/cs/cs/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/de/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/es/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/fr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/it/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ja/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ko/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pl/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pt-BR/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ru/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/tr/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hans/System.Text.Json.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hant/System.Text.Json.SourceGeneration.resources.dll", + "buildTransitive/net461/System.Text.Json.targets", + "buildTransitive/net462/System.Text.Json.targets", + "buildTransitive/net6.0/System.Text.Json.targets", + "buildTransitive/netcoreapp2.0/System.Text.Json.targets", + "buildTransitive/netstandard2.0/System.Text.Json.targets", + "lib/net462/System.Text.Json.dll", + "lib/net462/System.Text.Json.xml", + "lib/net6.0/System.Text.Json.dll", + "lib/net6.0/System.Text.Json.xml", + "lib/net7.0/System.Text.Json.dll", + "lib/net7.0/System.Text.Json.xml", + "lib/net8.0/System.Text.Json.dll", + "lib/net8.0/System.Text.Json.xml", + "lib/netstandard2.0/System.Text.Json.dll", + "lib/netstandard2.0/System.Text.Json.xml", + "system.text.json.8.0.0.nupkg.sha512", + "system.text.json.nuspec", + "useSharedDesignerContext.txt" + ] } }, "projectFileDependencyGroups": { @@ -624,7 +1048,8 @@ "Aspose.Cells >= 23.11.0", "LibGit2Sharp >= 0.28.0", "NLog >= 5.2.5", - "Newtonsoft.Json >= 13.0.3" + "Newtonsoft.Json >= 13.0.3", + "Npgsql >= 8.0.0" ] }, "packageFolders": { @@ -686,6 +1111,10 @@ "Newtonsoft.Json": { "target": "Package", "version": "[13.0.3, )" + }, + "Npgsql": { + "target": "Package", + "version": "[8.0.0, )" } }, "imports": [ diff --git a/Server/obj/project.nuget.cache b/Server/obj/project.nuget.cache index 8bde66e..11347c7 100644 --- a/Server/obj/project.nuget.cache +++ b/Server/obj/project.nuget.cache @@ -1,21 +1,28 @@ { "version": 2, - "dgSpecHash": "99RXt0NwS8q6F1wF/mcbT3nbDzb+Y98MRQt/+irrxH7z/JXUyGO93qBq4+P2ULoeTYxJIlW/A+rxMPCl3+EIeA==", + "dgSpecHash": "mqjrT0psY1bh5pPYuFvVGksqVDGIb9h3wRTl0WKT65Jvc3vVnbn6gASe/F71xdFwk7B4tkYfnfbGzX7I7bZYhQ==", "success": true, "projectFilePath": "E:\\git\\CsServer\\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", "C:\\Users\\acst0\\.nuget\\packages\\libgit2sharp.nativebinaries\\2.0.320\\libgit2sharp.nativebinaries.2.0.320.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.0\\microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.0\\microsoft.extensions.logging.abstractions.8.0.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.0\\microsoft.netcore.platforms.3.1.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\nlog\\5.2.5\\nlog.5.2.5.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\npgsql\\8.0.0\\npgsql.8.0.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\skiasharp\\2.88.6\\skiasharp.2.88.6.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\skiasharp.nativeassets.macos\\2.88.6\\skiasharp.nativeassets.macos.2.88.6.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\skiasharp.nativeassets.win32\\2.88.6\\skiasharp.nativeassets.win32.2.88.6.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\system.diagnostics.diagnosticsource\\8.0.0\\system.diagnostics.diagnosticsource.8.0.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\system.formats.asn1\\6.0.0\\system.formats.asn1.6.0.0.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", "C:\\Users\\acst0\\.nuget\\packages\\system.security.cryptography.pkcs\\6.0.3\\system.security.cryptography.pkcs.6.0.3.nupkg.sha512", - "C:\\Users\\acst0\\.nuget\\packages\\system.text.encoding.codepages\\4.7.0\\system.text.encoding.codepages.4.7.0.nupkg.sha512" + "C:\\Users\\acst0\\.nuget\\packages\\system.text.encoding.codepages\\4.7.0\\system.text.encoding.codepages.4.7.0.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512", + "C:\\Users\\acst0\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file