From 26d39a6fd3498d447c7ed8342550d158a560db59 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 18 八月 2020 18:01:45 +0800
Subject: [PATCH] fix push ios msg

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

diff --git a/service/msgPush.go b/service/msgPush.go
index 05ebef6..76cd324 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -181,6 +181,28 @@
 	}
 	url := baseUrl+"/push/list/message"
 	intent := "intent:#Intent;action=android.intent.action.oppopush;launchFlags=0x14000000;component=uni.UNIEDF0B5C/io.dcloud.PandoraEntry;S.UP-OL-SU=true;S.title="+title+";S.content="+msg+";S.payload=test;end"
+	androidPush := map[string]map[string]map[string]string {
+		"ups": {
+			"notification": {
+				"title": title,
+				"body": msg,
+				"click_type": "intent",
+				"intent": intent,
+			},
+		},
+	}
+	iosPush := map[string]interface{}{
+		"type":"notify",
+		"payload":"鑲茶嫳涓鍋滆溅",
+		"aps":map[string]interface{}{
+			"alert":map[string]string{
+				"title": title,
+				"body": msg,
+			},
+			"content-available":0,
+		},
+		"auto_badge":"+1",
+	}
 	reqBody := map[string]interface{} {
 		"request_id": time.Now().Format("20060102150405") + util.GenValidateCode(6),
 		"settings":map[string]int {
@@ -194,17 +216,9 @@
 				"intent": intent,
 			},
 		},
-		"push_channel": map[string]map[string]map[string]map[string]string {
-			"android": {
-				"ups": {
-					"notification": {
-						"title": title,
-						"body": msg,
-						"click_type": "intent",
-						"intent": intent,
-					},
-				},
-			},
+		"push_channel": map[string]interface{} {
+			"android": androidPush,
+			"ios":iosPush,
 		},
 	}
 	header := map[string]string {
@@ -462,6 +476,7 @@
 	return b,e, aliasArr
 }
 
+/*
 func PushAll(title string, msg string) (bool,error) {
 	appId := beego.AppConfig.String("pushAppId")
 	baseUrl := beego.AppConfig.String("pushBaseUrl") + appId
@@ -546,7 +561,7 @@
 	}
 
 	return false, errors.New("鎺ㄩ�佸け璐�")
-}
+}*/
 
 func RefreshToken() (*TokenResult,error) {
 	appId := beego.AppConfig.String("pushAppId")

--
Gitblit v1.8.0