diff --git a/backend/init/hook/hook.go b/backend/init/hook/hook.go index d179157d6..131cdbfdc 100644 --- a/backend/init/hook/hook.go +++ b/backend/init/hook/hook.go @@ -17,11 +17,11 @@ func Init() { global.LOG.Errorf("load service port from setting failed, err: %v", err) } global.CONF.System.Port = portSetting.Value - enptrySetting, err := settingRepo.Get(settingRepo.WithByKey("EncryptKey")) + encryptSetting, err := settingRepo.Get(settingRepo.WithByKey("EncryptKey")) if err != nil { global.LOG.Errorf("load service encrypt key from setting failed, err: %v", err) } - global.CONF.System.EncryptKey = enptrySetting.Value + global.CONF.System.EncryptKey = encryptSetting.Value sslSetting, err := settingRepo.Get(settingRepo.WithByKey("SSL")) if err != nil { global.LOG.Errorf("load service ssl from setting failed, err: %v", err) diff --git a/backend/init/migration/migrations/init.go b/backend/init/migration/migrations/init.go index 2caab3669..cf40bd0e8 100644 --- a/backend/init/migration/migrations/init.go +++ b/backend/init/migration/migrations/init.go @@ -441,6 +441,12 @@ var EncryptHostPassword = &gormigrate.Migration{ return err } + var encryptSetting model.Setting + if err := tx.Where("key = ?", "EncryptKey").Find(&encryptSetting).Error; err != nil { + return err + } + global.CONF.System.EncryptKey = encryptSetting.Value + for _, host := range hosts { if len(host.Password) != 0 { pass, err := encrypt.StringEncrypt(host.Password) diff --git a/backend/server/server.go b/backend/server/server.go index 4359e2df4..032a06a3b 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -34,7 +34,6 @@ func Start() { log.Init() app.Init() db.Init() - hook.Init() migration.Init() validator.Init() gob.Register(psession.SessionUser{}) @@ -43,6 +42,7 @@ func Start() { gin.SetMode("debug") cron.Run() business.Init() + hook.Init() rootRouter := router.Routers() address := fmt.Sprintf(":%s", global.CONF.System.Port) diff --git a/cmd/server/cmd/user-info.go b/cmd/server/cmd/user-info.go index 2882c64a7..0e29af56d 100644 --- a/cmd/server/cmd/user-info.go +++ b/cmd/server/cmd/user-info.go @@ -25,11 +25,11 @@ var userinfoCmd = &cobra.Command{ port := getSettingByKey(db, "ServerPort") ssl := getSettingByKey(db, "SSL") entrance := getSettingByKey(db, "SecurityEntrance") - enptrySetting := getSettingByKey(db, "EncryptKey") + encryptSetting := getSettingByKey(db, "EncryptKey") p := "" - if len(enptrySetting) == 16 { - global.CONF.System.EncryptKey = enptrySetting + if len(encryptSetting) == 16 { + global.CONF.System.EncryptKey = encryptSetting p, _ = encrypt.StringDecrypt(password) } else { p = password