From 8445310a3664af111f36bacdd3da1658878dbab2 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Thu, 7 Jul 2022 12:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=B5=81=E9=87=8F=E3=80=81?= =?UTF-8?q?=E5=B8=A6=E5=AE=BD=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/setup/sql_upgrade.go | 39 +++++++++++++++++++++++++++++- internal/setup/sql_upgrade_test.go | 20 +++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/internal/setup/sql_upgrade.go b/internal/setup/sql_upgrade.go index aa354e10..87ad3ff7 100644 --- a/internal/setup/sql_upgrade.go +++ b/internal/setup/sql_upgrade.go @@ -78,6 +78,9 @@ var upgradeFuncs = []*upgradeVersion{ { "0.4.8", upgradeV0_4_8, }, + { + "0.4.9", upgradeV0_4_9, + }, } // UpgradeSQLData 升级SQL数据 @@ -676,7 +679,7 @@ func upgradeV0_4_7(db *dbs.DB) error { return nil } -// v0.4.7 +// v0.4.8 func upgradeV0_4_8(db *dbs.DB) error { // 设置edgeIPLists中的serverId { @@ -727,3 +730,37 @@ func upgradeV0_4_8(db *dbs.DB) error { return nil } + +// v0.4.9 +func upgradeV0_4_9(db *dbs.DB) error { + // 升级用户UI配置 + { + one, err := db.FindOne("SELECT value FROM edgeSysSettings WHERE code=?", systemconfigs.SettingCodeUserUIConfig) + if err != nil { + return err + } + if one != nil { + var valueJSON = one.GetBytes("value") + if len(valueJSON) > 0 { + var config = &systemconfigs.UserUIConfig{} + err = json.Unmarshal(valueJSON, config) + if err == nil { + config.ShowTrafficCharts = true + config.ShowBandwidthCharts = true + config.BandwidthUnit = systemconfigs.BandwidthUnitBit + configJSON, err := json.Marshal(config) + if err != nil { + return errors.New("encode UserUIConfig failed: " + err.Error()) + } else { + _, err := db.Exec("UPDATE edgeSysSettings SET value=? WHERE code=?", configJSON, systemconfigs.SettingCodeUserUIConfig) + if err != nil { + return err + } + } + } + } + } + } + + return nil +} diff --git a/internal/setup/sql_upgrade_test.go b/internal/setup/sql_upgrade_test.go index 2a5c5a46..13073113 100644 --- a/internal/setup/sql_upgrade_test.go +++ b/internal/setup/sql_upgrade_test.go @@ -194,3 +194,23 @@ func TestUpgradeSQLData_v0_4_8(t *testing.T) { } t.Log("ok") } + + +func TestUpgradeSQLData_v0_4_9(t *testing.T) { + db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{ + Driver: "mysql", + Dsn: "root:123456@tcp(127.0.0.1:3306)/db_edge?charset=utf8mb4&timeout=30s", + Prefix: "edge", + }) + if err != nil { + t.Fatal(err) + } + defer func() { + _ = db.Close() + }() + err = upgradeV0_4_9(db) + if err != nil { + t.Fatal(err) + } + t.Log("ok") +}