Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/i18n/lang/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/es-ES.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/ja.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ErrAppWarn: '異常な状態です。ログを確認してください'
ErrAppParamKey: 'パラメータ {{ .name }} フィールドが異常です'
ErrAppUpgrade: 'アプリケーション {{ .name }} のアップグレードに失敗しました {{ .err }}'
AppRecover: 'アプリケーション {{ .name }} をロールバックします'
PullImageStart: "イメージ {{ .name }} のプルを開始します"
PullImageStart: "イメージ [{{ .name }}] のプルを開始します"
PullImageSuccess: 'イメージのプルが成功しました'
AppStoreIsLastVersion: 'App Store はすでに最新バージョンです'
AppStoreSyncSuccess: 'App Store の同期が成功しました'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/ko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ErrAppWarn: '비정상적인 상태입니다. 로그를 확인해 주세요.'
ErrAppParamKey: '매개변수 {{ .name }} 필드가 비정상입니다.'
ErrAppUpgrade: '애플리케이션 {{ .name }} 업그레이드에 실패했습니다 {{ .err }}'
AppRecover: '롤백 애플리케이션 {{ .name }}'
PullImageStart: '이미지 {{ .name }} 가져오기 시작'
PullImageStart: '이미지 [{{ .name }}] 가져오기 시작'
PullImageSuccess: '이미지 가져오기 성공'
AppStoreIsLastVersion: '앱스토어가 이미 최신 버전입니다'
AppStoreSyncSuccess: '앱스토어 동기화 성공'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/ms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/pt-BR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ErrAppWarn: 'Ненормальное состояние, проверьте ж
ErrAppParamKey: 'Поле параметра {{ .name }} ненормально'
ErrAppUpgrade: 'Обновление приложения {{ .name }} не удалось {{ .err }}'
AppRecover: 'Откатить приложение {{ .name }}'
PullImageStart: 'Начать извлечение изображения {{ .name }}'
PullImageStart: 'Начать извлечение изображения [{{ .name }}]'
PullImageSuccess: 'Изображение извлечено успешно'
AppStoreIsLastVersion: 'В App Store уже установлена последняя версия'
AppStoreSyncSuccess: 'Синхронизация с App Store прошла успешно'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/tr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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ı'
Expand Down
2 changes: 1 addition & 1 deletion agent/i18n/lang/zh-Hant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ErrAppWarn: '狀態異常,請檢視日誌'
ErrAppParamKey: '參數{{ .name }} 欄位異常'
ErrAppUpgrade: '應用程式{{ .name }} 升級失敗{{ .err }}'
AppRecover: '應用程式{{ .name }} 回滾'
PullImageStart: '開始拉取鏡像{{ .name }}'
PullImageStart: '開始拉取鏡像 [{{ .name }}]'
PullImageSuccess: '鏡像拉取成功'
AppStoreSyncSuccess: '應用程式商店同步成功'
SyncAppDetail: '同步應用程式設定'
Expand Down
3 changes: 2 additions & 1 deletion agent/i18n/lang/zh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ErrAppWarn: "状态异常,请查看日志"
ErrAppParamKey: "参数 {{ .name }} 字段异常"
ErrAppUpgrade: "应用 {{ .name }} 升级失败 {{ .err }}"
AppRecover: "应用 {{ .name }} 回滚 "
PullImageStart: "开始拉取镜像 {{ .name }}"
PullImageStart: "开始拉取镜像 [{{ .name }}]"
PullImageSuccess: "镜像拉取成功"
AppStoreSyncSuccess: "应用商店同步成功"
SyncAppDetail: "同步应用配置"
Expand All @@ -95,6 +95,7 @@ ErrAppVersionDeprecated: " {{ .name }} 应用不适配当前 1Panel 版本,跳
ErrDockerFailed: "Docker 状态异常,请检查服务状态"
ErrDockerComposeCmdNotFound: "Docker Compose 命令不存在,请先在宿主机安装此命令"
UseExistImage: "拉取镜像失败,使用存量镜像"
ErrDatabaseNotFound: "数据库 {{ .name }} 不存在"

