- update log

master
李光春 2 years ago
parent 1b5500e045
commit b8b3fcba82

@ -11,6 +11,7 @@ type ConfigClient struct {
ApiKey string // 密钥 ApiKey string // 密钥
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -12,6 +12,7 @@ type ConfigClient struct {
AccessToken string AccessToken string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -13,6 +13,7 @@ import (
type ConfigClient struct { type ConfigClient struct {
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -12,6 +12,7 @@ type ConfigClient struct {
ApiKey string ApiKey string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -13,6 +13,7 @@ type ConfigClient struct {
Key string Key string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -40,8 +41,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -11,6 +11,7 @@ type ConfigClient struct {
Key string Key string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -14,6 +14,7 @@ type ConfigClient struct {
PositionId string // 推广位id PositionId string // 推广位id
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -12,6 +12,7 @@ type ConfigClient struct {
CustomerKey string // 商家密钥 CustomerKey string // 商家密钥
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 卡商网服务 // Client 卡商网服务
@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -10,6 +10,7 @@ import (
type ConfigClient struct { type ConfigClient struct {
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -13,6 +13,7 @@ type ConfigClient struct {
KeyAgent string KeyAgent string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 乐刷 // Client 乐刷
@ -40,8 +41,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -12,6 +12,7 @@ type ConfigClient struct {
AppKey string // 渠道标记 AppKey string // 渠道标记
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 美团联盟 // Client 美团联盟
@ -39,8 +40,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -10,6 +10,7 @@ import (
type ConfigClient struct { type ConfigClient struct {
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -36,8 +37,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -19,6 +19,7 @@ type ConfigClient struct {
Pid string // 推广位 Pid string // 推广位
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -46,8 +47,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -14,6 +14,7 @@ type ConfigClient struct {
AppSecret string AppSecret string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 电影票服务 // Client 电影票服务
@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -12,6 +12,7 @@ type ConfigClient struct {
ApiKey string // API_KEY ApiKey string // API_KEY
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -38,8 +39,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -17,6 +17,7 @@ type ConfigClient struct {
AdzoneId int64 // mm_xxx_xxx_xxx的第三位 AdzoneId int64 // mm_xxx_xxx_xxx的第三位
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -16,6 +16,7 @@ type ConfigClient struct {
TokenDb *gorm.DB // 令牌数据库 TokenDb *gorm.DB // 令牌数据库
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -16,6 +16,7 @@ type ConfigClient struct {
TokenDb *gorm.DB // 令牌数据库 TokenDb *gorm.DB // 令牌数据库
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信公众号服务 // Client 微信公众号服务
@ -43,8 +44,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -21,6 +21,7 @@ type ConfigClient struct {
RedisClient *dorm.RedisClient // 缓存数据库 RedisClient *dorm.RedisClient // 缓存数据库
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信公众号服务 // Client 微信公众号服务
@ -48,8 +49,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -16,6 +16,7 @@ type ConfigClient struct {
KeyString string KeyString string
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信支付服务 // Client 微信支付服务
@ -43,8 +44,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -17,6 +17,7 @@ type ConfigClient struct {
MchSslKey string // pem key 内容 MchSslKey string // pem key 内容
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信支付直连商户 // Client 微信支付直连商户
@ -44,8 +45,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -20,6 +20,7 @@ type ConfigClient struct {
MchSslKey string // pem key 内容 MchSslKey string // pem key 内容
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信支付服务 // Client 微信支付服务
@ -48,8 +49,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -11,6 +11,7 @@ type ConfigClient struct {
Key string // key Key string // key
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -37,8 +38,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -15,6 +15,7 @@ type ConfigClient struct {
RedisClient *dorm.RedisClient // 缓存数据库 RedisClient *dorm.RedisClient // 缓存数据库
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
// Client 微信小程序联盟 // Client 微信小程序联盟
@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -13,6 +13,7 @@ import (
type ConfigClient struct { type ConfigClient struct {
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -42,8 +43,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -14,6 +14,7 @@ type ConfigClient struct {
AppSecret string // secret AppSecret string // secret
MongoDb *dorm.MongoClient // 日志数据库 MongoDb *dorm.MongoClient // 日志数据库
PgsqlDb *gorm.DB // 日志数据库 PgsqlDb *gorm.DB // 日志数据库
DatabaseName string // 库名
} }
type Client struct { type Client struct {
@ -41,8 +42,9 @@ func NewClient(config *ConfigClient) (*Client, error) {
} }
if c.config.MongoDb != nil { if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient( c.log, err = golog.NewApiClient(
golog.WithMongoCollectionClient(c.config.MongoDb), golog.WithMongoClient(c.config.MongoDb),
golog.WithTableName(logTable), golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
) )
if err != nil { if err != nil {
return nil, err return nil, err

@ -7,16 +7,17 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
"os" "os"
"runtime" "runtime"
"strings"
) )
// ApiClient 接口 // ApiClient 接口
type ApiClient struct { type ApiClient struct {
gormClient *gorm.DB // 驱动 gormClient *gorm.DB // 数据库驱动
mongoCollectionClient *dorm.MongoClient // 驱动(温馨提示:需要已选择库) mongoClient *dorm.MongoClient // 数据库驱动
config struct { config struct {
logType string // 日志类型 logType string // 日志类型
tableName string // 表名 tableName string // 表名
databaseName string // 库名
collectionName string // 表名
insideIp string // 内网ip insideIp string // 内网ip
hostname string // 主机名 hostname string // 主机名
goVersion string // go版本 goVersion string // go版本
@ -25,7 +26,7 @@ type ApiClient struct {
// NewApiClient 创建接口实例化 // NewApiClient 创建接口实例化
// WithGormClient && WithTableName // WithGormClient && WithTableName
// WithMongoCollectionClient && WithTableName // WithMongoCollectionClient && WithDatabaseName && WithCollectionName
func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) { func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) {
c := &ApiClient{} c := &ApiClient{}
@ -34,13 +35,19 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) {
c.gormClient = attr.gormClient c.gormClient = attr.gormClient
c.config.logType = attr.logType c.config.logType = attr.logType
} }
if attr.mongoCollectionClient != nil { if attr.mongoClient != nil {
c.mongoCollectionClient = attr.mongoCollectionClient c.mongoClient = attr.mongoClient
c.config.logType = attr.logType c.config.logType = attr.logType
} }
if attr.tableName != "" { if attr.tableName != "" {
c.config.tableName = 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 { switch c.config.logType {
@ -61,12 +68,16 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) {
case logTypeMongo: case logTypeMongo:
if c.mongoCollectionClient.Db == nil { if c.mongoClient.Db == nil {
return nil, errors.New("驱动不能为空") return nil, errors.New("没有设置驱动")
} }
if c.config.tableName == "" { if c.config.tableName == "" {
return nil, errors.New("表名不能为空") return nil, errors.New("没有设置库名")
}
if c.config.collectionName == "" {
return nil, errors.New("没有设置表名")
} }
default: default:
@ -77,7 +88,7 @@ func NewApiClient(attrs ...*OperationAttr) (*ApiClient, error) {
c.config.hostname = hostname c.config.hostname = hostname
c.config.insideIp = goip.GetInsideIp() c.config.insideIp = goip.GetInsideIp()
c.config.goVersion = strings.TrimPrefix(runtime.Version(), "go") c.config.goVersion = runtime.Version()
return c, nil return c, nil
} }

@ -4,7 +4,6 @@ import (
"go.dtapp.net/library/utils/dorm" "go.dtapp.net/library/utils/dorm"
"go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gorequest"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"log"
) )
// 模型结构体 // 模型结构体
@ -38,14 +37,14 @@ func (c *ApiClient) mongoRecord(mongoLog apiMongoLog) error {
mongoLog.LogId = primitive.NewObjectID() 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)
log.Printf("api.mongoRecord%s\n", err)
return err return err
} }
// MongoQuery 查询 // MongoQuery 查询
func (c *ApiClient) MongoQuery() *dorm.MongoClient { 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 中间件 // MongoMiddleware 中间件

@ -14,12 +14,14 @@ import (
// GinClient 框架 // GinClient 框架
type GinClient struct { type GinClient struct {
gormClient *gorm.DB // 驱动 gormClient *gorm.DB // 数据库驱动
mongoCollectionClient *dorm.MongoClient // 驱动(温馨提示:需要已选择库) mongoClient *dorm.MongoClient // 数据库驱动
ipService *goip.Client // ip服务 ipService *goip.Client // ip服务
config struct { config struct {
logType string // 日志类型 logType string // 日志类型
tableName string // 表名 tableName string // 表名
databaseName string // 库名
collectionName string // 表名
insideIp string // 内网ip insideIp string // 内网ip
hostname string // 主机名 hostname string // 主机名
goVersion string // go版本 goVersion string // go版本
@ -27,6 +29,8 @@ type GinClient struct {
} }
// NewGinClient 创建框架实例化 // NewGinClient 创建框架实例化
// WithGormClient && WithTableName
// WithMongoCollectionClient && WithDatabaseName && WithCollectionName
func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) { func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) {
c := &GinClient{} c := &GinClient{}
@ -35,13 +39,19 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) {
c.gormClient = attr.gormClient c.gormClient = attr.gormClient
c.config.logType = attr.logType c.config.logType = attr.logType
} }
if attr.mongoCollectionClient != nil { if attr.mongoClient != nil {
c.mongoCollectionClient = attr.mongoCollectionClient c.mongoClient = attr.mongoClient
c.config.logType = attr.logType c.config.logType = attr.logType
} }
if attr.tableName != "" { if attr.tableName != "" {
c.config.tableName = 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 { if attr.ipService != nil {
c.ipService = attr.ipService c.ipService = attr.ipService
} }
@ -51,11 +61,11 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) {
case logTypeGorm: case logTypeGorm:
if c.gormClient == nil { if c.gormClient == nil {
return nil, errors.New("驱动不能为空") return nil, errors.New("没有设置驱动")
} }
if c.config.tableName == "" { if c.config.tableName == "" {
return nil, errors.New("表名不能为空") return nil, errors.New("没有设置表名")
} }
err := c.gormClient.Table(c.config.tableName).AutoMigrate(&apiPostgresqlLog{}) err := c.gormClient.Table(c.config.tableName).AutoMigrate(&apiPostgresqlLog{})
@ -65,12 +75,16 @@ func NewGinClient(attrs ...*OperationAttr) (*GinClient, error) {
case logTypeMongo: case logTypeMongo:
if c.mongoCollectionClient.Db == nil { if c.mongoClient.Db == nil {
return nil, errors.New("驱动不能为空") return nil, errors.New("没有设置驱动")
} }
if c.config.tableName == "" { if c.config.tableName == "" {
return nil, errors.New("表名不能为空") return nil, errors.New("没有设置库名")
}
if c.config.collectionName == "" {
return nil, errors.New("没有设置表名")
} }
default: default:

@ -55,14 +55,14 @@ func (c *GinClient) mongoRecord(mongoLog ginMongoLog) error {
mongoLog.LogId = primitive.NewObjectID() 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 return err
} }
// MongoQuery 查询 // MongoQuery 查询
func (c *GinClient) MongoQuery() *dorm.MongoClient { 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 中间件 // MongoMiddleware 中间件
@ -121,7 +121,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
} }
// 记录 // 记录
if c.mongoCollectionClient != nil { if c.mongoClient != nil {
host := "" host := ""
if ginCtx.Request.TLS == nil { if ginCtx.Request.TLS == nil {
host = "http://" + ginCtx.Request.Host host = "http://" + ginCtx.Request.Host

@ -13,29 +13,41 @@ const (
// OperationAttr 操作属性 // OperationAttr 操作属性
type OperationAttr struct { type OperationAttr struct {
gormClient *gorm.DB // 驱动 gormClient *gorm.DB // 数据库驱动
mongoCollectionClient *dorm.MongoClient // 驱动 mongoClient *dorm.MongoClient // 数据库驱动
ipService *goip.Client // ip服务
logType string // 类型 logType string // 类型
tableName string // 表名 tableName string // 表名
ipService *goip.Client // ip服务 databaseName string // 库名
collectionName string // 表名
} }
// WithGormClient 数据库驱动 // WithGormClient 设置数据库驱动
func WithGormClient(client *gorm.DB) *OperationAttr { func WithGormClient(client *gorm.DB) *OperationAttr {
return &OperationAttr{gormClient: client, logType: logTypeGorm} return &OperationAttr{gormClient: client, logType: logTypeGorm}
} }
// WithMongoCollectionClient 数据库驱动(温馨提示:需要已选择库) // WithMongoClient 设置数据库驱动
func WithMongoCollectionClient(client *dorm.MongoClient) *OperationAttr { func WithMongoClient(client *dorm.MongoClient) *OperationAttr {
return &OperationAttr{mongoCollectionClient: client, logType: logTypeMongo} return &OperationAttr{mongoClient: client, logType: logTypeMongo}
} }
// WithTableName 表名 // WithTableName 设置表名
func WithTableName(tableName string) *OperationAttr { func WithTableName(tableName string) *OperationAttr {
return &OperationAttr{tableName: tableName} 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 { func WithIpService(ipService *goip.Client) *OperationAttr {
return &OperationAttr{ipService: ipService} return &OperationAttr{ipService: ipService}
} }

Loading…
Cancel
Save