From 0c170fe1c686af95567fc9ae5101c298ba91b038 Mon Sep 17 00:00:00 2001
From: linwenxiang <991154416@qq.com>
Date: Thu, 10 Dec 2020 10:24:06 +0800
Subject: [PATCH] =?UTF-8?q?config=20setup=E9=85=8D=E7=BD=AE=E6=8F=90?=
 =?UTF-8?q?=E5=88=B0=E5=A4=96=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/api/server.go      | 6 ++++--
 cmd/config/server.go   | 3 ++-
 cmd/migrate/server.go  | 3 ++-
 tools/config/config.go | 8 +++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmd/api/server.go b/cmd/api/server.go
index 0ca01337..55bdffda 100644
--- a/cmd/api/server.go
+++ b/cmd/api/server.go
@@ -3,14 +3,15 @@ package api
 import (
 	"context"
 	"fmt"
-	"go-admin/tools/trace"
 	"net/http"
 	"os"
 	"os/signal"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
+
 	"go-admin/app/admin/router"
 	"go-admin/app/jobs"
 	"go-admin/common/database"
@@ -20,6 +21,7 @@ import (
 	"go-admin/pkg/logger"
 	"go-admin/tools"
 	"go-admin/tools/config"
+	"go-admin/tools/trace"
 )
 
 var (
@@ -56,7 +58,7 @@ func init() {
 func setup() {
 
 	//1. 读取配置
-	config.Setup(configYml)
+	config.Setup(file.NewSource, file.WithPath(configYml))
 	go config.Watch()
 	//2. 设置日志
 	global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus")
diff --git a/cmd/config/server.go b/cmd/config/server.go
index 8cae4cac..f23cba39 100644
--- a/cmd/config/server.go
+++ b/cmd/config/server.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
 
 	"go-admin/tools/config"
@@ -27,7 +28,7 @@ func init() {
 }
 
 func run() {
-	config.Setup(configYml)
+	config.Setup(file.NewSource, file.WithPath(configYml))
 
 	application, errs := json.MarshalIndent(config.ApplicationConfig, "", "   ") //转换成JSON返回的是byte[]
 	if errs != nil {
diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go
index e540bbcc..0cd27d5f 100644
--- a/cmd/migrate/server.go
+++ b/cmd/migrate/server.go
@@ -7,6 +7,7 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
 
 	"go-admin/cmd/migrate/migration"
@@ -46,7 +47,7 @@ func run() {
 
 	if !generate {
 		//1. 读取配置
-		config.Setup(configYml)
+		config.Setup(file.NewSource, file.WithPath(configYml))
 		//2. 设置日志
 		global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus")
 		global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job")
diff --git a/tools/config/config.go b/tools/config/config.go
index ca081c9e..6edee1f7 100644
--- a/tools/config/config.go
+++ b/tools/config/config.go
@@ -3,7 +3,7 @@ package config
 import (
 	"fmt"
 	"github.com/go-admin-team/go-admin-core/config"
-	"github.com/go-admin-team/go-admin-core/config/source/file"
+	"github.com/go-admin-team/go-admin-core/config/source"
 	"log"
 )
 
@@ -33,15 +33,13 @@ var (
 )
 
 // Setup 载入配置文件
-func Setup(path string) {
+func Setup(f func(opts ...source.Option) source.Source, options ...source.Option) {
 	c, err := config.NewConfig()
 	if err != nil {
 		log.Fatal(fmt.Sprintf("New config object fail: %s", err.Error()))
 	}
 	err = c.Load(
-		file.NewSource(
-			file.WithPath(path),
-		),
+		f(options...),
 	)
 	if err != nil {
 		log.Fatal(fmt.Sprintf("Load config source fail: %s", err.Error()))