From 0081e69728220bad700e58c11a365611d1ba9664 Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 7 Dec 2022 13:49:58 +0900 Subject: [PATCH] fix read config error :bug: --- bootstrap/bootstrap.go | 2 +- config/config.yaml.example | 2 +- go.mod | 1 + go.sum | 2 ++ handler/group_msg_handler.go | 7 ++++--- handler/handler.go | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go index 4dbcc2f..bbd3a5f 100644 --- a/bootstrap/bootstrap.go +++ b/bootstrap/bootstrap.go @@ -2,8 +2,8 @@ package bootstrap import ( "github.com/eatmoreapple/openwechat" + log "github.com/sirupsen/logrus" "github.com/wechatgpt/wechatbot/handler" - "log" ) func Run() { diff --git a/config/config.yaml.example b/config/config.yaml.example index 85a9e81..dd6e523 100644 --- a/config/config.yaml.example +++ b/config/config.yaml.example @@ -1,3 +1,3 @@ chatgpt: - keyword: @chatgpt + keyword: chatgpt token: your token \ No newline at end of file diff --git a/go.mod b/go.mod index 51e3506..1532bab 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,6 @@ go 1.16 require ( github.com/eatmoreapple/openwechat v1.2.1 + github.com/sirupsen/logrus v1.6.0 github.com/spf13/viper v1.14.0 ) diff --git a/go.sum b/go.sum index ed26aeb..0789268 100644 --- a/go.sum +++ b/go.sum @@ -400,6 +400,7 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -485,6 +486,7 @@ github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= diff --git a/handler/group_msg_handler.go b/handler/group_msg_handler.go index 1725fb4..db0fde5 100644 --- a/handler/group_msg_handler.go +++ b/handler/group_msg_handler.go @@ -37,10 +37,11 @@ func (gmh *GroupMessageHandler) ReplyText(msg *openwechat.Message) error { return errors.New("can not get appConfig file,please check") } - if !strings.Contains(msg.Content, appConfig.ChatGpt.Keyword) { + keyword := appConfig.ChatGpt.Keyword + if !strings.Contains(msg.Content, keyword) { return nil } - splitItems := strings.Split(msg.Content, appConfig.ChatGpt.Keyword) + splitItems := strings.Split(msg.Content, keyword) if len(splitItems) < 2 { return nil } @@ -52,7 +53,7 @@ func (gmh *GroupMessageHandler) ReplyText(msg *openwechat.Message) error { if err != nil { return err } - fmt.Println(text) + log.Println(text) return err } diff --git a/handler/handler.go b/handler/handler.go index 9813378..37954eb 100644 --- a/handler/handler.go +++ b/handler/handler.go @@ -2,7 +2,7 @@ package handler import ( "github.com/eatmoreapple/openwechat" - "github.com/prometheus/common/log" + log "github.com/sirupsen/logrus" ) type MessageHandlerInterface interface {