diff --git a/OCPP.Core.Management/Dockerfile b/OCPP.Core.Management/Dockerfile index 7a8b16f..c66a5af 100644 --- a/OCPP.Core.Management/Dockerfile +++ b/OCPP.Core.Management/Dockerfile @@ -8,5 +8,5 @@ RUN dotnet publish OCPP.Core.Management/OCPP.Core.Management.csproj -o /publish FROM registry.71dev.com/dotnetaspnet:8.0 WORKDIR /app COPY --from=build-env /publish . -ENV ASPNETCORE_URLS http://*:8082 +ENV ASPNETCORE_URLS http://*:8080 ENTRYPOINT ["dotnet", "OCPP.Core.Management.dll"] \ No newline at end of file diff --git a/OCPP.Core.Management/Logs/OCPP.Core.Management-00.log b/OCPP.Core.Management/Logs/OCPP.Core.Management-00.log index f56e0f9..07b1848 100644 --- a/OCPP.Core.Management/Logs/OCPP.Core.Management-00.log +++ b/OCPP.Core.Management/Logs/OCPP.Core.Management-00.log @@ -1,2 +1,4 @@ warn: Microsoft.AspNetCore.Server.Kestrel[0] @ 2024-06-01T18:31:32.2089150+07:00 Overriding address(es) 'http://localhost:8082'. Binding to endpoints defined via IConfiguration and/or UseKestrel() instead. +warn: Microsoft.AspNetCore.Server.Kestrel[0] @ 2024-06-02T00:27:32.0567750+07:00 + Overriding address(es) 'http://localhost:8082'. Binding to endpoints defined via IConfiguration and/or UseKestrel() instead. diff --git a/OCPP.Core.Management/appsettings.json b/OCPP.Core.Management/appsettings.json index ef0fd80..528af71 100644 --- a/OCPP.Core.Management/appsettings.json +++ b/OCPP.Core.Management/appsettings.json @@ -55,7 +55,7 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://localhost:8082" + "Url": "http://localhost:8080" }, "HttpsInlineCertFile": { "Url": "https://localhost:8092", diff --git a/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.dll b/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.dll index e96e4ed..0dacc98 100644 Binary files a/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.dll and b/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.dll differ diff --git a/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.pdb b/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.pdb index 1156d21..3142160 100644 Binary files a/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.pdb and b/OCPP.Core.Management/bin/Debug/net8.0/OCPP.Core.Management.pdb differ diff --git a/OCPP.Core.Management/bin/Debug/net8.0/appsettings.json b/OCPP.Core.Management/bin/Debug/net8.0/appsettings.json index 3aa2b0e..ef0fd80 100644 --- a/OCPP.Core.Management/bin/Debug/net8.0/appsettings.json +++ b/OCPP.Core.Management/bin/Debug/net8.0/appsettings.json @@ -31,10 +31,12 @@ "ConnectionStrings": { //"SQLite": "Filename=.\\..\\SQLite\\OCPP.Core.sqlite;" - "SqlServer": "Server=.;Database=OCPP.Core;Trusted_Connection=True;Encrypt=false;TrustServerCertificate=false" + //"SqlServer": "Server=.;Database=OCPP.Core;Trusted_Connection=True;Encrypt=false;TrustServerCertificate=false", + "SqlServer": "Data Source=202.129.205.201,31455;Initial Catalog=OCPP.Core;User ID=dev;Password=password@1;TrustServerCertificate=true;" }, - "ServerApiUrl": "http://localhost:8081/API", + //"ServerApiUrl": "http://localhost:8081/API", + "ServerApiUrl": "http://server-ocpp-service.ocpp/API", "ApiKey": "36029A5F-B736-4DA9-AE46-D66847C9062C", "Users": [ diff --git a/OCPP.Core.Management/bin/Debug/net8.0/de/OCPP.Core.Management.resources.dll b/OCPP.Core.Management/bin/Debug/net8.0/de/OCPP.Core.Management.resources.dll index 55f8f98..8831e94 100644 Binary files a/OCPP.Core.Management/bin/Debug/net8.0/de/OCPP.Core.Management.resources.dll and b/OCPP.Core.Management/bin/Debug/net8.0/de/OCPP.Core.Management.resources.dll differ diff --git a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfo.cs b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfo.cs index e01fb4b..aadde4c 100644 --- a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfo.cs +++ b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("dallmann consulting GmbH")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.3.2.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+fc38961b62d48b98657acc81848beb625ce56692")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+6206dbce7a103541974902bccd208fafb3a0c99d")] [assembly: System.Reflection.AssemblyProductAttribute("OCPP.Core")] [assembly: System.Reflection.AssemblyTitleAttribute("OCPP.Core.Management")] [assembly: System.Reflection.AssemblyVersionAttribute("1.3.2.0")] diff --git a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfoInputs.cache b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfoInputs.cache index aab02f5..70c3255 100644 --- a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfoInputs.cache +++ b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.AssemblyInfoInputs.cache @@ -1 +1 @@ -ec8730582114481ba95afca3f7c6d409282650a7d1eb4ed7cf74d0cf01c5f0b7 +b94d85bb8ba51b4c3e1e4e558957a11f134b662d7c9c2b42a3e295fd0e5c24d6 diff --git a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.dll b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.dll index e96e4ed..0dacc98 100644 Binary files a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.dll and b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.dll differ diff --git a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.pdb b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.pdb index 1156d21..3142160 100644 Binary files a/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.pdb and b/OCPP.Core.Management/obj/Debug/net8.0/OCPP.Core.Management.pdb differ diff --git a/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.cs b/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.cs index 640531f..defc9fa 100644 --- a/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.cs +++ b/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("dallmann consulting GmbH")] [assembly: System.Reflection.AssemblyCopyrightAttribute(" ")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.3.2.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+fc38961b62d48b98657acc81848beb625ce56692")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+6206dbce7a103541974902bccd208fafb3a0c99d")] [assembly: System.Reflection.AssemblyProductAttribute("OCPP.Core")] [assembly: System.Reflection.AssemblyTitleAttribute("OCPP.Core.Management")] [assembly: System.Reflection.AssemblyVersionAttribute("1.3.2.0")] diff --git a/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.dll b/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.dll index 55f8f98..8831e94 100644 Binary files a/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.dll and b/OCPP.Core.Management/obj/Debug/net8.0/de/OCPP.Core.Management.resources.dll differ diff --git a/OCPP.Core.Management/obj/Debug/net8.0/ref/OCPP.Core.Management.dll b/OCPP.Core.Management/obj/Debug/net8.0/ref/OCPP.Core.Management.dll index 59db14d..e084917 100644 Binary files a/OCPP.Core.Management/obj/Debug/net8.0/ref/OCPP.Core.Management.dll and b/OCPP.Core.Management/obj/Debug/net8.0/ref/OCPP.Core.Management.dll differ diff --git a/OCPP.Core.Management/obj/Debug/net8.0/refint/OCPP.Core.Management.dll b/OCPP.Core.Management/obj/Debug/net8.0/refint/OCPP.Core.Management.dll index 59db14d..e084917 100644 Binary files a/OCPP.Core.Management/obj/Debug/net8.0/refint/OCPP.Core.Management.dll and b/OCPP.Core.Management/obj/Debug/net8.0/refint/OCPP.Core.Management.dll differ diff --git a/OCPP.Core.Server/Logs/OCPP.Core.Server-00.log b/OCPP.Core.Server/Logs/OCPP.Core.Server-00.log index fdcf3ef..d6e55ab 100644 --- a/OCPP.Core.Server/Logs/OCPP.Core.Server-00.log +++ b/OCPP.Core.Server/Logs/OCPP.Core.Server-00.log @@ -657,3 +657,15 @@ trce: OCPPMiddleware[0] @ 2024-06-01T18:26:40.9769120+07:00 OCPPMiddleware => Websocket request: Path='/favicon.ico' warn: OCPPMiddleware[0] @ 2024-06-01T18:26:40.9770220+07:00 OCPPMiddleware => Bad path request +trce: OCPP.Core.Server.Startup[0] @ 2024-06-02T00:27:39.9933040+07:00 + Startup => Configure(...) +warn: Microsoft.AspNetCore.Server.Kestrel[0] @ 2024-06-02T00:27:40.7525190+07:00 + Overriding address(es) 'http://localhost:8081'. Binding to endpoints defined via IConfiguration and/or UseKestrel() instead. +trce: OCPPMiddleware[0] @ 2024-06-02T00:27:49.7709810+07:00 + OCPPMiddleware => Websocket request: Path='/' +trce: OCPPMiddleware[0] @ 2024-06-02T00:27:49.7711660+07:00 + OCPPMiddleware => Index status page +trce: OCPPMiddleware[0] @ 2024-06-02T00:27:49.7969730+07:00 + OCPPMiddleware => Websocket request: Path='/favicon.ico' +warn: OCPPMiddleware[0] @ 2024-06-02T00:27:49.7970820+07:00 + OCPPMiddleware => Bad path request diff --git a/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.dll b/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.dll index 0871f69..2ddb407 100644 Binary files a/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.dll and b/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.dll differ diff --git a/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.pdb b/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.pdb index 05b9eac..4fa3f66 100644 Binary files a/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.pdb and b/OCPP.Core.Server/bin/Debug/net8.0/OCPP.Core.Server.pdb differ diff --git a/OCPP.Core.Server/bin/Debug/net8.0/appsettings.json b/OCPP.Core.Server/bin/Debug/net8.0/appsettings.json index 62468c2..364b47d 100644 --- a/OCPP.Core.Server/bin/Debug/net8.0/appsettings.json +++ b/OCPP.Core.Server/bin/Debug/net8.0/appsettings.json @@ -50,7 +50,7 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://localhost:8081" + "Url": "http://localhost:8080" }, "HttpsInlineCertFile": { "Url": "https://localhost:8091", diff --git a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfo.cs b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfo.cs index 479c31c..7a2c053 100644 --- a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfo.cs +++ b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("dallmann consulting GmbH")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.3.2.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+fc38961b62d48b98657acc81848beb625ce56692")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3.2+6206dbce7a103541974902bccd208fafb3a0c99d")] [assembly: System.Reflection.AssemblyProductAttribute("OCPP.Core")] [assembly: System.Reflection.AssemblyTitleAttribute("OCPP.Core.Server")] [assembly: System.Reflection.AssemblyVersionAttribute("1.3.2.0")] diff --git a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfoInputs.cache b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfoInputs.cache index 5519bb0..38cd909 100644 --- a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfoInputs.cache +++ b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.AssemblyInfoInputs.cache @@ -1 +1 @@ -4ce0e2e256c4fcaef8eb526dcd1c5005fd8fb69a0496fd2b83ed7a2d691299cc +8e94af7d52e7e5a123d157211bfb4bce410d8e501726c5ac34b9d78e30da777d diff --git a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.dll b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.dll index 0871f69..2ddb407 100644 Binary files a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.dll and b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.dll differ diff --git a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.pdb b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.pdb index 05b9eac..4fa3f66 100644 Binary files a/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.pdb and b/OCPP.Core.Server/obj/Debug/net8.0/OCPP.Core.Server.pdb differ diff --git a/OCPP.Core.Server/obj/Debug/net8.0/ref/OCPP.Core.Server.dll b/OCPP.Core.Server/obj/Debug/net8.0/ref/OCPP.Core.Server.dll index afae2f1..cf6f798 100644 Binary files a/OCPP.Core.Server/obj/Debug/net8.0/ref/OCPP.Core.Server.dll and b/OCPP.Core.Server/obj/Debug/net8.0/ref/OCPP.Core.Server.dll differ diff --git a/OCPP.Core.Server/obj/Debug/net8.0/refint/OCPP.Core.Server.dll b/OCPP.Core.Server/obj/Debug/net8.0/refint/OCPP.Core.Server.dll index afae2f1..cf6f798 100644 Binary files a/OCPP.Core.Server/obj/Debug/net8.0/refint/OCPP.Core.Server.dll and b/OCPP.Core.Server/obj/Debug/net8.0/refint/OCPP.Core.Server.dll differ