diff --git a/agent/i18n/lang/en.yaml b/agent/i18n/lang/en.yaml index 68b44c53aa04..ca0ec8967d09 100644 --- a/agent/i18n/lang/en.yaml +++ b/agent/i18n/lang/en.yaml @@ -78,7 +78,7 @@ ErrAppWarn: 'Abnormal status, please check the log' ErrAppParamKey: 'Parameter {{ .name }} field is abnormal' ErrAppUpgrade: 'Application {{ .name }} upgrade failed {{ .err }}' AppRecover: 'Rollback application {{ .name }}' -PullImageStart: 'Start pulling image {{ .name }}' +PullImageStart: 'Start pulling image [{{ .name }}]' PullImageSuccess: 'Image pull successful' AppStoreIsLastVersion: 'The App Store is already the latest version' AppStoreSyncSuccess: 'App Store synchronization successful' diff --git a/agent/i18n/lang/es-ES.yaml b/agent/i18n/lang/es-ES.yaml index 7a2bf5e68e30..eda664f45d6f 100644 --- a/agent/i18n/lang/es-ES.yaml +++ b/agent/i18n/lang/es-ES.yaml @@ -78,7 +78,7 @@ ErrAppWarn: 'Estado anómalo, revise el log' ErrAppParamKey: 'El campo de parámetro {{ .name }} es anómalo' ErrAppUpgrade: 'La actualización de la aplicación {{ .name }} falló {{ .err }}' AppRecover: 'Revertir la aplicación {{ .name }}' -PullImageStart: 'Iniciar descarga de la imagen {{ .name }}' +PullImageStart: 'Iniciar descarga de la imagen [{{ .name }}]' PullImageSuccess: 'Descarga de imagen exitosa' AppStoreIsLastVersion: 'La tienda de aplicaciones ya está en la última versión' AppStoreSyncSuccess: 'Sincronización de la tienda de aplicaciones exitosa' diff --git a/agent/i18n/lang/ja.yaml b/agent/i18n/lang/ja.yaml index 0318e500ca2c..42f0943fb5b0 100644 --- a/agent/i18n/lang/ja.yaml +++ b/agent/i18n/lang/ja.yaml @@ -77,7 +77,7 @@ ErrAppWarn: '異常な状態です。ログを確認してください' ErrAppParamKey: 'パラメータ {{ .name }} フィールドが異常です' ErrAppUpgrade: 'アプリケーション {{ .name }} のアップグレードに失敗しました {{ .err }}' AppRecover: 'アプリケーション {{ .name }} をロールバックします' -PullImageStart: "イメージ {{ .name }} のプルを開始します" +PullImageStart: "イメージ [{{ .name }}] のプルを開始します" PullImageSuccess: 'イメージのプルが成功しました' AppStoreIsLastVersion: 'App Store はすでに最新バージョンです' AppStoreSyncSuccess: 'App Store の同期が成功しました' diff --git a/agent/i18n/lang/ko.yaml b/agent/i18n/lang/ko.yaml index af54651d7548..b4e005b1b868 100644 --- a/agent/i18n/lang/ko.yaml +++ b/agent/i18n/lang/ko.yaml @@ -78,7 +78,7 @@ ErrAppWarn: '비정상적인 상태입니다. 로그를 확인해 주세요.' ErrAppParamKey: '매개변수 {{ .name }} 필드가 비정상입니다.' ErrAppUpgrade: '애플리케이션 {{ .name }} 업그레이드에 실패했습니다 {{ .err }}' AppRecover: '롤백 애플리케이션 {{ .name }}' -PullImageStart: '이미지 {{ .name }} 가져오기 시작' +PullImageStart: '이미지 [{{ .name }}] 가져오기 시작' PullImageSuccess: '이미지 가져오기 성공' AppStoreIsLastVersion: '앱스토어가 이미 최신 버전입니다' AppStoreSyncSuccess: '앱스토어 동기화 성공' diff --git a/agent/i18n/lang/ms.yaml b/agent/i18n/lang/ms.yaml index dad5705912a2..756303bd00e5 100644 --- a/agent/i18n/lang/ms.yaml +++ b/agent/i18n/lang/ms.yaml @@ -81,7 +81,7 @@ ErrAppWarn: 'Status tidak normal, sila semak log' ErrAppParamKey: 'Parameter {{ .name }} medan tidak normal' ErrAppUpgrade: 'Peningkatan {{ .name }} aplikasi gagal {{ .err }}' AppRecover: 'Aplikasi tarik balik {{ .name }}' -PullImageStart: 'Mula tarik imej {{ .name }}' +PullImageStart: 'Mula tarik imej [{{ .name }}]' PullImageSuccess: 'Tarik imej berjaya' AppStoreIsLastVersion: 'App Store sudah pun versi terkini' AppStoreSyncSuccess: 'Penyegerakan App Store berjaya' diff --git a/agent/i18n/lang/pt-BR.yaml b/agent/i18n/lang/pt-BR.yaml index 624e6cb7522e..bee72b115ce4 100644 --- a/agent/i18n/lang/pt-BR.yaml +++ b/agent/i18n/lang/pt-BR.yaml @@ -81,7 +81,7 @@ ErrAppWarn: 'Status anormal, verifique o log' ErrAppParamKey: 'O campo de parâmetro {{ .name }} está anormal' ErrAppUpgrade: 'Falha na atualização do aplicativo {{ .name }} {{ .err }}' AppRecover: 'Reverter aplicativo {{ .name }}' -PullImageStart: 'Comece a extrair a imagem {{ .name }}' +PullImageStart: 'Comece a extrair a imagem [{{ .name }}]' PullImageSuccess: 'Imagem retirada com sucesso' AppStoreIsLastVersion: 'A App Store já é a versão mais recente' AppStoreSyncSuccess: 'Sincronização da App Store bem-sucedida' diff --git a/agent/i18n/lang/ru.yaml b/agent/i18n/lang/ru.yaml index c602bdc12b57..6f5e64bc2064 100644 --- a/agent/i18n/lang/ru.yaml +++ b/agent/i18n/lang/ru.yaml @@ -81,7 +81,7 @@ ErrAppWarn: 'Ненормальное состояние, проверьте ж ErrAppParamKey: 'Поле параметра {{ .name }} ненормально' ErrAppUpgrade: 'Обновление приложения {{ .name }} не удалось {{ .err }}' AppRecover: 'Откатить приложение {{ .name }}' -PullImageStart: 'Начать извлечение изображения {{ .name }}' +PullImageStart: 'Начать извлечение изображения [{{ .name }}]' PullImageSuccess: 'Изображение извлечено успешно' AppStoreIsLastVersion: 'В App Store уже установлена последняя версия' AppStoreSyncSuccess: 'Синхронизация с App Store прошла успешно' diff --git a/agent/i18n/lang/tr.yaml b/agent/i18n/lang/tr.yaml index 9b3c78449d6d..a097fdc50395 100644 --- a/agent/i18n/lang/tr.yaml +++ b/agent/i18n/lang/tr.yaml @@ -81,7 +81,7 @@ ErrAppWarn: 'Anormal durum, lütfen günlüğü kontrol edin' ErrAppParamKey: 'Parametre {{ .name }} alanı anormal' ErrAppUpgrade: 'Uygulama {{ .name }} yükseltmesi başarısız {{ .err }}' AppRecover: 'Uygulama {{ .name }} geri alma' -PullImageStart: 'Image {{ .name }} çekmeye başla' +PullImageStart: 'Image [{{ .name }}] çekmeye başla' PullImageSuccess: 'Image çekme başarılı' AppStoreIsLastVersion: 'Uygulama Mağazası zaten en son sürüm' AppStoreSyncSuccess: 'Uygulama Mağazası senkronizasyonu başarılı' diff --git a/agent/i18n/lang/zh-Hant.yaml b/agent/i18n/lang/zh-Hant.yaml index 7da3e890c703..07135b001e4c 100644 --- a/agent/i18n/lang/zh-Hant.yaml +++ b/agent/i18n/lang/zh-Hant.yaml @@ -78,7 +78,7 @@ ErrAppWarn: '狀態異常,請檢視日誌' ErrAppParamKey: '參數{{ .name }} 欄位異常' ErrAppUpgrade: '應用程式{{ .name }} 升級失敗{{ .err }}' AppRecover: '應用程式{{ .name }} 回滾' -PullImageStart: '開始拉取鏡像{{ .name }}' +PullImageStart: '開始拉取鏡像 [{{ .name }}]' PullImageSuccess: '鏡像拉取成功' AppStoreSyncSuccess: '應用程式商店同步成功' SyncAppDetail: '同步應用程式設定' diff --git a/agent/i18n/lang/zh.yaml b/agent/i18n/lang/zh.yaml index 0aee05903b0e..875e6bca5be1 100644 --- a/agent/i18n/lang/zh.yaml +++ b/agent/i18n/lang/zh.yaml @@ -78,7 +78,7 @@ ErrAppWarn: "状态异常,请查看日志" ErrAppParamKey: "参数 {{ .name }} 字段异常" ErrAppUpgrade: "应用 {{ .name }} 升级失败 {{ .err }}" AppRecover: "应用 {{ .name }} 回滚 " -PullImageStart: "开始拉取镜像 {{ .name }}" +PullImageStart: "开始拉取镜像 [{{ .name }}]" PullImageSuccess: "镜像拉取成功" AppStoreSyncSuccess: "应用商店同步成功" SyncAppDetail: "同步应用配置" @@ -95,6 +95,7 @@ ErrAppVersionDeprecated: " {{ .name }} 应用不适配当前 1Panel 版本,跳 ErrDockerFailed: "Docker 状态异常,请检查服务状态" ErrDockerComposeCmdNotFound: "Docker Compose 命令不存在,请先在宿主机安装此命令" UseExistImage: "拉取镜像失败,使用存量镜像" +ErrDatabaseNotFound: "数据库 {{ .name }} 不存在" #ssh ExportIP: "登录 IP" diff --git a/agent/utils/postgresql/client/local.go b/agent/utils/postgresql/client/local.go index 082c3c16bb09..9919c1da15ff 100644 --- a/agent/utils/postgresql/client/local.go +++ b/agent/utils/postgresql/client/local.go @@ -182,10 +182,12 @@ func (r *Local) Recover(info RecoverInfo) error { cmd.Stdin = fi } stdout, err := cmd.CombinedOutput() - if err != nil || strings.HasPrefix(string(stdout), "ERROR ") { - return errors.New(string(stdout)) + if err != nil { + if strings.HasPrefix(string(stdout), "ERROR ") { + return errors.New(string(stdout)) + } + return err } - return nil } diff --git a/core/app/task/task.go b/core/app/task/task.go index 546fd8686b61..4bf9b42e1c08 100644 --- a/core/app/task/task.go +++ b/core/app/task/task.go @@ -126,6 +126,7 @@ func (s *SubTask) Execute() error { if s.Name == "" { subTaskName = i18n.GetMsgByKey("SubTask") } + s.RootTask.LogStart(subTaskName) var err error for i := 0; i < s.Retry+1; i++ { if i > 0 { diff --git a/frontend/src/api/modules/app.ts b/frontend/src/api/modules/app.ts index ed1f23652faa..bfaef028809f 100644 --- a/frontend/src/api/modules/app.ts +++ b/frontend/src/api/modules/app.ts @@ -84,8 +84,9 @@ export const syncInstalledApp = () => { return http.post('apps/installed/sync', {}); }; -export const getAppService = (key: string | undefined) => { - return http.get(`apps/services/${key}`); +export const getAppService = (key: string | undefined, node?: string) => { + const params = node ? `?operateNode=${node}` : ''; + return http.get(`apps/services/${key}${params}`); }; export const getAppUpdateVersions = (req: App.AppUpdateVersionReq) => { diff --git a/frontend/src/components/backup/index.vue b/frontend/src/components/backup/index.vue index 16d8ce5100c2..e9f3bf64877e 100644 --- a/frontend/src/components/backup/index.vue +++ b/frontend/src/components/backup/index.vue @@ -128,7 +128,7 @@ - +