切换序列化库
This commit is contained in:
14
client.go
14
client.go
@ -10,13 +10,13 @@ package redis
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"git.zhangdeman.cn/zhangdeman/consts"
|
||||
"git.zhangdeman.cn/zhangdeman/serialize"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"git.zhangdeman.cn/zhangdeman/util"
|
||||
|
||||
"git.zhangdeman.cn/zhangdeman/logger"
|
||||
redisInstance "github.com/go-redis/redis/v8"
|
||||
"go.uber.org/zap"
|
||||
@ -213,15 +213,15 @@ func (c *OwnClient) loadConfig(cfgPath string) error {
|
||||
strings.Trim(fileName, ".json"),
|
||||
".yaml"), ".yml")
|
||||
switch strings.ToLower(fileArr[len(fileArr)-1]) {
|
||||
case "json":
|
||||
if err = util.File.ReadJSONContent(cfgPath, &cfg); nil != err {
|
||||
case consts.FileTypeJson:
|
||||
if err = serialize.File.ReadJSONContent(cfgPath, &cfg); nil != err {
|
||||
return err
|
||||
}
|
||||
flag = strings.Join(fileArr[0:len(fileArr)-1], ".")
|
||||
case "yml":
|
||||
case consts.FileTypeYml:
|
||||
fallthrough
|
||||
case "yaml":
|
||||
if err = util.File.ReadYmlContent(cfgPath, &cfg); nil != err {
|
||||
case consts.FileTypeYaml:
|
||||
if err = serialize.File.ReadYmlContent(cfgPath, &cfg); nil != err {
|
||||
return err
|
||||
}
|
||||
flag = strings.Join(fileArr[0:len(fileArr)-1], ".")
|
||||
|
Reference in New Issue
Block a user