Merge branch 'cygx7.5' into debug

services/cygx_research_summary.go

@@ -20,8 +20,8 @@ func CygxResearchSummary(cont context.Context) (err error) {
 		}
 	}()
 	//content := "本周研究汇总"
-	friday := utils.GetNowWeekThursday().Add(9 * time.Hour)
-	lastfriday := utils.GetLastWeekThursday().Add(9 * time.Hour)
+	friday := utils.GetNowWeekFriday().Add(15 * time.Hour)
+	lastfriday := utils.GetLastWeekFriday().Add(15 * time.Hour)
 	lastMonth := int(lastfriday.Month())
 	month := int(friday.Month())
 	lastDay := lastfriday.Day()
@@ -513,8 +513,8 @@ func CygxLastWeekSummary(cont context.Context) (err error) {
 			fmt.Println(err)
 		}
 	}()
-	tuesday := utils.GetNowWeekThursday().Add(8 * time.Hour)
-	lastTuesday := utils.GetLastWeekThursday().Add(8 * time.Hour)
+	tuesday := utils.GetNowWeekTuesday().Add(8 * time.Hour)
+	lastTuesday := utils.GetLastWeekTuesday().Add(8 * time.Hour)
 	lastMonth := int(lastTuesday.Month())
 	month := int(tuesday.Month())
 	lastDay := lastTuesday.Day()

services/task.go

@@ -117,11 +117,11 @@ func Task() {
 	task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
 
 	// 定时生成本周研究汇总
-	cygxResearchSummary := task.NewTask("cygxResearchSummary", "0 0 9 * * 5", CygxResearchSummary)
+	cygxResearchSummary := task.NewTask("cygxResearchSummary", "0 0 15 * * 5", CygxResearchSummary)
 	task.AddTask("定时生成本周研究汇总", cygxResearchSummary)
 
 	// 定时生成上周纪要汇总
-	cygxLastWeekSummary := task.NewTask("CygxLastWeekSummary", "0 0 9 * * 5", CygxLastWeekSummary)
+	cygxLastWeekSummary := task.NewTask("CygxLastWeekSummary", "0 0 8 * * 2", CygxLastWeekSummary)
 	task.AddTask("定时生成上周纪要汇总", cygxLastWeekSummary)
 	//CygxResearchSummary()
 	//CygxLastWeekSummary()