From a931554f2f761bf7f03c396793fd7f1e810fad5c Mon Sep 17 00:00:00 2001
From: Nokecy <nokecy@163.com>
Date: Thu, 8 Nov 2018 17:11:33 +0800
Subject: [PATCH 1/2] Add extraParameter to ISmsSender.SendAsync

---
 framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs    | 5 +++--
 framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
index c72a5013cd..f3e0081c67 100644
--- a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
+++ b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
@@ -1,9 +1,10 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Volo.Abp.Sms
 {
     public interface ISmsSender
     {
-        Task SendAsync(string phoneNumber, string text);
+        Task SendAsync(string phoneNumber, string text, IDictionary<string, object> extraParameter);
     }
 }
diff --git a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
index 0b3c8879e4..c972fef8c4 100644
--- a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
+++ b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
@@ -1,6 +1,7 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Sms
@@ -14,7 +15,7 @@ namespace Volo.Abp.Sms
             Logger = NullLogger<NullSmsSender>.Instance;
         }
 
-        public Task SendAsync(string phoneNumber, string text)
+        public Task SendAsync(string phoneNumber, string text, IDictionary<string, object> extraParameter)
         {
             Logger.LogWarning($"SMS Sending was not implemented! Using {nameof(NullSmsSender)}:");
             Logger.LogWarning("Phone Number : " + phoneNumber);

From d4688255c471b20f107499a3f9f68320180c5981 Mon Sep 17 00:00:00 2001
From: Nokecy <nokecy@163.com>
Date: Thu, 8 Nov 2018 19:46:52 +0800
Subject: [PATCH 2/2] create SmsMessage class

---
 .../src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs   |  2 +-
 .../Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs    |  6 +++---
 .../src/Volo.Abp.Sms/Volo/Abp/Sms/SmsMessage.cs   | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 framework/src/Volo.Abp.Sms/Volo/Abp/Sms/SmsMessage.cs

diff --git a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
index f3e0081c67..f62be39663 100644
--- a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
+++ b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/ISmsSender.cs
@@ -5,6 +5,6 @@ namespace Volo.Abp.Sms
 {
     public interface ISmsSender
     {
-        Task SendAsync(string phoneNumber, string text, IDictionary<string, object> extraParameter);
+        Task SendAsync(SmsMessage smsMessage);
     }
 }
diff --git a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
index c972fef8c4..8bf319ef84 100644
--- a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
+++ b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/NullSmsSender.cs
@@ -15,11 +15,11 @@ namespace Volo.Abp.Sms
             Logger = NullLogger<NullSmsSender>.Instance;
         }
 
-        public Task SendAsync(string phoneNumber, string text, IDictionary<string, object> extraParameter)
+        public Task SendAsync(SmsMessage smsMessage)
         {
             Logger.LogWarning($"SMS Sending was not implemented! Using {nameof(NullSmsSender)}:");
-            Logger.LogWarning("Phone Number : " + phoneNumber);
-            Logger.LogWarning("SMS Text     : " + text);
+            Logger.LogWarning("Phone Number : " + smsMessage.PhoneNumber);
+            Logger.LogWarning("SMS Text     : " + smsMessage.Text);
 
             return Task.CompletedTask;
         }
diff --git a/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/SmsMessage.cs b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/SmsMessage.cs
new file mode 100644
index 0000000000..8e8c9d3c1c
--- /dev/null
+++ b/framework/src/Volo.Abp.Sms/Volo/Abp/Sms/SmsMessage.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.Sms
+{
+    public class SmsMessage
+    {
+        public string PhoneNumber { get; set; }
+
+        public string Text { get; set; }
+
+        public IDictionary<string, object> Properties { get; set; }
+    }
+}