#ssh
ExportIP: "登录 IP"
Expand Down
8 changes: 5 additions & 3 deletions agent/utils/postgresql/client/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions core/app/task/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/api/modules/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ export const syncInstalledApp = () => {
return http.post<any>('apps/installed/sync', {});
};

export const getAppService = (key: string | undefined) => {
return http.get<App.AppService[]>(`apps/services/${key}`);
export const getAppService = (key: string | undefined, node?: string) => {
const params = node ? `?operateNode=${node}` : '';
return http.get<App.AppService[]>(`apps/services/${key}${params}`);
};

export const getAppUpdateVersions = (req: App.AppUpdateVersionReq) => {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/backup/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@

<OpDialog ref="opRef" @search="search" />
<TaskLog ref="taskLogRef" @close="search" />
<PushApp ref="pushAppRef" v-if="isProductPro" />
<PushApp ref="pushAppRef" />
</template>

<script lang="ts" setup>
Expand All @@ -150,7 +150,7 @@ import { MsgSuccess } from '@/utils/message';
import TaskLog from '@/components/log/task/index.vue';
import { routerToFileWithPath } from '@/utils/router';
import { useGlobalStore } from '@/composables/useGlobalStore';
const { isProductPro, currentNode } = useGlobalStore();
const { currentNode } = useGlobalStore();

const PushApp = defineAsyncComponent(async () => {
const modules = import.meta.glob('@/xpack/views/appstore/push-app/index.vue');
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2198,7 +2198,6 @@ const message = {
restartOperatorHelper: 'The application will be restarted. Do you want to continue?',
reloadOperatorHelper: 'The application will be reloaded. Do you want to continue?',
checkInstalledWarn: `"{0}" isn't detected. Go to "App Store" to install.`,
gotoInstalled: 'Go to install',
limitHelper: 'The application has already been installed.',
deleteHelper: `"{0}" has been associated with the following resource(s) and can't be deleted`,
checkTitle: 'Hint',
Expand Down Expand Up @@ -3742,6 +3741,8 @@ const message = {
selectNode: 'Select Node',
selectNodeError: 'Please select a node',
licenseHelper: 'The Pro version supports the custom application repository feature',
databaseHelper: 'Application associated database, please select target node database',
nodeHelper: 'Cannot select current node',
},
alert: {
isAlert: 'Alert',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/es-es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2200,7 +2200,6 @@ const message = {
restartOperatorHelper: 'La aplicación se reiniciará. ¿Desea continuar?',
reloadOperatorHelper: 'La aplicación se recargará. ¿Desea continuar?',
checkInstalledWarn: 'No se detecta "{0}". Vaya a "Tienda de aplicaciones" para instalar.',
gotoInstalled: 'Ir a instalar',
limitHelper: 'La aplicación ya está instalada.',
deleteHelper: '"{0}" está asociada con los siguientes recursos y no puede eliminarse',
checkTitle: 'Aviso',
Expand Down Expand Up @@ -3692,6 +3691,8 @@ const message = {
selectNode: 'Seleccionar Nodo',
selectNodeError: 'Por favor, selecciona un nodo',
licenseHelper: 'La versión Pro admite la función de repositorio de aplicaciones personalizadas',
databaseHelper: 'Base de datos asociada a la aplicación, seleccione la base de datos del nodo destino',
nodeHelper: 'No se puede seleccionar el nodo actual',
},
alert: {
isAlert: 'Alerta',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2114,7 +2114,6 @@ const message = {
restartOperatorHelper: 'アプリケーションが再起動されます。続けたいですか?',
reloadOperatorHelper: 'アプリケーションはリロードされます。続けたいですか?',
checkInstalledWarn: `「{0}」が検出されませんでした。「アプリストア」に移動してインストールしてください。`,
gotoInstalled: 'インストールに移動します',
limitHelper: 'アプリケーションはすでにインストールされています。',
deleteHelper: `「{0}」は、次のリソースに関連付けられています。チェックしてもう一度やり直してください!`,
checkTitle: 'ヒント',
Expand Down Expand Up @@ -3631,6 +3630,8 @@ const message = {
selectNode: 'ノードを選択',
selectNodeError: 'ノードを選択してください',
licenseHelper: 'プロバージョンはカスタムアプリケーションリポジトリ機能をサポートしています',
databaseHelper: 'アプリケーション関連データベース、ターゲットノードのデータベースを選択してください',
nodeHelper: '現在のノードは選択できません',
},
alert: {
isAlert: 'アラート',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,6 @@ const message = {
restartOperatorHelper: '애플리케이션이 재시작됩니다. 계속 하시겠습니까?',
reloadOperatorHelper: '애플리케이션이 다시 로드됩니다. 계속 하시겠습니까?',
checkInstalledWarn: '"{0}"이(가) 감지되지 않았습니다. "앱 스토어"로 가서 설치하세요.',
gotoInstalled: '설치하러 가기',
limitHelper: '애플리케이션은 이미 설치되었습니다.',
deleteHelper: '"{0}"은(는) 다음 리소스와 연결되어 있습니다. 확인 후 다시 시도하세요!',
checkTitle: '힌트',
Expand Down Expand Up @@ -3567,6 +3566,8 @@ const message = {
selectNode: '노드 선택',
selectNodeError: '노드를 선택하세요',
licenseHelper: '프로 버전은 사용자 정의 애플리케이션 저장소 기능을 지원합니다',
databaseHelper: '애플리케이션 관련 데이터베이스, 대상 노드 데이터베이스를 선택하세요',
nodeHelper: '현재 노드는 선택할 수 없습니다',
},
alert: {
isAlert: '알림',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2177,7 +2177,6 @@ const message = {
restartOperatorHelper: 'Aplikasi akan dimulakan semula. Adakah anda mahu meneruskan?',
reloadOperatorHelper: 'Aplikasi akan dimuat semula. Adakah anda mahu meneruskan?',
checkInstalledWarn: '"{0}" tidak dikesan. Pergi ke "Kedai Aplikasi" untuk memasang.',
gotoInstalled: 'Pergi ke pasang',
limitHelper: 'Aplikasi ini telah dipasang.',
deleteHelper: '"{0}" telah dikaitkan dengan sumber berikut. Sila semak dan cuba lagi!',
checkTitle: 'Petunjuk',
Expand Down Expand Up @@ -3704,6 +3703,8 @@ const message = {
selectNode: 'Pilih Node',
selectNodeError: 'Sila pilih node',
licenseHelper: 'Versi Pro menyokong fungsi gudang aplikasi tersuai',
databaseHelper: 'Pangkalan data berkaitan aplikasi, sila pilih pangkalan data nod sasaran',
nodeHelper: 'Tidak boleh memilih nod semasa',
},
alert: {
isAlert: 'Amaran',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2170,7 +2170,6 @@ const message = {
restartOperatorHelper: 'O aplicativo será reiniciado. Deseja continuar?',
reloadOperatorHelper: 'O aplicativo será recarregado. Deseja continuar?',
checkInstalledWarn: `"{0}" não foi detectado. Vá para "Loja de Aplicativos" para instalar.`,
gotoInstalled: 'Ir para instalar',
limitHelper: 'O aplicativo já foi instalado.',
deleteHelper: `"{0}" foi associado aos seguintes recursos. Por favor, verifique e tente novamente!`,
checkTitle: 'Dica',
Expand Down Expand Up @@ -3720,6 +3719,8 @@ const message = {
selectNode: 'Selecionar Node',
selectNodeError: 'Por favor, selecione um nó',
licenseHelper: 'A versão Pro suporta o recurso de repositório de aplicativos personalizados',
databaseHelper: 'Banco de dados associado ao aplicativo, selecione o banco de dados do nó de destino',
nodeHelper: 'Não é possível selecionar o nó atual',
},
alert: {
isAlert: 'Alerta',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,6 @@ const message = {
restartOperatorHelper: 'Приложение будет перезапущено. Хотите продолжить?',
reloadOperatorHelper: 'Приложение будет перезагружено. Хотите продолжить?',
checkInstalledWarn: '"{0}" не обнаружено. Перейдите в "Магазин приложений" для установки.',
gotoInstalled: 'Перейти к установке',
limitHelper: 'Приложение уже установлено.',
deleteHelper: '"{0}" связано со следующими ресурсами. Пожалуйста, проверьте и попробуйте снова!',
checkTitle: 'Подсказка',
Expand Down Expand Up @@ -3711,6 +3710,8 @@ const message = {
selectNode: 'Выбрать узел',
selectNodeError: 'Пожалуйста, выберите узел',
licenseHelper: 'Профессиональная версия поддерживает функцию пользовательского репозитория приложений',
databaseHelper: 'База данных, связанная с приложением, выберите базу данных целевого узла',
nodeHelper: 'Нельзя выбрать текущий узел',
},
alert: {
isAlert: 'Оповещение',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2223,7 +2223,6 @@ const message = {
restartOperatorHelper: 'Uygulama yeniden başlatılacak. Devam etmek istiyor musunuz?',
reloadOperatorHelper: 'Uygulama yeniden yüklenecek. Devam etmek istiyor musunuz?',
checkInstalledWarn: '"{0}" tespit edilmedi. Kurulum için "Uygulama Mağazası"na gidin.',
gotoInstalled: 'Kurulum için git',
limitHelper: 'Uygulama zaten kurulmuş.',
deleteHelper: '"{0}" aşağıdaki kaynak(lar) ile ilişkilendirilmiş ve silinemez',
checkTitle: 'İpucu',
Expand Down Expand Up @@ -3785,6 +3784,8 @@ const message = {
selectNode: 'Düğüm Seç',
selectNodeError: 'Lütfen bir düğüm seçin',
licenseHelper: 'Pro sürümü, özel uygulama deposu özelliğini destekler',
databaseHelper: 'Uygulama ilişkili veritabanı, lütfen hedef düğüm veritabanını seçin',
nodeHelper: 'Geçerli düğüm seçilemez',
},
alert: {
isAlert: 'Uyarı',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/zh-Hant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,6 @@ const message = {
versionSelect: '請選擇版本',
operatorHelper: '將對選中應用進行 {0} 操作,是否繼續?',
checkInstalledWarn: '未檢測到 {0} ,請進入應用商店點擊安裝!',
gotoInstalled: '去安裝',
limitHelper: '該應用已安裝,不支援重複安裝',
deleteHelper: '{0}已經關聯以下資源,請檢查後重試!',
checkTitle: '提示',
Expand Down Expand Up @@ -3456,6 +3455,8 @@ const message = {
selectNode: '選擇節點',
selectNodeError: '請選擇節點',
licenseHelper: '專業版支援自訂應用倉庫功能',
databaseHelper: '應用關聯數據庫,請選擇目標節點數據庫',
nodeHelper: '不能選擇當前節點',
},
alert: {
isAlert: '是否告警',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,6 @@ const message = {
versionSelect: '请选择版本',
operatorHelper: '将对选中应用进行 {0} 操作,是否继续?',
checkInstalledWarn: '未检测到 {0} ,请进入应用商店点击安装!',
gotoInstalled: '去安装',
limitHelper: '该应用已安装,不支持重复安装',
deleteHelper: '{0}已经关联以下资源,请检查后重试!',
checkTitle: '提示',
Expand Down Expand Up @@ -3443,6 +3442,8 @@ const message = {
selectNode: '选择节点',
selectNodeError: '请选择节点',
licenseHelper: '专业版支持自定义应用仓库功能',
databaseHelper: '应用关联数据库,请选择目标节点数据库',
nodeHelper: '不能选择当前节点',
},
alert: {
isAlert: '是否告警',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/app-store/detail/params/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
v-model="form[p.child.envKey]"
v-if="p.child.type == 'service'"
@change="changeService(form[p.child.envKey], p.services)"
class="p-w-400"
class="p-w-300"
>
<el-option
v-for="service in p.services"
Expand All @@ -89,7 +89,7 @@
:disabled="service.status != 'Running'"
>
<el-row :gutter="5">
<el-col :span="18">
<el-col :span="14">
<span>{{ service.label }}</span>
</el-col>
<el-col :span="6">
Expand Down
Loading