Skip to content

Commit ec081f1

Browse files
author
CJ
committed
Fix application query bug: AppID is actually app.name
1 parent 818d6ef commit ec081f1

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

datatype/request/user.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package request
22

33
import (
4-
"github.com/MuShare/pluto/utils/general"
54
"strings"
5+
6+
"github.com/MuShare/pluto/utils/general"
67
)
78

89
const (
@@ -74,7 +75,9 @@ func (gml *GoogleMobileLogin) Validation() bool {
7475
type WechatMobileLogin struct {
7576
Code string `json:"code"`
7677
DeviceID string `json:"device_id"`
77-
AppID string `json:"app_id"`
78+
79+
// NOTE(cj): 这里的 id 其实是目前的 app.name
80+
AppID string `json:"app_id"`
7881
}
7982

8083
func (wml *WechatMobileLogin) Validation() bool {
@@ -97,7 +100,9 @@ func (wml *WechatMobileLogin) Validation() bool {
97100
type AppleMobileLogin struct {
98101
Code string `json:"code"`
99102
DeviceID string `json:"device_id"`
100-
AppID string `json:"app_id"`
103+
104+
// NOTE(cj): 这里的 id 其实是目前的 app.name
105+
AppID string `json:"app_id"`
101106
}
102107

103108
func (aml *AppleMobileLogin) Validation() bool {

manage/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func NewManager(db *sql.DB, config *config.Config, logger *plog.PlutoLog) (*Mana
182182
}
183183

184184
func getAppAppleLogin(m *Manager, appID string) (*modelexts.AppleLogin, *perror.PlutoError) {
185-
app, err := models.Applications(qm.Where("id = ?", appID)).One(m.db)
185+
app, err := models.Applications(qm.Where("name = ?", appID)).One(m.db)
186186

187187
if err != nil && err != sql.ErrNoRows {
188188
return nil, perror.ServerError.Wrapper(err)
@@ -203,7 +203,7 @@ func getAppAppleLogin(m *Manager, appID string) (*modelexts.AppleLogin, *perror.
203203
}
204204

205205
func getAppWechatLogin(m *Manager, appID string) (*modelexts.WechatLogin, *perror.PlutoError) {
206-
app, err := models.Applications(qm.Where("id = ?", appID)).One(m.db)
206+
app, err := models.Applications(qm.Where("name = ?", appID)).One(m.db)
207207

208208
if err != nil && err != sql.ErrNoRows {
209209
return nil, perror.ServerError.Wrapper(err)

0 commit comments

Comments
 (0)