diff --git a/agent/app/service/backup.go b/agent/app/service/backup.go index 653205595..9657571e0 100644 --- a/agent/app/service/backup.go +++ b/agent/app/service/backup.go @@ -566,7 +566,7 @@ func changeLocalBackup(oldPath, newPath string) error { } } if fileOp.Stat(path.Join(oldPath, "website")) { - if err := fileOp.CopyDir(path.Join(oldPath, "website"), newPath); err != nil { + if err := fileOp.Mv(path.Join(oldPath, "website"), newPath); err != nil { return err } } diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index 5241c03a6..4da8b8ae0 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -167,7 +167,7 @@ var InitHost = &gormigrate.Migration{ ID: "20240816-init-host", Migrate: func(tx *gorm.DB) error { hostGroup := &model.Group{Name: "Default", Type: "host", IsDefault: true} - if err := tx.Create(hostGroup).Error; err != nil { + if err := global.DB.Create(hostGroup).Error; err != nil { return err } if err := tx.Create(&model.Group{Name: "Default", Type: "node", IsDefault: true}).Error; err != nil { diff --git a/frontend/src/api/modules/setting.ts b/frontend/src/api/modules/setting.ts index 886f3010e..8a07bf655 100644 --- a/frontend/src/api/modules/setting.ts +++ b/frontend/src/api/modules/setting.ts @@ -30,8 +30,8 @@ export const syncLicense = (id: number) => { export const bindLicense = (id: number, nodeID: number) => { return http.post(`/core/licenses/bind`, { nodeID: nodeID, licenseID: id }, TimeoutEnum.T_60S); }; -export const unbindLicense = (id: number) => { - return http.post(`/core/licenses/unbind`, { id: id }, TimeoutEnum.T_60S); +export const unbindLicense = (id: number, force: boolean) => { + return http.post(`/core/licenses/unbind`, { id: id, force: force }, TimeoutEnum.T_60S); }; export const loadLicenseOptions = () => { return http.get(`/core/licenses/options`); diff --git a/frontend/src/components/agent-group/index.vue b/frontend/src/components/agent-group/index.vue index 60100f39d..ba6c49d1a 100644 --- a/frontend/src/components/agent-group/index.vue +++ b/frontend/src/components/agent-group/index.vue @@ -8,10 +8,10 @@