fix: analusis create user isset
CI / changes (push) Successful in 1m31s
CI / ad (push) Successful in 0s
CI / admin (push) Successful in 0s
CI / aiserver (push) Successful in 0s
CI / analysis (push) Successful in 0s
CI / bff (push) Successful in 0s
CI / chore (push) Successful in 0s
CI / equipment (push) Successful in 0s
CI / express (push) Successful in 1s
CI / factory (push) Successful in 0s
CI / message (push) Successful in 0s
CI / order (push) Successful in 0s
CI / payment (push) Successful in 0s
CI / percutaneous (push) Successful in 0s
CI / product (push) Successful in 0s
CI / record (push) Successful in 0s
CI / sale (push) Successful in 0s
CI / store (push) Successful in 1s
CI / support (push) Successful in 0s
CI / task (push) Successful in 0s
CI / user (push) Successful in 32s
CI / water (push) Successful in 0s
CI / wecom (push) Successful in 1s
CI / ws (push) Successful in 0s
CI / changes (push) Successful in 1m31s
CI / ad (push) Successful in 0s
CI / admin (push) Successful in 0s
CI / aiserver (push) Successful in 0s
CI / analysis (push) Successful in 0s
CI / bff (push) Successful in 0s
CI / chore (push) Successful in 0s
CI / equipment (push) Successful in 0s
CI / express (push) Successful in 1s
CI / factory (push) Successful in 0s
CI / message (push) Successful in 0s
CI / order (push) Successful in 0s
CI / payment (push) Successful in 0s
CI / percutaneous (push) Successful in 0s
CI / product (push) Successful in 0s
CI / record (push) Successful in 0s
CI / sale (push) Successful in 0s
CI / store (push) Successful in 1s
CI / support (push) Successful in 0s
CI / task (push) Successful in 0s
CI / user (push) Successful in 32s
CI / water (push) Successful in 0s
CI / wecom (push) Successful in 1s
CI / ws (push) Successful in 0s
This commit is contained in:
@@ -248,7 +248,6 @@ func issueLoginToken(ctx context.Context, jwtAuth *config.JWTAuth, row *dao.User
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// C 端多小程序共用同一 token:已登录则续期并更新会话;门店/销售仍发新 token
|
|
||||||
if renewed, ok := tryRenewUserLogin(jwtAuth, session, client); ok {
|
if renewed, ok := tryRenewUserLogin(jwtAuth, session, client); ok {
|
||||||
return renewed, nil
|
return renewed, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ func ensureClientBizUser(ctx context.Context, svcCtx *svc.ServiceContext, userId
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
bizId, err := createBizUser(ctx, svcCtx, clientCode)
|
bizId, err := createBizUser(ctx, svcCtx, userId, clientCode)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -49,26 +49,42 @@ func ensureClientBizUser(ctx context.Context, svcCtx *svc.ServiceContext, userId
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func createBizUser(ctx context.Context, svcCtx *svc.ServiceContext, serviceKey string) (int64, error) {
|
func createBizUser(ctx context.Context, svcCtx *svc.ServiceContext, userId int64, serviceKey string) (int64, error) {
|
||||||
switch serviceKey {
|
switch serviceKey {
|
||||||
case "user_skin":
|
case "user_skin":
|
||||||
return createAnalysisBizUser(ctx, svcCtx.AnalysisSvcName)
|
return createAnalysisBizUser(ctx, svcCtx.AnalysisSvcName, userId)
|
||||||
default:
|
default:
|
||||||
return utils.NumberZero, nil
|
return utils.NumberZero, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func createAnalysisBizUser(ctx context.Context, svcName string) (int64, error) {
|
func createAnalysisBizUser(ctx context.Context, svcName string, userId int64) (int64, error) {
|
||||||
cli, err := svc.GetRpcClient(svcName)
|
cli, err := svc.GetRpcClient(svcName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return utils.NumberZero, err
|
return utils.NumberZero, err
|
||||||
}
|
}
|
||||||
res, err := analysispb.NewAnalysisClient(cli.Conn()).InternalCreateUser(ctx, &analysispb.InternalCreateUserReq{})
|
client := analysispb.NewAnalysisClient(cli.Conn())
|
||||||
|
res, err := client.InternalCreateUser(ctx, &analysispb.InternalCreateUserReq{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return utils.NumberZero, err
|
return utils.NumberZero, err
|
||||||
}
|
}
|
||||||
if res == nil || res.Id < utils.NumberOne {
|
if res == nil || res.Id < utils.NumberOne {
|
||||||
return utils.NumberZero, status.Error(codes.Internal, "analysis create user empty id")
|
return utils.NumberZero, status.Error(codes.Internal, "analysis create user empty id")
|
||||||
}
|
}
|
||||||
return res.Id, nil
|
bizId := res.Id
|
||||||
|
var userRow dao.UserRow
|
||||||
|
err = model.UserModel{}.Init().GetOne(modelbase.Params{
|
||||||
|
Eq: map[string]string{"id": strconv.FormatInt(userId, utils.NumberTen)},
|
||||||
|
}, &userRow)
|
||||||
|
if err != nil {
|
||||||
|
return utils.NumberZero, err
|
||||||
|
}
|
||||||
|
if userRow.Mobile != utils.StringEmpty {
|
||||||
|
if _, err := client.InternalSetRegistered(ctx, &analysispb.InternalSetRegisteredReq{
|
||||||
|
Id: bizId,
|
||||||
|
}); err != nil {
|
||||||
|
return utils.NumberZero, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bizId, nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user