wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feat-20240109-001-Robin' (#56) from feat-20240109-001-Robin into main 

Reviewed-on: #56
This commit is contained in:
chenhao 2024-01-12 20:46:10 +08:00
parent f176544e33 ad07404137
commit 15e2a33218
11 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/errcode/errcode.go
View File

@ -36,8 +36,10 @@ var ErrCodeMsgMap = map[ErrCode]string{
ErrCodeLoginRegisterUserFail: "账号注册失败，请稍后重试",
ErrCodeLoginWrongOldPswd: "旧密码错误",
ErrCodeAccountSrvFail: "账户服务错误",
ErrCodeAccountNotExist: "账户信息不存在",
ErrCodeAccountSrvFail: "账户服务错误",
ErrCodeAccountNotExist: "账户信息不存在",
ErrCodeAccountInviterNotExist: "邀请人不存在",
ErrCodeAccountInviterIsNotAStreamer: "邀请人非主播",
ErrCodeVasSrvFail: "增值服务错误",
ErrCodeVasProductNotExist: "商品不存在",
@ -188,9 +190,11 @@ const (
ErrCodeLoginWrongOldPswd ErrCode = -5011 //旧密码错误
// Account: 6xxx
ErrCodeAccountSrvOk ErrCode = ErrCodeOk
ErrCodeAccountSrvFail ErrCode = -6001 //账户服务错误
ErrCodeAccountNotExist ErrCode = -6002 //账户信息不存在
ErrCodeAccountSrvOk ErrCode = ErrCodeOk
ErrCodeAccountSrvFail ErrCode = -6001 //账户服务错误
ErrCodeAccountNotExist ErrCode = -6002 //账户信息不存在
ErrCodeAccountInviterNotExist ErrCode = -6003 //邀请人不存在,
ErrCodeAccountInviterIsNotAStreamer ErrCode = -6004 //邀请人非主播,
// Vas: 7xxx
ErrCodeVasSrvOk ErrCode = ErrCodeOk

1
api/proto/login/proto/login_api.go
View File

@ -75,6 +75,7 @@ type ApiLoginByVeriCodeReq struct {
base.BaseRequest
MobilePhoneInfoComponent `jcrypto:"true"`
VeriCodeComponent
Inviter *int64 `json:"inviter"`
}
type ApiLoginData struct {

1
api/proto/login/proto/login_op.go
View File

@ -75,6 +75,7 @@ type OpLoginByVeriCodeReq struct {
base.BaseRequest
MobilePhoneInfoComponent `jcrypto:"true"`
VeriCodeComponent
Inviter *int64 `json:"inviter"`
}
type OpLoginData struct {

2
app/mix/service/apiservice.go
View File

@ -123,7 +123,7 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB
// 2.如果错误码是登录信息不存在，则判断为首次登录，将创建用户信息
if ec == errcode.ErrCodeLoginNotExist {
login, account, ec = s.utilRegisterUser(ctx, &req.MobilePhoneInfoComponent)
login, account, ec = s.utilRegisterUser(ctx, &req.MobilePhoneInfoComponent, req.Inviter)
if ec != errcode.ErrCodeLoginSrvOk {
logger.Error("utilRegisterUser failed")
ec = errcode.ErrCodeLoginRegisterUserFail

2
app/mix/service/apiservice_business_validation.go
View File

@ -112,7 +112,7 @@ func (s *Service) ApiLoginByVeriCodeBusinessValidate(ctx *gin.Context, req *logi
account, _ = resultList[2].(*dbstruct.Account)
vericode, _ = resultList[3].(*dbstruct.VeriCode)
} else {
logger.Error("ApiLoginByPswd business validation failed!")
logger.Error("ApiLoginByVeriCode business validation failed!")
return
}
return

1
app/mix/service/opservice_business_validation.go
View File

@ -112,6 +112,7 @@ func (s *Service) OpLoginByVeriCodeBusinessValidate(ctx *gin.Context, req *login
// 2.如果错误码是登录信息不存在，则判断为首次登录，将创建用户信息
if ec == errcode.ErrCodeLoginNotExist {
vericode, _ = resultList[3].(*dbstruct.VeriCode)
return
} else if ec == errcode.ErrCodeLoginSrvOk {
login, _ = resultList[1].(*dbstruct.Login)

2
app/mix/service/service.go
View File

@ -524,7 +524,7 @@ func (s *Service) OpLoginByVeriCode(ctx *gin.Context, req *loginproto.OpLoginByV
// 2.如果错误码是登录信息不存在，则判断为首次登录，将创建用户信息
if ec == errcode.ErrCodeLoginNotExist {
login, account, ec = s.utilRegisterUser(ctx, &req.MobilePhoneInfoComponent)
login, account, ec = s.utilRegisterUser(ctx, &req.MobilePhoneInfoComponent, req.Inviter)
if ec != errcode.ErrCodeLoginSrvOk {
logger.Error("utilRegisterUser failed")
ec = errcode.ErrCodeLoginRegisterUserFail

21
app/mix/service/utilservice.go
View File

@ -2,6 +2,7 @@ package service
import (
"fmt"
"service/api/consts"
"service/api/errcode"
accountproto "service/api/proto/account/proto"
contact_customer_service_sessionproto "service/api/proto/contact_customer_service_session/proto"
@ -19,11 +20,26 @@ import (
// 不向外暴露的辅助公共函数
// 注册账户
func (s *Service) utilRegisterUser(ctx *gin.Context, req *loginproto.MobilePhoneInfoComponent) (login *dbstruct.Login, account *dbstruct.Account, ec errcode.ErrCode) {
func (s *Service) utilRegisterUser(ctx *gin.Context, req *loginproto.MobilePhoneInfoComponent, inviter *int64) (login *dbstruct.Login, account *dbstruct.Account, ec errcode.ErrCode) {
var err error
inviterUserId := int64(0)
ec = errcode.ErrCodeLoginSrvOk
//判断邀请人是否是主播
if inviter != nil {
account, err := _DefaultAccount.OpListByUserId(ctx, &accountproto.OpListByUserIdReq{
UserId: inviter,
})
if err != nil || account == nil {
logger.Error("inviter does not exist: err:%v", err)
} else if util.DerefInt64(account.Role) != consts.Streamer {
logger.Error("inviter is not a streamer")
} else {
inviterUserId = util.DerefInt64(inviter)
}
}
// 使用发号器发放一个user_id
userIdSeq, err := _DefaultUserId.OpGetNextNormalUserId(ctx)
if err != nil {
@ -44,6 +60,9 @@ func (s *Service) utilRegisterUser(ctx *gin.Context, req *loginproto.MobilePhone
account.MobilePhone = goproto.String(req.MobilePhone)
account.RegionCode = goproto.String(req.RegionCode)
account.PhoneHash = goproto.String(req.PhoneHash)
if inviterUserId != 0 {
account.Inviter = goproto.Int64(inviterUserId)
}
// 创建账户，生成mid
err = _DefaultAccount.OpCreate(ctx, &accountproto.OpCreateReq{

1
dbstruct/account.go
View File

@ -20,6 +20,7 @@ type Account struct {
IsDndModeEnabled *int64 `json:"is_dnd_mode_enabled" bson:"is_dnd_mode_enabled"` // 是否开启勿扰模式
GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量
DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量
Inviter *int64 `json:"inviter" bson:"inviter"` // 邀请人user_id
Latitude *float64 `bson:"latitude"` // 纬度
Longitude *float64 `bson:"longitude"` // 经度
Ct *int64 `json:"ct" bson:"ct"` // 创建时间

3
library/mycrypto/aesCrypto.go
View File

@ -39,6 +39,9 @@ func (aesCrypto *AesCrypto) Encrypt(msg []byte) (encryptedBytes []byte, err erro
}
func (aesCrypto *AesCrypto) Decrypt(encryptedBytes []byte) (decryptedBytes []byte, err error) {
if len(encryptedBytes) == 0 {
return
}
//CBC解密
block, _ := aes.NewCipher(aesCrypto.aesPriKey) // 分组秘钥
blockSize := block.BlockSize() // 获取秘钥块的长度

3
library/mycrypto/rsaCrypto.go
View File

@ -39,6 +39,9 @@ func (rsaCrypto *RsaCrypto) Encrypt(msg []byte) (encryptedBytes []byte, err erro
}
func (rsaCrypto *RsaCrypto) Decrypt(encryptedBytes []byte) (decryptedBytes []byte, err error) {
if len(encryptedBytes) == 0 {
return
}
//私钥解密
decryptedBytes, err = rsa.DecryptPKCS1v15(rand.Reader, rsaCrypto.rsaPriKey, encryptedBytes)
if err != nil {