feat: fix some problem

Author: CutebreadCat

cmd/common/main.go

@@ -218,7 +218,8 @@ func syncNoticeTask(ctx context.Context) error {
 			deeplink := constants.UmengJwchNoticeDeeplink + "?url=" + url.QueryEscape(info.URL)
 			umeng.PushByType(
 				constants.UmengPushTypeTeaching,
-				constants.UmengJwchNotificationTitle,
+				"教务处通知",
+				info.Title,
 				[]string{info.Title},
 				"",
 				constants.UmengJwchNoticeTag,

config/config.example.yaml

@@ -103,7 +103,7 @@ vendors:
     channel_category: ''    # 华为消息分类，需在华为后台申请自分类权益后配置，例如 SERVICE
   harmony:
     channel_category: 'SUBSCRIPTION'  # 鸿蒙消息分类，需在友盟/华为后台申请自分类后配置，例如 SERVICE
-    # 这里的华为配置指的是老版本手机未升级到纯血鸿蒙系统的通知配置,这个跟纯血鸿蒙系统的通知不是一套的
+    # 这里的华为配置指的原本版本的卓易通fuu,而后面新增的鸿蒙配置则指鸿蒙福uu
 
 friend:
   max-nums : 3  # 兜底默认值，优先读取数据库 friend_config 表中 config_key='max_num' 的记录

internal/academic/service/get_scores.go

@@ -202,9 +202,10 @@ func (s *AcademicService) handleScoreChange(stuID string, scores []*jwch.Mark) (
 
 func (s *AcademicService) sendNotifications(courseName, tag string) (err error) {
 	// 这个函数由于放在 task queue 上跑，所以 logger 没有加 crx，防止把 trace 语义弄脏
-	title := constants.UmengGradeNotificationTitle
+	title := "成绩更新啦"
+	text := courseName + "成绩已更新"
 	description := fmt.Sprintf("成绩更新%v", tag[:12])
-	umeng.PushByType(constants.UmengPushTypeScore, title, []string{courseName}, "", tag, description, constants.UmengGradeDeeplink)
+	umeng.PushByType(constants.UmengPushTypeScore, title, text, []string{courseName}, "", tag, description, constants.UmengGradeDeeplink)
 
 	logger.Infof("task queue: send notice to app, tag:%v", tag)
 	return nil

internal/academic/service/get_scores_test.go

@@ -649,8 +649,8 @@ func TestAcademicService_sendNotifications(t *testing.T) {
 				umengAndroidPatch := mockey.Mock(umeng.SendAndroidGroupcastWithGoApp).To(
 					func(pushType, title, text, ticker, gotTag, description, deeplink string, keywords []string) error {
 						So(pushType, ShouldEqual, constants.UmengPushTypeScore)
-						So(title, ShouldEqual, constants.UmengGradeNotificationTitle)
-						So(text, ShouldEqual, courseName+constants.UmengGradeNotificationBodySuffix)
+						So(title, ShouldEqual, "成绩更新啦")
+						So(text, ShouldEqual, courseName+"成绩已更新")
 						So(gotTag, ShouldEqual, tag)
 						So(description, ShouldEqual, fmt.Sprintf("成绩更新%v", tag[:12]))
 						So(deeplink, ShouldEqual, constants.UmengGradeDeeplink)

internal/course/service/get_course_list.go

@@ -262,9 +262,10 @@ func (s *CourseService) updateExamSnapshot(id int64, examInfo, examInfoSHA256 st
 func (s *CourseService) sendExamNotification(change courseExamChange) {
 	// 与成绩通知一致，推送失败仅由 Umeng 任务队列统一记录，不影响业务快照。
 	// 这里直接不返回错误了,直接打印错误日志,因为就是安卓跟iOS都直推送一次,如果错过就直接算了
-	title := constants.UmengExamNotificationTitle
+	title := "考试更新啦"
+	text := change.Exam.Name + "考试已更新"
 	description := fmt.Sprintf("考试信息更新%v", change.Tag[:12])
-	umeng.PushByType(constants.UmengPushTypeExam, title, []string{change.Exam.Name}, "", change.Tag, description, constants.UmengExamRoomDeeplink)
+	umeng.PushByType(constants.UmengPushTypeExam, title, text, []string{change.Exam.Name}, "", change.Tag, description, constants.UmengExamRoomDeeplink)
 }
 
 func (s *CourseService) GetCourseListYjsy(req *course.CourseListRequest, loginData *kitexModel.LoginData) ([]*kitexModel.Course, error) {

pkg/constants/umeng.go

@@ -45,10 +45,5 @@ const (
 )
 
 const (
-	UmengXiaomiTemplateKeyword       = "keywords1" // 小米模板的参数占位符
-	UmengGradeNotificationTitle      = "成绩更新啦"
-	UmengGradeNotificationBodySuffix = "成绩已更新"
-	UmengExamNotificationTitle       = "考试更新啦"
-	UmengExamNotificationBodySuffix  = "考试已更新"
-	UmengJwchNotificationTitle       = "教务处通知"
+	UmengXiaomiTemplateKeyword = "keywords1" // 小米模板的参数占位符
 )

pkg/umeng/groupcast.go

@@ -57,13 +57,9 @@ func getChannelProperties(title, content string) AndroidChannelProperties {
 	}
 }
 
-// getXiaomiNoticeProperties 按推送类型从小米模板注册表与配置中选取模板，
+// getXiaomiNoticeProperties 按推送类型从配置中选取小米模板，
 // 模板参数直接取调用方透传的 keywords[0]，不做字符串反解
 func getXiaomiNoticeProperties(pushType string, keywords []string, notice config.XiaomiNotice) (string, *XiaomiExtraProperties) {
-	_, ok := xiaomiTemplateKinds[pushType]
-	if !ok {
-		return "", nil
-	}
 	template, ok := notice[pushType]
 	if !ok {
 		return "", nil
@@ -90,9 +86,8 @@ func getXiaomiNoticeProperties(pushType string, keywords []string, notice config
 }
 
 // PushByType 按推送类型同时下发安卓、iOS 与鸿蒙推送，任一端失败仅记录日志，不影响业务（尽力而为）。
-// keywords 为模板参数（透传，不做字符串反解），例如成绩通知传 []string{courseName}，正文由注册表拼装
-func PushByType(pushType, title string, keywords []string, ticker, tag, description, deeplink string) {
-	text := buildPushText(pushType, keywords)
+// text 由调用方按推送类型拼装好传入；keywords 为模板参数（透传复用，不做字符串反解），例如成绩通知传 []string{courseName}
+func PushByType(pushType, title, text string, keywords []string, ticker, tag, description, deeplink string) {
 	if err := SendAndroidGroupcastWithGoApp(pushType, title, text, ticker, tag, description, deeplink, keywords); err != nil {
 		logger.Errorf("umeng.PushByType: %s failed to send Android groupcast: %v", pushType, err)
 	}

pkg/umeng/groupcast_test.go

@@ -78,7 +78,7 @@ func TestPushByType(t *testing.T) {
 			defer harmonyPatch.UnPatch()
 
 			// PushByType 为尽力而为，三端失败仅记录日志，不应 panic
-			PushByType(tt.pushType, "title", []string{"text"}, "ticker", "tag", "description", "deeplink")
+			PushByType(tt.pushType, "title", "text", []string{"text"}, "ticker", "tag", "description", "deeplink")
 
 			assert.Equal(t, tt.pushType, androidPushType)
 			assert.True(t, iosCalled)