修改
This commit is contained in:
parent
70348b930d
commit
6808771732
File diff suppressed because it is too large
Load Diff
@ -47,7 +47,7 @@ service Account {
|
||||
rpc Remove (RemoveRequest) returns (RemoveResponse) {}
|
||||
rpc Update (UpdateRequest) returns (UpdateResponse) {}
|
||||
rpc UsersByTel (UsersByTelRequest) returns (ListResponse) {}
|
||||
rpc UserByTel (UserByTelRequest) returns (InfoResponse) {}
|
||||
rpc UserByTel (UserByTelRequest) returns (UserInfoResponse) {}
|
||||
rpc OnlySendMsg (SendMsgRequest) returns (SendMsgStatusResponse) {} //仅发验证码
|
||||
rpc OnlyCheckMsg (CheckMsgRequest) returns (SendMsgStatusResponse) {}//仅校验之前发送的验证码
|
||||
rpc MailAccountByNickName(MailAccountByNickNameRequest) returns(MaiAccountResponse){} //根据昵称姓名获取昵称的邮箱和拼音名称
|
||||
@ -154,6 +154,7 @@ message UserInfoResponse{
|
||||
string attachment = 11;
|
||||
string subNum = 12;
|
||||
string notPassRemarks = 13;
|
||||
string domain = 14;
|
||||
}
|
||||
message RealNameResponse{
|
||||
uint64 id = 1;
|
||||
|
@ -53,7 +53,7 @@ type AccountClient interface {
|
||||
Remove(ctx context.Context, in *RemoveRequest, opts ...grpc_go.CallOption) (*RemoveResponse, common.ErrorWithAttachment)
|
||||
Update(ctx context.Context, in *UpdateRequest, opts ...grpc_go.CallOption) (*UpdateResponse, common.ErrorWithAttachment)
|
||||
UsersByTel(ctx context.Context, in *UsersByTelRequest, opts ...grpc_go.CallOption) (*ListResponse, common.ErrorWithAttachment)
|
||||
UserByTel(ctx context.Context, in *UserByTelRequest, opts ...grpc_go.CallOption) (*InfoResponse, common.ErrorWithAttachment)
|
||||
UserByTel(ctx context.Context, in *UserByTelRequest, opts ...grpc_go.CallOption) (*UserInfoResponse, common.ErrorWithAttachment)
|
||||
OnlySendMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
|
||||
OnlyCheckMsg(ctx context.Context, in *CheckMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
|
||||
MailAccountByNickName(ctx context.Context, in *MailAccountByNickNameRequest, opts ...grpc_go.CallOption) (*MaiAccountResponse, common.ErrorWithAttachment)
|
||||
@ -98,7 +98,7 @@ type AccountClientImpl struct {
|
||||
Remove func(ctx context.Context, in *RemoveRequest) (*RemoveResponse, error)
|
||||
Update func(ctx context.Context, in *UpdateRequest) (*UpdateResponse, error)
|
||||
UsersByTel func(ctx context.Context, in *UsersByTelRequest) (*ListResponse, error)
|
||||
UserByTel func(ctx context.Context, in *UserByTelRequest) (*InfoResponse, error)
|
||||
UserByTel func(ctx context.Context, in *UserByTelRequest) (*UserInfoResponse, error)
|
||||
OnlySendMsg func(ctx context.Context, in *SendMsgRequest) (*SendMsgStatusResponse, error)
|
||||
OnlyCheckMsg func(ctx context.Context, in *CheckMsgRequest) (*SendMsgStatusResponse, error)
|
||||
MailAccountByNickName func(ctx context.Context, in *MailAccountByNickNameRequest) (*MaiAccountResponse, error)
|
||||
@ -270,8 +270,8 @@ func (c *accountClient) UsersByTel(ctx context.Context, in *UsersByTelRequest, o
|
||||
return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UsersByTel", in, out)
|
||||
}
|
||||
|
||||
func (c *accountClient) UserByTel(ctx context.Context, in *UserByTelRequest, opts ...grpc_go.CallOption) (*InfoResponse, common.ErrorWithAttachment) {
|
||||
out := new(InfoResponse)
|
||||
func (c *accountClient) UserByTel(ctx context.Context, in *UserByTelRequest, opts ...grpc_go.CallOption) (*UserInfoResponse, common.ErrorWithAttachment) {
|
||||
out := new(UserInfoResponse)
|
||||
interfaceKey := ctx.Value(constant.InterfaceKey).(string)
|
||||
return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UserByTel", in, out)
|
||||
}
|
||||
@ -383,7 +383,7 @@ type AccountServer interface {
|
||||
Remove(context.Context, *RemoveRequest) (*RemoveResponse, error)
|
||||
Update(context.Context, *UpdateRequest) (*UpdateResponse, error)
|
||||
UsersByTel(context.Context, *UsersByTelRequest) (*ListResponse, error)
|
||||
UserByTel(context.Context, *UserByTelRequest) (*InfoResponse, error)
|
||||
UserByTel(context.Context, *UserByTelRequest) (*UserInfoResponse, error)
|
||||
OnlySendMsg(context.Context, *SendMsgRequest) (*SendMsgStatusResponse, error)
|
||||
OnlyCheckMsg(context.Context, *CheckMsgRequest) (*SendMsgStatusResponse, error)
|
||||
MailAccountByNickName(context.Context, *MailAccountByNickNameRequest) (*MaiAccountResponse, error)
|
||||
@ -477,7 +477,7 @@ func (UnimplementedAccountServer) Update(context.Context, *UpdateRequest) (*Upda
|
||||
func (UnimplementedAccountServer) UsersByTel(context.Context, *UsersByTelRequest) (*ListResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method UsersByTel not implemented")
|
||||
}
|
||||
func (UnimplementedAccountServer) UserByTel(context.Context, *UserByTelRequest) (*InfoResponse, error) {
|
||||
func (UnimplementedAccountServer) UserByTel(context.Context, *UserByTelRequest) (*UserInfoResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method UserByTel not implemented")
|
||||
}
|
||||
func (UnimplementedAccountServer) OnlySendMsg(context.Context, *SendMsgRequest) (*SendMsgStatusResponse, error) {
|
||||
|
@ -43,21 +43,23 @@ func CheckLogin(provider *api.AccountClientImpl) gin.HandlerFunc {
|
||||
service.Error(ctx, err)
|
||||
return
|
||||
}
|
||||
if infoRes.IsExist == false {
|
||||
service.Error(ctx, errors.New(e.ErrNotLogin))
|
||||
return
|
||||
}
|
||||
|
||||
info := infoRes.Info
|
||||
//info := infoRes.Info/
|
||||
loginInfo := login.Info{
|
||||
Domain: info.Domain,
|
||||
ID: info.ID,
|
||||
Account: info.Account,
|
||||
NickName: info.NickName,
|
||||
TelNum: infoRes.Info.TelNum,
|
||||
Avatar: infoRes.Info.Avatar,
|
||||
RealName: infoRes.Info.RealName,
|
||||
IDNum: infoRes.Info.IDNum,
|
||||
ID: infoRes.Id,
|
||||
Status: infoRes.Status,
|
||||
Name: infoRes.Name,
|
||||
Sex: infoRes.Sex,
|
||||
Nationality: infoRes.Nationality,
|
||||
DocumentType: infoRes.DocumentType,
|
||||
CertificatePicture: infoRes.CertificatePicture,
|
||||
Validity: infoRes.Validity,
|
||||
PlaceOfResidence: infoRes.PlaceOfResidence,
|
||||
GroupPhoto: infoRes.GroupPhoto,
|
||||
Attachment: infoRes.Attachment,
|
||||
SubNum: infoRes.SubNum,
|
||||
NotPassRemarks: infoRes.NotPassRemarks,
|
||||
Domain: infoRes.Domain,
|
||||
}
|
||||
|
||||
ctx.Set("jwtInfo", loginInfo)
|
||||
|
@ -11,15 +11,20 @@ type WxUser struct {
|
||||
}
|
||||
|
||||
type Info struct {
|
||||
Domain string `json:"domain"`
|
||||
ID uint64 `json:"ID"`
|
||||
Account string `json:"account"`
|
||||
NickName string `json:"nickName"`
|
||||
TelNum string `json:"telNum"`
|
||||
Avatar string `json:"avatar"`
|
||||
RealName string `json:"realName"`
|
||||
IDNum string `json:"idNum"`
|
||||
Coin string `json:"coin"` //追加一个余额
|
||||
Status int32 `json:"status"`
|
||||
Name string `json:"name"`
|
||||
Sex int32 `json:"sex"`
|
||||
Nationality string `json:"nationality"`
|
||||
DocumentType int32 `json:"documentType"`
|
||||
CertificatePicture string `json:"certificatePicture"`
|
||||
Validity string `json:"validity"`
|
||||
PlaceOfResidence string `json:"placeOfResidence"`
|
||||
GroupPhoto string `json:"groupPhoto"`
|
||||
Attachment string `json:"attachment"`
|
||||
SubNum string `json:"subNum"`
|
||||
NotPassRemarks string `json:"notPassRemarks"`
|
||||
Domain string `json:"domain"`
|
||||
}
|
||||
|
||||
func GetUserInfoFromC(c *gin.Context) Info {
|
||||
|
Loading…
Reference in New Issue
Block a user