From 35334c16509359126ebf2000fd52b649c115d186 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 5 Jul 2023 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#1544)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/init/hook/hook.go                 | 4 ++--
 backend/init/migration/migrations/init.go | 6 ++++++
 backend/server/server.go                  | 2 +-
 cmd/server/cmd/user-info.go               | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

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