diff --git a/httpclient/client.go b/httpclient/client.go index f2cca53..c810fde 100644 --- a/httpclient/client.go +++ b/httpclient/client.go @@ -12,6 +12,7 @@ import ( "git.zhangdeman.cn/zhangdeman/consts" "git.zhangdeman.cn/zhangdeman/network/httpclient/cache" "git.zhangdeman.cn/zhangdeman/network/httpclient/define" + "git.zhangdeman.cn/zhangdeman/network/httpclient/log" "git.zhangdeman.cn/zhangdeman/network/httpclient/validate" "git.zhangdeman.cn/zhangdeman/serialize" "github.com/go-resty/resty/v2" @@ -28,7 +29,7 @@ import ( // Date : 15:27 2024/5/31 func NewHttpClient(reqConfig *define.Request, cacheInstance cache.ICache) (*HttpClient, error) { if nil == reqConfig.Logger { - reqConfig.Logger = logger // 未单独指定日志实例, 则使用全局日志实例 + reqConfig.Logger = log.Get() // 未单独指定日志实例, 则使用全局日志实例 } // 验证配置正确性以及初始化默认值 if err := validate.RequestConfig(reqConfig); nil != err { diff --git a/httpclient/log.go b/httpclient/log/log.go similarity index 71% rename from httpclient/log.go rename to httpclient/log/log.go index 755e7e0..36894f2 100644 --- a/httpclient/log.go +++ b/httpclient/log/log.go @@ -5,7 +5,7 @@ // Author : go_developer@163.com<白茶清欢> // // Date : 2025-03-31 18:02 -package httpclient +package log import ( "git.zhangdeman.cn/zhangdeman/consts" @@ -16,21 +16,30 @@ var ( logger *zap.Logger ) -// SetLogger 设置日志实例 +// Set 设置日志实例 // // Author : go_developer@163.com<白茶清欢> // // Date : 18:02 2025/3/31 -func SetLogger(l *zap.Logger) { +func Set(l *zap.Logger) { logger = l } -// logRecord 日志记录 +// Get 获取日志实例 +// +// Author : go_developer@163.com<白茶清欢> +// +// Date : 18:19 2025/3/31 +func Get() *zap.Logger { + return logger +} + +// Record 日志记录 // // Author : go_developer@163.com<白茶清欢> // // Date : 18:07 2025/3/31 -func logRecord(logInstance *zap.Logger, level consts.LogLevel, msg string, fields ...zap.Field) { +func Record(logInstance *zap.Logger, level consts.LogLevel, msg string, fields ...zap.Field) { if nil == logInstance { // 未设置日志实例 return