Merge tag 'tag/1.0.19' into develop
消息推送过期时间问题
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/kafka_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/kafka_service_impl.kt
index c913448..fc5afd8 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/kafka_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/kafka_service_impl.kt
@@ -79,10 +79,6 @@
if (it.lastloginplatform.isNullOrEmpty()) {
message.platform = "all"
kafkaTemplate.send(topic, msg.msgid, gson.toJson(message))
-// message.platform="ios"
-// kafkaTemplate.send(topic, msg.msgid, gson.toJson(message))
-// message.platform="android"
-// kafkaTemplate.send(topic, msg.msgid, gson.toJson(message))
} else {
kafkaTemplate.send(topic, msg.msgid, gson.toJson(message))
}
@@ -109,6 +105,7 @@
this.callback = true
this.retries = 3
this.custom = gson.toJson(extras)
+ this.expiretime = DateUtil.getNewTime(DateUtil.getNow(), 300)
}
println(gson.toJson(message))
kafkaTemplate.send(topic, noticeMsg.msgid, gson.toJson(message))