diff --git a/core/app/service/script_library.go b/core/app/service/script_library.go index f320faa2e..1eec5e9cd 100644 --- a/core/app/service/script_library.go +++ b/core/app/service/script_library.go @@ -195,7 +195,7 @@ func (u *ScriptService) Sync(req dto.OperateByTaskID) error { syncTask.Log("start to download data.yaml") dataUrl := fmt.Sprintf("%s/scripts/data.yaml", global.CONF.RemoteURL.ResourceURL) - _, dataRes, err := req_helper.HandleRequest(dataUrl, http.MethodGet, constant.TimeOut20s) + _, dataRes, err := req_helper.HandleRequestWithProxy(dataUrl, http.MethodGet, constant.TimeOut20s) if err != nil { return fmt.Errorf("load scripts data.yaml from remote failed, err: %v", err) } @@ -213,7 +213,7 @@ func (u *ScriptService) Sync(req dto.OperateByTaskID) error { _ = os.MkdirAll(tmpDir, 0755) } scriptsUrl := fmt.Sprintf("%s/scripts/scripts.tar.gz", global.CONF.RemoteURL.ResourceURL) - if err := files.DownloadFile(scriptsUrl, tmpDir+"/scripts.tar.gz"); err != nil { + if err := files.DownloadFileWithProxy(scriptsUrl, tmpDir+"/scripts.tar.gz"); err != nil { return fmt.Errorf("download scripts.tar.gz failed, err: %v", err) } syncTask.Log("download successful! now start to decompress...") diff --git a/core/init/run/run.go b/core/init/run/run.go new file mode 100644 index 000000000..770ee54ab --- /dev/null +++ b/core/init/run/run.go @@ -0,0 +1,13 @@ +package run + +import ( + "github.com/1Panel-dev/1Panel/core/app/dto" + "github.com/1Panel-dev/1Panel/core/app/service" + "github.com/1Panel-dev/1Panel/core/global" +) + +func Init() { + if err := service.NewIScriptService().Sync(dto.OperateByTaskID{}); err != nil { + global.LOG.Errorf("sync scripts from remote failed, err: %v", err) + } +} diff --git a/core/server/server.go b/core/server/server.go index 55fd30370..9d696c109 100644 --- a/core/server/server.go +++ b/core/server/server.go @@ -4,15 +4,17 @@ import ( "crypto/tls" "encoding/gob" "fmt" - "github.com/1Panel-dev/1Panel/core/init/db" - "github.com/1Panel-dev/1Panel/core/init/geo" - "github.com/1Panel-dev/1Panel/core/init/log" - "github.com/1Panel-dev/1Panel/core/init/migration" "net" "net/http" "os" "path" + "github.com/1Panel-dev/1Panel/core/init/db" + "github.com/1Panel-dev/1Panel/core/init/geo" + "github.com/1Panel-dev/1Panel/core/init/log" + "github.com/1Panel-dev/1Panel/core/init/migration" + "github.com/1Panel-dev/1Panel/core/init/run" + "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/i18n" @@ -42,6 +44,8 @@ func Start() { hook.Init() InitOthers() + run.Init() + rootRouter := router.Routers() tcpItem := "tcp4"