From f64dd9f191dff341b4eb430d7bacc44a3db9a279 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 04 三月 2022 10:12:45 +0800
Subject: [PATCH] fix nil
---
service/msgPush.go | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/service/msgPush.go b/service/msgPush.go
index 7f19c39..d07d3de 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,
@@ -258,6 +262,9 @@
//瀵瑰凡娉ㄥ唽鐨勭敤鎴疯繘琛屾秷鎭帹閫併�傝皟鐢ㄦ鎺ュ彛鍓嶉渶璋冪敤鍒涘缓娑堟伅鎺ュ彛璁剧疆娑堟伅鍐呭
func PushByAlias(title string, msg string, isTest bool) (bool, error, []string) {
+ if !isPushOpen() {
+ return false,errors.New("鎺ㄩ�佸紑鍏冲凡鍏抽棴"),nil
+ }
var aliasArr []string
pushUserM := make(map[string]string)
@@ -422,6 +429,9 @@
}
func NightPush(title string, msg string) (bool, error, []string, []string) {
+ if !isPushOpen() {
+ return false,errors.New("鎺ㄩ�佸紑鍏冲凡鍏抽棴"),nil,nil
+ }
var aliasArr []string
var carOwners []string
@@ -482,7 +492,8 @@
}
} else { //鎵句笉鍒拌溅涓伙紝鍗宠涓轰复鏃惰溅锛屽皢杞︾墝浣滀负杞︿富濮撳悕鎺ㄩ��
if sn.PlateNo == "鏃犺溅鐗�" {
- carOwners = append(carOwners, sn.PlateNo)
+ //鏃犺溅鐗岀殑涓嶆帹閫�
+ //carOwners = append(carOwners, sn.PlateNo)
} else {
carOwners = append(carOwners, sn.PlateNo+"()")
}
@@ -557,10 +568,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+"()")
+ }
}
}
}
@@ -585,14 +600,22 @@
}
//濡傛灉澶滈棿鏈夌粰杞﹀簱鍐呯殑杞︿富鎺ㄩ�佲�滆灏藉揩椹剁鈥濈殑娑堟伅锛屽垯鍛婄煡绠＄悊鍛� 鏈夊摢浜涜溅灏氬仠鍦ㄨ溅搴撳唴
-func Push2Manager(title string, msg string) (bool, error, []string) {
+func Push2Manager(title string, msg string, isTest bool) (bool, error, []string) {
+ if !isPushOpen() {
+ return false,errors.New("鎺ㄩ�佸紑鍏冲凡鍏抽棴"),nil
+ }
if len(msg) > 256 {
fmt.Println("澶滈棿鍋滅暀杞﹀お澶氾紝message:", msg)
r := []rune(msg)
msg = string(r[:125])+"..."
}
- managers := beego.AppConfig.String("nightManagerPhones")
+ managers := ""
+ if isTest {
+ managers = beego.AppConfig.String("testPushPhones")
+ } else {
+ managers = beego.AppConfig.String("nightManagerPhones")
+ }
if managers == "" {
return false, errors.New("澶滈棿鎺ㄩ�佺鐞嗗憳鎵嬫満鍙锋湭閰嶇疆"), []string{}
}
@@ -610,6 +633,15 @@
b,e := doPush(taskId, managerArr)
return b,e, managerArr
+}
+
+func isPushOpen() bool {
+ b, err := beego.AppConfig.Bool("pushOpen")
+ fmt.Println("pushOpen:", b, "err:", err)
+ if err != nil {
+ return false
+ }
+ return b
}
/*
@@ -738,4 +770,4 @@
return &t, nil
}
return nil, errors.New("鑾峰彇unipush骞冲彴token澶辫触")
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0