config重构

This commit is contained in:
linwenxiang committed 2020-12-08 20:28:26 +08:00
1 parent 0810383afc
commit 5f873914e0
14 files changed
+134 -208

No files matched your search

+70 -59
View File
@@ -2,83 +2,94 @@ package config
import (
"fmt"
"io/ioutil"
"github.com/go-admin-team/go-admin-core/config"
"github.com/go-admin-team/go-admin-core/config/source/file"
"log"
"os"
"strings"
"github.com/spf13/viper"
)
// 数据库配置项
var cfgDatabase *viper.Viper
var (
ExtendConfig interface{}
)
// 应用配置项
var cfgApplication *viper.Viper
// Settings 兼容原先的配置结构
type Settings struct {
Settings Config `yaml:"settings"`
}
// Token配置项
var cfgJwt *viper.Viper
// Config 配置集合
type Config struct {
Application *Application `yaml:"application"`
Ssl *Ssl `yaml:"ssl"`
Logger *Logger `yaml:"logger"`
Jwt *Jwt `yaml:"jwt"`
Database *Database `yaml:"database"`
Gen *Gen `yaml:"gen"`
Extend interface{} `yaml:"extend"`
}
// Log配置项
var cfgLogger *viper.Viper
var (
_watch config.Watcher
_cfg *Settings
)
// Ssl配置项 非必须
var cfgSsl *viper.Viper
// 代码生成配置项 非必须
var cfgGen *viper.Viper
//载入配置文件
// Setup 载入配置文件
func Setup(path string) {
viper.SetConfigFile(path)
content, err := ioutil.ReadFile(path)
c, err := config.NewConfig()
if err != nil {
log.Fatal(fmt.Sprintf("Read config file fail: %s", err.Error()))
log.Fatal(fmt.Sprintf("New config object fail: %s", err.Error()))
}
//Replace environment variables
err = viper.ReadConfig(strings.NewReader(os.ExpandEnv(string(content))))
err = c.Load(
file.NewSource(
file.WithPath(path),
),
)
if err != nil {
log.Fatal(fmt.Sprintf("Parse config file fail: %s", err.Error()))
log.Fatal(fmt.Sprintf("Load config source fail: %s", err.Error()))
}
cfgDatabase = viper.Sub("settings.database")
if cfgDatabase == nil {
panic("No found settings.database in the configuration")
_cfg = &Settings{Config{
Application: ApplicationConfig,
Ssl: SslConfig,
Logger: LoggerConfig,
Jwt: JwtConfig,
Database: DatabaseConfig,
Gen: GenConfig,
Extend: ExtendConfig,
}}
err = c.Scan(_cfg)
if err != nil {
log.Fatal(fmt.Sprintf("Scan config fail: %s", err.Error()))
}
DatabaseConfig = InitDatabase(cfgDatabase)
cfgApplication = viper.Sub("settings.application")
if cfgApplication == nil {
panic("No found settings.application in the configuration")
_watch, err = c.Watch()
if err != nil {
log.Fatal(fmt.Sprintf("Watch config source fail: %s", err.Error()))
}
ApplicationConfig = InitApplication(cfgApplication)
}
cfgJwt = viper.Sub("settings.jwt")
if cfgJwt == nil {
panic("No found settings.jwt in the configuration")
// Watch 配置监听, 重载时报错,不影响运行
func Watch() {
for {
v, err := _watch.Next()
if err != nil {
if err.Error() != "watch stopped" {
log.Println(fmt.Sprintf("Next config fail: %s", err.Error()))
}
break
}
err = v.Scan(_cfg)
if err != nil {
log.Println(fmt.Sprintf("Scan config fail: %s", err.Error()))
break
}
fmt.Println(DatabaseConfig)
}
JwtConfig = InitJwt(cfgJwt)
}
cfgLogger = viper.Sub("settings.logger")
if cfgLogger == nil {
panic("No found settings.logger in the configuration")
}
LoggerConfig = InitLog(cfgLogger)
cfgSsl = viper.Sub("settings.ssl")
if cfgSsl == nil {
// Ssl不是系统强制要求的配置,默认可以不用配置,将设置为关闭状态
fmt.Println("warning config not found settings.ssl in the configuration")
SslConfig = new(Ssl)
SslConfig.Enable = false
} else {
SslConfig = InitSsl(cfgSsl)
}
cfgGen = viper.Sub("settings.gen")
if cfgGen == nil {
panic("No found settings.gen")
// Stop 停止监听
func Stop() {
err := _watch.Stop()
if err != nil {
log.Println(err)
}
GenConfig = InitGen(cfgGen)
}