Merge branch 'xjjdev' into dev
This commit is contained in:
commit
2d26f15400
@ -16,4 +16,4 @@ COPY ./conf/ ./conf/
|
|||||||
WORKDIR /app/main-client/bin
|
WORKDIR /app/main-client/bin
|
||||||
|
|
||||||
# 在容器启动时输出环境变量BUILD_DATE的值
|
# 在容器启动时输出环境变量BUILD_DATE的值
|
||||||
CMD ["./mainServer"]
|
CMD ["./mainServer"]
|
||||||
|
@ -24,21 +24,20 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func RegisterUser(req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.RegisterUserRespond, err error) {
|
func RegisterUser(req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.RegisterUserRespond, err error) {
|
||||||
|
var user = model.User{
|
||||||
// var user = model.User{
|
MgmtAccId: req.MgmtAccId,
|
||||||
// MgmtAccId: req.MgmtAccId,
|
TelNum: req.TelNum,
|
||||||
// TelNum: req.TelNum,
|
MgmtArtistId: req.MgmtArtistId,
|
||||||
// MgmtArtistId: req.MgmtArtistId,
|
MgmtArtistUid: req.MgmtArtistUid,
|
||||||
// MgmtArtistUid: req.MgmtArtistUid,
|
InviteCode: req.UserInviteCode,
|
||||||
// InviteCode: req.UserInviteCode,
|
Account: req.Account,
|
||||||
// Account: req.Account,
|
}
|
||||||
// }
|
zap.L().Debug(fmt.Sprintf("RegisterUser--user: %+v", user))
|
||||||
// zap.L().Debug(fmt.Sprintf("RegisterUser--user: %+v", user))
|
if err = db.DB.Create(&user).Error; err != nil {
|
||||||
// if err = db.DB.Create(&user).Error; err != nil {
|
zap.L().Error("register user err", zap.Error(err))
|
||||||
// zap.L().Error("register user err", zap.Error(err))
|
err = errors.New(m.ERROR_SELECT)
|
||||||
// err = errors.New(m.ERROR_SELECT)
|
return nil, err
|
||||||
// return nil, err
|
}
|
||||||
// }
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user