From 0f70d37950723bb58ea0701bc9e6315c6e60c4fe Mon Sep 17 00:00:00 2001 From: ssongliu Date: Fri, 2 Aug 2024 17:29:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/init/migration/migrations/init.go | 53 +++++++++++++------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go index 69f74f0a8..c8c4afcd1 100644 --- a/agent/init/migration/migrations/init.go +++ b/agent/init/migration/migrations/init.go @@ -92,34 +92,35 @@ var InitSetting = &gormigrate.Migration{ if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: encryptKey}).Error; err != nil { return err } - if _, err := os.Stat("/opt/1panel/nodeJson"); err != nil { + if _, err := os.Stat("/opt/1panel/nodeJson"); err == nil { + type nodeInfo struct { + ServerCrt string `json:"serverCrt"` + ServerKey string `json:"serverKey"` + CurrentNode string `json:"currentNode"` + } + nodeJson, err := os.ReadFile("/opt/1panel/nodeJson") + if err != nil { + return err + } + var node nodeInfo + if err := json.Unmarshal(nodeJson, &node); err != nil { + return err + } + itemKey, _ := encrypt.StringEncrypt(node.ServerKey) + if err := tx.Create(&model.Setting{Key: "ServerKey", Value: itemKey}).Error; err != nil { + return err + } + itemCrt, _ := encrypt.StringEncrypt(node.ServerCrt) + if err := tx.Create(&model.Setting{Key: "ServerCrt", Value: itemCrt}).Error; err != nil { + return err + } + global.CurrentNode = node.CurrentNode + } else { + global.CurrentNode = "127.0.0.1" + } + if err := tx.Create(&model.Setting{Key: "CurrentNode", Value: global.CurrentNode}).Error; err != nil { return err } - type nodeInfo struct { - ServerCrt string `json:"serverCrt"` - ServerKey string `json:"serverKey"` - CurrentNode string `json:"currentNode"` - } - nodeJson, err := os.ReadFile("/opt/1panel/nodeJson") - if err != nil { - return err - } - var node nodeInfo - if err := json.Unmarshal(nodeJson, &node); err != nil { - return err - } - itemKey, _ := encrypt.StringEncrypt(node.ServerKey) - if err := tx.Create(&model.Setting{Key: "ServerKey", Value: itemKey}).Error; err != nil { - return err - } - itemCrt, _ := encrypt.StringEncrypt(node.ServerCrt) - if err := tx.Create(&model.Setting{Key: "ServerCrt", Value: itemCrt}).Error; err != nil { - return err - } - if err := tx.Create(&model.Setting{Key: "CurrentNode", Value: node.CurrentNode}).Error; err != nil { - return err - } - global.CurrentNode = node.CurrentNode if err := tx.Create(&model.Setting{Key: "SystemIP", Value: ""}).Error; err != nil { return err