diff --git a/core/app/dto/setting.go b/core/app/dto/setting.go index a4b73f325686..975a953ac482 100644 --- a/core/app/dto/setting.go +++ b/core/app/dto/setting.go @@ -52,7 +52,7 @@ type SettingUpdate struct { type SSLUpdate struct { SSLType string `json:"sslType" validate:"required,oneof=self select import import-paste import-local"` Domain string `json:"domain"` - SSL string `json:"ssl" validate:"required,oneof=enable disable"` + SSL string `json:"ssl" validate:"required,oneof=Enable Disable"` Cert string `json:"cert"` Key string `json:"key"` SSLID uint `json:"sslID"` @@ -143,7 +143,7 @@ type SyncTime struct { } type BindInfo struct { - Ipv6 string `json:"ipv6" validate:"required,oneof=enable disable"` + Ipv6 string `json:"ipv6" validate:"required,oneof=Enable Disable"` BindAddress string `json:"bindAddress" validate:"required"` } diff --git a/core/middleware/operation.go b/core/middleware/operation.go index efe7bb28e822..12231202ae81 100644 --- a/core/middleware/operation.go +++ b/core/middleware/operation.go @@ -211,7 +211,7 @@ func newDB(pathItem string) (*gorm.DB, error) { case strings.HasPrefix(pathItem, "/core"): dbFile = path.Join(global.CONF.System.BaseDir, "1panel/db/core.db") case strings.HasPrefix(pathItem, "/xpack"): - dbFile = path.Join(global.CONF.System.BaseDir, "1panel/db/xpack/xpack.db") + dbFile = path.Join(global.CONF.System.BaseDir, "1panel/db/xpack.db") default: dbFile = path.Join(global.CONF.System.BaseDir, "1panel/db/agent.db") } diff --git a/frontend/src/api/interface/cronjob.ts b/frontend/src/api/interface/cronjob.ts index a8681de388f4..5da4b1749183 100644 --- a/frontend/src/api/interface/cronjob.ts +++ b/frontend/src/api/interface/cronjob.ts @@ -29,9 +29,8 @@ export namespace Cronjob { files: Array; sourceDir: string; - sourceAccountIDs: string; - downloadAccountID: number; - sourceAccounts: Array; + sourceAccounts: Array; + downloadAccount: string; retainCopies: number; status: string; secret: string; diff --git a/frontend/src/api/interface/setting.ts b/frontend/src/api/interface/setting.ts index 80fff1ee894f..e07c263dc240 100644 --- a/frontend/src/api/interface/setting.ts +++ b/frontend/src/api/interface/setting.ts @@ -146,8 +146,8 @@ export namespace Setting { export interface SnapshotInfo { id: number; name: string; - from: string; - defaultDownload: string; + sourceAccounts: Array; + downloadAccount: string; description: string; status: string; message: string; diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue index 22e9e63c498a..19eb43f5df66 100644 --- a/frontend/src/layout/components/Sidebar/index.vue +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -170,7 +170,7 @@ const loadNodes = async () => { nodes.value = []; return; } - nodes.value = res.data; + nodes.value = res.data || []; if (nodes.value.length === 0) { globalStore.currentNode = 'local'; } diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue index 1ce8152f8a13..95af32097d96 100644 --- a/frontend/src/views/cronjob/index.vue +++ b/frontend/src/views/cronjob/index.vue @@ -99,33 +99,34 @@ {{ row.lastRecordTime }} - +