Merge branch 'yb_3.0' into debug

services/report_push.go

@@ -158,7 +158,7 @@ func SendToThs(sendDetailId, reportId int, reportType string) (err error) {
 		if tmpErr != nil {
 			err = tmpErr
 		}
-	case "研报":
+	case "研报小程序":
 		tmpErr := SendReportMiniToThs(reportId)
 		if tmpErr != nil {
 			err = tmpErr
@@ -446,8 +446,8 @@ func SendReportMiniToThs(reportId int) (err error) {
 			return
 		}
 	} else {
-		labelMap := map[string]string{utils.REPORT_TYPE_DAY: "晨报", utils.REPORT_TYPE_WEEK: "周报"}
-		permissionStr = labelMap[report.ChapterType]
+		// 同php的
+		permissionStr = "宏观,利率债,原油,PTA,MEG,织造终端,甲醇,聚烯烃,沥青,橡胶,苯乙烯,玻璃纯碱,钢材,铁矿,双焦（焦煤、焦炭）,有色（铜、铝）,有色（锌、铅）,镍+不锈钢"
 	}
 	// 实际推送到同花顺
 	err = SendThs(report.Title, permissionStr, report.Abstract, jumpUrl, logoUrl, "2")