add config file recover function

.gitignore

@@ -21,4 +21,5 @@ example/iris/tmp
 example/iris/www
 example/iris/config
 .idea/
+.DS_Store
 

g/var.go

@@ -0,0 +1,14 @@
+package g
+
+import (
+	"os"
+	"strings"
+)
+
+var (
+	TestRedisPwd  = strings.TrimSpace(os.Getenv("redisPwd"))
+	TestMysqlAddr = strings.TrimSpace(os.Getenv("mysqlAddr"))
+	TestMysqlPwd  = strings.TrimSpace(os.Getenv("mysqlPwd"))
+	TestMongoAddr = strings.TrimSpace(os.Getenv("mongoAddr"))
+	TestDbType    = strings.TrimSpace(os.Getenv("dbType"))
+)

migration/migrate_test.go

@@ -1,11 +1,10 @@
 package migration
 
 import (
-	"os"
-	"strings"
 	"testing"
 
 	"github.com/go-gormigrate/gormigrate/v2"
+	"github.com/snowlyg/iris-admin/g"
 	"github.com/snowlyg/iris-admin/server/database"
 	"github.com/snowlyg/iris-admin/server/zap_server"
 	"gorm.io/gorm"
@@ -55,8 +54,8 @@ func TestAddSeed(t *testing.T) {
 func TestMigrate(t *testing.T) {
 	defer zap_server.Remove()
 	defer database.Remove()
-	database.CONFIG.Path = strings.TrimSpace(os.Getenv("mysqlAddr"))
-	database.CONFIG.Password = os.Getenv("mysqlPwd")
+	database.CONFIG.Path = g.TestMysqlAddr
+	database.CONFIG.Password = g.TestMysqlPwd
 	migrate := New()
 	migrate.AddMigration(m)
 	t.Run("migrate migrate", func(t *testing.T) {
@@ -69,8 +68,8 @@ func TestMigrate(t *testing.T) {
 func TestRollback(t *testing.T) {
 	defer zap_server.Remove()
 	defer database.Remove()
-	database.CONFIG.Path = strings.TrimSpace(os.Getenv("mysqlAddr"))
-	database.CONFIG.Password = os.Getenv("mysqlPwd")
+	database.CONFIG.Path = g.TestMysqlAddr
+	database.CONFIG.Password = g.TestMysqlPwd
 	migrate := New()
 	t.Run("migrate rollback no migrate with id", func(t *testing.T) {
 		err := migrate.Rollback(id)
@@ -107,8 +106,8 @@ func TestRollback(t *testing.T) {
 func TestRefresh(t *testing.T) {
 	defer zap_server.Remove()
 	defer database.Remove()
-	database.CONFIG.Path = strings.TrimSpace(os.Getenv("mysqlAddr"))
-	database.CONFIG.Password = os.Getenv("mysqlPwd")
+	database.CONFIG.Path = g.TestMysqlAddr
+	database.CONFIG.Password = g.TestMysqlPwd
 	migrate := New()
 
 	t.Run("migrate refresh no migrate", func(t *testing.T) {

server/cache/cmd_test.go

@@ -1,20 +1,24 @@
 package cache
 
 import (
-	"os"
 	"testing"
+
+	"github.com/snowlyg/iris-admin/g"
+	"github.com/snowlyg/iris-admin/server/zap_server"
 )
 
 func TestInitConfig(t *testing.T) {
+	defer zap_server.Remove()
 	t.Run("test redis's file initialize", func(t *testing.T) {
-		redisPwd := os.Getenv("redisPwd")
-		CONFIG.Password = redisPwd
+		CONFIG.Password = g.TestRedisPwd
 		err := InitConfig()
 		if err != nil {
 			t.Error(err)
+			return
 		}
 		if !IsExist() {
 			t.Errorf("config's files is not exist.")
+			return
 		}
 		if err := Remove(); err != nil {
 			t.Error(err)

server/cache/config.go

@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
 
@@ -30,11 +31,16 @@ func IsExist() bool {
 
 // Remove remove config file
 func Remove() error {
-	err := getViperConfig().Remove()
+	return getViperConfig().Remove()
+}
+
+// Recover
+func Recover() error {
+	b, err := json.Marshal(CONFIG)
 	if err != nil {
 		return err
 	}
-	return nil
+	return getViperConfig().Recover(b)
 }
 
 // getViperConfig get viper config

server/cache/config_test.go

@@ -1,21 +1,10 @@
 package cache
 
 import (
-	"os"
 	"testing"
-
-	"github.com/snowlyg/iris-admin/server/viper_server"
 )
 
 func TestIsExist(t *testing.T) {
-	viper_server.Init(getViperConfig())
-	t.Run("test redis's IsExist function", func(t *testing.T) {
-		redisPwd := os.Getenv("redisPwd")
-		CONFIG.Password = redisPwd
-		if !IsExist() {
-			t.Errorf("config's files is not exist.")
-		}
-	})
 	t.Run("Test Remove function", func(t *testing.T) {
 		if err := Remove(); err != nil {
 			t.Error(err)

server/cache/index_test.go

@@ -1,19 +1,18 @@
 package cache
 
 import (
-	"os"
 	"reflect"
 	"testing"
 	"time"
 
+	"github.com/snowlyg/iris-admin/g"
 	"github.com/snowlyg/iris-admin/server/zap_server"
 )
 
 func TestSetCacheString(t *testing.T) {
 	defer Remove()
 	defer zap_server.Remove()
-	redisPwd := os.Getenv("redisPwd")
-	CONFIG.Password = redisPwd
+	CONFIG.Password = g.TestRedisPwd
 	t.Run("test set cache string", func(t *testing.T) {
 		key := "test_set_cache"
 		want := "test_set_cache_value"
@@ -39,8 +38,7 @@ func TestSetCacheString(t *testing.T) {
 func TestSetCacheUint(t *testing.T) {
 	defer Remove()
 	defer zap_server.Remove()
-	redisPwd := os.Getenv("redisPwd")
-	CONFIG.Password = redisPwd
+	CONFIG.Password = g.TestRedisPwd
 	t.Run("test set cache uint", func(t *testing.T) {
 		key := "test_set_cache"
 		var want uint64 = 123
@@ -65,8 +63,7 @@ func TestSetCacheUint(t *testing.T) {
 func TestSetCacheBytes(t *testing.T) {
 	defer Remove()
 	defer zap_server.Remove()
-	redisPwd := os.Getenv("redisPwd")
-	CONFIG.Password = redisPwd
+	CONFIG.Password = g.TestRedisPwd
 	t.Run("test set cache bytes", func(t *testing.T) {
 		key := "test_set_cache"
 		want := []byte("test_set_cache_value")

server/casbin/main_test.go

@@ -3,11 +3,11 @@ package casbin
 import (
 	_ "embed"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/bwmarrin/snowflake"
 	"github.com/snowlyg/helper/str"
+	"github.com/snowlyg/iris-admin/g"
 	"github.com/snowlyg/iris-admin/server/database"
 	"github.com/snowlyg/iris-admin/server/zap_server"
 )
@@ -18,8 +18,8 @@ func TestMain(m *testing.M) {
 	uuid := str.Join("casbin", "_", node.Generate().String())
 
 	database.CONFIG.Dbname = uuid
-	database.CONFIG.Path = strings.TrimSpace(os.Getenv("mysqlAddr"))
-	database.CONFIG.Password = strings.TrimSpace(os.Getenv("mysqlPwd"))
+	database.CONFIG.Path = g.TestMysqlAddr
+	database.CONFIG.Password = g.TestMysqlPwd
 
 	Instance()
 

server/database/config.go

@@ -1,8 +1,10 @@
 package database
 
 import (
+	"encoding/json"
 	"fmt"
 
+	"github.com/fsnotify/fsnotify"
 	"github.com/snowlyg/iris-admin/g"
 	"github.com/snowlyg/iris-admin/server/viper_server"
 	"github.com/spf13/viper"
@@ -37,7 +39,7 @@ func (m *Mysql) Dsn() string {
 	return fmt.Sprintf("%s%s?%s", m.BaseDsn(), m.Dbname, m.Config)
 }
 
-// Dsn return 
+// Dsn return
 func (m *Mysql) BaseDsn() string {
 	return fmt.Sprintf("%s:%s@tcp(%s)/", m.Username, m.Password, m.Path)
 }
@@ -49,11 +51,16 @@ func IsExist() bool {
 
 // Remove remove config file
 func Remove() error {
-	err := getViperConfig().Remove()
+	return getViperConfig().Remove()
+}
+
+// Recover
+func Recover() error {
+	b, err := json.Marshal(CONFIG)
 	if err != nil {
 		return err
 	}
-	return nil
+	return getViperConfig().Recover(b)
 }
 
 // getViperConfig get viper config
@@ -72,7 +79,10 @@ func getViperConfig() viper_server.ViperConfig {
 				return fmt.Errorf("get Unarshal error: %v", err)
 			}
 			// watch config file change
-			vi.SetConfigName(configName)
+			vi.OnConfigChange(func(e fsnotify.Event) {
+				fmt.Println("Config file changed:", e.Name)
+			})
+			vi.WatchConfig()
 			return nil
 		},
 		//

server/database/main_test.go

@@ -3,11 +3,11 @@ package database
 import (
 	_ "embed"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/bwmarrin/snowflake"
 	"github.com/snowlyg/helper/str"
+	"github.com/snowlyg/iris-admin/g"
 	"github.com/snowlyg/iris-admin/server/zap_server"
 )
 
@@ -17,8 +17,8 @@ func TestMain(m *testing.M) {
 	uuid := str.Join("database", "_", node.Generate().String())
 
 	CONFIG.Dbname = uuid
-	CONFIG.Path = strings.TrimSpace(os.Getenv("mysqlAddr"))
-	CONFIG.Password = strings.TrimSpace(os.Getenv("mysqlPwd"))
+	CONFIG.Path = g.TestMysqlAddr
+	CONFIG.Password = g.TestMysqlPwd
 
 	Instance()
 

server/mongodb/config.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"encoding/json"
 	"fmt"
 	"time"
 
@@ -10,6 +11,11 @@ import (
 	"github.com/spf13/viper"
 )
 
+// init  initialize
+func init() {
+	viper_server.Init(getViperConfig())
+}
+
 var CONFIG = MongoDB{
 	DB:      "mongo_test",
 	Timeout: 10,
@@ -33,16 +39,16 @@ func IsExist() bool {
 
 // Remove remove config file
 func Remove() error {
-	err := getViperConfig().Remove()
+	return getViperConfig().Remove()
+}
+
+// Recover
+func Recover() error {
+	b, err := json.Marshal(CONFIG)
 	if err != nil {
 		return err
 	}
-	return nil
-}
-
-// init  initialize
-func init() {
-	viper_server.Init(getViperConfig())
+	return getViperConfig().Recover(b)
 }
 
 // getViperConfig get viper config