diff --git a/agent/app/service/dashboard.go b/agent/app/service/dashboard.go index 3f745782e..5e9cb6237 100644 --- a/agent/app/service/dashboard.go +++ b/agent/app/service/dashboard.go @@ -327,9 +327,6 @@ func (u *DashboardService) LoadAppLauncher(ctx *gin.Context) ([]dto.AppLauncher, if data[i].IsInstall != data[j].IsInstall { return data[i].IsInstall } - if data[i].IsInstall && data[j].IsInstall { - return data[i].Name < data[j].Name - } return data[i].Recommend < data[j].Recommend }) return data, nil diff --git a/core/app/service/backup.go b/core/app/service/backup.go index 9d42e2528..4d05fe29c 100644 --- a/core/app/service/backup.go +++ b/core/app/service/backup.go @@ -44,13 +44,7 @@ func (u *BackupService) LoadBackupClientInfo(clientType string) (dto.BackupClien var data dto.BackupClientInfo clientIDKey := "OneDriveID" clientIDSc := "OneDriveSc" - if clientType == constant.GoogleDrive { - clientIDKey = "GoogleID" - clientIDSc = "GoogleSc" - data.RedirectUri = constant.GoogleRedirectURI - } else { - data.RedirectUri = constant.OneDriveRedirectURI - } + data.RedirectUri = constant.OneDriveRedirectURI clientID, err := settingRepo.Get(repo.WithByKey(clientIDKey)) if err != nil { return data, err diff --git a/core/constant/common.go b/core/constant/common.go index e5a0f1fe1..9c1862071 100644 --- a/core/constant/common.go +++ b/core/constant/common.go @@ -32,7 +32,6 @@ const ( GoogleDrive = "GoogleDrive" OneDriveRedirectURI = "http://localhost/login/authorized" - GoogleRedirectURI = "https://localhost:8080" ) const ( diff --git a/core/init/migration/migrate.go b/core/init/migration/migrate.go index cb1fc5502..a27f26518 100644 --- a/core/init/migration/migrate.go +++ b/core/init/migration/migrate.go @@ -14,10 +14,8 @@ func Init() { migrations.InitOneDrive, migrations.InitHost, migrations.InitTerminalSetting, - migrations.InitGoogle, migrations.AddTaskDB, migrations.AddXpackHideMenu, - migrations.UpdateGoogle, migrations.UpdateXpackHideMenu, migrations.UpdateOnedrive, migrations.AddClusterMenu, diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index 468daf365..e061a9989 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -255,19 +255,6 @@ var InitOneDrive = &gormigrate.Migration{ }, } -var InitGoogle = &gormigrate.Migration{ - ID: "20241111-init-google", - Migrate: func(tx *gorm.DB) error { - if err := tx.Create(&model.Setting{Key: "GoogleID", Value: "NTU2NTQ3NDYwMTQtY2Q0bGR0dDk2aGNsNWcxYWtwdmJhZTFmcjJlZ2Y0MXAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20K"}).Error; err != nil { - return err - } - if err := tx.Create(&model.Setting{Key: "GoogleSc", Value: "R09DU1BYLXRibXg0QVdVZ3d3Ykc2QW1XTHQ3YUdaZElVeE4K"}).Error; err != nil { - return err - } - return nil - }, -} - var AddTaskDB = &gormigrate.Migration{ ID: "20241125-add-task-table", Migrate: func(tx *gorm.DB) error { @@ -456,23 +443,6 @@ var UpdateXpackHideMenu = &gormigrate.Migration{ }, } -var UpdateGoogle = &gormigrate.Migration{ - ID: "20250616-update-google", - Migrate: func(tx *gorm.DB) error { - if err := tx.Model(&model.Setting{}). - Where("key = ?", "GoogleID"). - Update("value", "NTU2NTQ3NDYwMTQtY2Q0bGR0dDk2aGNsNWcxYWtwdmJhZTFmcjJlZ2Y0MXAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20=").Error; err != nil { - return err - } - if err := tx.Model(&model.Setting{}). - Where("key = ?", "GoogleSc"). - Update("value", "R09DU1BYLXRibXg0QVdVZ3d3Ykc2QW1XTHQ3YUdaZElVeE4=").Error; err != nil { - return err - } - return nil - }, -} - var UpdateOnedrive = &gormigrate.Migration{ ID: "20250704-update-onedrive", Migrate: func(tx *gorm.DB) error { diff --git a/frontend/src/components/system-upgrade/releases/index.vue b/frontend/src/components/system-upgrade/releases/index.vue index d505357cf..491aea16d 100644 --- a/frontend/src/components/system-upgrade/releases/index.vue +++ b/frontend/src/components/system-upgrade/releases/index.vue @@ -1,12 +1,7 @@