Merge branch 'feature/usda_psd_edb_data' of eta_server/eta_crawler into master

services/task.go

@@ -24,8 +24,8 @@ func Task() {
 	//FileCoalCoastal()
 	//FileCoalInland()
 	if utils.BusinessCode == utils.BusinessCodeRelease {
-		refreshUsdaPsd := task.NewTask("RefreshUsdaPsd", "0 0 16 * * 5", DownloadUsdaPsdDataTask) //每周五下午16点
-		refreshUsdaFms := task.NewTask("RefreshUsdaFms", "0 0 16 * * 5", DownloadUsdaFmsDataTask) //每周五下午16点
+		refreshUsdaPsd := task.NewTask("RefreshUsdaPsd", "0 0 16,19 * * 1,5", DownloadUsdaPsdDataTask) //每周一五下午16点，19点
+		refreshUsdaFms := task.NewTask("RefreshUsdaFms", "0 0 16,19 * * 1,5", DownloadUsdaFmsDataTask) //每周一五下午16点，19点
 		refreshData := task.NewTask("refreshData", "0 0,30 16-18 * * *", RefreshData)
 		refreshEic := task.NewTask("RefreshEic", "0 0 2,6 * * *", RefreshEic)
 		refreshCoal := task.NewTask("RefreshCoal", "0 0,30 16-23 * * *", RefreshCoal)

utils/common.go

@@ -1202,7 +1202,7 @@ func HttpGetNoCookie(url string) ([]byte, error) {
 // PostEdbLib 调用指标接口
 func PostEdbLib(param map[string]interface{}, method string) (result []byte, err error) {
 	// todo postUrl := EDB_LIB_URL + method
-	postUrl := "http://127.0.0.1:8900/edbapi/" + method
+	postUrl := EDB_LIB_URL + method
 	postData, err := json.Marshal(param)
 	if err != nil {
 		return
@@ -1235,8 +1235,8 @@ func httpPostEtaLib(url, postData string, params ...string) ([]byte, error) {
 		contentType = params[0]
 	}
 	req.Header.Set("Content-Type", contentType)
-	// todo req.Header.Set("authorization", MD5(APP_EDB_LIB_NAME_EN+"EDB_LIB_Md5_KEY"))
-	req.Header.Set("authorization", MD5("eta_index_lib"+"2342342341asd"))
+	req.Header.Set("authorization", MD5(APP_EDB_LIB_NAME_EN+EDB_LIB_Md5_KEY))
+	//req.Header.Set("authorization", MD5("eta_index_lib"+"2342342341asd"))
 	resp, err := client.Do(req)
 	if err != nil {
 		fmt.Println("client.Do err:" + err.Error())

utils/config.go

@@ -81,6 +81,9 @@ func init() {
 
 	// 商家编码
 	BusinessCode = config["business_code"]
+	EDB_LIB_URL = config["edb_lib_url"]
+	APP_EDB_LIB_NAME_EN = config["app_edb_lib_name_en"]
+	EDB_LIB_Md5_KEY = config["edb_lib_md5_key"]
 
 	if BusinessCode == BusinessCodeRelease {
 		MYSQL_URL = config["mysql_url"]