1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-18 21:38:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Add version printing after rollback (#11378)

Browse source 
Refs #11265
This commit is contained in:
ssongliu 2025-12-17 16:48:10 +08:00 • committed by GitHub
parent e43d7b7a59
commit 02b278ecff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/cmd/server/cmd/restore.go
View file

@ -98,7 +98,8 @@ var restoreCmd = &cobra.Command{
}
fmt.Println(i18n.GetMsgByKeyForCmd("RestoreStep5"))
fmt.Println(i18n.GetMsgByKeyForCmd("RestoreSuccessful"))
version := loadRollbackVersion(tmpPath)
fmt.Println(i18n.GetMsgWithMapForCmd("RestoreSuccessful", map[string]interface{}{"version": version}))
controller.RestartPanel(true, true, true)
return nil
@ -127,3 +128,15 @@ func loadRestorePath(upgradeDir string) (string, error) {
})
return folders[0], nil
}
func loadRollbackVersion(upgradeDir string) string {
stdout, err := cmdUtils.RunDefaultWithStdoutBashCf("grep '^ORIGINAL_VERSION=' %s/1pctl | cut -d'=' -f2", upgradeDir)
if err != nil {
return "-"
}
info := strings.ReplaceAll(stdout, "\n", "")
if len(info) == 0 || info == `""` {
return "-"
}
return info
}

2
core/i18n/lang/en.yaml
View file

@ -192,7 +192,7 @@ RestoreStep2: "(2/5) 1Panel binary rollback successful"
RestoreStep3: "(3/5) 1Panel script rollback successful"
RestoreStep4: "(4/5) 1Panel service rollback successful"
RestoreStep5: "(5/5) 1Panel data rollback successful"
RestoreSuccessful: "Rollback successful! Restarting service, please wait..."
RestoreSuccessful: "Rollback successful! Rolled back to {{ .version }}, restarting service, please wait..."
UpdateCommands: "Update panel info"
UpdateUser: "Update panel user"
UpdatePassword: "Update panel password"

2
core/i18n/lang/es-ES.yaml
View file

@ -192,7 +192,7 @@ RestoreStep2: "(2/5) Reversión de binarios de 1Panel finalizada con éxito"
RestoreStep3: "(3/5) Reversión de scripts de 1Panel finalizada con éxito"
RestoreStep4: "(4/5) Reversión de servicio de 1Panel finalizada con éxito"
RestoreStep5: "(5/5) Reversión de datos de 1Panel finalizada con éxito"
RestoreSuccessful: "¡Reversión finalizada con éxito! Reiniciando el servicio, espere..."
RestoreSuccessful: "¡Reversión exitosa! Revertido a {{ .version }}, reiniciando servicio, espere por favor..."
UpdateCommands: "Actualizar información del panel"
UpdateUser: "Actualizar usuario del panel"
UpdatePassword: "Actualizar contraseña del panel"

2
core/i18n/lang/ja.yaml
View file

@ -193,7 +193,7 @@ RestoreStep2: "（2/5）1パネルバイナリロールバックが成功しま
RestoreStep3: "（3/5）1パネルスクリプトロールバック成功"
RestoreStep4: "（4/5）1パネルサービスロールバックが成功しました"
RestoreStep5: "（5/5）1パネルデータロールバックが成功しました"
RestoreSuccessful: "ロールバックが成功しました！サービスを再起動します、待ってください..."
RestoreSuccessful: "ロールバック成功！{{ .version }} にロールバックしました。サービスを再起動中です。しばらくお待ちください..."
UpdateCommands: "パネル情報を更新します"
UpdateUser: "パネルユーザーを更新します"
UpdatePassword: "パスワードを更新します"

2
core/i18n/lang/ko.yaml
View file

@ -192,7 +192,7 @@ RestoreStep2: "(2/5) 1Panel 바이너리 복구 성공"
RestoreStep3: "(3/5) 1Panel 스크립트 복구 성공"
RestoreStep4: "(4/5) 1Panel 서비스 복구 성공"
RestoreStep5: "(5/5) 1Panel 데이터 복구 성공"
RestoreSuccessful: "복구 성공! 서비스를 다시 시작합니다. 잠시만 기다려주세요..."
RestoreSuccessful: "롤백 성공! {{ .version }}(으)로 롤백되었습니다. 서비스를 재시작 중입니다. 잠시만 기다려 주세요..."
UpdateCommands: "패널 정보 업데이트"
UpdateUser: "패널 사용자 업데이트"
UpdatePassword: "패널 비밀번호 업데이트"

2
core/i18n/lang/ms.yaml
View file

