From 4631da2212a5625fe22f42f30352b98660b23285 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 7 Jun 2023 14:53:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20(#1273)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/upgrade.go | 11 ++++++-----
 backend/constant/errs.go       |  1 +
 backend/i18n/lang/en.yaml      |  4 +++-
 backend/i18n/lang/zh.yaml      |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/app/service/upgrade.go b/backend/app/service/upgrade.go
index c6d9865b3..3757c09cc 100644
--- a/backend/app/service/upgrade.go
+++ b/backend/app/service/upgrade.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -12,6 +11,8 @@ import (
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/buserr"
+	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
@@ -204,12 +205,12 @@ func (u *UpgradeService) loadVersion(isLatest bool, currentVersion string) (stri
 	}
 	latestVersionRes, err := http.Get(path)
 	if err != nil {
-		return "", err
+		return "", buserr.New(constant.ErrOSSConn)
 	}
 	defer latestVersionRes.Body.Close()
 	version, err := io.ReadAll(latestVersionRes.Body)
 	if err != nil {
-		return "", err
+		return "", buserr.New(constant.ErrOSSConn)
 	}
 	if isLatest {
 		return string(version), nil
@@ -217,7 +218,7 @@ func (u *UpgradeService) loadVersion(isLatest bool, currentVersion string) (stri
 
 	versionMap := make(map[string]string)
 	if err := json.Unmarshal(version, &versionMap); err != nil {
-		return "", fmt.Errorf("load version map failed, err: %v", err)
+		return "", buserr.New(constant.ErrOSSConn)
 	}
 
 	if len(currentVersion) < 4 {
@@ -226,7 +227,7 @@ func (u *UpgradeService) loadVersion(isLatest bool, currentVersion string) (stri
 	if version, ok := versionMap[currentVersion[0:4]]; ok {
 		return version, nil
 	}
-	return "", errors.New("load version failed in latest.current")
+	return "", buserr.New(constant.ErrOSSConn)
 }
 
 func (u *UpgradeService) loadReleaseNotes(path string) (string, error) {
diff --git a/backend/constant/errs.go b/backend/constant/errs.go
index aeae8ae78..4cbae7677 100644
--- a/backend/constant/errs.go
+++ b/backend/constant/errs.go
@@ -118,4 +118,5 @@ var (
 
 var (
 	ErrBackupInUsed = "ErrBackupInUsed"
+	ErrOSSConn      = "ErrOSSConn"
 )
diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml
index 9e89fd78c..16e92572f 100644
--- a/backend/i18n/lang/en.yaml
+++ b/backend/i18n/lang/en.yaml
@@ -87,4 +87,6 @@ ErrImageExist: "Image is already exist！"
 ErrDelWithWebsite: "The operating environment has been associated with a website and cannot be deleted"
 
 #setting
-ErrBackupInUsed: "The backup account is already being used in a cronjob and cannot be deleted."
\ No newline at end of file
+ErrBackupInUsed: "The backup account is already being used in a cronjob and cannot be deleted."
+
+ErrOSSConn: "Unable to successfully request the latest version. Please check if the server can connect to the external network environment."
\ No newline at end of file
diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml
index d84969447..2525d3177 100644
--- a/backend/i18n/lang/zh.yaml
+++ b/backend/i18n/lang/zh.yaml
@@ -88,3 +88,5 @@ ErrDelWithWebsite: "运行环境已经关联网站，无法删除"
 
 #setting
 ErrBackupInUsed: "该备份账号已在计划任务中使用，无法删除"
+
+ErrOSSConn: "无法成功请求最新版本，请检查服务器是否能够连接到外部网络环境。"