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

+ AuthBind中添加BindType

Browse Source 
- 合并函数GetAuthBindsByAuthID2
- User中的mobile与email改为可为null
This commit is contained in:
gazebo
2019-09-03 15:35:54 +08:00
parent 73c5656be2
commit dad8adc4bf
10 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/authz.go
View File

@@ -1,6 +1,7 @@
package cms
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/authz"
@@ -65,12 +66,12 @@ func TransferLegacyWeixins(mobile string) (err error) {
user := &model.User{
UserID2: v.Tel,
Name: v.NickName,
Mobile: v.Tel,
Mobile: &v.Tel,
Type: model.UserTypeStoreBoss,
Remark: remark4Transfer,
}
if user.Name == "" {
user.Name = user.Mobile
user.Name = utils.Pointer2String(user.Mobile)
}
userList, _, err2 := dao.GetUsers(db, 0, "", nil, "", v.Tel, 0, -1)
if err = err2; err != nil {

6
business/jxstore/cms/user2.go
View File

@@ -102,7 +102,7 @@ func init() {
}
func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDMobile, mobileVerifyCode)
mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, utils.Pointer2String(user.Mobile), auth2.UserIDMobile, mobileVerifyCode)
if err = err2; err == nil {
if !mobileAuth.IsUserEmpty() {
return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
@@ -133,7 +133,7 @@ func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, er
}
func CreateUser(user *model.User, creatorName string) (err error) {
if user == nil || user.UserID2 == "" || user.Name == "" || user.Mobile == "" {
if user == nil || user.UserID2 == "" || user.Name == "" || utils.Pointer2String(user.Mobile) == "" {
return ErrUserIDAndNameMustGiven
}
dao.WrapAddIDCULDEntity(user, creatorName)
@@ -165,7 +165,7 @@ func OnDingDingMsg(msg map[string]interface{}) (callbackResponse *dingdingapi.Ca
for _, userID := range msg[dingdingapi.KeyUserID].([]interface{}) {
userIDStr := utils.Interface2String(userID)
globals.SugarLogger.Debugf("OnDingDingMsg dingding user:%s left company", userIDStr)
if authBind, err = dao.GetAuthBind(db, "", dingding.AuthTypeStaff, userIDStr); err == nil { // 直接找到了
if authBind, err = dao.GetAuthBind(db, "", model.AuthBindTypeAuth, dingding.AuthTypeStaff, userIDStr); err == nil { // 直接找到了
globals.SugarLogger.Debugf("OnDingDingMsg dingding user:%s, userID:%s left company", userIDStr, authBind.UserID)
if err = DisableUser(jxcontext.AdminCtx, authBind.UserID); err != nil {
globals.SugarLogger.Errorf("OnDingDingMsg failed with error:%v", err)