bofore release memorycache and asyn createDbContext

Dockerfile

@@ -1,8 +1,8 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
-RUN sed -i 's/TLSv1.2/TLSv1/g' /etc/ssl/openssl.cnf
-RUN sed -i 's/DEFAULT@SECLEVEL=2/DEFAULT@SECLEVEL=1/g' /etc/ssl/openssl.cnf
+#RUN sed -i 's/TLSv1.2/TLSv1/g' /etc/ssl/openssl.cnf
+#RUN sed -i 's/DEFAULT@SECLEVEL=2/DEFAULT@SECLEVEL=1/g' /etc/ssl/openssl.cnf
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends dialog \

EVCB_OCPP.WSServer/Jobs/HeartBeatCheckJob.cs

@@ -60,11 +60,11 @@ public class HeartBeatCheckJob : IJob
                             machine.ConnectionType = session.UriScheme.Equals("wss") ? 2 : 1;
                             db.Entry(machine).Property(x => x.HeartbeatUpdatedOn).IsModified = true;
                             db.Entry(machine).Property(x => x.ConnectionType).IsModified = true;
-                            //db.SaveChanges();
+                            //await db.SaveChangesAsync();
                         }
                     }
 
-                    db.SaveChanges();
+                    await db.SaveChangesAsync();
                     transaction.Commit();
                     db.ChangeTracker.Clear();
                 }

EVCB_OCPP.WSServer/Jobs/ServerUpdateJob.cs

@@ -118,7 +118,7 @@ public class ServerUpdateJob : IJob
 
                             //        });
 
-                            //        db.SaveChanges();
+                            //        await db.SaveChangesAsync();
 
                             //    }
 

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -576,7 +576,7 @@ internal partial class ProfileHandler
 
                                 db.TransactionRecord.Add(_newTransaction);
 
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                                 t4 = timer.ElapsedMilliseconds;
 
                                 _transactionId = _newTransaction.Id;
@@ -713,8 +713,8 @@ internal partial class ProfileHandler
                                     }
 
 
-                                    //db.SaveChanges();
-                                    db.SaveChanges();
+                                    //await db.SaveChangesAsync();
+                                    await db.SaveChangesAsync();
 
 
                                     if (session.IsBilling)
@@ -903,7 +903,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = string.IsNullOrEmpty(_confirm.data) ? "" : _confirm.data;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                             if (_request.messageId == "ID_FirmwareVersion")
@@ -916,7 +916,7 @@ internal partial class ProfileHandler
                                     db.Machine.Attach(machine);
                                     machine.BoardVersions = _confirm.data;
                                     db.Entry(machine).Property(x => x.BoardVersions).IsModified = true;
-                                    db.SaveChanges();
+                                    await db.SaveChangesAsync();
                                 }
                             }
 
@@ -1149,7 +1149,7 @@ internal partial class ProfileHandler
                                         db.Entry(tx).Property(x => x.Receipt).IsModified = true;
                                         db.Entry(tx).Property(x => x.BillingDone).IsModified = true;
 
-                                        db.SaveChanges();
+                                        await db.SaveChangesAsync();
 
                                         await mainDbService.AddServerMessage(
                                             ChargeBoxId: session.ChargeBoxId,
@@ -1308,7 +1308,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1329,7 +1329,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1350,7 +1350,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1371,7 +1371,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1392,7 +1392,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1438,7 +1438,7 @@ internal partial class ProfileHandler
                                     });
                                 }
                             }
-                            db.SaveChanges();
+                            await db.SaveChangesAsync();
                         }
 
                     }
@@ -1532,7 +1532,7 @@ internal partial class ProfileHandler
 
                                 }
 
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
 
                             }
                         }
@@ -1558,7 +1558,7 @@ internal partial class ProfileHandler
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -1613,7 +1613,7 @@ internal partial class ProfileHandler
                             operation.Status = 1;//電樁有回覆
                             operation.EVSE_Status = (int)255;//錯誤
                             operation.EVSE_Value = errorMsg;
-                            db.SaveChanges();
+                            await db.SaveChangesAsync();
                         }
 
                     }