@ -187,7 +187,7 @@ RestoreStep2: "(2/5) Pemulihan binari 1Panel berjaya"
RestoreStep3: "(3/5) Pemulihan skrip 1Panel berjaya"
RestoreStep4: "(4/5) Pemulihan perkhidmatan 1Panel berjaya"
RestoreStep5: "(5/5) Pemulihan data 1Panel berjaya"
RestoreSuccessful: "Pemulihan berjaya! Memulakan semula perkhidmatan, sila tunggu..."
RestoreSuccessful: "Pulangan semula berjaya! Dikembalikan ke {{ .version }}, memulakan semula perkhidmatan, sila tunggu..."
UpdateCommands: "Kemas kini maklumat panel"
UpdateUser: "Kemas kini pengguna panel"
UpdatePassword: "Kemas kini kata laluan panel"

2
core/i18n/lang/pt-BR.yaml
View file

@ -192,7 +192,7 @@ RestoreStep2: "(2/5) Restauração do binário do 1Panel bem-sucedida"
RestoreStep3: "(3/5) Restauração dos scripts do 1Panel bem-sucedida"
RestoreStep4: "(4/5) Restauração do serviço do 1Panel bem-sucedida"
RestoreStep5: "(5/5) Restauração dos dados do 1Panel bem-sucedida"
RestoreSuccessful: "Restauração bem-sucedida! Reiniciando o serviço, por favor, aguarde..."
RestoreSuccessful: "Reversão bem-sucedida! Revertido para {{ .version }}, reiniciando serviço, por favor aguarde..."
UpdateCommands: "Atualizar informações do painel"
UpdateUser: "Atualizar usuário do painel"
UpdatePassword: "Atualizar senha do painel"

2
core/i18n/lang/ru.yaml
View file

@ -192,7 +192,7 @@ RestoreStep2: "（2/5）Откат бинарного файла 1Panel заве
RestoreStep3: "（3/5）Откат скриптов 1Panel завершён"
RestoreStep4: "（4/5）Откат сервисов 1Panel завершён"
RestoreStep5: "（5/5）Откат данных 1Panel завершён"
RestoreSuccessful: "Откат успешен! Перезапускаем сервисы, пожалуйста, подождите..."
RestoreSuccessful: "Откат успешен! Откатился к {{ .version }}, перезапускаю службу, пожалуйста, подождите..."
UpdateCommands: "Изменить информацию панели"
UpdateUser: "Изменить пользователя панели"
UpdatePassword: "Изменить пароль панели"

2
core/i18n/lang/tr.yaml
View file

@ -191,7 +191,7 @@ RestoreStep2: "(2/5) 1Panel binary geri alımı başarılı"
RestoreStep3: "(3/5) 1Panel betik geri alımı başarılı"
RestoreStep4: "(4/5) 1Panel servis geri alımı başarılı"
RestoreStep5: "(5/5) 1Panel veri geri alımı başarılı"
RestoreSuccessful: "Geri alma başarılı! Servis yeniden başlatılıyor, lütfen bekleyin..."
RestoreSuccessful: "Geri alma başarılı! {{ .version }} sürümüne geri alındı, hizmet yeniden başlatılıyor, lütfen bekleyin..."
UpdateCommands: "Panel bilgilerini güncelle"
UpdateUser: "Panel kullanıcısını güncelle"
UpdatePassword: "Panel şifresini güncelle"

2
core/i18n/lang/zh-Hant.yaml
View file

@ -194,7 +194,7 @@ RestoreStep2: "（2/5）1Panel 二進制回滾成功"
RestoreStep3: "（3/5）1Panel 腳本回滾成功"
RestoreStep4: "（4/5）1Panel 服務回滾成功"
RestoreStep5: "（5/5）1Panel 資料回滾成功"
RestoreSuccessful: "回滾成功！正在重啟服務，請稍候..."
RestoreSuccessful: "回滾成功！已回滾到 {{ .version }，正在重啟服務，請稍候..."
UpdateCommands: "修改面板資訊"
UpdateUser: "修改面板使用者"
UpdatePassword: "修改面板密碼"

2
core/i18n/lang/zh.yaml
View file

@ -193,7 +193,7 @@ RestoreStep2: "（2/5）1Panel 二进制回滚成功"
RestoreStep3: "（3/5）1Panel 脚本回滚成功"
RestoreStep4: "（4/5）1Panel 服务回滚成功"
RestoreStep5: "（5/5）1Panel 数据回滚成功"
RestoreSuccessful: "回滚成功！正在重启服务，请稍候..."
RestoreSuccessful: "回滚成功！已回滚到 {{ .version }}，正在重启服务，请稍候..."
UpdateCommands: "修改面板信息"
UpdateUser: "修改面板用户"
UpdatePassword: "修改面板密码"