chore: 优化推送描述

Author: linrongda

cmd/common/main.go

@@ -174,12 +174,12 @@ func syncNoticeTask() error {
 
 		// 进行消息推送
 		if ok := umeng.EnqueueAsync(func() error {
-			err = umeng.SendAndroidGroupcastWithUrl("教务处通知", info.Title, "", info.URL, constants.UmengJwchNoticeTag)
+			err = umeng.SendAndroidGroupcastWithUrl("教务处通知", info.Title, "", info.URL, constants.UmengJwchNoticeTag, "教务处")
 			if err != nil {
 				logger.Errorf("notice sync task: failed to send notice to Android: %v", err)
 			}
 
-			err = umeng.SendIOSGroupcast("教务处通知", "", info.Title, constants.UmengJwchNoticeTag)
+			err = umeng.SendIOSGroupcast("教务处通知", "", info.Title, constants.UmengJwchNoticeTag, "教务处")
 			if err != nil {
 				logger.Errorf("notice sync task: failed to send notice to IOS: %v", err)
 			}

internal/academic/service/get_scores.go

@@ -201,11 +201,11 @@ func (s *AcademicService) handleScoreChange(stuID string, scores []*jwch.Mark) (
 }
 
 func (s *AcademicService) sendNotifications(courseName, tag string) (err error) {
-	err = umeng.SendAndroidGroupcastWithGoApp(fmt.Sprintf("%v成绩更新啦", courseName), "", "", tag)
+	err = umeng.SendAndroidGroupcastWithGoApp(fmt.Sprintf("%v成绩更新啦", courseName), "", "", tag, fmt.Sprintf("成绩更新%v", tag[:12]))
 	if err != nil {
 		logger.Errorf("task queue: failed to send notice to Android: %v", err)
 	}
-	err = umeng.SendIOSGroupcast(fmt.Sprintf("%v成绩更新啦", courseName), "", "", tag)
+	err = umeng.SendIOSGroupcast(fmt.Sprintf("%v成绩更新啦", courseName), "", "", tag, fmt.Sprintf("成绩更新%v", tag[:12]))
 	if err != nil {
 		logger.Errorf("task queue: failed to send notice to IOS: %v", err)
 	}

internal/course/service/get_course_list.go

@@ -194,17 +194,15 @@ func (s *CourseService) handleCourseUpdate(term string, newCourses []*kitexModel
 }
 
 func (s *CourseService) sendNotifications(courseName, tag string) (err error) {
-	err = umeng.SendAndroidGroupcastWithGoApp(fmt.Sprintf("[调课] %v", courseName), "", "", tag)
+	err = umeng.SendAndroidGroupcastWithGoApp(fmt.Sprintf("[调课] %v", courseName), "", "", tag, fmt.Sprintf("调课%v", tag[:12]))
 	if err != nil {
 		logger.Errorf("service.sendNotifications: Send course updated message to Android failed: %v", err)
-		return err
 	}
-
-	err = umeng.SendIOSGroupcast(fmt.Sprintf("[调课] %v", courseName), "", "", tag)
+	err = umeng.SendIOSGroupcast(fmt.Sprintf("[调课] %v", courseName), "", "", tag, fmt.Sprintf("调课%v", tag[:12]))
 	if err != nil {
 		logger.Errorf("service.sendNotifications: Send course updated message to IOS failed: %v", err)
-		return err
 	}
+	logger.Infof("service.sendNotifications: Send course updated message, tag:%v", tag)
 	return nil
 }
 

pkg/umeng/groupcast.go

@@ -46,7 +46,7 @@ func getChannelProperties() AndroidChannelProperties {
 	}
 }
 
-func SendAndroidGroupcastWithGoApp(title, text, ticker, tag string) error {
+func SendAndroidGroupcastWithGoApp(title, text, ticker, tag, description string) error {
 	message := AndroidGroupcastMessage{
 		AppKey:    config.Umeng.Android.AppKey,
 		Timestamp: fmt.Sprintf("%d", time.Now().Unix()),
@@ -71,7 +71,7 @@ func SendAndroidGroupcastWithGoApp(title, text, ticker, tag string) error {
 			ExpireTime:               time.Now().Add(constants.UmengMessageExpireTime).Format("2006-01-02 15:04:05"),
 			NotificationClosedFilter: true,
 		},
-		Description:       "Android-广播通知",
+		Description:       description,
 		Category:          0,
 		ChannelProperties: getChannelProperties(),
 	}
@@ -80,7 +80,7 @@ func SendAndroidGroupcastWithGoApp(title, text, ticker, tag string) error {
 }
 
 // Android广播函数
-func SendAndroidGroupcastWithUrl(title, text, ticker, url, tag string) error {
+func SendAndroidGroupcastWithUrl(title, text, ticker, url, tag, description string) error {
 	message := AndroidGroupcastMessage{
 		AppKey:    config.Umeng.Android.AppKey,
 		Timestamp: fmt.Sprintf("%d", time.Now().Unix()),
@@ -106,7 +106,7 @@ func SendAndroidGroupcastWithUrl(title, text, ticker, url, tag string) error {
 			ExpireTime:               time.Now().Add(constants.UmengMessageExpireTime).Format("2006-01-02 15:04:05"),
 			NotificationClosedFilter: true,
 		},
-		Description:       "Android-广播通知",
+		Description:       description,
 		Category:          0,
 		ChannelProperties: getChannelProperties(),
 	}
@@ -115,7 +115,7 @@ func SendAndroidGroupcastWithUrl(title, text, ticker, url, tag string) error {
 }
 
 // iOS广播函数
-func SendIOSGroupcast(title, subtitle, body, tag string) error {
+func SendIOSGroupcast(title, subtitle, body, tag, description string) error {
 	message := IOSGroupcastMessage{
 		AppKey:    config.Umeng.IOS.AppKey,
 		Timestamp: fmt.Sprintf("%d", time.Now().Unix()),
@@ -141,7 +141,7 @@ func SendIOSGroupcast(title, subtitle, body, tag string) error {
 		Policy: IOSPolicy{
 			ExpireTime: time.Now().Add(constants.UmengMessageExpireTime).Format("2006-01-02 15:04:05"),
 		},
-		Description: "iOS-广播通知",
+		Description: description,
 	}
 
 	return sendGroupcast(config.Umeng.IOS.AppMasterSecret, message)
@@ -184,7 +184,6 @@ func sendGroupcast(appMasterSecret string, message interface{}) error {
 		return errno.Errorf(errno.InternalServiceErrorCode, "umeng.sendGroupcast : Groupcast failed: %s (%s)", response.Data.ErrorMsg, response.Data.ErrorCode)
 	}
 
-	logger.Infof("Groupcast sent successfully! MsgID: %s\n", response.Data.MsgID)
 	return nil
 }