Merge remote-tracking branch 'origin/master' into fix/open_binlog

controllers/base_from_coal.go

@@ -44,7 +44,7 @@ func (this *CoalController) Add() {
 		err = models.AddEdbDataFromCoal(req.EdbCode)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
-			br.ErrMsg = "获取指标信息失败 AddEdbDataFromZz，Err:" + err.Error()
+			br.ErrMsg = "获取指标信息失败 AddEdbDataFromCoal，Err:" + err.Error()
 			return
 		}
 		br.Ret = 200
@@ -69,7 +69,7 @@ func (this *CoalController) Refresh() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	source := utils.DATA_SOURCE_ZZ
+	source := utils.DATA_SOURCE_COAL
 	var req models.RefreshEdbInfoReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -93,7 +93,7 @@ func (this *CoalController) Refresh() {
 		err = models.RefreshEdbDataFromCoal(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
-			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromZz，Err:" + err.Error()
+			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCoal，Err:" + err.Error()
 			return
 		}
 		br.Ret = 200

models/base_from_coal.go

@@ -138,7 +138,7 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 }
 
 func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error) {
-	source := utils.DATA_SOURCE_YS
+	source := utils.DATA_SOURCE_COAL
 	o := orm.NewOrm()
 	if err != nil {
 		return

models/base_from_zz.go

@@ -126,7 +126,7 @@ func AddEdbDataFromZz(edbCode string) (err error) {
 
 //刷新郑商所指标数据
 func RefreshEdbDataFromZz(edbInfoId int, edbCode, startDate string) (err error) {
-	source := utils.DATA_SOURCE_YS
+	source := utils.DATA_SOURCE_COAL
 	o := orm.NewOrm()
 	if err != nil {
 		return