feat: Add the display of details for backup accounts. (#7941)

agent/app/dto/snapshot.go

@@ -2,17 +2,6 @@ package dto
 
 import "time"
 
-type SnapshotStatus struct {
-	BaseData   string `json:"baseData"`
-	AppImage   string `json:"appImage"`
-	PanelData  string `json:"panelData"`
-	BackupData string `json:"backupData"`
-
-	Compress string `json:"compress"`
-	Size     string `json:"size"`
-	Upload   string `json:"upload"`
-}
-
 type PageSnapshot struct {
 	PageInfo
 	Info    string `json:"info"`

agent/cron/cron.go

@@ -72,6 +72,7 @@ func Run() {
 			global.LOG.Errorf("update cronjob %s %s failed, err: %v", cronJobs[i].Type, cronJobs[i].Name, err)
 		}
 	}
+	global.Cron.Start()
 }
 
 func syncBeforeStart() {

core/app/dto/setting.go

@@ -80,19 +80,6 @@ type PortUpdate struct {
 	ServerPort uint `json:"serverPort" validate:"required,number,max=65535,min=1"`
 }
 
-type SnapshotStatus struct {
-	Panel      string `json:"panel"`
-	PanelInfo  string `json:"panelInfo"`
-	DaemonJson string `json:"daemonJson"`
-	AppData    string `json:"appData"`
-	PanelData  string `json:"panelData"`
-	BackupData string `json:"backupData"`
-
-	Compress string `json:"compress"`
-	Size     string `json:"size"`
-	Upload   string `json:"upload"`
-}
-
 type SnapshotCreate struct {
 	ID              uint   `json:"id"`
 	From            string `json:"from" validate:"required"`

frontend/src/api/interface/setting.ts

@@ -198,16 +198,6 @@ export namespace Setting {
 
         Children: Array<DataTree>;
     }
-    export interface SnapshotStatus {
-        baseData: string;
-        appImage: string;
-        panelData: string;
-        backupData: string;
-
-        compress: string;
-        size: string;
-        upload: string;
-    }
     export interface UpgradeInfo {
         testVersion: string;
         newVersion: string;

frontend/src/api/modules/setting.ts

@@ -121,9 +121,6 @@ export const snapshotCreate = (param: Setting.SnapshotCreate) => {
 export const snapshotRecreate = (id: number) => {
     return http.post(`/settings/snapshot/recreate`, { id: id });
 };
-export const loadSnapStatus = (id: number) => {
-    return http.post<Setting.SnapshotStatus>(`/settings/snapshot/status`, { id: id });
-};
 export const snapshotImport = (param: Setting.SnapshotImport) => {
     return http.post(`/settings/snapshot/import`, param);
 };

frontend/src/components/codemirror-pro/index.vue

@@ -70,7 +70,7 @@ const initCodeMirror = () => {
     const defaultTheme = EditorView.theme({
         '&.cm-editor': {
             minHeight: props.minHeight + 'px',
-            height: props.height ? props.height + 'px' : 'calc(100vh - ' + props.heightDiff + 'px)',
+            height: loadHeight(),
         },
     });
 
@@ -119,6 +119,12 @@ const initCodeMirror = () => {
     });
 };
 
+const loadHeight = () => {
+    if (props.height || props.heightDiff) {
+        return props.height ? props.height + 'px' : 'calc(100vh - ' + props.heightDiff + 'px)';
+    }
+};
+
 watch(
     () => content.value,
     (newValue) => {

frontend/src/components/detail-show/index.vue

@@ -0,0 +1,39 @@
+<template>
+    <DialogPro v-model="visible" :title="$t('app.detail')">
+        <div class="mt-5">
+            <el-descriptions border :column="1">
+                <el-descriptions-item v-for="(item, key) in list" :label="item.label" :key="key">
+                    {{ item.value }}
+                    <CopyButton v-if="!item.hideCopy" :content="item.value" type="icon" />
+                </el-descriptions-item>
+            </el-descriptions>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="visible = false">
+                    {{ $t('commons.button.cancel') }}
+                </el-button>
+            </span>
+        </template>
+    </DialogPro>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const list = ref();
+const visible = ref(false);
+
+interface DialogProps {
+    list: Array<string>;
+}
+
+const acceptParams = (props: DialogProps): void => {
+    visible.value = true;
+    list.value = props.list;
+};
+
+defineExpose({
+    acceptParams,
+});
+</script>

frontend/src/lang/modules/en.ts

@@ -1185,14 +1185,15 @@ const message = {
             apps: 'App',
             websites: 'Website',
             containers: 'Container',
-            files: 'File Manage',
+            files: 'File',
             runtimes: 'Runtime',
             process: 'Process',
             toolbox: 'Toolbox',
+            backups: 'Backup / Restore',
             tampers: 'Tamper',
             xsetting: 'Interface Settings',
-            logs: 'Panel Logs',
+            logs: 'Log',
-            settings: 'Panel Setting',
+            settings: 'Setting',
             cronjobs: 'Cronjob',
             databases: 'Database',
         },

frontend/src/lang/modules/ja.ts

@@ -1122,16 +1122,19 @@ const message = {
         detail: {
             groups: 'グループ',
             hosts: 'ホスト',
-            apps: 'アプリ',
+            apps: 'アプリケーション',
-            websites: 'Webサイト',
+            websites: 'ウェブサイト',
-            containers: '容器',
+            containers: 'コンテナ',
             files: 'ファイル管理',
             runtimes: 'ランタイム',
-            process: 'プロセス',
+            process: 'プロセス管理',
             toolbox: 'ツールボックス',
-            logs: 'パネルログ',
+            backups: 'バックアップ / 復元',
+            tampers: '改ざん防止',
+            xsetting: 'インターフェース設定',
+            logs: 'ログ監査',
             settings: 'パネル設定',
-            cronjobs: 'クローニョブ',
+            cronjobs: 'スケジュールされたタスク',
             databases: 'データベース',
         },
         websiteLog: 'ウェブサイトログ',

frontend/src/lang/modules/ko.ts

@@ -1114,12 +1114,15 @@ const message = {
             websites: '웹사이트',
             containers: '컨테이너',
             files: '파일 관리',
-            runtimes: '런타임',
+            runtimes: '실행 환경',
-            process: '프로세스',
+            process: '프로세스 관리',
-            toolbox: '도구상자',
+            toolbox: '도구 상자',
-            logs: '패널 로그',
+            backups: '백업 / 복원',
+            tampers: '변조 방지',
+            xsetting: '인터페이스 설정',
+            logs: '로그 감사',
             settings: '패널 설정',
-            cronjobs: '크론 작업',
+            cronjobs: '예약 작업',
             databases: '데이터베이스',
         },
         websiteLog: '웹사이트 로그',

frontend/src/lang/modules/ms.ts

@@ -1167,13 +1167,16 @@ const message = {
             websites: 'Laman Web',
             containers: 'Kontena',
             files: 'Pengurusan Fail',
-            runtimes: 'Runtime',
+            runtimes: 'Persekitaran Jalankan',
-            process: 'Proses',
+            process: 'Pengurusan Proses',
             toolbox: 'Kotak Alat',
-            logs: 'Log Panel',
+            backups: 'Sandaran / Pulihkan',
+            tampers: 'Perlindungan daripada Pinda',
+            xsetting: 'Tetapan Antara Muka',
+            logs: 'Audit Log',
             settings: 'Tetapan Panel',
-            cronjobs: 'Cronjob',
+            cronjobs: 'Tugas Terjadual',
-            databases: 'Pangkalan Data',
+            databases: 'Pangkalan',
         },
         websiteLog: 'Log Laman Web',
         runLog: 'Log Jalankan',

frontend/src/lang/modules/pt-br.ts

@@ -1145,19 +1145,22 @@ const message = {
         deleteLogs: 'Limpar logs',
         resource: 'Recurso',
         detail: {
-            groups: 'Grupo',
+            groups: 'Grupos',
-            hosts: 'Host',
+            hosts: 'Hosts',
-            apps: 'Aplicativo',
+            apps: 'Aplicativos',
-            websites: 'Website',
+            websites: 'Sites',
-            containers: 'Container',
+            containers: 'Contêineres',
-            files: 'Gerenciamento de arquivos',
+            files: 'Gerenciamento de Arquivos',
-            runtimes: 'Ambiente de execução',
+            runtimes: 'Ambientes de Execução',
-            process: 'Processo',
+            process: 'Gerenciamento de Processos',
-            toolbox: 'Caixa de ferramentas',
+            toolbox: 'Caixa de Ferramentas',
-            logs: 'Logs do painel',
+            backups: 'Backup / Restauração',
-            settings: 'Configurações do painel',
+            tampers: 'Proteção contra Alterações',
-            cronjobs: 'Tarefas agendadas',
+            xsetting: 'Configurações da Interface',
-            databases: 'Banco de dados',
+            logs: 'Auditoria de Logs',
+            settings: 'Configurações do Painel',
+            cronjobs: 'Tarefas Agendadas',
+            databases: 'Bancos de Dados',
         },
         websiteLog: 'Logs do website',
         runLog: 'Logs de execução',

frontend/src/lang/modules/ru.ts

@@ -1150,19 +1150,22 @@ const message = {
         deleteLogs: 'Очистить логи',
         resource: 'Ресурс',
         detail: {
-            groups: 'Группа',
+            groups: 'Группы',
-            hosts: 'Хост',
+            hosts: 'Хосты',
-            apps: 'Приложение',
+            apps: 'Приложения',
-            websites: 'Веб-сайт',
+            websites: 'Вебсайты',
-            containers: 'Контейнер',
+            containers: 'Контейнеры',
             files: 'Управление файлами',
-            runtimes: 'Среда выполнения',
+            runtimes: 'Среды выполнения',
-            process: 'Процесс',
+            process: 'Управление процессами',
-            toolbox: 'Инструменты',
+            toolbox: 'Инструментальный ящик',
-            logs: 'Логи панели',
+            backups: 'Резервное копирование / Восстановление',
+            tampers: 'Защита от подделки',
+            xsetting: 'Настройки интерфейса',
+            logs: 'Аудит журналов',
             settings: 'Настройки панели',
-            cronjobs: 'Cron',
+            cronjobs: 'Запланированные задачи',
-            databases: 'База данных',
+            databases: 'Базы данных',
         },
         websiteLog: 'Логи веб-сайта',
         runLog: 'Логи выполнения',

frontend/src/lang/modules/tw.ts

@@ -1123,12 +1123,13 @@ const message = {
             runtimes: '運行環境',
             process: '進程管理',
             toolbox: '工具箱',
+            backups: '備份 / 還原',
             tampers: '防篡改',
-            xsetting: '界面設定',
+            xsetting: '介面設定',
             logs: '日誌審計',
-            settings: '面板設置',
+            settings: '面板設定',
-            cronjobs: '計劃任務',
+            cronjobs: '計畫任務',
-            databases: '數據庫',
+            databases: '資料庫',
         },
         websiteLog: '網站日誌',
         runLog: '運行日誌',

frontend/src/lang/modules/zh.ts

@@ -1120,6 +1120,7 @@ const message = {
             runtimes: '运行环境',
             process: '进程管理',
             toolbox: '工具箱',
+            backups: '备份 / 恢复',
             tampers: '防篡改',
             xsetting: '界面设置',
             logs: '日志审计',

frontend/src/views/cronjob/operate/index.vue

@@ -280,7 +280,8 @@
                             v-model="dialogData.rowData!.script"
                             placeholder="#Define or paste the content of your shell file here"
                             mode="javascript"
-                            :heightDiff="400"
+                            :heightDiff="0"
+                            :min-height="200"
                         />
                         <el-input
                             v-if="dialogData.rowData!.scriptMode=== 'select'"

frontend/src/views/setting/backup-account/index.vue

@@ -33,7 +33,13 @@
                         :min-width="80"
                         prop="name"
                         show-overflow-tooltip
-                    />
+                    >
+                        <template #default="{ row }">
+                            <el-text type="primary" class="cursor-pointer" @click="onInspect(row)">
+                                {{ row.name }}
+                            </el-text>
+                        </template>
+                    </el-table-column>
                     <el-table-column
                         v-if="globalStore.isProductPro"
                         :label="$t('setting.scope')"
@@ -103,6 +109,7 @@
         </LayoutContent>
 
         <Operate ref="dialogRef" @search="search" />
+        <DetailShow ref="detailRef" />
         <OpDialog ref="opRef" @search="search" />
     </div>
 </template>
@@ -111,10 +118,12 @@ import { dateFormat } from '@/utils/util';
 import { onMounted, ref } from 'vue';
 import { searchBackup, deleteBackup, refreshToken } from '@/api/modules/backup';
 import Operate from '@/views/setting/backup-account/operate/index.vue';
+import DetailShow from '@/components/detail-show/index.vue';
 import { Backup } from '@/api/interface/backup';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { GlobalStore } from '@/store';
+import { Base64 } from 'js-base64';
 const globalStore = GlobalStore();
 
 const loading = ref();
@@ -129,6 +138,7 @@ const paginationConfig = reactive({
 });
 const opRef = ref();
 const dialogRef = ref();
+const detailRef = ref();
 
 const search = async () => {
     let params = {
@@ -143,7 +153,7 @@ const search = async () => {
             loading.value = false;
             data.value = res.data.items || [];
             for (const bac of data.value) {
-                if (bac.id !== 0) {
+                if (bac.vars) {
                     bac.varsJson = JSON.parse(bac.vars);
                 }
             }
@@ -192,6 +202,68 @@ const onOpenDialog = async (
     dialogRef.value!.acceptParams(params);
 };
 
+const onInspect = (row: any) => {
+    let list = [];
+    list.push({ label: i18n.global.t('commons.table.name'), value: row.name, hideCopy: true });
+    list.push({
+        label: i18n.global.t('commons.table.type'),
+        value: i18n.global.t('setting.' + row.type),
+        hideCopy: true,
+    });
+    if (row.type === 'S3') {
+        list.push({ label: i18n.global.t('setting.mode'), value: row.varsJson['mode'] });
+    }
+    if (row.type === 'COS' || row.type === 'KODO' || row.type === 'MINIO' || row.type === 'OSS' || row.type === 'S3') {
+        if (row.rememberAuth) {
+            list.push({ label: 'Access Key ID', value: Base64.decode(row.accessKey) });
+            list.push({ label: 'Secret Key', value: Base64.decode(row.credential) });
+        }
+    }
+    if (row.type === 'UPYUN') {
+        if (row.rememberAuth) {
+            list.push({ label: i18n.global.t('setting.operator'), value: Base64.decode(row.accessKey) });
+            list.push({ label: i18n.global.t('commons.login.password'), value: Base64.decode(row.credential) });
+        }
+    }
+    if (row.type === 'WebDAV' || row.type === 'SFTP') {
+        list.push({ label: i18n.global.t('setting.address'), value: row.varsJson['address'] || '' });
+        list.push({ label: i18n.global.t('commons.login.username'), value: Base64.decode(row.accessKey) });
+    }
+    if (row.type === 'SFTP') {
+        list.push({ label: i18n.global.t('commons.table.port'), value: row.varsJson['port'] || '' });
+        if (row.rememberAuth) {
+            list.push({ label: i18n.global.t('terminal.authMode'), value: row.varsJson['authMode'] });
+            if (row.varsJson['authMode'] === 'key') {
+                list.push({ label: i18n.global.t('terminal.key'), value: Base64.decode(row.credential) });
+                list.push({ label: i18n.global.t('terminal.keyPassword'), value: row.varsJson['passPhrase'] });
+            } else {
+                list.push({ label: i18n.global.t('commons.login.password'), value: Base64.decode(row.credential) });
+            }
+        }
+    }
+    if (row.type === 'COS' || row.type === 'S3') {
+        list.push({ label: 'Region', value: row.varsJson['region'] || '' });
+    }
+    if (row.type === 'COS' || row.type === 'KODO' || row.type === 'MINIO' || row.type === 'OSS' || row.type === 'S3') {
+        list.push({
+            label: row.type === 'KODO' ? i18n.global.t('setting.domain') : 'Endpoint',
+            value: row.varsJson['endpoint'] || '',
+        });
+        list.push({ label: 'Bucket', value: row.bucket });
+    }
+    if (row.type === 'UPYUN') {
+        list.push({ label: i18n.global.t('setting.serviceName'), value: row.bucket });
+    }
+    if (row.type === 'COS' || row.type === 'OOS' || row.type === 'S3') {
+        list.push({ label: i18n.global.t('setting.scType'), value: row.varsJson['scType'] });
+    }
+    if (row.type === 'KODO') {
+        list.push({ label: i18n.global.t('cronjob.requestExpirationTime'), value: row.varsJson['timeout'] });
+    }
+    list.push({ label: i18n.global.t('setting.backupLabel'), value: row.backupPath });
+    detailRef.value.acceptParams({ list: list });
+};
+
 const refreshItemToken = async (row: any) => {
     await refreshToken({ id: row.id, name: row.name, isPublic: row.isPublic });
     MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));