Merge tag '1.0.16' into develop
合并1.0.16
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 2938317..364856c 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -9,7 +9,8 @@
id "com.palantir.docker"
}
-payapiVersion = version
+payapiVersion = gitVersion()
+def details = versionDetails()
def payapiStartClass = "com.supwisdom.dlpay.PayApiApplicationKt"
@@ -107,3 +108,7 @@
}
+tasks.withType(JavaCompile) {
+ options.encoding = "UTF-8"
+}
+
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
new file mode 100644
index 0000000..4408895
--- /dev/null
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
@@ -0,0 +1,41 @@
+package com.supwisdom.dlpay.api.controller
+
+import com.supwisdom.dlpay.api.bean.*
+import com.supwisdom.dlpay.api.service.*
+import com.supwisdom.dlpay.framework.ResponseBodyBuilder
+import com.supwisdom.dlpay.framework.service.SystemUtilService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/api/common")
+class SendMessageAPIController {
+
+ @Autowired
+ lateinit var systemUtilService: SystemUtilService
+
+ @Autowired
+ lateinit var transactionService: TransactionServiceProxy
+
+ @Autowired
+ lateinit var kafkaSendMsgService: KafkaSendMsgService
+
+ /**
+ * ============================================================================
+ * 发送消息推送
+ * ============================================================================
+ * */
+ @PostMapping("/sendmsg")
+ fun doSend(@RequestBody param: CommonSendMessageParam): ResponseEntity<Any> {
+ kafkaSendMsgService.sendJpushMessage(param.userid,param.title,param.content,"",mutableMapOf(),"")
+
+ return ResponseEntity.ok(ResponseBodyBuilder.create()
+ .success("发送成功"))
+ }
+
+
+}
\ No newline at end of file