feat: Complete the node initialization logic

Author: ssongliu

agent/app/model/setting.go

@@ -8,10 +8,9 @@ type Setting struct {
 }
 
 type NodeInfo struct {
-	Scope      string `json:"scope"`
-	BaseDir    string `json:"baseDir"`
-	Version    string `json:"version"`
-	EncryptKey string `json:"encryptKey"`
-	ServerCrt  string `json:"serverCrt"`
-	ServerKey  string `json:"serverKey"`
+	Scope     string `json:"scope"`
+	BaseDir   string `json:"baseDir"`
+	Version   string `json:"version"`
+	ServerCrt string `json:"serverCrt"`
+	ServerKey string `json:"serverKey"`
 }

agent/app/repo/app_launcher.go

@@ -13,6 +13,8 @@ type ILauncherRepo interface {
 	Create(launcher *model.AppLauncher) error
 	Save(launcher *model.AppLauncher) error
 	Delete(opts ...DBOption) error
+
+	SyncAll(data []model.AppLauncher) error
 }
 
 func NewILauncherRepo() ILauncherRepo {
@@ -53,3 +55,17 @@ func (u *LauncherRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.AppLauncher{}).Error
 }
+
+func (u *LauncherRepo) SyncAll(data []model.AppLauncher) error {
+	tx := global.DB.Begin()
+	if err := tx.Where("1 = 1").Delete(&model.AppLauncher{}).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	if err := tx.Model(model.AppLauncher{}).Save(&data).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
+}

agent/app/repo/backup.go

@@ -26,6 +26,8 @@ type IBackupRepo interface {
 	WithByFileName(fileName string) DBOption
 	WithByCronID(cronjobID uint) DBOption
 	WithFileNameStartWith(filePrefix string) DBOption
+
+	SyncAll(data []model.BackupAccount) error
 }
 
 func NewIBackupRepo() IBackupRepo {
@@ -153,3 +155,17 @@ func (u *BackupRepo) GetRecord(opts ...DBOption) (*model.BackupRecord, error) {
 	err := db.Find(record).Error
 	return record, err
 }
+
+func (u *BackupRepo) SyncAll(data []model.BackupAccount) error {
+	tx := global.DB.Begin()
+	if err := tx.Where("1 = 1").Delete(&model.BackupAccount{}).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	if err := tx.Model(model.BackupAccount{}).Save(&data).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
+}

agent/app/service/setting.go

@@ -106,7 +106,6 @@ func (u *SettingService) ReloadConn() error {
 
 	global.CONF.System.BaseDir = nodeInfo.BaseDir
 	global.CONF.System.Version = nodeInfo.Version
-	global.CONF.System.EncryptKey = nodeInfo.EncryptKey
 	global.IsMaster = nodeInfo.Scope == "master"
 	return nil
 }

agent/init/hook/hook.go

@@ -26,7 +26,7 @@ func initGlobalData() {
 	if err := settingRepo.Update("SystemStatus", "Free"); err != nil {
 		global.LOG.Fatalf("init service before start failed, err: %v", err)
 	}
-
+	global.CONF.System.EncryptKey, _ = settingRepo.GetValueByKey("EncryptKey")
 	_ = service.NewISettingService().ReloadConn()
 	if global.IsMaster {
 		global.CoreDB = common.LoadDBConnByPath(path.Join(global.CONF.System.DbPath, "core.db"), "core")

agent/init/migration/migrations/init.go

@@ -81,9 +81,6 @@ var InitSetting = &gormigrate.Migration{
 		if err := tx.Create(&model.Setting{Key: "BaseDir", Value: nodeInfo.BaseDir}).Error; err != nil {
 			return err
 		}
-		if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: nodeInfo.EncryptKey}).Error; err != nil {
-			return err
-		}
 		itemKey, _ := encrypt.StringEncrypt(nodeInfo.ServerKey)
 		if err := tx.Create(&model.Setting{Key: "ServerKey", Value: itemKey}).Error; err != nil {
 			return err
@@ -99,6 +96,9 @@ var InitSetting = &gormigrate.Migration{
 			return err
 		}
 
+		if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: common.RandStr(16)}).Error; err != nil {
+			return err
+		}
 		if err := tx.Create(&model.Setting{Key: "SystemIP", Value: ""}).Error; err != nil {
 			return err
 		}

agent/utils/xpack/xpack.go

@@ -14,7 +14,6 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/buserr"
 	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/utils/cmd"
-	"github.com/1Panel-dev/1Panel/agent/utils/common"
 )
 
 func RemoveTamper(website string) {}
@@ -48,7 +47,6 @@ func LoadNodeInfo() (bool, model.NodeInfo, error) {
 	var info model.NodeInfo
 	info.BaseDir = loadParams("BASE_DIR")
 	info.Version = loadParams("ORIGINAL_VERSION")
-	info.EncryptKey = common.RandStr(16)
 	info.Scope = "master"
 	return false, info, nil
 }