From b8b3fcba82fa3f05befbacd701eb49b2bf174fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Thu, 23 Jun 2022 16:14:57 +0800 Subject: [PATCH] - update log --- service/dingdanxia/client.go | 12 ++++---- service/dingtalk/client.go | 14 +++++---- service/douyin/client.go | 10 ++++--- service/eastiot/client.go | 14 +++++---- service/ejiaofei/client.go | 16 +++++----- service/feishu/client.go | 12 ++++---- service/jd/client.go | 18 ++++++----- service/kashangwl/client.go | 14 +++++---- service/kuaishou/client.go | 10 ++++--- service/leshuazf/client.go | 16 +++++----- service/meituan/client.go | 14 +++++---- service/pconline/client.go | 10 ++++--- service/pinduoduo/client.go | 6 ++-- service/pintoto/client.go | 14 +++++---- service/sendcloud/client.go | 14 +++++---- service/taobao/client.go | 16 +++++----- service/wechatminiprogram/client.go | 22 +++++++------- service/wechatoffice/client.go | 22 +++++++------- service/wechatopen/client.go | 6 ++-- service/wechatpayapiv2/client.go | 22 +++++++------- service/wechatpayapiv3/client.go | 6 ++-- service/wechatpayopen/client.go | 6 ++-- service/wechatqy/client.go | 12 ++++---- service/wechatunion/client.go | 20 +++++++------ service/weishi/client.go | 10 ++++--- service/wikeyun/client.go | 16 +++++----- utils/golog/api.go | 43 +++++++++++++++++---------- utils/golog/api_mongo.go | 7 ++--- utils/golog/gin.go | 46 +++++++++++++++++++---------- utils/golog/gin_mongo.go | 6 ++-- utils/golog/operation_attr.go | 34 ++++++++++++++------- 31 files changed, 288 insertions(+), 200 deletions(-) diff --git a/service/dingdanxia/client.go b/service/dingdanxia/client.go index 76c7f365..baf1215b 100644 --- a/service/dingdanxia/client.go +++ b/service/dingdanxia/client.go @@ -8,9 +8,10 @@ import ( ) type ConfigClient struct { - ApiKey string // 密钥 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + ApiKey string // 密钥 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/dingtalk/client.go b/service/dingtalk/client.go index 2a990f23..df39c87f 100644 --- a/service/dingtalk/client.go +++ b/service/dingtalk/client.go @@ -8,10 +8,11 @@ import ( ) type ConfigClient struct { - Secret string - AccessToken string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + Secret string + AccessToken string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/douyin/client.go b/service/douyin/client.go index f96edf4b..0d060a07 100644 --- a/service/douyin/client.go +++ b/service/douyin/client.go @@ -11,8 +11,9 @@ import ( ) type ConfigClient struct { - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/eastiot/client.go b/service/eastiot/client.go index e411b0b7..bf948d4b 100644 --- a/service/eastiot/client.go +++ b/service/eastiot/client.go @@ -8,10 +8,11 @@ import ( ) type ConfigClient struct { - AppId string - ApiKey string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppId string + ApiKey string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/ejiaofei/client.go b/service/ejiaofei/client.go index ab96b47a..9f0d8caf 100644 --- a/service/ejiaofei/client.go +++ b/service/ejiaofei/client.go @@ -8,11 +8,12 @@ import ( ) type ConfigClient struct { - UserId string - Pwd string - Key string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + UserId string + Pwd string + Key string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -40,8 +41,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/feishu/client.go b/service/feishu/client.go index 2005bb5b..5d7f7350 100644 --- a/service/feishu/client.go +++ b/service/feishu/client.go @@ -8,9 +8,10 @@ import ( ) type ConfigClient struct { - Key string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + Key string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/jd/client.go b/service/jd/client.go index 7af31e9f..538fec81 100644 --- a/service/jd/client.go +++ b/service/jd/client.go @@ -8,12 +8,13 @@ import ( ) type ConfigClient struct { - AppKey string // 应用Key - SecretKey string // 密钥 - SiteId string // 网站ID/APP ID - PositionId string // 推广位id - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppKey string // 应用Key + SecretKey string // 密钥 + SiteId string // 网站ID/APP ID + PositionId string // 推广位id + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/kashangwl/client.go b/service/kashangwl/client.go index 38eab882..9efb1061 100644 --- a/service/kashangwl/client.go +++ b/service/kashangwl/client.go @@ -8,10 +8,11 @@ import ( ) type ConfigClient struct { - CustomerId int // 商家编号 - CustomerKey string // 商家密钥 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + CustomerId int // 商家编号 + CustomerKey string // 商家密钥 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 卡商网服务 @@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/kuaishou/client.go b/service/kuaishou/client.go index bf7473de..41503b5d 100644 --- a/service/kuaishou/client.go +++ b/service/kuaishou/client.go @@ -8,8 +8,9 @@ import ( ) type ConfigClient struct { - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/leshuazf/client.go b/service/leshuazf/client.go index 911b365b..0721466b 100644 --- a/service/leshuazf/client.go +++ b/service/leshuazf/client.go @@ -8,11 +8,12 @@ import ( ) type ConfigClient struct { - AgentId string // 服务商编号，由乐刷分配的接入方唯一标识，明文传输。 - Environment string // 环境 - KeyAgent string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AgentId string // 服务商编号，由乐刷分配的接入方唯一标识，明文传输。 + Environment string // 环境 + KeyAgent string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 乐刷 @@ -40,8 +41,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/meituan/client.go b/service/meituan/client.go index d554e909..4fe71d00 100644 --- a/service/meituan/client.go +++ b/service/meituan/client.go @@ -8,10 +8,11 @@ import ( ) type ConfigClient struct { - Secret string // 秘钥 - AppKey string // 渠道标记 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + Secret string // 秘钥 + AppKey string // 渠道标记 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 美团联盟 @@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/pconline/client.go b/service/pconline/client.go index 3c4c0730..7b44b4b0 100644 --- a/service/pconline/client.go +++ b/service/pconline/client.go @@ -8,8 +8,9 @@ import ( ) type ConfigClient struct { - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -36,8 +37,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/pinduoduo/client.go b/service/pinduoduo/client.go index 1e0b4430..81182763 100644 --- a/service/pinduoduo/client.go +++ b/service/pinduoduo/client.go @@ -19,6 +19,7 @@ type ConfigClient struct { Pid string // 推广位 MongoDb *dorm.MongoClient // 日志数据库 PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -46,8 +47,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/pintoto/client.go b/service/pintoto/client.go index c45cd976..712ca184 100644 --- a/service/pintoto/client.go +++ b/service/pintoto/client.go @@ -10,10 +10,11 @@ import ( ) type ConfigClient struct { - AppKey string - AppSecret string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppKey string + AppSecret string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 电影票服务 @@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/sendcloud/client.go b/service/sendcloud/client.go index 27cc781b..69cbf6b1 100644 --- a/service/sendcloud/client.go +++ b/service/sendcloud/client.go @@ -8,10 +8,11 @@ import ( ) type ConfigClient struct { - ApiUser string // API_USER - ApiKey string // API_KEY - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + ApiUser string // API_USER + ApiKey string // API_KEY + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/taobao/client.go b/service/taobao/client.go index b7fde1b9..9f3fbe91 100644 --- a/service/taobao/client.go +++ b/service/taobao/client.go @@ -12,11 +12,12 @@ import ( ) type ConfigClient struct { - AppKey string // 应用Key - AppSecret string // 密钥 - AdzoneId int64 // mm_xxx_xxx_xxx的第三位 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppKey string // 应用Key + AppSecret string // 密钥 + AdzoneId int64 // mm_xxx_xxx_xxx的第三位 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatminiprogram/client.go b/service/wechatminiprogram/client.go index bd6d26ab..8027ae6a 100644 --- a/service/wechatminiprogram/client.go +++ b/service/wechatminiprogram/client.go @@ -8,14 +8,15 @@ import ( ) type ConfigClient struct { - AppId string // 小程序唯一凭证，即 appId - AppSecret string // 小程序唯一凭证密钥，即 appSecret - AccessToken string // 接口调用凭证 - JsapiTicket string // 签名凭证 - RedisClient *dorm.RedisClient // 缓存数据库 - TokenDb *gorm.DB // 令牌数据库 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppId string // 小程序唯一凭证，即 appId + AppSecret string // 小程序唯一凭证密钥，即 appSecret + AccessToken string // 接口调用凭证 + JsapiTicket string // 签名凭证 + RedisClient *dorm.RedisClient // 缓存数据库 + TokenDb *gorm.DB // 令牌数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } @@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatoffice/client.go b/service/wechatoffice/client.go index 4bcb03cb..f040858b 100644 --- a/service/wechatoffice/client.go +++ b/service/wechatoffice/client.go @@ -8,14 +8,15 @@ import ( ) type ConfigClient struct { - AppId string // 小程序唯一凭证，即 appId - AppSecret string // 小程序唯一凭证密钥，即 appSecret - AccessToken string // 接口调用凭证 - JsapiTicket string // 签名凭证 - RedisClient *dorm.RedisClient // 缓存数据库 - TokenDb *gorm.DB // 令牌数据库 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppId string // 小程序唯一凭证，即 appId + AppSecret string // 小程序唯一凭证密钥，即 appSecret + AccessToken string // 接口调用凭证 + JsapiTicket string // 签名凭证 + RedisClient *dorm.RedisClient // 缓存数据库 + TokenDb *gorm.DB // 令牌数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信公众号服务 @@ -43,8 +44,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatopen/client.go b/service/wechatopen/client.go index 8714ba7f..b23b81cc 100644 --- a/service/wechatopen/client.go +++ b/service/wechatopen/client.go @@ -21,6 +21,7 @@ type ConfigClient struct { RedisClient *dorm.RedisClient // 缓存数据库 MongoDb *dorm.MongoClient // 日志数据库 PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信公众号服务 @@ -48,8 +49,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatpayapiv2/client.go b/service/wechatpayapiv2/client.go index c58ba461..ebcbee45 100644 --- a/service/wechatpayapiv2/client.go +++ b/service/wechatpayapiv2/client.go @@ -8,14 +8,15 @@ import ( ) type ConfigClient struct { - AppId string // 小程序或者公众号唯一凭证 - AppSecret string // 小程序或者公众号唯一凭证密钥 - MchId string // 微信支付的商户id - MchKey string // 私钥 - CertString string - KeyString string - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppId string // 小程序或者公众号唯一凭证 + AppSecret string // 小程序或者公众号唯一凭证密钥 + MchId string // 微信支付的商户id + MchKey string // 私钥 + CertString string + KeyString string + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信支付服务 @@ -43,8 +44,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatpayapiv3/client.go b/service/wechatpayapiv3/client.go index b32d2d5a..96d696d3 100644 --- a/service/wechatpayapiv3/client.go +++ b/service/wechatpayapiv3/client.go @@ -17,6 +17,7 @@ type ConfigClient struct { MchSslKey string // pem key 内容 MongoDb *dorm.MongoClient // 日志数据库 PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信支付直连商户 @@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatpayopen/client.go b/service/wechatpayopen/client.go index 8f68ce28..3b9d0dff 100644 --- a/service/wechatpayopen/client.go +++ b/service/wechatpayopen/client.go @@ -20,6 +20,7 @@ type ConfigClient struct { MchSslKey string // pem key 内容 MongoDb *dorm.MongoClient // 日志数据库 PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信支付服务 @@ -48,8 +49,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatqy/client.go b/service/wechatqy/client.go index 0950f3a6..adc6797c 100644 --- a/service/wechatqy/client.go +++ b/service/wechatqy/client.go @@ -8,9 +8,10 @@ import ( ) type ConfigClient struct { - Key string // key - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + Key string // key + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wechatunion/client.go b/service/wechatunion/client.go index 3ef071de..ff6f46d3 100644 --- a/service/wechatunion/client.go +++ b/service/wechatunion/client.go @@ -8,13 +8,14 @@ import ( ) type ConfigClient struct { - AppId string // 小程序唯一凭证，即 appId - AppSecret string // 小程序唯一凭证密钥，即 appSecret - AccessToken string // 接口调用凭证 - Pid string // 推广位PID - RedisClient *dorm.RedisClient // 缓存数据库 - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + AppId string // 小程序唯一凭证，即 appId + AppSecret string // 小程序唯一凭证密钥，即 appSecret + AccessToken string // 接口调用凭证 + Pid string // 推广位PID + RedisClient *dorm.RedisClient // 缓存数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } // Client 微信小程序联盟 @@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/weishi/client.go b/service/weishi/client.go index 09bf82f6..c1676bf8 100644 --- a/service/weishi/client.go +++ b/service/weishi/client.go @@ -11,8 +11,9 @@ import ( ) type ConfigClient struct { - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/service/wikeyun/client.go b/service/wikeyun/client.go index bc4d0c68..ab3f2c10 100644 --- a/service/wikeyun/client.go +++ b/service/wikeyun/client.go @@ -9,11 +9,12 @@ import ( ) type ConfigClient struct { - StoreId int // 店铺ID - AppKey int // key - AppSecret string // secret - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 + StoreId int // 店铺ID + AppKey int // key + AppSecret string // secret + MongoDb *dorm.MongoClient // 日志数据库 + PgsqlDb *gorm.DB // 日志数据库 + DatabaseName string // 库名 } type Client struct { @@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) { } if c.config.MongoDb != nil { c.log, err = golog.NewApiClient( - golog.WithMongoCollectionClient(c.config.MongoDb), - golog.WithTableName(logTable), + golog.WithMongoClient(c.config.MongoDb), + golog.WithDatabaseName(c.config.DatabaseName), + golog.WithCollectionName(logTable), ) if err != nil { return nil, err diff --git a/utils/golog/api.go b/utils/golog/api.go index fa14143d..1400f857 100644 --- a/utils/golog/api.go +++ b/utils/golog/api.go @@ -7,25 +7,26 @@ import ( "gorm.io/gorm" "os" "runtime" - "strings" ) // ApiClient 接口 type ApiClient struct { - gormClient *gorm.DB // 驱动 - mongoCollectionClient *dorm.MongoClient // 驱动(温馨提示：需要已选择库) - config struct { - logType string // 日志类型 - tableName string // 表名 - insideIp string // 内网ip - hostname string // 主机名 - goVersion string // go版本 + gormClient *gorm.DB // 数据库驱动 + mongoClient *dorm.MongoClient // 数据库驱动 + config struct { + logType string // 日志类型 + tableName string // 表名 + databaseName string // 库名 + collectionName string // 表名 + insideIp string // 内网ip + hostname string // 主机名 + goVersion string // go版本 } // 配置 } // NewApiClient 创建接口实例化 // WithGormClient && WithTableName -// WithMongoCollectionClient && WithTableName +// WithMongoCollectionClient && WithDatabaseName && WithCollectionName func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) { c := &ApiClient{} @@ -34,13 +35,19 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) { c.gormClient = attr.gormClient c.config.logType = attr.logType } - if attr.mongoCollectionClient != nil { - c.mongoCollectionClient = attr.mongoCollectionClient + if attr.mongoClient != nil { + c.mongoClient = attr.mongoClient c.config.logType = attr.logType } if attr.tableName != "" { c.config.tableName = attr.tableName } + if attr.databaseName != "" { + c.config.databaseName = attr.databaseName + } + if attr.collectionName != "" { + c.config.collectionName = attr.collectionName + } } switch c.config.logType { @@ -61,12 +68,16 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) { case logTypeMongo: - if c.mongoCollectionClient.Db == nil { - return nil, errors.New("驱动不能为空") + if c.mongoClient.Db == nil { + return nil, errors.New("没有设置驱动") } if c.config.tableName == "" { - return nil, errors.New("表名不能为空") + return nil, errors.New("没有设置库名") + } + + if c.config.collectionName == "" { + return nil, errors.New("没有设置表名") } default: @@ -77,7 +88,7 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) { c.config.hostname = hostname c.config.insideIp = goip.GetInsideIp() - c.config.goVersion = strings.TrimPrefix(runtime.Version(), "go") + c.config.goVersion = runtime.Version() return c, nil } diff --git a/utils/golog/api_mongo.go b/utils/golog/api_mongo.go index cae9856e..64d4ef28 100644 --- a/utils/golog/api_mongo.go +++ b/utils/golog/api_mongo.go @@ -4,7 +4,6 @@ import ( "go.dtapp.net/library/utils/dorm" "go.dtapp.net/library/utils/gorequest" "go.mongodb.org/mongo-driver/bson/primitive" - "log" ) // 模型结构体 @@ -38,14 +37,14 @@ func (c *ApiClient) mongoRecord(mongoLog apiMongoLog) error { mongoLog.LogId = primitive.NewObjectID() - _, err := c.mongoCollectionClient.Collection(c.config.tableName).InsertOne(mongoLog) - log.Printf("api.mongoRecord：%s\n", err) + _, err := c.mongoClient.Database(c.config.databaseName).Collection(c.config.collectionName).InsertOne(mongoLog) + return err } // MongoQuery 查询 func (c *ApiClient) MongoQuery() *dorm.MongoClient { - return c.mongoCollectionClient.Collection(c.config.tableName) + return c.mongoClient.Database(c.config.databaseName).Collection(c.config.collectionName) } // MongoMiddleware 中间件 diff --git a/utils/golog/gin.go b/utils/golog/gin.go index 5b2d5405..7c5d0909 100644 --- a/utils/golog/gin.go +++ b/utils/golog/gin.go @@ -14,19 +14,23 @@ import ( // GinClient 框架 type GinClient struct { - gormClient *gorm.DB // 驱动 - mongoCollectionClient *dorm.MongoClient // 驱动(温馨提示：需要已选择库) - ipService *goip.Client // ip服务 - config struct { - logType string // 日志类型 - tableName string // 表名 - insideIp string // 内网ip - hostname string // 主机名 - goVersion string // go版本 + gormClient *gorm.DB // 数据库驱动 + mongoClient *dorm.MongoClient // 数据库驱动 + ipService *goip.Client // ip服务 + config struct { + logType string // 日志类型 + tableName string // 表名 + databaseName string // 库名 + collectionName string // 表名 + insideIp string // 内网ip + hostname string // 主机名 + goVersion string // go版本 } // 配置 } // NewGinClient 创建框架实例化 +// WithGormClient && WithTableName +// WithMongoCollectionClient && WithDatabaseName && WithCollectionName func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) { c := &GinClient{} @@ -35,13 +39,19 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) { c.gormClient = attr.gormClient c.config.logType = attr.logType } - if attr.mongoCollectionClient != nil { - c.mongoCollectionClient = attr.mongoCollectionClient + if attr.mongoClient != nil { + c.mongoClient = attr.mongoClient c.config.logType = attr.logType } if attr.tableName != "" { c.config.tableName = attr.tableName } + if attr.databaseName != "" { + c.config.databaseName = attr.databaseName + } + if attr.collectionName != "" { + c.config.collectionName = attr.collectionName + } if attr.ipService != nil { c.ipService = attr.ipService } @@ -51,11 +61,11 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) { case logTypeGorm: if c.gormClient == nil { - return nil, errors.New("驱动不能为空") + return nil, errors.New("没有设置驱动") } if c.config.tableName == "" { - return nil, errors.New("表名不能为空") + return nil, errors.New("没有设置表名") } err := c.gormClient.Table(c.config.tableName).AutoMigrate(&apiPostgresqlLog{}) @@ -65,12 +75,16 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) { case logTypeMongo: - if c.mongoCollectionClient.Db == nil { - return nil, errors.New("驱动不能为空") + if c.mongoClient.Db == nil { + return nil, errors.New("没有设置驱动") } if c.config.tableName == "" { - return nil, errors.New("表名不能为空") + return nil, errors.New("没有设置库名") + } + + if c.config.collectionName == "" { + return nil, errors.New("没有设置表名") } default: diff --git a/utils/golog/gin_mongo.go b/utils/golog/gin_mongo.go index 35df2495..d85b112a 100644 --- a/utils/golog/gin_mongo.go +++ b/utils/golog/gin_mongo.go @@ -55,14 +55,14 @@ func (c *GinClient) mongoRecord(mongoLog ginMongoLog) error { mongoLog.LogId = primitive.NewObjectID() - _, err := c.mongoCollectionClient.Collection(c.config.tableName).InsertOne(mongoLog) + _, err := c.mongoClient.Database(c.config.databaseName).Collection(c.config.collectionName).InsertOne(mongoLog) return err } // MongoQuery 查询 func (c *GinClient) MongoQuery() *dorm.MongoClient { - return c.mongoCollectionClient.Collection(c.config.tableName) + return c.mongoClient.Database(c.config.databaseName).Collection(c.config.collectionName) } // MongoMiddleware 中间件 @@ -121,7 +121,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc { } // 记录 - if c.mongoCollectionClient != nil { + if c.mongoClient != nil { host := "" if ginCtx.Request.TLS == nil { host = "http://" + ginCtx.Request.Host diff --git a/utils/golog/operation_attr.go b/utils/golog/operation_attr.go index 4d0dc8f1..86197d48 100644 --- a/utils/golog/operation_attr.go +++ b/utils/golog/operation_attr.go @@ -13,29 +13,41 @@ const ( // OperationAttr 操作属性 type OperationAttr struct { - gormClient *gorm.DB // 驱动 - mongoCollectionClient *dorm.MongoClient // 驱动 - logType string // 类型 - tableName string // 表名 - ipService *goip.Client // ip服务 + gormClient *gorm.DB // 数据库驱动 + mongoClient *dorm.MongoClient // 数据库驱动 + ipService *goip.Client // ip服务 + logType string // 类型 + tableName string // 表名 + databaseName string // 库名 + collectionName string // 表名 } -// WithGormClient 数据库驱动 +// WithGormClient 设置数据库驱动 func WithGormClient(client *gorm.DB) *OperationAttr { return &OperationAttr{gormClient: client, logType: logTypeGorm} } -// WithMongoCollectionClient 数据库驱动(温馨提示：需要已选择库) -func WithMongoCollectionClient(client *dorm.MongoClient) *OperationAttr { - return &OperationAttr{mongoCollectionClient: client, logType: logTypeMongo} +// WithMongoClient 设置数据库驱动 +func WithMongoClient(client *dorm.MongoClient) *OperationAttr { + return &OperationAttr{mongoClient: client, logType: logTypeMongo} } -// WithTableName 表名 +// WithTableName 设置表名 func WithTableName(tableName string) *OperationAttr { return &OperationAttr{tableName: tableName} } -// WithIpService ip服务 +// WithDatabaseName 设置库名 +func WithDatabaseName(databaseName string) *OperationAttr { + return &OperationAttr{databaseName: databaseName} +} + +// WithCollectionName 设置表名 +func WithCollectionName(collectionName string) *OperationAttr { + return &OperationAttr{collectionName: collectionName} +} + +// WithIpService 设置ip服务 func WithIpService(ipService *goip.Client) *OperationAttr { return &OperationAttr{ipService: ipService} }