fix code conflicts
This commit is contained in:
parent
a1e5433af6
commit
206562efa4
1 changed files with 2 additions and 2 deletions
|
|
@ -113,7 +113,7 @@ func NewQQChannel(cfg config.QQConfig, messageBus *bus.MessageBus) (*QQChannel,
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *QQChannel) Start(ctx context.Context) error {
|
func (c *QQChannel) Start(ctx context.Context) error {
|
||||||
if c.config.AppID == "" || c.config.AppSecret() == "" {
|
if c.config.AppID == "" || c.config.AppSecret.IsZero() {
|
||||||
return fmt.Errorf("QQ app_id and app_secret not configured")
|
return fmt.Errorf("QQ app_id and app_secret not configured")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ func (c *QQChannel) Start(ctx context.Context) error {
|
||||||
// create token source
|
// create token source
|
||||||
credentials := &token.QQBotCredentials{
|
credentials := &token.QQBotCredentials{
|
||||||
AppID: c.config.AppID,
|
AppID: c.config.AppID,
|
||||||
AppSecret: c.config.AppSecret(),
|
AppSecret: c.config.AppSecret.String(),
|
||||||
}
|
}
|
||||||
c.tokenSource = token.NewQQBotTokenSource(credentials)
|
c.tokenSource = token.NewQQBotTokenSource(credentials)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue