From dbc843d0b37f786fb816131bcc7ebca86dbe72e9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 06 八月 2020 09:58:46 +0800
Subject: [PATCH] add crossRecord

---
 service/msgPush.go |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/service/msgPush.go b/service/msgPush.go
index 3d8d42c..844ae2e 100644
--- a/service/msgPush.go
+++ b/service/msgPush.go
@@ -66,17 +66,32 @@
 		return false, errors.New("token is nil")
 	}
 	url := baseUrl+"/push/all"
+	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"
 	reqBody := map[string]interface{} {
 		"request_id": time.Now().Format("20060102150405") + util.GenValidateCode(6),
 		"settings":map[string]int {
 			"ttl": 8 * 3600 * 1000,
 		},
 		"audience": "all",
-		"push_message": map[string]string{
-			"title": title,
-			"body": msg,
-			"click_type": "url",
-			"url": "http://baidu.com",
+		"push_message": map[string]map[string]string {
+			"notification": {
+				"title": title,
+				"body": msg,
+				"click_type": "intent",
+				"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,
+					},
+				},
+			},
 		},
 	}
 	header := map[string]string {
@@ -104,21 +119,18 @@
 				goto ReTry
 			}
 		}
-
+	} else {
+		fmt.Println("鎺ㄩ�佺粨鏋�:", result)
 	}
 
 	return false, errors.New("鎺ㄩ�佸け璐�")
 }
 
 func RefreshToken() (*TokenResult,error) {
-	//appId := beego.AppConfig.String("pushAppId")
-	//appKey := beego.AppConfig.String("pushAppKey")
-	//masterSecret := beego.AppConfig.String("pushMasterSecret")
-	//baseUrl := beego.AppConfig.String("pushBaseUrl") + appId
-	appId := "WU8KzZBaTwADIjTwaMSzW5"
-	appKey := "9JLs4B1ZVkAVh93JXX3MP4"
-	masterSecret := "IbSAe83ZoZAczhKSA3Bwj9"
-	baseUrl := "https://restapi.getui.com/v2/"+appId
+	appId := beego.AppConfig.String("pushAppId")
+	appKey := beego.AppConfig.String("pushAppKey")
+	masterSecret := beego.AppConfig.String("pushMasterSecret")
+	baseUrl := beego.AppConfig.String("pushBaseUrl") + appId
 	url := baseUrl +"/auth"
 	timestamp := fmt.Sprintf("%v", time.Now().UnixNano() / 1e6)
 	sign := util.Sha256(appKey + timestamp + masterSecret)

--
Gitblit v1.8.0