|
|
|
@ -4,7 +4,6 @@ import (
|
|
|
|
"go.dtapp.net/dorm"
|
|
|
|
"go.dtapp.net/dorm"
|
|
|
|
"go.dtapp.net/golog"
|
|
|
|
"go.dtapp.net/golog"
|
|
|
|
"go.dtapp.net/gorequest"
|
|
|
|
"go.dtapp.net/gorequest"
|
|
|
|
"gorm.io/gorm"
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
type ConfigClient struct {
|
|
|
|
type ConfigClient struct {
|
|
|
|
@ -18,17 +17,16 @@ type ConfigClient struct {
|
|
|
|
ComponentAppSecret string // 第三方平台 app_secret
|
|
|
|
ComponentAppSecret string // 第三方平台 app_secret
|
|
|
|
MessageToken string
|
|
|
|
MessageToken string
|
|
|
|
MessageKey string
|
|
|
|
MessageKey string
|
|
|
|
RedisClient *dorm.RedisClient // 缓存数据库
|
|
|
|
GormClient *dorm.GormClient // 日志数据库
|
|
|
|
MongoDb *dorm.MongoClient // 日志数据库
|
|
|
|
LogClient *golog.GoLog // 日志驱动
|
|
|
|
PgsqlDb *gorm.DB // 日志数据库
|
|
|
|
LogDebug bool // 日志开关
|
|
|
|
DatabaseName string // 库名
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Client 微信公众号服务
|
|
|
|
// Client 微信公众号服务
|
|
|
|
type Client struct {
|
|
|
|
type Client struct {
|
|
|
|
client *gorequest.App // 请求客户端
|
|
|
|
requestClient *gorequest.App // 请求服务
|
|
|
|
log *golog.ApiClient // 日志服务
|
|
|
|
logClient *golog.ApiClient // 日志服务
|
|
|
|
config *ConfigClient // 配置
|
|
|
|
config *ConfigClient // 配置
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func NewClient(config *ConfigClient) (*Client, error) {
|
|
|
|
func NewClient(config *ConfigClient) (*Client, error) {
|
|
|
|
@ -36,23 +34,15 @@ func NewClient(config *ConfigClient) (*Client, error) {
|
|
|
|
var err error
|
|
|
|
var err error
|
|
|
|
c := &Client{config: config}
|
|
|
|
c := &Client{config: config}
|
|
|
|
|
|
|
|
|
|
|
|
c.client = gorequest.NewHttp()
|
|
|
|
c.requestClient = gorequest.NewHttp()
|
|
|
|
|
|
|
|
|
|
|
|
if c.config.PgsqlDb != nil {
|
|
|
|
if c.config.GormClient.Db != nil {
|
|
|
|
c.log, err = golog.NewApiClient(
|
|
|
|
c.logClient, err = golog.NewApiClient(&golog.ApiClientConfig{
|
|
|
|
golog.WithGormClient(c.config.PgsqlDb),
|
|
|
|
GormClient: c.config.GormClient,
|
|
|
|
golog.WithTableName(logTable),
|
|
|
|
TableName: logTable,
|
|
|
|
)
|
|
|
|
LogClient: c.config.LogClient,
|
|
|
|
if err != nil {
|
|
|
|
LogDebug: c.config.LogDebug,
|
|
|
|
return nil, err
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if c.config.MongoDb != nil {
|
|
|
|
|
|
|
|
c.log, err = golog.NewApiClient(
|
|
|
|
|
|
|
|
golog.WithMongoClient(c.config.MongoDb),
|
|
|
|
|
|
|
|
golog.WithDatabaseName(c.config.DatabaseName),
|
|
|
|
|
|
|
|
golog.WithCollectionName(logTable),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
