From 91facb54ce1cbd802da41a1525f161736302f302 Mon Sep 17 00:00:00 2001
From: Mrs4s <mrs4sxiaoshi@gmail.com>
Date: Sat, 11 Mar 2023 01:12:57 +0800
Subject: [PATCH] update dep

---
 cmd/gocq/login.go | 14 +++++++-------
 go.mod            |  2 +-
 go.sum            |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmd/gocq/login.go b/cmd/gocq/login.go
index 37da2cf..b2092eb 100644
--- a/cmd/gocq/login.go
+++ b/cmd/gocq/login.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/Mrs4s/MiraiGo/warpper"
+	"github.com/Mrs4s/MiraiGo/wrapper"
 	"github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -28,7 +28,7 @@ import (
 var console = bufio.NewReader(os.Stdin)
 
 func init() {
-	warpper.DandelionEnergy = energy
+	wrapper.DandelionEnergy = energy
 }
 
 func readLine() (str string) {
@@ -273,22 +273,22 @@ func fetchCaptcha(id string) string {
 	return ""
 }
 
-func energy(id string, salt []byte) []byte {
+func energy(uin uint64, id string, salt []byte) ([]byte, error) {
 	// temporary solution
 	response, err := download.Request{
 		Method: http.MethodPost,
 		URL:    "https://captcha.go-cqhttp.org/sdk/dandelion/energy",
 		Header: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
-		Body:   bytes.NewReader([]byte(fmt.Sprintf("id=%s&salt=%s", id, hex.EncodeToString(salt)))),
+		Body:   bytes.NewReader([]byte(fmt.Sprintf("uin=%v&id=%s&salt=%s", uin, id, hex.EncodeToString(salt)))),
 	}.Bytes()
 	if err != nil {
 		log.Errorf("获取T544时出现问题: %v", err)
-		return nil
+		return nil, err
 	}
 	sign, err := hex.DecodeString(gjson.GetBytes(response, "result").String())
 	if err != nil {
 		log.Errorf("获取T544时出现问题: %v", err)
-		return nil
+		return nil, err
 	}
-	return sign
+	return sign, nil
 }
diff --git a/go.mod b/go.mod
index 04dc562..b8e9817 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/FloatTech/sqlite v1.5.7
 	github.com/Microsoft/go-winio v0.6.0
-	github.com/Mrs4s/MiraiGo v0.0.0-20230305102225-a42218b851d8
+	github.com/Mrs4s/MiraiGo v0.0.0-20230310170800-80b6b2843637
 	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc
 	github.com/fumiama/go-base16384 v1.6.1
diff --git a/go.sum b/go.sum
index 08784a8..fb4dc14 100644
--- a/go.sum
+++ b/go.sum
@@ -4,8 +4,8 @@ github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJG
 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
 github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
 github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
-github.com/Mrs4s/MiraiGo v0.0.0-20230305102225-a42218b851d8 h1:0RMPpAHY5W5rdDVRtrc5nWtDCnmrR5E9L6wi9y1uhAc=
-github.com/Mrs4s/MiraiGo v0.0.0-20230305102225-a42218b851d8/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
+github.com/Mrs4s/MiraiGo v0.0.0-20230310170800-80b6b2843637 h1:6Gmc1Y4LLhLFaniN6QbYelXOANOuXwlknmT6+ao7BZw=
+github.com/Mrs4s/MiraiGo v0.0.0-20230310170800-80b6b2843637/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
 github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d h1:/Xuj3fIiMY2ls1TwvPKmaqQrtJsPY+c9s+0lOScVHd8=
 github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
 github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=