liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 注释掉老user与auth相关的代码

Browse Source
This commit is contained in:
gazebo
2019-09-24 16:39:50 +08:00
parent 72c9889d10
commit 412b11396a
18 changed files with 1172 additions and 1442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxutils/jxcontext/jxcontext.go
View File

@@ -5,9 +5,7 @@ import (
"net/http"
"git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/jxcallback/auth"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
)
@@ -63,11 +61,13 @@ func New(notUsed interface{}, token string, w http.ResponseWriter, r *http.Reque
}
}
} else {
userInfo, err2 := auth.GetUserInfo(token)
if err = err2; err == nil {
// globals.SugarLogger.Debugf("jxcontext New, V1 authInfo:%s", utils.Format4Output(userInfo, true))
ctx.userInfo = userInfo
}
globals.SugarLogger.Warnf("jxcontext wrong token:%s", token)
errCode = model.ErrCodeTokenIsInvalid
// userInfo, err2 := auth.GetUserInfo(token)
// if err = err2; err == nil {
// // globals.SugarLogger.Debugf("jxcontext New, V1 authInfo:%s", utils.Format4Output(userInfo, true))
// ctx.userInfo = userInfo
// }
}
if err == model.ErrTokenIsInvalid {
if !globals.IsProductEnv() {
@@ -142,14 +142,6 @@ func (ctx *Context) GetMobileAndUserID() (mobile, userID string) {
}
}
} else {
userInfo, err2 := auth.GetUserInfo(token)
if err2 == nil {
if mobile = userInfo.GetAuthID(); mobile != "" {
if user, err := dao.GetUserByID(dao.GetDB(), "mobile", mobile); err == nil {
userID = user.UserID
}
}
}
}
return mobile, userID
}

14
business/jxutils/jxutils.go
View File

@@ -448,13 +448,13 @@ func HandleUserWXRemark(db *dao.DaoDB, mobile string, mobileIsUerID bool) (err e
storeID := 0
remark := ""
if !globals.DisableWXAuth1 {
wxinfo, err := dao.GetUserStoreInfo(db, "tel", mobile)
if err == nil {
openIDs = []string{wxinfo.OpenID}
storeID = wxinfo.JxStoreID
}
}
// if !globals.DisableWXAuth1 {
// wxinfo, err := dao.GetUserStoreInfo(db, "tel", mobile)
// if err == nil {
// openIDs = []string{wxinfo.OpenID}
// storeID = wxinfo.JxStoreID
// }
// }
if globals.EnableWXAuth2 {
userID := ""
if mobileIsUerID {

54
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -89,33 +89,33 @@ var (
func GetWeixinOpenIDsFromStoreID(storeID int) (retVal []string) {
db := dao.GetDB()
openIDMap := make(map[string]int)
if !globals.DisableWXAuth1 {
var openIDList []string
sql := `
SELECT openid
FROM weixins t1
JOIN
(SELECT id
FROM weixins
WHERE jxstoreid = ? AND parentid = -1) t2 ON t2.id = t1.parentid
WHERE openid IS NOT NULL
UNION
SELECT openid
FROM weixins
WHERE jxstoreid = ? AND parentid = -1 AND openid IS NOT NULL`
sqlParams := []interface{}{
storeID,
storeID,
}
err := dao.GetRows(db, &openIDList, sql, sqlParams...)
if err != nil || len(openIDList) == 0 {
globals.SugarLogger.Infof("GetWeixinOpenIDsFromStoreID can not find openid for store:%d, num:%d, error:%v", storeID, len(openIDList), err)
return retVal
}
for _, v := range openIDList {
openIDMap[v] = 1
}
}
// if !globals.DisableWXAuth1 {
// var openIDList []string
// sql := `
// SELECT openid
// FROM weixins t1
// JOIN
// (SELECT id
// FROM weixins
// WHERE jxstoreid = ? AND parentid = -1) t2 ON t2.id = t1.parentid
// WHERE openid IS NOT NULL
// UNION
// SELECT openid
// FROM weixins
// WHERE jxstoreid = ? AND parentid = -1 AND openid IS NOT NULL`
// sqlParams := []interface{}{
// storeID,
// storeID,
// }
// err := dao.GetRows(db, &openIDList, sql, sqlParams...)
// if err != nil || len(openIDList) == 0 {
// globals.SugarLogger.Infof("GetWeixinOpenIDsFromStoreID can not find openid for store:%d, num:%d, error:%v", storeID, len(openIDList), err)
// return retVal
// }
// for _, v := range openIDList {
// openIDMap[v] = 1
// }
// }
if globals.EnableWXAuth2 {
if userIDList, err2 := api2.RoleMan.GetRoleUserList(autils.NewStoreBossRole(storeID)); err2 == nil {
for _, v := range userIDList {