diff --git a/agent/app/service/backup_record.go b/agent/app/service/backup_record.go index 5e498fb66..ecae836f3 100644 --- a/agent/app/service/backup_record.go +++ b/agent/app/service/backup_record.go @@ -177,11 +177,14 @@ func (u *BackupRecordService) ListAppRecords(name, detailName, fileName string) func (u *BackupRecordService) ListFiles(req dto.OperateByID) []string { var datas []string - _, client, err := NewBackupClientWithID(req.ID) + backupItem, client, err := NewBackupClientWithID(req.ID) if err != nil { return datas } prefix := "system_snapshot" + if len(backupItem.BackupPath) != 0 { + prefix = path.Join(backupItem.BackupPath, prefix) + } files, err := client.ListObjects(prefix) if err != nil { global.LOG.Debugf("load files failed, err: %v", err) diff --git a/agent/utils/cloud_storage/client/up.go b/agent/utils/cloud_storage/client/up.go index d044f0c6f..4b8f0960c 100644 --- a/agent/utils/cloud_storage/client/up.go +++ b/agent/utils/cloud_storage/client/up.go @@ -31,7 +31,7 @@ func (o upClient) ListBuckets() ([]interface{}, error) { func (s upClient) Upload(src, target string) (bool, error) { if _, err := s.client.GetInfo(path.Dir(src)); err != nil { - _ = s.client.Mkdir(path.Dir(src)) + _ = s.client.Mkdir(path.Dir(target)) } if err := s.client.Put(&upyun.PutObjectConfig{ Path: target, diff --git a/core/app/service/upgrade.go b/core/app/service/upgrade.go index 9a1122cc2..f88385928 100644 --- a/core/app/service/upgrade.go +++ b/core/app/service/upgrade.go @@ -130,7 +130,7 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error { _ = settingRepo.Update("SystemStatus", "Free") return } - itemLog := model.UpgradeLog{NodeID: 0, OldVersion: global.CONF.Base.Version, NewVersion: req.Version, BackupFile: originalDir} + itemLog := model.UpgradeLog{NodeID: 0, OldVersion: global.CONF.Base.Version, NewVersion: req.Version, BackupFile: baseDir} _ = upgradeLogRepo.Create(&itemLog) global.LOG.Info("backup original data successful, now start to upgrade!") diff --git a/core/cmd/server/cmd/listen-ip.go b/core/cmd/server/cmd/listen-ip.go index 0fe5a64ff..7a2afc06f 100644 --- a/core/cmd/server/cmd/listen-ip.go +++ b/core/cmd/server/cmd/listen-ip.go @@ -3,6 +3,7 @@ package cmd import ( "fmt" + "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/i18n" "github.com/spf13/cobra" ) @@ -51,11 +52,11 @@ func updateBindInfo(protocol string) error { if err != nil { return err } - ipv6 := "disable" + ipv6 := constant.StatusDisable tcp := "tcp4" address := "0.0.0.0" if protocol == "ipv6" { - ipv6 = "enable" + ipv6 = constant.StatusEnable tcp = "tcp6" address = "::" } diff --git a/core/cmd/server/cmd/reset.go b/core/cmd/server/cmd/reset.go index 1521577de..13e5158c8 100644 --- a/core/cmd/server/cmd/reset.go +++ b/core/cmd/server/cmd/reset.go @@ -3,6 +3,7 @@ package cmd import ( "fmt" + "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/i18n" "github.com/spf13/cobra" ) @@ -43,7 +44,7 @@ var resetMFACmd = &cobra.Command{ return err } - return setSettingByKey(db, "MFAStatus", "disable") + return setSettingByKey(db, "MFAStatus", constant.StatusDisable) }, } var resetSSLCmd = &cobra.Command{ @@ -59,7 +60,7 @@ var resetSSLCmd = &cobra.Command{ return err } - return setSettingByKey(db, "SSL", "disable") + return setSettingByKey(db, "SSL", constant.StatusDisable) }, } var resetEntranceCmd = &cobra.Command{ diff --git a/core/cmd/server/cmd/restore.go b/core/cmd/server/cmd/restore.go index 326552b59..88f01d187 100644 --- a/core/cmd/server/cmd/restore.go +++ b/core/cmd/server/cmd/restore.go @@ -73,7 +73,7 @@ var restoreCmd = &cobra.Command{ } fmt.Println(i18n.GetMsgByKeyForCmd("RestoreStep4")) if _, err := os.Stat(path.Join(tmpPath, "db")); err == nil { - dbPath := path.Join(baseDir, "1panel/db") + dbPath := path.Join(baseDir, "1panel") if err := files.CopyItem(true, true, path.Join(tmpPath, "db"), dbPath); err != nil { global.LOG.Errorf("rollback 1panel db failed, err: %v", err) } diff --git a/core/cmd/server/cmd/update.go b/core/cmd/server/cmd/update.go index 4b7d58523..14521c005 100644 --- a/core/cmd/server/cmd/update.go +++ b/core/cmd/server/cmd/update.go @@ -9,6 +9,7 @@ import ( "strings" "unicode" + "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/i18n" "github.com/1Panel-dev/1Panel/core/utils/cmd" @@ -136,7 +137,7 @@ func password() { return } complexSetting := getSettingByKey(db, "ComplexityVerification") - if complexSetting == "enable" { + if complexSetting == constant.StatusEnable { if isValidPassword("newPassword") { fmt.Println("\n" + i18n.GetMsgByKeyForCmd("UpdatePasswordFormat")) return diff --git a/core/cmd/server/cmd/user-info.go b/core/cmd/server/cmd/user-info.go index 0bdab2f26..8a23773e1 100644 --- a/core/cmd/server/cmd/user-info.go +++ b/core/cmd/server/cmd/user-info.go @@ -3,6 +3,7 @@ package cmd import ( "fmt" + "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/i18n" "github.com/1Panel-dev/1Panel/core/utils/encrypt" @@ -41,7 +42,7 @@ var userinfoCmd = &cobra.Command{ address := getSettingByKey(db, "SystemIP") protocol := "http" - if ssl == "enable" { + if ssl == constant.StatusEnable { protocol = "https" } if address == "" { diff --git a/core/i18n/lang/en.yaml b/core/i18n/lang/en.yaml index dd36ef761..37fd76402 100644 --- a/core/i18n/lang/en.yaml +++ b/core/i18n/lang/en.yaml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "The current free node has reached its limit, please check an ErrNoSuchNode: "Node information not found, please check and retry!" ErrNodeUnbind: "This node is not within the license binding range, please check and retry!" ErrNodeBind: "This node is already bound to a license, please check and retry!" +ErrNodeLocalRollback: "The primary node does not support direct rollback. Please manually execute the '1pctl restore' command to rollback!" # alert ErrAlertSync: "Alert information sync error, please check and retry!" diff --git a/core/i18n/lang/ja.yaml b/core/i18n/lang/ja.yaml index f27a82740..99bf828fc 100644 --- a/core/i18n/lang/ja.yaml +++ b/core/i18n/lang/ja.yaml @@ -63,6 +63,7 @@ ErrNodeBoundLimit: "現在の無料ノードは上限に達しました。確認 ErrNoSuchNode: "そのノード情報が見つかりませんでした、確認して再試行してください!" ErrNodeUnbind: "そのノードはライセンスのバインド範囲内ではありません、確認して再試行してください!" ErrNodeBind: "そのノードはライセンスにバインドされています、確認して再試行してください!" +ErrNodeLocalRollback: "マスターノードは直接ロールバックをサポートしていません。手動で「1pctl restore」コマンドを実行してロールバックしてください！" # alert ErrAlertSync: "アラート情報の同期エラーです。後で再試行してください！" diff --git a/core/i18n/lang/ko.yaml b/core/i18n/lang/ko.yaml index 5f3aa651b..b07d96a0a 100644 --- a/core/i18n/lang/ko.yaml +++ b/core/i18n/lang/ko.yaml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "현재 무료 노드가 한도에 도달했습니다. 확인 ErrNoSuchNode: "노드 정보를 찾을 수 없습니다. 다시 확인하고 시도해 주세요!" ErrNodeUnbind: "이 노드가 라이선스 바인딩 범위에 있지 않음을 감지하였습니다. 다시 확인하고 시도해 주세요!" ErrNodeBind: "이 노드가 이미 라이선스에 바인딩되어 있음을 감지하였습니다. 다시 확인하고 시도해 주세요!" +ErrNodeLocalRollback: "마스터 노드는 직접 롤백을 지원하지 않습니다. 수동으로 '1pctl restore' 명령어를 실행하여 롤백하세요!" # alert ErrAlertSync: "경고 정보 동기화 오류, 다시 확인하고 시도해 주세요!" diff --git a/core/i18n/lang/ms.yml b/core/i18n/lang/ms.yml index 9210b1736..2a56cd727 100644 --- a/core/i18n/lang/ms.yml +++ b/core/i18n/lang/ms.yml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "Nod percuma semasa telah mencapai had, sila semak dan cuba l ErrNoSuchNode: "Maklumat nod tidak ditemui, sila semak dan cuba lagi!" ErrNodeUnbind: "Nod di luar skop lesen dikesan, sila semak dan cuba lagi!" ErrNodeBind: "Nod ini telah diikat dengan lesen, sila semak dan cuba lagi!" +ErrNodeLocalRollback: "Nod utama tidak menyokong rollback secara langsung. Sila laksanakan arahan '1pctl restore' secara manual untuk rollback!" # alert ErrAlertSync: "Ralat penyinkronan maklumat amaran, sila semak dan cuba lagi!" diff --git a/core/i18n/lang/pt-BR.yaml b/core/i18n/lang/pt-BR.yaml index 647bec53d..f3e841e3b 100644 --- a/core/i18n/lang/pt-BR.yaml +++ b/core/i18n/lang/pt-BR.yaml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "O nó gratuito atual atingiu seu limite, por favor verifique ErrNoSuchNode: "As informações deste nó não foram encontradas, por favor verifique e tente novamente!" ErrNodeUnbind: "Nó fora do escopo da licença detectado, por favor verifique e tente novamente!" ErrNodeBind: "Este nó já está vinculado a uma licença, por favor verifique e tente novamente!" +ErrNodeLocalRollback: "O nó principal não suporta rollback direto. Por favor, execute manualmente o comando '1pctl restore' para fazer o rollback!" # alert ErrAlertSync: "Erro na sincronização das informações de alerta, verifique e tente novamente!" diff --git a/core/i18n/lang/ru.yaml b/core/i18n/lang/ru.yaml index 59241d675..a7bac8023 100644 --- a/core/i18n/lang/ru.yaml +++ b/core/i18n/lang/ru.yaml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "Текущий бесплатный узел достиг п ErrNoSuchNode: "Информация об узле не найдена, проверьте и повторите попытку!" ErrNodeUnbind: "Обнаружен узел вне области действия лицензии, проверьте и повторите попытку!" ErrNodeBind: "Этот узел уже связан с лицензией, проверьте и повторите попытку!" +ErrNodeLocalRollback: "Основной узел не поддерживает прямой откат. Пожалуйста, вручную выполните команду '1pctl restore' для отката!" # alert ErrAlertSync: "Ошибка синхронизации информации об оповещениях, пожалуйста, проверьте и повторите попытку!" diff --git a/core/i18n/lang/zh-Hant.yaml b/core/i18n/lang/zh-Hant.yaml index d8268c473..11e50fb1a 100644 --- a/core/i18n/lang/zh-Hant.yaml +++ b/core/i18n/lang/zh-Hant.yaml @@ -62,6 +62,7 @@ ErrNodeBoundLimit: "當前免費節點已達上限，請檢查後重試！" ErrNoSuchNode: "未能找到該節點信息，請檢查後重試！" ErrNodeUnbind: "檢測到該節點未在許可證綁定範圍內，請檢查後重試！" ErrNodeBind: "檢測到該節點已綁定許可證，請檢查後重試！" +ErrNodeLocalRollback: "主節點暫不支援直接回滾，請手動執行「1pctl restore」命令回滾！" # alert ErrAlertSync: "告警信息同步錯誤，請檢查後重試！" diff --git a/core/i18n/lang/zh.yaml b/core/i18n/lang/zh.yaml index 489072008..3c94eb511 100644 --- a/core/i18n/lang/zh.yaml +++ b/core/i18n/lang/zh.yaml @@ -63,6 +63,7 @@ ErrNodeBoundLimit: "当前免费节点已经达到上限，请检查后重试！ ErrNoSuchNode: "未能找到该节点信息，请检查后重试！" ErrNodeUnbind: "检测到该节点未在许可证绑定范围内，请检查后重试！" ErrNodeBind: "检测到该节点已绑定许可证，请检查后重试！" +ErrNodeLocalRollback: "主节点暂不支持直接回滚，请手动执行 1pctl restore 命令回滚！" # alert ErrAlertSync: "告警信息同步错误，请检查后重试！" diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index a4bf2b57d..f98c0d5bb 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1835,17 +1835,16 @@ const message = { noUpgrade: 'It is currently the latest version', versionHelper: 'Name rules: [major version].[functional version].[Bug fix version], as shown in the following example:', - versionHelper1: 'v1.0.1 is a Bug fix after v1.0.0', - versionHelper2: 'v1.1.0 is a feature release after v1.0.0', + rollbackLocalHelper: + 'The primary node does not support direct rollback. Please manually execute the [1pctl restore] command to rollback!', upgradeCheck: 'Check for updates', upgradeNotes: 'Release note', upgradeNow: 'Upgrade now', source: 'Download source', - hasNewVersion: 'New version Available', - versionHigher: - 'Detected that node {0} version is higher than the main node, switching is not supported at this time. Please upgrade the main node system version and try again!', - versionLower: - 'Detected that node {0} version is lower than the main node, switching is not supported at this time. Please upgrade the system version of this node and try again!', + versionNotSame: + 'The version of this node does not match the primary node. Switching is not supported at this time. Please check and try again!', + versionCompare: + 'Detected that node {0} is already at the latest upgradable version. Please check the primary node version and try again!', about: 'About', project: 'Project Address', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index a242a5ac1..61dd5eebc 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -1739,10 +1739,16 @@ const message = { 'この回復をロールバックすると、この回復からすべてのファイルを置き換え、Dockerサービスと1パネルサービスを再起動する必要がある場合があります。続けたいですか？', upgradeHelper: 'アップグレードには、1パネルサービスを再起動する必要があります。続けたいですか？', + rollbackLocalHelper: + 'マスターノードは直接ロールバックをサポートしていません。手動で「1pctl restore」コマンドを実行してロールバックしてください！', noUpgrade: '現在、最新バージョンです', upgradeNotes: 'リリースノート', upgradeNow: '今すぐアップグレードしてください', source: 'ソースをダウンロードします', + versionNotSame: + 'このノードのバージョンがマスターノードと一致しません。現在は切り替えをサポートしていません。確認後、再試行してください！', + versionCompare: + 'ノード {0} は既にアップグレード可能な最新バージョンです。マスターノードのバージョンを確認後、再試行してください！', about: 'について', project: 'GitHub', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index c345e77eb..20ccdb5eb 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -1713,10 +1713,16 @@ const message = { '이 복구를 롤백하면 해당 복구의 모든 파일이 대체되며 Docker 및 1Panel 서비스를 재시작해야 할 수 있습니다. 계속하시겠습니까?', upgradeHelper: '업그레이드에는 1Panel 서비스를 재시작해야 합니다. 계속하시겠습니까?', + rollbackLocalHelper: + '마스터 노드는 직접 롤백을 지원하지 않습니다. 수동으로 [1pctl restore] 명령어를 실행하여 롤백하세요!', noUpgrade: '현재 최신 버전입니다', upgradeNotes: '릴리스 노트', upgradeNow: '지금 업그레이드', source: '다운로드 소스', + versionNotSame: + '이 노드의 버전이 마스터 노드와 일치하지 않습니다. 현재 전환을 지원하지 않습니다. 확인 후 다시 시도하세요!', + versionCompare: + '노드 {0}이(가) 이미 업그레이드 가능한 최신 버전입니다. 마스터 노드 버전을 확인 후 다시 시도하세요!', about: '정보', project: 'GitHub', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 091ffa717..f66f23e63 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -1797,10 +1797,16 @@ const message = { 'Pulangkan semula pemulihan ini akan menggantikan semua fail dari pemulihan ini, dan mungkin memerlukan mulakan semula perkhidmatan Docker dan 1Panel. Adakah anda mahu meneruskan?', upgradeHelper: 'Kemas kini memerlukan mulakan semula perkhidmatan 1Panel. Adakah anda mahu meneruskan?', + rollbackLocalHelper: + 'Nod utama tidak menyokong rollback secara langsung. Sila laksanakan arahan [1pctl restore] secara manual untuk rollback!', noUpgrade: 'Ia adalah versi terbaru pada masa ini', upgradeNotes: 'Nota pelepasan', upgradeNow: 'Kemas kini sekarang', source: 'Sumber muat turun', + versionNotSame: + 'Versi nod ini tidak sepadan dengan nod utama. Penukaran tidak disokong buat masa ini. Sila periksa dan cuba lagi!', + versionCompare: + 'Nod {0} telah berada pada versi terkini yang boleh dinaik taraf. Sila periksa versi nod utama dan cuba lagi!', about: 'Mengenai', project: 'GitHub', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index e3567e20a..380c72230 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -1782,10 +1782,16 @@ const message = { 'Reverter essa recuperação substituirá todos os arquivos dessa recuperação e pode exigir reiniciar os serviços Docker e 1Panel. Você deseja continuar?', upgradeHelper: 'A atualização requer reiniciar o serviço 1Panel. Você deseja continuar?', + rollbackLocalHelper: + 'O nó principal não suporta rollback direto. Por favor, execute manualmente o comando [1pctl restore] para fazer o rollback!', noUpgrade: 'Esta é a versão mais recente', upgradeNotes: 'Notas de versão', upgradeNow: 'Atualizar agora', source: 'Fonte para download', + versionNotSame: + 'A versão deste nó não corresponde ao nó principal. A troca não é suportada no momento. Por favor, verifique e tente novamente!', + versionCompare: + 'Detectado que o nó {0} já está na última versão atualizável. Por favor, verifique a versão do nó principal e tente novamente!', about: 'Sobre', project: 'GitHub', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 6bf64c780..7bd6b3a46 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -1783,10 +1783,17 @@ const message = { rollbackHelper: 'Откат этого восстановления заменит все файлы из этого восстановления и может потребовать перезапуска служб Docker и 1Panel. Хотите продолжить?', upgradeHelper: 'Обновление требует перезапуска службы 1Panel. Хотите продолжить?', + rollbackLocalHelper: + 'Основной узел не поддерживает прямой откат. Пожалуйста, вручную выполните команду [1pctl restore] для отката!', noUpgrade: 'В настоящее время это последняя версия', upgradeNotes: 'Примечания к выпуску', upgradeNow: 'Обновить сейчас', source: 'Источник загрузки', + versionNotSame: + 'Версия этого узла не соответствует основной. Переключение в данный момент не поддерживается. Пожалуйста, проверьте и повторите попытку!', + versionCompare: + 'Обнаружено, что узел {0} уже имеет последнюю обновляемую версию. Пожалуйста, проверьте версию основного узла и повторите попытку!', + about: 'О программе', project: 'GitHub', issue: 'Проблема', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 2eecbe740..792a3fb13 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -1629,15 +1629,13 @@ const message = { upgradeHelper: '升級操作需要重啟 1Panel 服務，是否繼續？', noUpgrade: '當前已經是最新版本', versionHelper: '1Panel 版本號命名規則為： [大版本].[功能版本].[Bug 修復版本]，例：', - versionHelper1: 'v1.0.1 是 v1.0.0 之後的 Bug 修復版本', - versionHelper2: 'v1.1.0 是 v1.0.0 之後的功能版本', + rollbackLocalHelper: '主節點暫不支援直接回滾，請手動執行「1pctl restore」命令回滾！', upgradeCheck: '檢查更新', upgradeNotes: '更新內容', upgradeNow: '立即更新', source: '下載源', - hasNewVersion: '有新版本', - versionHigher: '檢測到節點 {0} 版本高於主節點，暫不支持切換，請先升級主節點系統版本後重試！', - versionLower: '檢測到節點 {0} 版本低於主節點，暫不支持切換，請先升級該節點系統版本後重試！', + versionNotSame: '檢測到該節點版本與主節點不一致，暫不支援切換，請檢查後重試！', + versionCompare: '檢測到節點 {0} 版本已是當前可升級最新版本，請檢查主節點版本後重試！', safe: '安全', bindInfo: '監聽地址', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 91b274a25..1e8b58042 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1622,15 +1622,13 @@ const message = { upgradeHelper: '升级操作需要重启 1Panel 服务，是否继续？', noUpgrade: '当前已经是最新版本', versionHelper: '1Panel 版本号命名规则为： [大版本].[功能版本].[Bug 修复版本]，例：', - versionHelper1: 'v1.0.1 是 v1.0.0 之后的 Bug 修复版本', - versionHelper2: 'v1.1.0 是 v1.0.0 之后的功能版本', + rollbackLocalHelper: '主节点暂不支持直接回滚，请手动执行 1pctl restore 命令回滚！', upgradeCheck: '检查更新', upgradeNotes: '更新内容', upgradeNow: '立即更新', source: '下载源', - hasNewVersion: '有新版本', - versionHigher: '检测到节点 {0} 版本高于主节点，暂不支持切换，请先升级主节点系统版本后重试！', - versionLower: '检测到节点 {0} 版本低于主节点，暂不支持切换，请先升级该节点系统版本后重试！', + versionNotSame: '检测该节点版本与主节点不一致，暂不支持切换，请检查后重试！', + versionCompare: '检测到节点 {0} 版本已是当前可升级最新版本，请检查主节点版本后重试！', safe: '安全', bindInfo: '监听地址', diff --git a/frontend/src/layout/components/Sidebar/components/Collapse.vue b/frontend/src/layout/components/Sidebar/components/Collapse.vue index bbd61627b..824ad17cf 100644 --- a/frontend/src/layout/components/Sidebar/components/Collapse.vue +++ b/frontend/src/layout/components/Sidebar/components/Collapse.vue @@ -57,7 +57,6 @@ import { GlobalStore, MenuStore } from '@/store'; import { DropdownInstance } from 'element-plus'; import { countExecutingTask } from '@/api/modules/log'; -import { compareVersion } from '@/utils/version'; import { MsgError, MsgSuccess } from '@/utils/message'; import i18n from '@/lang'; import { listNodeOptions } from '@/api/modules/setting'; @@ -125,13 +124,8 @@ const changeNode = (command: string) => { location.reload(); return; } - let compareItem = compareVersion(item.version, props.version); - if (compareItem) { - MsgError(i18n.global.t('setting.versionHigher', [command])); - return; - } - if (!compareItem) { - MsgError(i18n.global.t('setting.versionLower', [command])); + if (item.version !== props.version) { + MsgError(i18n.global.t('setting.versionNotSame')); return; } }