|
@@ -2,15 +2,12 @@ package service |
|
|
|
|
|
|
|
|
import ( |
|
|
import ( |
|
|
"context" |
|
|
"context" |
|
|
"errors" |
|
|
|
|
|
"gim/internal/business/comm/db" |
|
|
|
|
|
"gim/internal/business/domain/user/model" |
|
|
"gim/internal/business/domain/user/model" |
|
|
"gim/internal/business/domain/user/repo" |
|
|
"gim/internal/business/domain/user/repo" |
|
|
"gim/pkg/gerrors" |
|
|
"gim/pkg/gerrors" |
|
|
"gim/pkg/pb" |
|
|
"gim/pkg/pb" |
|
|
"gim/pkg/rpc" |
|
|
"gim/pkg/rpc" |
|
|
"gim/pkg/util" |
|
|
"gim/pkg/util" |
|
|
"strconv" |
|
|
|
|
|
"time" |
|
|
"time" |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
@@ -61,23 +58,23 @@ func (*authService) SignIn(ctx context.Context, phoneNumber, code string, master |
|
|
return false, 0, "", 0, err |
|
|
return false, 0, "", 0, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if pushAlia != "" { |
|
|
|
|
|
userPushForJg, err := db.DbUserPushForJg.UserPushForJgGetOne(strconv.FormatInt(user.Id, 10), masterId) |
|
|
|
|
|
if err != nil && err.Error() != "record not found" { |
|
|
|
|
|
return false, 0, "", 0, err |
|
|
|
|
|
} |
|
|
|
|
|
if userPushForJg == nil { |
|
|
|
|
|
save := db.DbUserPushForJg.UserPushForJgInsert(user.Id, masterId, pushAlia) |
|
|
|
|
|
if !save { |
|
|
|
|
|
return false, 0, "", 0, errors.New("插入user_push_for_jg记录失败") |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
update := db.DbUserPushForJg.UserPushForJgUpdate(user.Id, masterId, pushAlia) |
|
|
|
|
|
if !update { |
|
|
|
|
|
return false, 0, "", 0, errors.New("修改user_push_for_jg记录失败") |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//if pushAlia != "" { |
|
|
|
|
|
// userPushForJg, err := db.DbUserPushForJg.UserPushForJgGetOne(strconv.FormatInt(user.Id, 10), masterId) |
|
|
|
|
|
// if err != nil && err.Error() != "record not found" { |
|
|
|
|
|
// return false, 0, "", 0, err |
|
|
|
|
|
// } |
|
|
|
|
|
// if userPushForJg == nil { |
|
|
|
|
|
// save := db.DbUserPushForJg.UserPushForJgInsert(user.Id, masterId, pushAlia) |
|
|
|
|
|
// if !save { |
|
|
|
|
|
// return false, 0, "", 0, errors.New("插入user_push_for_jg记录失败") |
|
|
|
|
|
// } |
|
|
|
|
|
// } else { |
|
|
|
|
|
// update := db.DbUserPushForJg.UserPushForJgUpdate(user.Id, masterId, pushAlia) |
|
|
|
|
|
// if !update { |
|
|
|
|
|
// return false, 0, "", 0, errors.New("修改user_push_for_jg记录失败") |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
|
|
|
//} |
|
|
return isNew, user.Id, token, masterId, nil |
|
|
return isNew, user.Id, token, masterId, nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|