fix: update config load

Author: kooksee

config/builder_test.go

@@ -11,9 +11,10 @@ import (
 func TestName(t *testing.T) {
 	var is = assert.New(t)
 
-	env.Set("lava_hello", "hello")
+	_ = env.Set("lava_hello", "hello")
 
 	var c = newCfg()
 	is.NotNil(c)
 	is.Equal(c.GetString("hello"), "hello")
+	t.Log(c.All())
 }

config/config.go

@@ -1,13 +1,15 @@
 package config
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"io/fs"
 	"path/filepath"
 	"reflect"
 	"strings"
 	"sync"
+	"text/template"
 
 	"github.com/mitchellh/mapstructure"
 	"github.com/pubgo/funk"
@@ -16,7 +18,6 @@ import (
 	"github.com/pubgo/xerror"
 	"github.com/spf13/cast"
 	"github.com/spf13/viper"
-	"github.com/valyala/fasttemplate"
 
 	"github.com/pubgo/lava/consts"
 	"github.com/pubgo/lava/internal/pkg/env"
@@ -47,7 +48,7 @@ func newCfg() *configImpl {
 	// 配置文件名字和类型
 	v.SetConfigType(CfgType)
 	v.SetConfigName(CfgName)
-	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_", "/", "_"))
 	v.SetEnvPrefix(strings.ToUpper(EnvPrefix))
 	v.AutomaticEnv()
 
@@ -258,17 +259,22 @@ func (t *configImpl) LoadPath(path string) {
 
 	fmt.Printf("load config %s\n", path)
 
-	tmp, err := fasttemplate.NewTemplate(xerror.PanicStr(iox.ReadText(path)), "{{", "}}")
-	xerror.Panic(err, "unexpected error when parsing template")
-
-	// 重新加载配置
-	xerror.Panic(t.v.MergeConfig(strings.NewReader(tmp.ExecuteFuncString(func(w io.Writer, tag string) (int, error) {
-		tag = strings.TrimSpace(tag)
-		// 处理配置中的环境变量
-		if strings.HasPrefix(tag, "$") {
-			return w.Write([]byte(env.Get(tag)))
-		}
-
-		return w.Write([]byte(t.v.GetString(tag)))
-	}))))
+	tmpl := funk.Must1(template.New("").Funcs(template.FuncMap{
+		"upper": strings.ToUpper,
+		"env":   env.Get,
+		"trim":  strings.TrimSpace,
+		"v":     t.v.GetString,
+		"default": func(a string, b string) string {
+			if strings.TrimSpace(b) == "" {
+				return a
+			}
+			return b
+		},
+	}).Parse(funk.Must1(iox.ReadText(path))))
+
+	var buf bytes.Buffer
+	funk.Must(tmpl.Execute(&buf, map[string]string{}))
+
+	// 合并配置
+	funk.Must(t.v.MergeConfig(&buf))
 }

config/util.go

@@ -2,10 +2,11 @@ package config
 
 import (
 	"fmt"
-	"github.com/pubgo/lava/consts"
-	"github.com/pubgo/xerror"
 	"os"
 	"path/filepath"
+
+	"github.com/pubgo/lava/consts"
+	"github.com/pubgo/xerror"
 )
 
 const pkgKey = "name"

config/vars.go

@@ -1,10 +1,12 @@
 package config
 
 import (
+	"sort"
+
 	"github.com/pubgo/dix"
+	
 	"github.com/pubgo/lava/internal/pkg/typex"
 	"github.com/pubgo/lava/vars"
-	"sort"
 )
 
 func init() {

configs/config/1.yaml

@@ -7,6 +7,9 @@ orm:
     driver: "sqlite3"
     driver_config:
       dsn: "file::memory:?cache=shared"
+      data: '{{env "lava_hello" "lava_abc" | default "world"}}'
+      home: '{{env "home"}}'
+      other: '{{v "redis.codis.addr"}}'
 redis:
   codis1:
     addr: "127.0.0.1:6379"