Commit 78cc46a7 authored by ibuler's avatar ibuler

[Update] 修改加载配置文件从环境变量

parent 8b05a967
...@@ -2,6 +2,7 @@ package config ...@@ -2,6 +2,7 @@ package config
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
...@@ -81,13 +82,15 @@ func (c *Config) LoadFromJSON(body []byte) error { ...@@ -81,13 +82,15 @@ func (c *Config) LoadFromJSON(body []byte) error {
} }
func (c *Config) LoadFromEnv() error { func (c *Config) LoadFromEnv() error {
envMap := map[string]string{} envMap := make(map[string]string)
env := os.Environ() env := os.Environ()
for _, v := range env { for _, v := range env {
vSlice := strings.Split(v, "=") vSlice := strings.Split(v, "=")
envMap[vSlice[0]] = envMap[vSlice[1]] key := vSlice[0]
value := vSlice[1]
envMap[key] = value
} }
envYAML, err := yaml.Marshal(envMap) envYAML, err := yaml.Marshal(&envMap)
if err != nil { if err != nil {
log.Fatalf("Error occur: %v", err) log.Fatalf("Error occur: %v", err)
} }
...@@ -100,6 +103,7 @@ func (c *Config) Load(filepath string) error { ...@@ -100,6 +103,7 @@ func (c *Config) Load(filepath string) error {
return err return err
} }
err = c.LoadFromEnv() err = c.LoadFromEnv()
fmt.Println(c.CoreHost)
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment