解决冲突

This commit is contained in:
JNG 2026-01-16 14:57:41 +08:00
commit 564007d45d
5 changed files with 196 additions and 253 deletions

View File

@ -4269,20 +4269,6 @@ func (x *RemoveRequest) GetCode() string {
type WriteOffRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain"`
UserId uint64 `protobuf:"varint,3,opt,name=userId,proto3" json:"userId"`
Tel string `protobuf:"bytes,4,opt,name=tel,proto3" json:"tel"`
JonNum string `protobuf:"bytes,5,opt,name=jonNum,proto3" json:"jonNum"`
UserName string `protobuf:"bytes,6,opt,name=userName,proto3" json:"userName"`
EnterDate string `protobuf:"bytes,7,opt,name=enterDate,proto3" json:"enterDate"`
PositionName string `protobuf:"bytes,8,opt,name=positionName,proto3" json:"positionName"`
PositionId uint64 `protobuf:"varint,9,opt,name=positionId,proto3" json:"positionId"`
SiteName string `protobuf:"bytes,10,opt,name=siteName,proto3" json:"siteName"`
SiteId uint64 `protobuf:"varint,11,opt,name=siteId,proto3" json:"siteId"`
AuthUrl string `protobuf:"bytes,12,opt,name=authUrl,proto3" json:"authUrl"`
Type string `protobuf:"bytes,13,opt,name=type,proto3" json:"type"`
Status uint32 `protobuf:"varint,14,opt,name=status,proto3" json:"status"`
SubmitDate string `protobuf:"bytes,15,opt,name=submitDate,proto3" json:"submitDate"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -4324,104 +4310,6 @@ func (x *WriteOffRequest) GetId() uint64 {
return 0
}
func (x *WriteOffRequest) GetDomain() string {
if x != nil {
return x.Domain
}
return ""
}
func (x *WriteOffRequest) GetUserId() uint64 {
if x != nil {
return x.UserId
}
return 0
}
func (x *WriteOffRequest) GetTel() string {
if x != nil {
return x.Tel
}
return ""
}
func (x *WriteOffRequest) GetJonNum() string {
if x != nil {
return x.JonNum
}
return ""
}
func (x *WriteOffRequest) GetUserName() string {
if x != nil {
return x.UserName
}
return ""
}
func (x *WriteOffRequest) GetEnterDate() string {
if x != nil {
return x.EnterDate
}
return ""
}
func (x *WriteOffRequest) GetPositionName() string {
if x != nil {
return x.PositionName
}
return ""
}
func (x *WriteOffRequest) GetPositionId() uint64 {
if x != nil {
return x.PositionId
}
return 0
}
func (x *WriteOffRequest) GetSiteName() string {
if x != nil {
return x.SiteName
}
return ""
}
func (x *WriteOffRequest) GetSiteId() uint64 {
if x != nil {
return x.SiteId
}
return 0
}
func (x *WriteOffRequest) GetAuthUrl() string {
if x != nil {
return x.AuthUrl
}
return ""
}
func (x *WriteOffRequest) GetType() string {
if x != nil {
return x.Type
}
return ""
}
func (x *WriteOffRequest) GetStatus() uint32 {
if x != nil {
return x.Status
}
return 0
}
func (x *WriteOffRequest) GetSubmitDate() string {
if x != nil {
return x.SubmitDate
}
return ""
}
type WriteOffListRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
Page uint64 `protobuf:"varint,1,opt,name=page,proto3" json:"page"`
@ -6000,6 +5888,7 @@ type AccountInfo struct {
UpdatedAt string `protobuf:"bytes,41,opt,name=updatedAt,proto3" json:"updatedAt"`
SecurityCode string `protobuf:"bytes,42,opt,name=SecurityCode,json=securityCode,proto3" json:"SecurityCode"`
BlockAddr string `protobuf:"bytes,43,opt,name=BlockAddr,json=blockAddr,proto3" json:"BlockAddr"`
WriteOff bool `protobuf:"varint,44,opt,name=WriteOff,json=writeOff,proto3" json:"WriteOff"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -6335,6 +6224,13 @@ func (x *AccountInfo) GetBlockAddr() string {
return ""
}
func (x *AccountInfo) GetWriteOff() bool {
if x != nil {
return x.WriteOff
}
return false
}
type UserInfoV2 struct {
state protoimpl.MessageState `protogen:"open.v1"`
ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID"`
@ -10756,28 +10652,9 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\rRemoveRequest\x12%\n" +
"\x06Domain\x18\x01 \x01(\tB\r\xe2\xdf\x1f\t*\x0570001X\x01R\x06domain\x12\x1d\n" +
"\x02ID\x18\x02 \x01(\x04B\r\xe2\xdf\x1f\t\x10\x00*\x0570004R\x02ID\x12\x12\n" +
"\x04code\x18\x03 \x01(\tR\x04code\"\x93\x03\n" +
"\x04code\x18\x03 \x01(\tR\x04code\"!\n" +
"\x0fWriteOffRequest\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" +
"\x06domain\x18\x02 \x01(\tR\x06domain\x12\x16\n" +
"\x06userId\x18\x03 \x01(\x04R\x06userId\x12\x10\n" +
"\x03tel\x18\x04 \x01(\tR\x03tel\x12\x16\n" +
"\x06jonNum\x18\x05 \x01(\tR\x06jonNum\x12\x1a\n" +
"\buserName\x18\x06 \x01(\tR\buserName\x12\x1c\n" +
"\tenterDate\x18\a \x01(\tR\tenterDate\x12\"\n" +
"\fpositionName\x18\b \x01(\tR\fpositionName\x12\x1e\n" +
"\n" +
"positionId\x18\t \x01(\x04R\n" +
"positionId\x12\x1a\n" +
"\bsiteName\x18\n" +
" \x01(\tR\bsiteName\x12\x16\n" +
"\x06siteId\x18\v \x01(\x04R\x06siteId\x12\x18\n" +
"\aauthUrl\x18\f \x01(\tR\aauthUrl\x12\x12\n" +
"\x04type\x18\r \x01(\tR\x04type\x12\x16\n" +
"\x06status\x18\x0e \x01(\rR\x06status\x12\x1e\n" +
"\n" +
"submitDate\x18\x0f \x01(\tR\n" +
"submitDate\"\xd5\x01\n" +
"\x02id\x18\x01 \x01(\x04R\x02id\"\xd5\x01\n" +
"\x13WriteOffListRequest\x12\x12\n" +
"\x04page\x18\x01 \x01(\x04R\x04page\x12\x1a\n" +
"\bpageSize\x18\x02 \x01(\x04R\bpageSize\x12\x16\n" +
@ -10893,7 +10770,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\n" +
"Department\x12\x0e\n" +
"\x02ID\x18\x01 \x01(\x04R\x02ID\x12\x12\n" +
"\x04Name\x18\x02 \x01(\tR\x04name\"\xb9\n" +
"\x04Name\x18\x02 \x01(\tR\x04name\"\xd5\n" +
"\n" +
"\vAccountInfo\x12\x0e\n" +
"\x02ID\x18\x01 \x01(\x04R\x02id\x12\x18\n" +
@ -10942,7 +10819,8 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\boperator\x18( \x01(\v2\x15.accountFiee.OperatorR\boperator\x12\x1c\n" +
"\tupdatedAt\x18) \x01(\tR\tupdatedAt\x12\"\n" +
"\fSecurityCode\x18* \x01(\tR\fsecurityCode\x12\x1c\n" +
"\tBlockAddr\x18+ \x01(\tR\tblockAddr\"\xdc\x03\n" +
"\tBlockAddr\x18+ \x01(\tR\tblockAddr\x12\x1a\n" +
"\bWriteOff\x18, \x01(\bR\bwriteOff\"\xdc\x03\n" +
"\n" +
"UserInfoV2\x12\x0e\n" +
"\x02ID\x18\x01 \x01(\x04R\x02ID\x12\x18\n" +
@ -11302,7 +11180,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\fImageMsgType\x10\x02\x12\x10\n" +
"\fAudioMsgType\x10\x03\x12\x10\n" +
"\fVideoMsgType\x10\x04\x12\f\n" +
"\bCardType\x10\x052\xc2/\n" +
"\bCardType\x10\x052\x8b0\n" +
"\vAccountFiee\x12<\n" +
"\x05Login\x12\x19.accountFiee.LoginRequest\x1a\x16.accountFiee.TokenInfo\"\x00\x12J\n" +
"\fRefreshToken\x12 .accountFiee.RefreshTokenRequest\x1a\x16.accountFiee.TokenInfo\"\x00\x12G\n" +
@ -11348,7 +11226,8 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\x12VerifySliderStatus\x12&.accountFiee.VerifySliderStatusRequest\x1a'.accountFiee.VerifySliderStatusResponse\"\x00\x12`\n" +
"\x15SendNationTemplateMsg\x12!.accountFiee.SendNationMsgRequest\x1a\".accountFiee.SendMsgStatusResponse\"\x00\x12U\n" +
"\x0eGetInviterInfo\x12\x1f.accountFiee.InviterInfoRequest\x1a .accountFiee.InviterInfoResponse\"\x00\x12U\n" +
"\x0eGetInviterList\x12\x1f.accountFiee.InviterListRequest\x1a .accountFiee.InviterListResponse\"\x00\x12p\n" +
"\x0eGetInviterList\x12\x1f.accountFiee.InviterListRequest\x1a .accountFiee.InviterListResponse\"\x00\x12G\n" +
"\bWriteOff\x12\x1c.accountFiee.WriteOffRequest\x1a\x1b.accountFiee.RemoveResponse\"\x00\x12p\n" +
"\x15CreateUserAndRealName\x12).accountFiee.CreateUserAndRealNameRequest\x1a*.accountFiee.CreateUserAndRealNameResponse\"\x00\x12M\n" +
"\x0eSaveSubmitInfo\x12\x1e.accountFiee.SubmitInfoRequest\x1a\x1b.accountFiee.CommonResponse\x12N\n" +
"\x0eCreateChatUser\x12\x19.accountFiee.ChatUserData\x1a\x1f.accountFiee.CreateChatUserResp\"\x00\x12E\n" +
@ -11613,107 +11492,109 @@ var file_api_accountFiee_accountFiee_proto_depIdxs = []int32{
7, // 78: accountFiee.AccountFiee.SendNationTemplateMsg:input_type -> accountFiee.SendNationMsgRequest
3, // 79: accountFiee.AccountFiee.GetInviterInfo:input_type -> accountFiee.InviterInfoRequest
1, // 80: accountFiee.AccountFiee.GetInviterList:input_type -> accountFiee.InviterListRequest
135, // 81: accountFiee.AccountFiee.CreateUserAndRealName:input_type -> accountFiee.CreateUserAndRealNameRequest
104, // 82: accountFiee.AccountFiee.SaveSubmitInfo:input_type -> accountFiee.SubmitInfoRequest
129, // 83: accountFiee.AccountFiee.CreateChatUser:input_type -> accountFiee.ChatUserData
129, // 84: accountFiee.AccountFiee.UpdateChatUser:input_type -> accountFiee.ChatUserData
129, // 85: accountFiee.AccountFiee.SaveChatUser:input_type -> accountFiee.ChatUserData
131, // 86: accountFiee.AccountFiee.DeleteChatUser:input_type -> accountFiee.DeleteChatUserRequest
132, // 87: accountFiee.AccountFiee.GetChatUserDetail:input_type -> accountFiee.GetChatUserByIdRequest
133, // 88: accountFiee.AccountFiee.GetChatUserList:input_type -> accountFiee.GetChatUserListRequest
120, // 89: accountFiee.AccountFiee.GetChatUserList2:input_type -> accountFiee.GetChatUserListRequest2
112, // 90: accountFiee.AccountFiee.RegisterWaiter:input_type -> accountFiee.RegisterWaiterRequest
106, // 91: accountFiee.AccountFiee.CreateChatRecord:input_type -> accountFiee.ChatRecordData
106, // 92: accountFiee.AccountFiee.UpdateChatRecord:input_type -> accountFiee.ChatRecordData
106, // 93: accountFiee.AccountFiee.SaveChatRecord:input_type -> accountFiee.ChatRecordData
108, // 94: accountFiee.AccountFiee.DeleteChatRecord:input_type -> accountFiee.DeleteChatRecordRequest
109, // 95: accountFiee.AccountFiee.GetChatRecordDetail:input_type -> accountFiee.GetChatRecordByIdRequest
110, // 96: accountFiee.AccountFiee.GetChatRecordList:input_type -> accountFiee.GetChatRecordListRequest
114, // 97: accountFiee.AccountFiee.CreateChatMedia:input_type -> accountFiee.ChatMediaData
114, // 98: accountFiee.AccountFiee.UpdateChatMedia:input_type -> accountFiee.ChatMediaData
114, // 99: accountFiee.AccountFiee.SaveChatMedia:input_type -> accountFiee.ChatMediaData
116, // 100: accountFiee.AccountFiee.DeleteChatMedia:input_type -> accountFiee.DeleteChatMediaRequest
117, // 101: accountFiee.AccountFiee.GetChatMediaDetail:input_type -> accountFiee.GetChatMediaByIdRequest
118, // 102: accountFiee.AccountFiee.GetChatMediaList:input_type -> accountFiee.GetChatMediaListRequest
123, // 103: accountFiee.AccountFiee.CreateChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
123, // 104: accountFiee.AccountFiee.UpdateChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
123, // 105: accountFiee.AccountFiee.SaveChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
125, // 106: accountFiee.AccountFiee.DeleteChatAutoReplyRuler:input_type -> accountFiee.DeleteChatAutoReplyRulerRequest
126, // 107: accountFiee.AccountFiee.GetChatAutoReplyRulerDetail:input_type -> accountFiee.GetChatAutoReplyRulerByIdRequest
127, // 108: accountFiee.AccountFiee.GetChatAutoReplyRulerList:input_type -> accountFiee.GetChatAutoReplyRulerListRequest
78, // 109: accountFiee.AccountFiee.Login:output_type -> accountFiee.TokenInfo
78, // 110: accountFiee.AccountFiee.RefreshToken:output_type -> accountFiee.TokenInfo
49, // 111: accountFiee.AccountFiee.Logout:output_type -> accountFiee.CommonResponse
49, // 112: accountFiee.AccountFiee.OffLine:output_type -> accountFiee.CommonResponse
43, // 113: accountFiee.AccountFiee.OnlineLog:output_type -> accountFiee.LoginLogsResponse
44, // 114: accountFiee.AccountFiee.OnlineLogById:output_type -> accountFiee.LoginLog
65, // 115: accountFiee.AccountFiee.CheckPwd:output_type -> accountFiee.UpdateResponse
55, // 116: accountFiee.AccountFiee.SendMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 117: accountFiee.AccountFiee.SendCustomMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 118: accountFiee.AccountFiee.SendExCustomMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 119: accountFiee.AccountFiee.SendMsgRegister:output_type -> accountFiee.SendMsgStatusResponse
55, // 120: accountFiee.AccountFiee.CheckMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 121: accountFiee.AccountFiee.SendNewTelNumMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 122: accountFiee.AccountFiee.UpdateTelNum:output_type -> accountFiee.SendMsgStatusResponse
75, // 123: accountFiee.AccountFiee.Authentication:output_type -> accountFiee.RequestStatus
71, // 124: accountFiee.AccountFiee.DecryptJwt:output_type -> accountFiee.DecryptJwtResponse
17, // 125: accountFiee.AccountFiee.Info:output_type -> accountFiee.UserInfoResponse
70, // 126: accountFiee.AccountFiee.JobNumGetInfo:output_type -> accountFiee.InfoResponse
17, // 127: accountFiee.AccountFiee.SubNumGetInfo:output_type -> accountFiee.UserInfoResponse
68, // 128: accountFiee.AccountFiee.List:output_type -> accountFiee.ListResponse
68, // 129: accountFiee.AccountFiee.RandList:output_type -> accountFiee.ListResponse
68, // 130: accountFiee.AccountFiee.ListByIDs:output_type -> accountFiee.ListResponse
61, // 131: accountFiee.AccountFiee.Remove:output_type -> accountFiee.RemoveResponse
65, // 132: accountFiee.AccountFiee.Update:output_type -> accountFiee.UpdateResponse
68, // 133: accountFiee.AccountFiee.UsersByTel:output_type -> accountFiee.ListResponse
17, // 134: accountFiee.AccountFiee.UserByTel:output_type -> accountFiee.UserInfoResponse
55, // 135: accountFiee.AccountFiee.OnlySendMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 136: accountFiee.AccountFiee.OnlyCheckMsg:output_type -> accountFiee.SendMsgStatusResponse
28, // 137: accountFiee.AccountFiee.MailAccountByNickName:output_type -> accountFiee.MaiAccountResponse
68, // 138: accountFiee.AccountFiee.ListV2:output_type -> accountFiee.ListResponse
23, // 139: accountFiee.AccountFiee.QueryPersonnelWithTheSameName:output_type -> accountFiee.QueryPersonnelWithTheSameNameResponse
68, // 140: accountFiee.AccountFiee.UsersByJobNum:output_type -> accountFiee.ListResponse
18, // 141: accountFiee.AccountFiee.RealName:output_type -> accountFiee.RealNameResponse
20, // 142: accountFiee.AccountFiee.Register:output_type -> accountFiee.RegisterResponse
14, // 143: accountFiee.AccountFiee.UserList:output_type -> accountFiee.UserListResponse
12, // 144: accountFiee.AccountFiee.CheckRealName:output_type -> accountFiee.CheckRealNameResponse
10, // 145: accountFiee.AccountFiee.GenerateSliderCaptcha:output_type -> accountFiee.GenerateSliderCaptchaResponse
8, // 146: accountFiee.AccountFiee.VerifySliderCaptcha:output_type -> accountFiee.VerifySliderCaptchaResponse
55, // 147: accountFiee.AccountFiee.SendNationMsg:output_type -> accountFiee.SendMsgStatusResponse
6, // 148: accountFiee.AccountFiee.VerifySliderStatus:output_type -> accountFiee.VerifySliderStatusResponse
55, // 149: accountFiee.AccountFiee.SendNationTemplateMsg:output_type -> accountFiee.SendMsgStatusResponse
4, // 150: accountFiee.AccountFiee.GetInviterInfo:output_type -> accountFiee.InviterInfoResponse
2, // 151: accountFiee.AccountFiee.GetInviterList:output_type -> accountFiee.InviterListResponse
136, // 152: accountFiee.AccountFiee.CreateUserAndRealName:output_type -> accountFiee.CreateUserAndRealNameResponse
49, // 153: accountFiee.AccountFiee.SaveSubmitInfo:output_type -> accountFiee.CommonResponse
130, // 154: accountFiee.AccountFiee.CreateChatUser:output_type -> accountFiee.CreateChatUserResp
105, // 155: accountFiee.AccountFiee.UpdateChatUser:output_type -> accountFiee.CommonMsg
105, // 156: accountFiee.AccountFiee.SaveChatUser:output_type -> accountFiee.CommonMsg
105, // 157: accountFiee.AccountFiee.DeleteChatUser:output_type -> accountFiee.CommonMsg
129, // 158: accountFiee.AccountFiee.GetChatUserDetail:output_type -> accountFiee.ChatUserData
134, // 159: accountFiee.AccountFiee.GetChatUserList:output_type -> accountFiee.GetChatUserListResp
122, // 160: accountFiee.AccountFiee.GetChatUserList2:output_type -> accountFiee.GetChatUserListResp2
113, // 161: accountFiee.AccountFiee.RegisterWaiter:output_type -> accountFiee.RegisterWaiterResp
107, // 162: accountFiee.AccountFiee.CreateChatRecord:output_type -> accountFiee.CreateChatRecordResp
105, // 163: accountFiee.AccountFiee.UpdateChatRecord:output_type -> accountFiee.CommonMsg
105, // 164: accountFiee.AccountFiee.SaveChatRecord:output_type -> accountFiee.CommonMsg
105, // 165: accountFiee.AccountFiee.DeleteChatRecord:output_type -> accountFiee.CommonMsg
106, // 166: accountFiee.AccountFiee.GetChatRecordDetail:output_type -> accountFiee.ChatRecordData
111, // 167: accountFiee.AccountFiee.GetChatRecordList:output_type -> accountFiee.GetChatRecordListResp
115, // 168: accountFiee.AccountFiee.CreateChatMedia:output_type -> accountFiee.CreateChatMediaResp
105, // 169: accountFiee.AccountFiee.UpdateChatMedia:output_type -> accountFiee.CommonMsg
105, // 170: accountFiee.AccountFiee.SaveChatMedia:output_type -> accountFiee.CommonMsg
105, // 171: accountFiee.AccountFiee.DeleteChatMedia:output_type -> accountFiee.CommonMsg
114, // 172: accountFiee.AccountFiee.GetChatMediaDetail:output_type -> accountFiee.ChatMediaData
119, // 173: accountFiee.AccountFiee.GetChatMediaList:output_type -> accountFiee.GetChatMediaListResp
124, // 174: accountFiee.AccountFiee.CreateChatAutoReplyRuler:output_type -> accountFiee.CreateChatAutoReplyRulerResp
105, // 175: accountFiee.AccountFiee.UpdateChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
105, // 176: accountFiee.AccountFiee.SaveChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
105, // 177: accountFiee.AccountFiee.DeleteChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
123, // 178: accountFiee.AccountFiee.GetChatAutoReplyRulerDetail:output_type -> accountFiee.ChatAutoReplyRulerData
128, // 179: accountFiee.AccountFiee.GetChatAutoReplyRulerList:output_type -> accountFiee.GetChatAutoReplyRulerListResp
109, // [109:180] is the sub-list for method output_type
38, // [38:109] is the sub-list for method input_type
57, // 81: accountFiee.AccountFiee.WriteOff:input_type -> accountFiee.WriteOffRequest
135, // 82: accountFiee.AccountFiee.CreateUserAndRealName:input_type -> accountFiee.CreateUserAndRealNameRequest
104, // 83: accountFiee.AccountFiee.SaveSubmitInfo:input_type -> accountFiee.SubmitInfoRequest
129, // 84: accountFiee.AccountFiee.CreateChatUser:input_type -> accountFiee.ChatUserData
129, // 85: accountFiee.AccountFiee.UpdateChatUser:input_type -> accountFiee.ChatUserData
129, // 86: accountFiee.AccountFiee.SaveChatUser:input_type -> accountFiee.ChatUserData
131, // 87: accountFiee.AccountFiee.DeleteChatUser:input_type -> accountFiee.DeleteChatUserRequest
132, // 88: accountFiee.AccountFiee.GetChatUserDetail:input_type -> accountFiee.GetChatUserByIdRequest
133, // 89: accountFiee.AccountFiee.GetChatUserList:input_type -> accountFiee.GetChatUserListRequest
120, // 90: accountFiee.AccountFiee.GetChatUserList2:input_type -> accountFiee.GetChatUserListRequest2
112, // 91: accountFiee.AccountFiee.RegisterWaiter:input_type -> accountFiee.RegisterWaiterRequest
106, // 92: accountFiee.AccountFiee.CreateChatRecord:input_type -> accountFiee.ChatRecordData
106, // 93: accountFiee.AccountFiee.UpdateChatRecord:input_type -> accountFiee.ChatRecordData
106, // 94: accountFiee.AccountFiee.SaveChatRecord:input_type -> accountFiee.ChatRecordData
108, // 95: accountFiee.AccountFiee.DeleteChatRecord:input_type -> accountFiee.DeleteChatRecordRequest
109, // 96: accountFiee.AccountFiee.GetChatRecordDetail:input_type -> accountFiee.GetChatRecordByIdRequest
110, // 97: accountFiee.AccountFiee.GetChatRecordList:input_type -> accountFiee.GetChatRecordListRequest
114, // 98: accountFiee.AccountFiee.CreateChatMedia:input_type -> accountFiee.ChatMediaData
114, // 99: accountFiee.AccountFiee.UpdateChatMedia:input_type -> accountFiee.ChatMediaData
114, // 100: accountFiee.AccountFiee.SaveChatMedia:input_type -> accountFiee.ChatMediaData
116, // 101: accountFiee.AccountFiee.DeleteChatMedia:input_type -> accountFiee.DeleteChatMediaRequest
117, // 102: accountFiee.AccountFiee.GetChatMediaDetail:input_type -> accountFiee.GetChatMediaByIdRequest
118, // 103: accountFiee.AccountFiee.GetChatMediaList:input_type -> accountFiee.GetChatMediaListRequest
123, // 104: accountFiee.AccountFiee.CreateChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
123, // 105: accountFiee.AccountFiee.UpdateChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
123, // 106: accountFiee.AccountFiee.SaveChatAutoReplyRuler:input_type -> accountFiee.ChatAutoReplyRulerData
125, // 107: accountFiee.AccountFiee.DeleteChatAutoReplyRuler:input_type -> accountFiee.DeleteChatAutoReplyRulerRequest
126, // 108: accountFiee.AccountFiee.GetChatAutoReplyRulerDetail:input_type -> accountFiee.GetChatAutoReplyRulerByIdRequest
127, // 109: accountFiee.AccountFiee.GetChatAutoReplyRulerList:input_type -> accountFiee.GetChatAutoReplyRulerListRequest
78, // 110: accountFiee.AccountFiee.Login:output_type -> accountFiee.TokenInfo
78, // 111: accountFiee.AccountFiee.RefreshToken:output_type -> accountFiee.TokenInfo
49, // 112: accountFiee.AccountFiee.Logout:output_type -> accountFiee.CommonResponse
49, // 113: accountFiee.AccountFiee.OffLine:output_type -> accountFiee.CommonResponse
43, // 114: accountFiee.AccountFiee.OnlineLog:output_type -> accountFiee.LoginLogsResponse
44, // 115: accountFiee.AccountFiee.OnlineLogById:output_type -> accountFiee.LoginLog
65, // 116: accountFiee.AccountFiee.CheckPwd:output_type -> accountFiee.UpdateResponse
55, // 117: accountFiee.AccountFiee.SendMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 118: accountFiee.AccountFiee.SendCustomMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 119: accountFiee.AccountFiee.SendExCustomMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 120: accountFiee.AccountFiee.SendMsgRegister:output_type -> accountFiee.SendMsgStatusResponse
55, // 121: accountFiee.AccountFiee.CheckMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 122: accountFiee.AccountFiee.SendNewTelNumMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 123: accountFiee.AccountFiee.UpdateTelNum:output_type -> accountFiee.SendMsgStatusResponse
75, // 124: accountFiee.AccountFiee.Authentication:output_type -> accountFiee.RequestStatus
71, // 125: accountFiee.AccountFiee.DecryptJwt:output_type -> accountFiee.DecryptJwtResponse
17, // 126: accountFiee.AccountFiee.Info:output_type -> accountFiee.UserInfoResponse
70, // 127: accountFiee.AccountFiee.JobNumGetInfo:output_type -> accountFiee.InfoResponse
17, // 128: accountFiee.AccountFiee.SubNumGetInfo:output_type -> accountFiee.UserInfoResponse
68, // 129: accountFiee.AccountFiee.List:output_type -> accountFiee.ListResponse
68, // 130: accountFiee.AccountFiee.RandList:output_type -> accountFiee.ListResponse
68, // 131: accountFiee.AccountFiee.ListByIDs:output_type -> accountFiee.ListResponse
61, // 132: accountFiee.AccountFiee.Remove:output_type -> accountFiee.RemoveResponse
65, // 133: accountFiee.AccountFiee.Update:output_type -> accountFiee.UpdateResponse
68, // 134: accountFiee.AccountFiee.UsersByTel:output_type -> accountFiee.ListResponse
17, // 135: accountFiee.AccountFiee.UserByTel:output_type -> accountFiee.UserInfoResponse
55, // 136: accountFiee.AccountFiee.OnlySendMsg:output_type -> accountFiee.SendMsgStatusResponse
55, // 137: accountFiee.AccountFiee.OnlyCheckMsg:output_type -> accountFiee.SendMsgStatusResponse
28, // 138: accountFiee.AccountFiee.MailAccountByNickName:output_type -> accountFiee.MaiAccountResponse
68, // 139: accountFiee.AccountFiee.ListV2:output_type -> accountFiee.ListResponse
23, // 140: accountFiee.AccountFiee.QueryPersonnelWithTheSameName:output_type -> accountFiee.QueryPersonnelWithTheSameNameResponse
68, // 141: accountFiee.AccountFiee.UsersByJobNum:output_type -> accountFiee.ListResponse
18, // 142: accountFiee.AccountFiee.RealName:output_type -> accountFiee.RealNameResponse
20, // 143: accountFiee.AccountFiee.Register:output_type -> accountFiee.RegisterResponse
14, // 144: accountFiee.AccountFiee.UserList:output_type -> accountFiee.UserListResponse
12, // 145: accountFiee.AccountFiee.CheckRealName:output_type -> accountFiee.CheckRealNameResponse
10, // 146: accountFiee.AccountFiee.GenerateSliderCaptcha:output_type -> accountFiee.GenerateSliderCaptchaResponse
8, // 147: accountFiee.AccountFiee.VerifySliderCaptcha:output_type -> accountFiee.VerifySliderCaptchaResponse
55, // 148: accountFiee.AccountFiee.SendNationMsg:output_type -> accountFiee.SendMsgStatusResponse
6, // 149: accountFiee.AccountFiee.VerifySliderStatus:output_type -> accountFiee.VerifySliderStatusResponse
55, // 150: accountFiee.AccountFiee.SendNationTemplateMsg:output_type -> accountFiee.SendMsgStatusResponse
4, // 151: accountFiee.AccountFiee.GetInviterInfo:output_type -> accountFiee.InviterInfoResponse
2, // 152: accountFiee.AccountFiee.GetInviterList:output_type -> accountFiee.InviterListResponse
61, // 153: accountFiee.AccountFiee.WriteOff:output_type -> accountFiee.RemoveResponse
136, // 154: accountFiee.AccountFiee.CreateUserAndRealName:output_type -> accountFiee.CreateUserAndRealNameResponse
49, // 155: accountFiee.AccountFiee.SaveSubmitInfo:output_type -> accountFiee.CommonResponse
130, // 156: accountFiee.AccountFiee.CreateChatUser:output_type -> accountFiee.CreateChatUserResp
105, // 157: accountFiee.AccountFiee.UpdateChatUser:output_type -> accountFiee.CommonMsg
105, // 158: accountFiee.AccountFiee.SaveChatUser:output_type -> accountFiee.CommonMsg
105, // 159: accountFiee.AccountFiee.DeleteChatUser:output_type -> accountFiee.CommonMsg
129, // 160: accountFiee.AccountFiee.GetChatUserDetail:output_type -> accountFiee.ChatUserData
134, // 161: accountFiee.AccountFiee.GetChatUserList:output_type -> accountFiee.GetChatUserListResp
122, // 162: accountFiee.AccountFiee.GetChatUserList2:output_type -> accountFiee.GetChatUserListResp2
113, // 163: accountFiee.AccountFiee.RegisterWaiter:output_type -> accountFiee.RegisterWaiterResp
107, // 164: accountFiee.AccountFiee.CreateChatRecord:output_type -> accountFiee.CreateChatRecordResp
105, // 165: accountFiee.AccountFiee.UpdateChatRecord:output_type -> accountFiee.CommonMsg
105, // 166: accountFiee.AccountFiee.SaveChatRecord:output_type -> accountFiee.CommonMsg
105, // 167: accountFiee.AccountFiee.DeleteChatRecord:output_type -> accountFiee.CommonMsg
106, // 168: accountFiee.AccountFiee.GetChatRecordDetail:output_type -> accountFiee.ChatRecordData
111, // 169: accountFiee.AccountFiee.GetChatRecordList:output_type -> accountFiee.GetChatRecordListResp
115, // 170: accountFiee.AccountFiee.CreateChatMedia:output_type -> accountFiee.CreateChatMediaResp
105, // 171: accountFiee.AccountFiee.UpdateChatMedia:output_type -> accountFiee.CommonMsg
105, // 172: accountFiee.AccountFiee.SaveChatMedia:output_type -> accountFiee.CommonMsg
105, // 173: accountFiee.AccountFiee.DeleteChatMedia:output_type -> accountFiee.CommonMsg
114, // 174: accountFiee.AccountFiee.GetChatMediaDetail:output_type -> accountFiee.ChatMediaData
119, // 175: accountFiee.AccountFiee.GetChatMediaList:output_type -> accountFiee.GetChatMediaListResp
124, // 176: accountFiee.AccountFiee.CreateChatAutoReplyRuler:output_type -> accountFiee.CreateChatAutoReplyRulerResp
105, // 177: accountFiee.AccountFiee.UpdateChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
105, // 178: accountFiee.AccountFiee.SaveChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
105, // 179: accountFiee.AccountFiee.DeleteChatAutoReplyRuler:output_type -> accountFiee.CommonMsg
123, // 180: accountFiee.AccountFiee.GetChatAutoReplyRulerDetail:output_type -> accountFiee.ChatAutoReplyRulerData
128, // 181: accountFiee.AccountFiee.GetChatAutoReplyRulerList:output_type -> accountFiee.GetChatAutoReplyRulerListResp
110, // [110:182] is the sub-list for method output_type
38, // [38:110] is the sub-list for method input_type
38, // [38:38] is the sub-list for extension type_name
38, // [38:38] is the sub-list for extension extendee
0, // [0:38] is the sub-list for field type_name

View File

@ -68,6 +68,7 @@ service AccountFiee {
rpc SendNationTemplateMsg (SendNationMsgRequest) returns (SendMsgStatusResponse) {} // --
rpc GetInviterInfo(InviterInfoRequest) returns(InviterInfoResponse) {} //
rpc GetInviterList(InviterListRequest) returns(InviterListResponse) {} //
rpc WriteOff (WriteOffRequest) returns (RemoveResponse) {} //
rpc CreateUserAndRealName (CreateUserAndRealNameRequest) returns (CreateUserAndRealNameResponse) {}// ,
@ -526,20 +527,6 @@ message RemoveRequest {
}
message WriteOffRequest{
uint64 id = 1;
string domain = 2;
uint64 userId = 3;
string tel = 4;
string jonNum = 5;
string userName = 6;
string enterDate = 7;
string positionName =8;
uint64 positionId = 9;
string siteName = 10;
uint64 siteId =11;
string authUrl =12;
string type =13;
uint32 status =14;
string submitDate=15;
}
message WriteOffListRequest{
uint64 page = 1;
@ -740,6 +727,7 @@ message AccountInfo {
string updatedAt = 41;
string SecurityCode = 42 [json_name = "securityCode"];
string BlockAddr = 43 [json_name = "blockAddr"];
bool WriteOff = 44 [json_name = "writeOff"];
}
message UserInfoV2 {

View File

@ -72,6 +72,7 @@ type AccountFieeClient interface {
SendNationTemplateMsg(ctx context.Context, in *SendNationMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
GetInviterInfo(ctx context.Context, in *InviterInfoRequest, opts ...grpc_go.CallOption) (*InviterInfoResponse, common.ErrorWithAttachment)
GetInviterList(ctx context.Context, in *InviterListRequest, opts ...grpc_go.CallOption) (*InviterListResponse, common.ErrorWithAttachment)
WriteOff(ctx context.Context, in *WriteOffRequest, opts ...grpc_go.CallOption) (*RemoveResponse, common.ErrorWithAttachment)
CreateUserAndRealName(ctx context.Context, in *CreateUserAndRealNameRequest, opts ...grpc_go.CallOption) (*CreateUserAndRealNameResponse, common.ErrorWithAttachment)
// submit info
SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
@ -152,6 +153,7 @@ type AccountFieeClientImpl struct {
SendNationTemplateMsg func(ctx context.Context, in *SendNationMsgRequest) (*SendMsgStatusResponse, error)
GetInviterInfo func(ctx context.Context, in *InviterInfoRequest) (*InviterInfoResponse, error)
GetInviterList func(ctx context.Context, in *InviterListRequest) (*InviterListResponse, error)
WriteOff func(ctx context.Context, in *WriteOffRequest) (*RemoveResponse, error)
CreateUserAndRealName func(ctx context.Context, in *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error)
SaveSubmitInfo func(ctx context.Context, in *SubmitInfoRequest) (*CommonResponse, error)
CreateChatUser func(ctx context.Context, in *ChatUserData) (*CreateChatUserResp, error)
@ -452,6 +454,12 @@ func (c *accountFieeClient) GetInviterList(ctx context.Context, in *InviterListR
return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInviterList", in, out)
}
func (c *accountFieeClient) WriteOff(ctx context.Context, in *WriteOffRequest, opts ...grpc_go.CallOption) (*RemoveResponse, common.ErrorWithAttachment) {
out := new(RemoveResponse)
interfaceKey := ctx.Value(constant.InterfaceKey).(string)
return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/WriteOff", in, out)
}
func (c *accountFieeClient) CreateUserAndRealName(ctx context.Context, in *CreateUserAndRealNameRequest, opts ...grpc_go.CallOption) (*CreateUserAndRealNameResponse, common.ErrorWithAttachment) {
out := new(CreateUserAndRealNameResponse)
interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@ -668,6 +676,7 @@ type AccountFieeServer interface {
SendNationTemplateMsg(context.Context, *SendNationMsgRequest) (*SendMsgStatusResponse, error)
GetInviterInfo(context.Context, *InviterInfoRequest) (*InviterInfoResponse, error)
GetInviterList(context.Context, *InviterListRequest) (*InviterListResponse, error)
WriteOff(context.Context, *WriteOffRequest) (*RemoveResponse, error)
CreateUserAndRealName(context.Context, *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error)
// submit info
SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error)
@ -835,6 +844,9 @@ func (UnimplementedAccountFieeServer) GetInviterInfo(context.Context, *InviterIn
func (UnimplementedAccountFieeServer) GetInviterList(context.Context, *InviterListRequest) (*InviterListResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetInviterList not implemented")
}
func (UnimplementedAccountFieeServer) WriteOff(context.Context, *WriteOffRequest) (*RemoveResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method WriteOff not implemented")
}
func (UnimplementedAccountFieeServer) CreateUserAndRealName(context.Context, *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method CreateUserAndRealName not implemented")
}
@ -2194,6 +2206,35 @@ func _AccountFiee_GetInviterList_Handler(srv interface{}, ctx context.Context, d
return interceptor(ctx, in, info, handler)
}
func _AccountFiee_WriteOff_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
in := new(WriteOffRequest)
if err := dec(in); err != nil {
return nil, err
}
base := srv.(dubbo3.Dubbo3GrpcService)
args := []interface{}{}
args = append(args, in)
md, _ := metadata.FromIncomingContext(ctx)
invAttachment := make(map[string]interface{}, len(md))
for k, v := range md {
invAttachment[k] = v
}
invo := invocation.NewRPCInvocation("WriteOff", args, invAttachment)
if interceptor == nil {
result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
return result, result.Error()
}
info := &grpc_go.UnaryServerInfo{
Server: srv,
FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
return result, result.Error()
}
return interceptor(ctx, in, info, handler)
}
func _AccountFiee_CreateUserAndRealName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
in := new(CreateUserAndRealNameRequest)
if err := dec(in); err != nil {
@ -3185,6 +3226,10 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
MethodName: "GetInviterList",
Handler: _AccountFiee_GetInviterList_Handler,
},
{
MethodName: "WriteOff",
Handler: _AccountFiee_WriteOff_Handler,
},
{
MethodName: "CreateUserAndRealName",
Handler: _AccountFiee_CreateUserAndRealName_Handler,

View File

@ -82,6 +82,7 @@ func NewRouter() *gin.Engine {
acRoute.POST("info", account.UserInfo) //用户详情
acRoute.POST("update", account.UserUpdate) //用户更新
acRoute.POST("ocr", account.CheckIdOcr) //
acRoute.POST("write/off", account.WriteOff) //
}
webAcRouter := privateGroup.Group("/user")
//webAcRouter.Use(middleware.CheckWebLogin(service.AccountProvider))

View File

@ -188,6 +188,26 @@ func CheckIdOcr(c *gin.Context) {
return
}
func WriteOff(c *gin.Context) {
var req account.WriteOffRequest
if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
service.Error(c, err)
return
}
user := login.GetUserInfoFromC(c)
res, err := service.AccountFieeProvider.WriteOff(c, &account.WriteOffRequest{
Id: user.ID,
})
if err != nil {
service.Error(c, err)
return
}
service.Success(c, res)
return
}
/**
* 获取身份证OCR识别结果
* @param realIDImgA string - 身份证图片的URL地址
@ -316,7 +336,11 @@ func SendMsg(c *gin.Context) {
//cache.RedisClient.Incr(daykey)
//cache.RedisClient.Incr(minutekey)
// ============================== redis检查ip结束
//todo 审核使用账号
if req.TelNum == "18888888888" {
service.Success1(c, "发送成功", &account.SendMsgStatusResponse{})
return
}
tempReq := &account.SendNationMsgRequest{
Domain: req.Domain,
TelNum: req.TelNum,
@ -509,6 +533,10 @@ func UserRegister(c *gin.Context) {
service.Error(c, err)
return
}
if tokenInfo.AccountInfo.WriteOff == true {
service.Error(c, errors.New("此账号已注销,无法登录"))
return
}
res.Token = tokenInfo.Token
service.Success(c, res)
return