From c4ca75868229186baf6eefd4231168935e1ed6f1 Mon Sep 17 00:00:00 2001 From: lixiangwuxian Date: Sun, 13 Oct 2024 04:53:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84ssid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/scoresaber/bind_ss.go | 10 ++-------- service/scoresaber/get_ssid.go | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 service/scoresaber/get_ssid.go diff --git a/service/scoresaber/bind_ss.go b/service/scoresaber/bind_ss.go index 7cce51b..7694ac7 100644 --- a/service/scoresaber/bind_ss.go +++ b/service/scoresaber/bind_ss.go @@ -291,15 +291,9 @@ func (ss *ssQuery) GetRecentScores(count int, qqId string) ([]RecordDataLite, er } defer tx.Rollback() - // 查询绑定的 ssId - var ssId string - err = tx.Get(&ssId, "SELECT ssid FROM ssBind WHERE qqid = ?", qqId) + ssId, err := getSSID(qqId) if err != nil { - if err == sql.ErrNoRows { - return nil, errors.New("未绑定ss账号,输入\"绑定ss [ssId]\"绑定") - } - log.Println("查询 ssId 出错:", err) - return nil, errors.New("查询 ssId 失败") + return nil, err } // 查询记录 diff --git a/service/scoresaber/get_ssid.go b/service/scoresaber/get_ssid.go new file mode 100644 index 0000000..e9cf7fd --- /dev/null +++ b/service/scoresaber/get_ssid.go @@ -0,0 +1,27 @@ +package scoresaber + +import ( + "database/sql" + "errors" + "log" + + "git.lxtend.com/qqbot/sqlite3" +) + +func getSSID(qqId string) (ssId string, err error) { + + db := sqlite3.GetDB() // 假设 sqlite3.GetDB() 返回 *sqlx.DB + if err != nil { + log.Print(err) + return "", errors.New("数据库连接失败,请稍后重试") + } + err = db.Get(&ssId, "SELECT ssid FROM ssBind WHERE qqid = ?", qqId) + if err != nil { + if err == sql.ErrNoRows { + return "", errors.New("未绑定ss账号,输入\"绑定ss [ssId]\"绑定") + } + log.Println("查询 ssId 出错:", err) + return "", errors.New("查询 ssId 失败") + } + return ssId, nil +}