use jsoniter instead of encoding/json

Sora233 · Aug 16, 2021 · 470791c · 470791c
1 parent 787abaa
commit 470791c
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 33 deletions.
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4
 	github.com/golang/protobuf v1.5.2
 	github.com/hashicorp/golang-lru v0.5.4
+	github.com/json-iterator/go v1.1.10
 	github.com/jupp0r/go-priority-queue v0.0.0-20160601094913-ab1073853bde
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/modern-go/gls v0.0.0-20190610040709-84558782a674

diff --git a/image_pool/lolicon_pool/persist.go b/image_pool/lolicon_pool/persist.go
@@ -1,11 +1,13 @@
 package lolicon_pool
 
 import (
-	"encoding/json"
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/tidwall/buntdb"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func (pool *LoliconPool) load() {
 	pool.cond.L.Lock()
 	defer pool.cond.L.Unlock()

diff --git a/lsp/bilibili/bilibili.go b/lsp/bilibili/bilibili.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/Sora233/DDBOT/requests"
+	jsoniter "github.com/json-iterator/go"
 	"strconv"
 	"strings"
 	"sync"
@@ -19,6 +20,8 @@ const (
 	PassportHost = "https://passport.bilibili.com"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 var BasePath = map[string]string{
 	PathRoomInit:               BaseLiveHost,
 	PathXSpaceAccInfo:          BaseHost,

diff --git a/lsp/bilibili/card_extension.go b/lsp/bilibili/card_extension.go
@@ -1,7 +1,6 @@
 package bilibili
 
 import (
-	"encoding/json"
 	"errors"
 )
 

diff --git a/lsp/bilibili/model.go b/lsp/bilibili/model.go
@@ -3,7 +3,6 @@ package bilibili
 import (
 	"crypto/md5"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Sora233/DDBOT/concern"

diff --git a/lsp/bilibili/stateManager.go b/lsp/bilibili/stateManager.go
@@ -1,7 +1,6 @@
 package bilibili
 
 import (
-	"encoding/json"
 	"errors"
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
 	"github.com/Sora233/DDBOT/lsp/concern_manager"

diff --git a/lsp/concern_manager/config.go b/lsp/concern_manager/config.go
@@ -1,7 +1,6 @@
 package concern_manager
 
 import (
-	"encoding/json"
 	"strings"
 )
 

diff --git a/lsp/concern_manager/config_filter.go b/lsp/concern_manager/config_filter.go
@@ -1,7 +1,6 @@
 package concern_manager
 
 import (
-	"encoding/json"
 	"errors"
 )
 

diff --git a/lsp/concern_manager/stateManager.go b/lsp/concern_manager/stateManager.go
@@ -9,13 +9,15 @@ import (
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
 	localutils "github.com/Sora233/DDBOT/utils"
 	"github.com/Sora233/sliceutil"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/sirupsen/logrus"
 	"github.com/tidwall/buntdb"
 	"strings"
 	"sync"
 	"time"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
 var logger = utils.GetModuleLogger("concern_manager")
 var ErrEmitQNotInit = errors.New("emit queue not enabled")
 

diff --git a/lsp/douyu/betard.go b/lsp/douyu/betard.go
@@ -2,7 +2,6 @@ package douyu
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/Sora233/DDBOT/proxy_pool"

diff --git a/lsp/douyu/douyu.go b/lsp/douyu/douyu.go
@@ -1,12 +1,17 @@
 package douyu
 
-import "strconv"
+import (
+	jsoniter "github.com/json-iterator/go"
+	"strconv"
+)
 
 const (
 	Site = "douyu"
 	Host = "https://www.douyu.com"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func DouyuPath(path string) string {
 	return Host + path
 }

diff --git a/lsp/douyu/model.go b/lsp/douyu/model.go
@@ -1,7 +1,6 @@
 package douyu
 
 import (
-	"encoding/json"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Sora233/DDBOT/concern"
 	"github.com/Sora233/DDBOT/proxy_pool"

diff --git a/lsp/douyu/stateManager.go b/lsp/douyu/stateManager.go
@@ -1,7 +1,6 @@
 package douyu
 
 import (
-	"encoding/json"
 	"errors"
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
 	"github.com/Sora233/DDBOT/lsp/concern_manager"

diff --git a/lsp/huya/concern.go b/lsp/huya/concern.go
@@ -7,11 +7,13 @@ import (
 	"github.com/Sora233/DDBOT/concern"
 	"github.com/Sora233/DDBOT/lsp/concern_manager"
 	localutils "github.com/Sora233/DDBOT/utils"
+	jsoniter "github.com/json-iterator/go"
 	"reflect"
 	"runtime"
 	"sync"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
 var logger = utils.GetModuleLogger("huya-concern")
 
 type EventType int64

diff --git a/lsp/huya/model.go b/lsp/huya/model.go
@@ -1,7 +1,6 @@
 package huya
 
 import (
-	"encoding/json"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Sora233/DDBOT/concern"
 	"github.com/Sora233/DDBOT/proxy_pool"

diff --git a/lsp/huya/stateManager.go b/lsp/huya/stateManager.go
@@ -1,7 +1,6 @@
 package huya
 
 import (
-	"encoding/json"
 	"errors"
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
 	"github.com/Sora233/DDBOT/lsp/concern_manager"

diff --git a/lsp/stateManager.go b/lsp/stateManager.go
@@ -25,6 +25,11 @@ type StateManager struct {
 	KeySet
 }
 
+//
+//func (s *StateManager) SaveGroupMessage(msg *message.GroupMessage) error {
+//
+//}
+
 func (s *StateManager) SaveMessageImageUrl(groupCode int64, messageID int32, msgs []message.IMessageElement) error {
 	imgs := utils.MessageFilter(msgs, func(e message.IMessageElement) bool {
 		return e.Type() == message.Image

diff --git a/lsp/youtube/model.go b/lsp/youtube/model.go
@@ -1,7 +1,6 @@
 package youtube
 
 import (
-	"encoding/json"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Sora233/DDBOT/concern"
 	"github.com/Sora233/DDBOT/proxy_pool"

diff --git a/lsp/youtube/stateManager.go b/lsp/youtube/stateManager.go
@@ -1,7 +1,6 @@
 package youtube
 
 import (
-	"encoding/json"
 	localdb "github.com/Sora233/DDBOT/lsp/buntdb"
 	"github.com/Sora233/DDBOT/lsp/concern_manager"
 	"github.com/tidwall/buntdb"

diff --git a/lsp/youtube/youtube.go b/lsp/youtube/youtube.go
@@ -1,8 +1,12 @@
 package youtube
 
+import jsoniter "github.com/json-iterator/go"
+
 const Site = "youtube"
 const VideoView = "https://www.youtube.com/watch?v="
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func VideoViewUrl(videoId string) string {
 	return VideoView + videoId
 }
diff --git a/utils/utils.go b/utils/utils.go
@@ -1,13 +1,13 @@
 package utils
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/Logiase/MiraiGo-Template/bot"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Sora233/requests"
 	"github.com/davecgh/go-spew/spew"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/sirupsen/logrus"
 	"net/url"
 	"os"
@@ -20,6 +20,7 @@ import (
 	"time"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
 var ErrGoCvNotSetUp = errors.New("gocv not setup")
 
 func FilePathWalkDir(root string) ([]string, error) {
@@ -234,24 +235,6 @@ func MsgToString(elements []message.IMessageElement) (res string) {
 	return
 }
 
-// CompareId 用_id的类型信息去转换number类型，并尝试比较
-func CompareId(number json.Number, _id interface{}) bool {
-	idType := reflect.TypeOf(_id)
-	switch idType.Kind() {
-	case reflect.Int64:
-		jid, err := number.Int64()
-		if err != nil {
-			panic(err)
-		}
-		return jid == _id.(int64)
-	case reflect.String:
-		jid := number.String()
-		return jid == _id.(string)
-	default:
-		return false
-	}
-}
-
 func Switch2Bool(_s string) bool {
 	return _s == "on"
 }