EVCB_OCPP.WSServer/Message/FirmwareManagementProfileHandler.cs

@@ -65,7 +65,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                                         });
 
-                                        db.SaveChanges();
+                                        await db.SaveChangesAsync();
 
                                         await mainDbService.AddServerMessage(
                                             ChargeBoxId: session.ChargeBoxId,
@@ -75,7 +75,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                                         var clearMachine = db.Machine.Where(x => x.Id == machine.Id).FirstOrDefault();
                                         clearMachine.FW_AssignedVersion = null;
-                                        db.SaveChanges();
+                                        await db.SaveChangesAsync();
                                     }
 
                                 }
@@ -100,7 +100,7 @@ namespace EVCB_OCPP.WSServer.Message
                                         //}
                                     }
 
-                                    db.SaveChanges();
+                                    await db.SaveChangesAsync();
                                 }
                             }
 
@@ -165,7 +165,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)1;//OK
                                 operation.EVSE_Value = string.IsNullOrEmpty(evse_rep) ? operation.EVSE_Value : evse_rep;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -203,7 +203,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }

EVCB_OCPP.WSServer/Message/LocalAuthListManagementProfileHandler.cs

@@ -32,7 +32,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = 1;//OK
                                 operation.EVSE_Value = _confirm.listVersion.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -52,7 +52,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK     
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -87,7 +87,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }

EVCB_OCPP.WSServer/Message/RemoteTriggerHandler.cs

@@ -34,7 +34,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -68,7 +68,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }

EVCB_OCPP.WSServer/Message/ReservationProfileHandler.cs

@@ -34,7 +34,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -54,7 +54,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -88,7 +88,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -106,7 +106,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }

EVCB_OCPP.WSServer/Message/SmartChargingProfileHandler.cs

@@ -90,7 +90,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -110,7 +110,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = _confirm.status.ToString();
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -131,7 +131,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)_confirm.status;//OK
                                 operation.EVSE_Value = JsonConvert.SerializeObject(_confirm.chargingSchedule, Formatting.None);
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }
@@ -168,7 +168,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 operation.Status = 1;//電樁有回覆
                                 operation.EVSE_Status = (int)255;//錯誤
                                 operation.EVSE_Value = errorMsg;
-                                db.SaveChanges();
+                                await db.SaveChangesAsync();
                             }
 
                         }

EVCB_OCPP.WSServer/ProtalServer.cs

@@ -600,7 +600,7 @@ namespace EVCB_OCPP.WSServer
                     if (machine != null)
                     {
                         machine.ConnectionType = session.Origin.Contains("https") ? 2 : 1;
-                        db.SaveChanges();
+                        await db.SaveChangesAsync();
                     }
 
                 }
@@ -929,7 +929,7 @@ namespace EVCB_OCPP.WSServer
                                                     session.IsAC = false;
                                                 }
                                                 machine.ConnectionType = session.Origin.Contains("https") ? 2 : 1;
-                                                db.SaveChanges();
+                                                await db.SaveChangesAsync();
                                             }
                                         }
 
@@ -1357,7 +1357,7 @@ namespace EVCB_OCPP.WSServer
                         var sc = await db.ServerMessage.Where(x => x.Id == foundRequest.Id).FirstOrDefaultAsync();
                         sc.InMessage = JsonConvert.SerializeObject(analysisResult.Message, Formatting.None);
                         sc.ReceivedOn = DateTime.UtcNow;
-                        db.SaveChanges();
+                        await db.SaveChangesAsync();
                         //  Console.WriteLine(string.Format("Now:{0} ServerMessage Id:{1} ", DateTime.UtcNow.ToString("yyyy/MM/dd HH:mm:ss"), foundRequest.Id));
 
                     }

EVCB_OCPP.WSServer/Service/MainDbService.cs

@@ -155,7 +155,7 @@ public class MainDbService : IMainDbService
         };
         db.ConnectorStatus.Add(_currentStatus);
 
-        db.SaveChanges();
+        await db.SaveChangesAsync();
 
         Task.Run(() => { 
         lock (memoryCache)
@@ -271,7 +271,7 @@ public class MainDbService : IMainDbService
             VendorId = VendorId
         });
 
-        db.SaveChanges();
+        await db.SaveChangesAsync();
 
     }
 
@@ -380,7 +380,7 @@ public class MainDbService : IMainDbService
             _machine.MeterType = pam.machine.MeterType;
         }
 
-        db.SaveChanges();
+        await db.SaveChangesAsync();
         trans.Commit();
     }
 
@@ -427,10 +427,10 @@ public class MainDbService : IMainDbService
             db.Entry(status).Property(x => x.VendorId).IsModified = true;
             db.Entry(status).Property(x => x.VendorErrorCode).IsModified = true;
 
-            //db.SaveChanges();
+            //await db.SaveChangesAsync();
         }
 
-        db.SaveChanges();
+        await db.SaveChangesAsync();
         trans.Commit();
         db.ChangeTracker.Clear();
     }
@@ -490,7 +490,7 @@ public class MainDbService : IMainDbService
             db.ServerMessage.Add(message);
         }
 
-        db.SaveChanges();
+        await db.SaveChangesAsync();
         trans.Commit();
         db.ChangeTracker.Clear();
     }

EVCB_OCPP.WSServer/Service/MeterValueDbService.cs

@@ -80,8 +80,8 @@ public class MeterValueDbService
 
         //await db.Database.ExecuteSqlRawAsync(sp, parameter.ToArray());
 
-        //return insertMeterValueHandler.HandleAsync(param);
-        return InsertWithDapper(param);
+        return insertMeterValueHandler.HandleAsync(param);
+        //return InsertWithDapper(param);
         //return meterValueGroupSingleHandler.HandleAsync(param);
     }
 
@@ -180,7 +180,7 @@ public class MeterValueDbService
 
         t1 = watch.ElapsedMilliseconds;
         using SqlConnection sqlConnection = await sqlConnectionFactory.CreateAsync();
-        using var tans = sqlConnection.BeginTransaction();
+        using var tans = await sqlConnection.BeginTransactionAsync();
 
         t2 = watch.ElapsedMilliseconds;
 
@@ -206,12 +206,12 @@ public class MeterValueDbService
                 parameters.Add("UnitId", param.unitId, DbType.Int32);
                 parameters.Add("ChargeBoxId", param.chargeBoxId, DbType.String, size:50);
                 parameters.Add("TransactionId", param.transactionId, DbType.Int32);
-                sqlConnection.Execute(command, parameters, tans);
+                await sqlConnection.ExecuteAsync(command, parameters, tans);
             }
         }
 
         t3 = watch.ElapsedMilliseconds;
-        tans.Commit();
+        await tans.CommitAsync();
 
         watch.Stop();
         t4 = watch.ElapsedMilliseconds;

TestTool.RemoteTriggerAPP/MainWindow.xaml.cs

@@ -903,7 +903,7 @@ namespace TestTool.RemoteTriggerAPP
 
                 });
 
-                db.SaveChanges();
+                await db.SaveChangesAsync();
             }
         }
 
@@ -1057,7 +1057,7 @@ namespace TestTool.RemoteTriggerAPP
             using (var db = new MainDBContext())
             {
                 db.UploadFile.Add(ufObj);
-                db.SaveChanges();
+                await db.SaveChangesAsync();
 
             }
 
@@ -1121,11 +1121,11 @@ namespace TestTool.RemoteTriggerAPP
                 db.MachineVersionFile.Add(obj);
 
                 //將machine的軟體更新更新到這個值
-                db.SaveChanges();
+                await db.SaveChangesAsync();
 
                 machine.FW_AssignedVersion = obj.Id;
 
-                db.SaveChanges();
+                await db.SaveChangesAsync();
 
 
             }
@@ -1147,7 +1147,7 @@ namespace TestTool.RemoteTriggerAPP
 
                 var machine = db.Machine.Where(x => x.ChargeBoxId == uxChargeBoxIdTb.Text).FirstOrDefault();
                 machine.FW_AssignedVersion = null;
-                db.SaveChanges();
+                await db.SaveChangesAsync();
             }
 
             uxMsgTb.Text = "Clear Publish";