Merge branch 'Docker' into Docker_msg

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -431,7 +431,9 @@ internal partial class ProfileHandler
 							{
 								foreach (var sampleVaule in item.sampledValue)
 								{
-									decimal value = Convert.ToDecimal(sampleVaule.value);
+                                    if (sampleVaule.format == ValueFormat.SignedData) continue;
+
+                                    decimal value = Convert.ToDecimal(sampleVaule.value);
 									datas.Add(new InsertMeterValueParam(
 										chargeBoxId: session.ChargeBoxId
 										, connectorId: (byte)_request.connectorId

EVCB_OCPP.WSServer/Service/DbService/MeterValueDbService.cs

@@ -82,7 +82,7 @@ public class MeterValueDbService
             string strSql = $"""
                 SELECT [TransactionId],Min(Value) as MinSoC,Max(Value) as MaxSoC
                 FROM [dbo].ConnectorMeterValueRecord{queryDate.Date.ToString("yyMMdd")}
-                WHERE TransactionId=@TransactionId and MeasurandId=20 group by [TransactionId]
+                WHERE TransactionId=@TransactionId and MeasurandId=20 and Value!= 0 group by [TransactionId]
                 """;
 
             var result = await conn.QueryFirstOrDefaultAsync<TransactionSoCDto>(strSql, parameters);

EVCB_OCPP.WSServer/Service/OuterBusinessService.cs

@@ -284,6 +284,11 @@ namespace EVCB_OCPP.WSServer.Service
                         connectorId = connectorStatus.ConnectorId;
                     }
                 }
+
+                if (connectorId is null)
+                {
+                    connectorId = -1;
+                }
             }
 
             return string.Format("charging_auth?ChargeBoxId={0}&ConnectorId={1}&IdTag={2}", chargeBoxId, connectorId, idTag);

EVCB_OCPP.WSServer/Service/WsService/OcppWebsocketService.cs

@@ -22,7 +22,7 @@ public static partial class AppExtention
     {
         webApplication.UseWebSockets(new WebSocketOptions()
         {
-            KeepAliveInterval = TimeSpan.FromSeconds(10)
+            KeepAliveInterval = TimeSpan.FromDays(1)
         });
 
         webApplication.Use(async (context, next) =>

version.txt

@@ -1 +1 @@
-Docker_v1.1.16
+Docker_v1.1.21