add config file to embed

Signed-off-by: hantmac <[email protected]>
hantmac · May 31, 2021 · 7025e44 · 7025e44
1 parent 017abef
commit 7025e44
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/config/example.tpl → cmd/fuckdb/cmd/example.tpl b/config/example.tpl → cmd/fuckdb/cmd/example.tpl
diff --git a/cmd/fuckdb/cmd/server.go b/cmd/fuckdb/cmd/server.go
@@ -35,7 +35,7 @@ var serverCmd = &cobra.Command{
 		}
 		logrus.Infoln("config init success")
 
-		tplFile := viper.GetString("customTmpl")
+		tplFile := viper.GetString("example.tpl")
 		if tplFile != "" {
 			tmpl, err := template.ParseFiles(tplFile)
 			if err != nil {

diff --git a/config/conf/config.yaml b/config/conf/config.yaml
diff --git a/config/config.go b/config/config.go
@@ -2,14 +2,14 @@ package config
 
 import (
 	"bytes"
-	"embed"
+	_ "embed"
 	"github.com/fsnotify/fsnotify"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 
-//go:embed conf
-var configBytes embed.FS
+//go:embed config.yaml
+var configBytes []byte
 
 type Config struct {
 	Name string
@@ -23,9 +23,8 @@ func (c *Config) WatchConfig() {
 }
 
 func (c *Config) Init() error {
-	by, err := configBytes.ReadFile("conf/config.yaml")
 	viper.SetConfigType("yaml")
-	err = viper.ReadConfig(bytes.NewBufferString(string(by)))
+	err := viper.ReadConfig(bytes.NewBufferString(string(configBytes)))
 	if err != nil {
 		return err
 	}

diff --git a/config/config.yaml b/config/config.yaml
@@ -0,0 +1,8 @@
+name: DbToGoStruct         # API Server的名字
+gormlog: true
+server:
+  host: 127.0.0.1
+  port: 8000
+
+
+genFilePath: ./