Merge remote-tracking branch 'origin/debug' into debug

# Conflicts:
#	services/task.go

models/data_manage/edb_info_calculate_mapping.go

@@ -65,7 +65,7 @@ func FixEdbInfoCalculateMapping() {
 			calculateMappingItem := new(EdbInfoCalculateMapping)
 			calculateMappingItem.CreateTime = time.Now()
 			calculateMappingItem.ModifyTime = time.Now()
-			calculateMappingItem.Sort = 1
+			calculateMappingItem.Sort = cv.Sort
 			calculateMappingItem.EdbCode = v.EdbCode
 			calculateMappingItem.EdbInfoId = v.EdbInfoId
 			calculateMappingItem.FromEdbInfoId = cv.FromEdbInfoId

services/task.go

@@ -52,7 +52,7 @@ func Task() {
 	// 定时往同花顺推送报告
 	sendWaitReport := task.NewTask("sendWaitReport", "0 */1 * * * * ", SendWaitReport)
 	task.AddTask("定时往同花顺推送报告", sendWaitReport)
-
+	
 	// 研报电话会提醒
 	ybTelRemind := task.NewTask("YbTelRemind", "0 */1 * * * * ", YbTelRemind)
 	task.AddTask("研报电话会提醒", ybTelRemind)
@@ -60,6 +60,11 @@ func Task() {
 	// 研报沙龙提醒
 	ybSalonRemind := task.NewTask("ybSalonRemind", "0 */1 * * * * ", YbSalonRemind)
 	task.AddTask("研报沙龙提醒", ybSalonRemind)
+
+	//初始化指标更新状态
+	resetEdbInfoIsUpdate := task.NewTask("resetEdbInfoIsUpdate", "0 0 0 * * *", data.ResetEdbInfoIsUpdate)
+	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
+
 	//GetHistoryLzProductDetail()
 	//GetLzPrice()
 	//GetLzProductDetail()
@@ -144,10 +149,6 @@ func releaseTask() {
 
 	checkPbDataInterface := task.NewTask("checkPbDataInterface", "0 */5 * * * * ", data.CheckPbDataInterface)
 	task.AddTask("checkPbDataInterface", checkPbDataInterface)
-
-	//初始化指标更新状态
-	resetEdbInfoIsUpdate := task.NewTask("resetEdbInfoIsUpdate", "0 0 0 * * *", data.ResetEdbInfoIsUpdate)
-	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
 }
 
 func TaskTest() {