Merge branch 'master' of http://8.136.199.33:3000/hongze/mysteel_watch

config/config.go

@@ -13,10 +13,12 @@ type Serve struct {
 	UseRedis          bool   `mapstructure:"use-redis" json:"use-redis" yaml:"use-redis" description:"是否使用redis"`
 	AppName           string `mapstructure:"app-name" json:"app-name" yaml:"app-name" description:"项目名称"`
 	StaticDir         string `mapstructure:"static-dir" json:"static-dir" yaml:"static-dir" description:"上传的文件存储目录地址"`
-	EdbLibUrl         string `mapstructure:"edb-lib-url" json:"edb-lib-url" yaml:"edb-lib-url" description:"公共指标库的地址"`
 	IndexSaveDir      string `mapstructure:"index-save-dir" json:"index-save-dir" yaml:"index-save-dir" description:"监听文件夹的路径"`
 	IndexMergeSaveDir string `mapstructure:"index-merge-save-dir" json:"index-merge-save-dir" yaml:"index-merge-save-dir" description:"监听合并文件夹的路径"`
-	Frequency         string `mapstructure:"frequency" json:"frequency" yaml:"frequency" description:"频度"`
+	Frequency     string `mapstructure:"frequency" json:"frequency" yaml:"frequency" description:"频度"`
+	EdbLibUrl         string `mapstructure:"edb-lib-url" json:"edb-lib-url" yaml:"edb-lib-url" description:"公共指标库的地址"`
+	AppEdbLibNameEn   string `mapstructure:"app_edb_lib_name_en" json:"app_edb_lib_name_en" yaml:"app_edb_lib_name_en" description:"指标库的英文名称"`
+	EdbLibMd5Key      string `mapstructure:"edb_lib_md5_key" json:"edb_lib_md5_key" yaml:"edb_lib_md5_key" description:"指标库服务秘钥"`
 }
 
 // Log 日志配置

watch/edb_lib.go

@@ -473,7 +473,8 @@ func HttpPost(url, postData string, params ...string) ([]byte, error) {
 		contentType = params[0]
 	}
 	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("authorization", utils.MD5(utils.APP_EDB_LIB_NAME_EN+utils.EDB_LIB_Md5_KEY))
+
+	req.Header.Set("authorization", utils.MD5(global.CONFIG.Serve.AppEdbLibNameEn+global.CONFIG.Serve.EdbLibMd5Key))
 	resp, err := client.Do(req)
 	if resp != nil {
 		defer resp.Body.Close()