Merge branch 'custom' of http://8.136.199.33:3000/eta_server/eta_api into bzq1/monitor_custom

controllers/resource.go

@@ -1040,7 +1040,15 @@ func (this *ResourceAuthController) FileDownload() {
 		return
 	}
 	fileName := fileArr[len(fileArr)-1]
+
 	//fmt.Println(fileName)
+	if utils.MinIoFileDownloadHost != "" {
+		fmt.Println("fileUrl replace before:" + fileUrl)
+
+		fileUrl = strings.Replace(fileUrl, utils.MinIoImghost, utils.MinIoFileDownloadHost, -1)
+
+		fmt.Println("fileUrl replace after:" + fileUrl)
+	}
 
 	// 获取文件
 	down, e := http.Get(fileUrl)

utils/config.go

@@ -233,6 +233,7 @@ var (
 	MinIoUseSSL           string
 	MinIoPort             string
 	MinIoRegion           string
+	MinIoFileDownloadHost string
 )
 
 // PythonUrlReport2Img 生成长图服务地址
@@ -581,6 +582,7 @@ func init() {
 		MinIoUseSSL = config["minio_use_ssl"]
 		MinIoPort = config["minio_port"]
 		MinIoRegion = config["minio_region"]
+		MinIoFileDownloadHost = config["minio_file_download_host"]
 	}
 
 	// S3-OSS相关