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

controllers/data_manage/edb_info_refresh.go

@@ -344,7 +344,8 @@ func (c *EdbInfoController) GetEdbRefreshDefaultConfig() {
 		return
 	}
 
-	if frequency == `` {
+	// 非有色的来源，频度不能为空
+	if source != utils.DATA_SOURCE_YS && frequency == `` {
 		br.Msg = "频度不能为空"
 		br.IsSendEmail = false
 		return

services/data/edb_info_refresh.go

@@ -70,7 +70,8 @@ func SaveEdbRefreshDefaultConfig(source, subSource int, frequency string, list [
 		return
 	}
 
-	if frequency == `` {
+	// 非有色的来源，频度不能为空
+	if source != utils.DATA_SOURCE_YS && frequency == `` {
 		errMsg = "频度不能为空"
 		err = errors.New(errMsg)
 		isSendEmail = false
@@ -383,7 +384,11 @@ func HandleRefreshTime(source, subSource int, list []*data_manage.BaseRefreshEdb
 			v.RefreshTime = refreshTime
 			continue
 		}
-		v.RefreshTime = defaultEdbRefreshConfigMap[v.Frequency]
+		if source == utils.DATA_SOURCE_YS {
+			v.RefreshTime = defaultEdbRefreshConfigMap[``]
+		} else {
+			v.RefreshTime = defaultEdbRefreshConfigMap[v.Frequency]
+		}
 	}
 
 	return