Merge branch '730' of http://gitlab.ioubuy.cn/xunjia/dmhub-plugin

src/main/java/com/bgy/sms/channel/api/DmHubApi.java

@@ -128,7 +128,7 @@ public class DmHubApi {
         log.info("**********单条发送入参*******：{},\r\n appId:{},timestamp:{},signature:{}", JSONObject.toJSONString(request), appId, timestamp, signature);
         DmHubResponse response;
         try {
-           boolean checkResult = this.checkSignature(timestamp, signature);
+            boolean checkResult = this.checkSignature(timestamp, signature);
             if (!checkResult) {
                 return new DmHubResponse("555", "签名校验不通过");
             }

src/main/java/com/bgy/sms/channel/dto/DmHubBatchSendRequest.java

@@ -22,6 +22,10 @@ public class DmHubBatchSendRequest implements Serializable {
     // 短信数据
     private List<JSONObject> data;
 
+    private String channelAccount;
+
+    private String channelType;
+
 
     public String getTemplateId() {
         return templateId;
@@ -54,4 +58,20 @@ public class DmHubBatchSendRequest implements Serializable {
     public void setAudienceIdType(String audienceIdType) {
         this.audienceIdType = audienceIdType;
     }
+
+    public String getChannelAccount() {
+        return channelAccount;
+    }
+
+    public void setChannelAccount(String channelAccount) {
+        this.channelAccount = channelAccount;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+    }
 }

src/main/java/com/bgy/sms/channel/dto/DmHubSendRequest.java

@@ -22,6 +22,10 @@ public class DmHubSendRequest implements Serializable {
     // 发送数据
     private JSONObject data;
 
+    private String channelAccount;
+
+    private String channelType;
+
 
     public String getTemplateId() {
         return templateId;
@@ -54,4 +58,20 @@ public class DmHubSendRequest implements Serializable {
     public void setData(JSONObject data) {
         this.data = data;
     }
+
+    public String getChannelAccount() {
+        return channelAccount;
+    }
+
+    public void setChannelAccount(String channelAccount) {
+        this.channelAccount = channelAccount;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+    }
 }

src/main/java/com/bgy/sms/service/impl/MessageServiceImpl.java

@@ -246,6 +246,9 @@ public class MessageServiceImpl implements MessageService {
             List<String> paramList = new ArrayList<>();
             String mobile = data.getString("_audienceId");
             data.remove("name");
+            data.remove("smsMessage");
+            data.remove("inWhiteList");
+            data.remove("isRealtime");
             data.remove("id");
             data.remove("_audienceId");
 
@@ -376,6 +379,9 @@ public class MessageServiceImpl implements MessageService {
             Set<String> keys = json.keySet();
             String mobile = json.getString("_audienceId");
             json.remove("name");
+            json.remove("smsMessage");
+            json.remove("inWhiteList");
+            json.remove("isRealtime");
             json.remove("id");
             json.remove("_audienceId");
             mobileList.add(mobile);