From b32281addc5623fbdcdf759c82ebb14c262b7d92 Mon Sep 17 00:00:00 2001
From: "binquan.qiu" <binquan.qiu@supwisdom.com>
Date: Wed, 15 Jul 2020 14:47:56 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?utf8?q?=E9=80=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B6=88?=
 =?utf8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java  | 4 ++++
 .../supwisdom/dlpay/api/controller/sendmsg_api_controller.kt  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
index f63b88f0..b0695f1c 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
@@ -17,6 +17,10 @@ public class CommonSendMessageParam extends APIRequestParam {
     private String content;
     @Sign
     private String title;
+    @Sign
+    private String msgtype;
+    @Sign
+    private String url;
 
     @Override
     public boolean checkParam() throws RequestParamCheckException {
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
index 4408895d..575a5704 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
@@ -31,7 +31,9 @@ class SendMessageAPIController {
      * */
     @PostMapping("/sendmsg")
     fun doSend(@RequestBody param: CommonSendMessageParam): ResponseEntity<Any> {
-        kafkaSendMsgService.sendJpushMessage(param.userid,param.title,param.content,"",mutableMapOf(),"")
+        val map = mutableMapOf<String, String>()
+        map["msgtype"] = param.msgtype
+        kafkaSendMsgService.sendJpushMessage(param.userid,param.title,param.content,"",map,"")
 
         return ResponseEntity.ok(ResponseBodyBuilder.create()
                 .success("发送成功"))
-- 
2.17.1