From 680e237ef307ef4d678b9ce358289e5ecc45e37c Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:52:45 +0800
Subject: [PATCH] fix: fix the issue of import cycle (#7757)

---
 agent/app/service/app.go                      |  2 +-
 agent/app/service/app_utils.go                |  2 +-
 agent/utils/files/file_op.go                  | 20 -------------------
 core/utils/req_helper/{http.go => requset.go} |  0
 4 files changed, 2 insertions(+), 22 deletions(-)
 rename core/utils/req_helper/{http.go => requset.go} (100%)

diff --git a/agent/app/service/app.go b/agent/app/service/app.go
index cf70fa9de..e70b6e25e 100644
--- a/agent/app/service/app.go
+++ b/agent/app/service/app.go
@@ -821,7 +821,7 @@ func getAppFromRepo(downloadPath string) error {
 	global.LOG.Infof("[AppStore] download file from %s", downloadUrl)
 	fileOp := files.NewFileOp()
 	packagePath := filepath.Join(constant.ResourceDir, filepath.Base(downloadUrl))
-	if err := fileOp.DownloadFileWithProxy(downloadUrl, packagePath); err != nil {
+	if err := fileOp.DownloadFile(downloadUrl, packagePath); err != nil {
 		return err
 	}
 	if err := fileOp.Decompress(packagePath, constant.ResourceDir, files.SdkZip, ""); err != nil {
diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go
index e249d5923..1a5b89d0a 100644
--- a/agent/app/service/app_utils.go
+++ b/agent/app/service/app_utils.go
@@ -897,7 +897,7 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 		}
 	}()
 
-	if err = fileOp.DownloadFileWithProxy(appDetail.DownloadUrl, filePath); err != nil {
+	if err = fileOp.DownloadFile(appDetail.DownloadUrl, filePath); err != nil {
 		if logger == nil {
 			global.LOG.Errorf("download app[%s] error %v", app.Name, err)
 		} else {
diff --git a/agent/utils/files/file_op.go b/agent/utils/files/file_op.go
index ac2ed4d22..53dc3f0e6 100644
--- a/agent/utils/files/file_op.go
+++ b/agent/utils/files/file_op.go
@@ -3,7 +3,6 @@ package files
 import (
 	"archive/zip"
 	"bufio"
-	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/json"
@@ -333,25 +332,6 @@ func (f FileOp) DownloadFile(url, dst string) error {
 	return nil
 }
 
-func (f FileOp) DownloadFileWithProxy(url, dst string) error {
-	_, resp, err := req_helper.HandleRequest(url, http.MethodGet, constant.TimeOut5m)
-	if err != nil {
-		return err
-	}
-
-	out, err := os.Create(dst)
-	if err != nil {
-		return fmt.Errorf("create download file [%s] error, err %s", dst, err.Error())
-	}
-	defer out.Close()
-
-	reader := bytes.NewReader(resp)
-	if _, err = io.Copy(out, reader); err != nil {
-		return fmt.Errorf("save download file [%s] error, err %s", dst, err.Error())
-	}
-	return nil
-}
-
 func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error {
 	for _, p := range oldPaths {
 		var dstPath string
diff --git a/core/utils/req_helper/http.go b/core/utils/req_helper/requset.go
similarity index 100%
rename from core/utils/req_helper/http.go
rename to core/utils/req_helper/requset.go