Merge branch 'ETA_2.3.2' into debug

controllers/base_from_clarksons.go

@@ -236,7 +236,7 @@ func (this *ClarksonsDataController) Refresh() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	source := utils.DATA_SOURCE_MTJH
+	source := utils.DATA_SOURCE_CLARKSONS
 	var req models.RefreshEdbInfoReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {

models/base_from_clarksons.go

@@ -76,7 +76,7 @@ func AddEdbDataFromClarksons(edbCode string) (err error) {
 	}
 
 	var isAdd bool
-	addSql := ` INSERT INTO edb_data_mtjh(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_clarksons(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	existMap := make(map[string]string)
 	for _, sv := range coalBaseDataAll {
 		eDate := sv.DataTime
@@ -117,7 +117,7 @@ func AddEdbDataFromClarksons(edbCode string) (err error) {
 }
 
 func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (err error) {
-	source := utils.DATA_SOURCE_MTJH
+	source := utils.DATA_SOURCE_CLARKSONS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 	o := orm.NewOrm()
 	if err != nil {
@@ -178,7 +178,7 @@ func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (err
 		existMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_mtjh(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_clarksons(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string