Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9da1a3bf25 | ||
|
|
2cb005e8ed | ||
|
|
374fdac477 | ||
|
|
595ababfde |
@@ -27,26 +27,26 @@ type Cfg struct {
|
|||||||
|
|
||||||
// Deprecated : pkg.Config().GetDbFile(name)
|
// Deprecated : pkg.Config().GetDbFile(name)
|
||||||
func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
|
func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
|
||||||
pkg.Config().GetDbFile(name)
|
res, err = pkg.Config().GetDbFile(name)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated : pkg.Config().GetFile(name, obj...)
|
// Deprecated : pkg.Config().GetFile(name, obj...)
|
||||||
func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
|
func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
|
||||||
pkg.Config().GetFile(filename)
|
jsonObj, err = pkg.Config().GetFile(filename)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// getUrlFile 获取远程配置
|
// getUrlFile 获取远程配置
|
||||||
// Deprecated : pkg.Config().GetUrlFile(name)
|
// Deprecated : pkg.Config().GetUrlFile(name)
|
||||||
func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
|
func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
|
||||||
pkg.Config().GetUrlFile(name)
|
jsonObj, err = pkg.Config().GetUrlFile(name)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated : pkg.Config().GetApollo(name, obj)
|
// Deprecated : pkg.Config().GetApollo(name, obj)
|
||||||
func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
|
func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
|
||||||
pkg.Config().GetApollo(name, obj)
|
jsonObj, err = pkg.Config().GetApollo(name, obj)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/gogf/gf/v2/container/gvar"
|
"github.com/gogf/gf/v2/container/gvar"
|
||||||
"github.com/gogf/gf/v2/encoding/gjson"
|
"github.com/gogf/gf/v2/encoding/gjson"
|
||||||
"github.com/gogf/gf/v2/frame/g"
|
"github.com/gogf/gf/v2/frame/g"
|
||||||
|
"github.com/gogf/gf/v2/os/gctx"
|
||||||
"github.com/gogf/gf/v2/os/gfile"
|
"github.com/gogf/gf/v2/os/gfile"
|
||||||
"github.com/gogf/gf/v2/os/gres"
|
"github.com/gogf/gf/v2/os/gres"
|
||||||
"github.com/gogf/gf/v2/text/gstr"
|
"github.com/gogf/gf/v2/text/gstr"
|
||||||
@@ -86,14 +87,22 @@ func (c *Cfg) GetFile(filename string, _pathStr ...string) (jsonObj *gjson.Json,
|
|||||||
bytes = gres.GetContent(filePath) // 从打包资源中获取内容
|
bytes = gres.GetContent(filePath) // 从打包资源中获取内容
|
||||||
}
|
}
|
||||||
|
|
||||||
//如果还是没有读取到配置,从当前目录返回上级读取
|
for range 5 {
|
||||||
if bytes == nil {
|
//如果还是没有读取到配置,从当前目录返回上级读取
|
||||||
// 拼接完整的文件路径
|
if bytes == nil {
|
||||||
filePath = "../../" + pathStr + filename + ".json"
|
// 上级拼接完整的文件路径
|
||||||
if gfile.IsFile(filePath) {
|
filePath = "../" + filePath
|
||||||
bytes = gfile.GetBytes(filePath) // 读取物理文件内容
|
if gfile.IsFile(filePath) {
|
||||||
|
bytes = gfile.GetBytes(filePath) // 读取物理文件内容
|
||||||
|
//找到配置了,跳过
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if bytes == nil {
|
||||||
|
g.Log().Errorf(gctx.New(), "未读取到配置文件:%v", filePath)
|
||||||
|
}
|
||||||
|
|
||||||
// 解析 JSON 内容并返回结果
|
// 解析 JSON 内容并返回结果
|
||||||
jsonObj, err = gjson.DecodeToJson(bytes)
|
jsonObj, err = gjson.DecodeToJson(bytes)
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user