Explorar el Código

1. fix send sms 餘額不足 回覆時間太久導致電樁斷線重連

Jessica Tseng hace 2 años
padre
commit
1f2ad91319

+ 5 - 5
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -276,21 +276,21 @@ namespace EVCB_OCPP.WSServer.Message
                             {
                                 var alarmCond = GlobalConfig.GetAlarmNotification_Cond();
 
-                                if (!string.IsNullOrEmpty(_request.vendorErrorCode) && alarmCond.Contains(_request.vendorErrorCode) )
+                                if (!string.IsNullOrEmpty(_request.vendorErrorCode) && alarmCond.Contains(_request.vendorErrorCode))
                                 {
                                     List<string> sendlist = GlobalConfig.GetSMS_Receivers().Split(',').ToList();
                                     foreach (var item in sendlist)
                                     {
-                                     
+
                                         string message = string.Format("[{0}告警-{1}]\r\n{2} -{3}\r\n時間:{4}\r\n", session.StationName, _request.vendorErrorCode, session.ChargeBoxId,
                                             _request.connectorId, DateTime.UtcNow.AddHours(8).ToString("yyyy/MM/dd HH:mm:ss"));
                                         string errorMsg = string.Empty;
-                                        smsService.SendMessage(item, message, out errorMsg);
+                                        errorMsg = await smsService.SendMessage(item, message);
 
-                                        if(!string.IsNullOrEmpty(errorMsg))
+                                        if (!string.IsNullOrEmpty(errorMsg))
                                         {
                                             logger.Error("Send SMS  " + message);
-                                            logger.Error("Send SMS Error "+ errorMsg);
+                                            logger.Error("Send SMS Error " + errorMsg);
                                         }
                                     }
                                 }

+ 4 - 3
EVCB_OCPP.WSServer/Service/SMSService.cs

@@ -10,8 +10,9 @@ namespace EVCB_OCPP.WSServer.Service
 {
     public class SMSService
     {
-        public int SendMessage(string phoneNumber, string message, out string errorMsg)
+       async public Task<string> SendMessage(string phoneNumber, string message)
         {
+            string errorMsg = string.Empty;
             int result = 0;
             try
             {
@@ -28,7 +29,7 @@ namespace EVCB_OCPP.WSServer.Service
                     Encoding.UTF8).Replace("+", "%20"));
                 url.Append("&CharsetURL=").Append("utf-8");
 
-                var id = client.GetStringAsync(url.ToString()).Result;
+                var id = await client.GetStringAsync(url.ToString());
 
                 if (!SendResult(id))
                 {
@@ -42,7 +43,7 @@ namespace EVCB_OCPP.WSServer.Service
                 errorMsg = ex.Message;
             }
 
-            return result;
+            return errorMsg;
         }
 
         private bool SendResult(string response)