From f3f7088545c2be0b6da1b4e5e1d8461fa57a63fc Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 08 九月 2020 15:03:56 +0800
Subject: [PATCH] fix url and fix testNightPush

---
 service/msgPush.go |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/service/msgPush.go b/service/msgPush.go
index 7f19c39..f23263c 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -184,6 +184,7 @@
 	androidPush := map[string]map[string]map[string]string {
 		"ups": {
 			"notification": {
+				"title": title,
 				"body": msg,
 				"big_text": msg,
 				"click_type": "intent",
@@ -193,8 +194,10 @@
 	}
 	iosPush := map[string]interface{}{
 		"type":"notify",
+		"payload": "鑲茶嫳涓鍋滆溅",
 		"aps":map[string]interface{}{
 			"alert":map[string]string{
+				"title": title,
 				"body": msg,
 			},
 			"content-available":0,
@@ -207,6 +210,7 @@
 		},
 		"push_message": map[string]map[string]string {
 			"notification": {
+				"title": title,
 				"body": msg,
 				"click_type": "intent",
 				"intent": intent,
@@ -557,10 +561,14 @@
 					if personId,ok := carPersonM[inCnPlateNo];ok {
 
 						if v,ex := hikPersonMap[personId]; ex {
-							carOwners = append(carOwners, v.PersonName)
+							carOwners = append(carOwners, sn.PlateNo+"("+v.PersonName+")")
 						}
 					} else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
-						carOwners = append(carOwners, sn.PlateNo)
+						if sn.PlateNo == "鏃犺溅鐗�" {
+							carOwners = append(carOwners, sn.PlateNo)
+						} else {
+							carOwners = append(carOwners, sn.PlateNo+"()")
+						}
 					}
 				}
 			}

--
Gitblit v1.8.0