修改

api/accountFiee/accountFiee.proto

@@ -184,6 +184,8 @@ message UserListRequest{
   int32 auditStatus = 7;
   uint64 page = 8;
   uint64 pageSize = 9;
+  string blurNameTel = 10;
+  repeated int64 ids = 11;
 }
 message UserInfoResponse{
   uint64 id = 1;

api/accountFiee/accountFiee.validator.pb.go

@@ -525,3 +525,175 @@ func (this *ClockLogListResponse) Validate() error {
 func (this *SubmitInfoRequest) Validate() error {
 	return nil
 }
+func (this *CommonMsg) Validate() error {
+	return nil
+}
+func (this *ChatRecordData) Validate() error {
+	for _, item := range this.Medias {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Medias", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *CreateChatRecordResp) Validate() error {
+	if this.Data != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Data); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+		}
+	}
+	return nil
+}
+func (this *DeleteChatRecordRequest) Validate() error {
+	return nil
+}
+func (this *GetChatRecordByIdRequest) Validate() error {
+	return nil
+}
+func (this *GetChatRecordListRequest) Validate() error {
+	if this.Query != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Query); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Query", err)
+		}
+	}
+	return nil
+}
+func (this *GetChatRecordListResp) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *RegisterWaiterRequest) Validate() error {
+	return nil
+}
+func (this *RegisterWaiterResp) Validate() error {
+	return nil
+}
+func (this *ChatMediaData) Validate() error {
+	return nil
+}
+func (this *CreateChatMediaResp) Validate() error {
+	if this.Data != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Data); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+		}
+	}
+	return nil
+}
+func (this *DeleteChatMediaRequest) Validate() error {
+	return nil
+}
+func (this *GetChatMediaByIdRequest) Validate() error {
+	return nil
+}
+func (this *GetChatMediaListRequest) Validate() error {
+	if this.Query != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Query); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Query", err)
+		}
+	}
+	return nil
+}
+func (this *GetChatMediaListResp) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *GetChatUserListRequest2) Validate() error {
+	return nil
+}
+func (this *ChatUser2) Validate() error {
+	return nil
+}
+func (this *GetChatUserListResp2) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ChatAutoReplyRulerData) Validate() error {
+	return nil
+}
+func (this *CreateChatAutoReplyRulerResp) Validate() error {
+	if this.Data != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Data); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+		}
+	}
+	return nil
+}
+func (this *DeleteChatAutoReplyRulerRequest) Validate() error {
+	return nil
+}
+func (this *GetChatAutoReplyRulerByIdRequest) Validate() error {
+	return nil
+}
+func (this *GetChatAutoReplyRulerListRequest) Validate() error {
+	if this.Query != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Query); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Query", err)
+		}
+	}
+	return nil
+}
+func (this *GetChatAutoReplyRulerListResp) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ChatUserData) Validate() error {
+	return nil
+}
+func (this *CreateChatUserResp) Validate() error {
+	if this.Data != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Data); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+		}
+	}
+	return nil
+}
+func (this *DeleteChatUserRequest) Validate() error {
+	return nil
+}
+func (this *GetChatUserByIdRequest) Validate() error {
+	return nil
+}
+func (this *GetChatUserListRequest) Validate() error {
+	if this.Query != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Query); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Query", err)
+		}
+	}
+	return nil
+}
+func (this *GetChatUserListResp) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}

api/accountFiee/accountFiee_triple.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.22.0--rc2
-// source: accountFiee.proto
+// - protoc             v4.24.0--rc1
+// source: api/accountFiee/accountFiee.proto
 
 package accountFiee
 
@@ -35,7 +35,7 @@ type AccountFieeClient interface {
 	OnlineLog(ctx context.Context, in *LoginInfosByUserIdRequest, opts ...grpc_go.CallOption) (*LoginLogsResponse, common.ErrorWithAttachment)
 	OnlineLogById(ctx context.Context, in *OnlineLogByIdRequest, opts ...grpc_go.CallOption) (*LoginLog, common.ErrorWithAttachment)
 	CheckPwd(ctx context.Context, in *CheckPwdRequest, opts ...grpc_go.CallOption) (*UpdateResponse, common.ErrorWithAttachment)
-	// rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
+	//  rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 	SendMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
 	SendCustomMsg(ctx context.Context, in *SendCustomMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
 	SendExCustomMsg(ctx context.Context, in *SendCustomMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
@@ -70,7 +70,7 @@ type AccountFieeClient interface {
 	VerifySliderStatus(ctx context.Context, in *VerifySliderStatusRequest, opts ...grpc_go.CallOption) (*VerifySliderStatusResponse, common.ErrorWithAttachment)
 	// submit info
 	SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
-	// -----------------------------客服聊天系统--------------------------------
+	//-----------------------------客服聊天系统--------------------------------
 	CreateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CreateChatUserResp, common.ErrorWithAttachment)
 	UpdateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment)
 	SaveChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment)
@@ -591,7 +591,7 @@ type AccountFieeServer interface {
 	OnlineLog(context.Context, *LoginInfosByUserIdRequest) (*LoginLogsResponse, error)
 	OnlineLogById(context.Context, *OnlineLogByIdRequest) (*LoginLog, error)
 	CheckPwd(context.Context, *CheckPwdRequest) (*UpdateResponse, error)
-	// rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
+	//  rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 	SendMsg(context.Context, *SendMsgRequest) (*SendMsgStatusResponse, error)
 	SendCustomMsg(context.Context, *SendCustomMsgRequest) (*SendMsgStatusResponse, error)
 	SendExCustomMsg(context.Context, *SendCustomMsgRequest) (*SendMsgStatusResponse, error)
@@ -626,7 +626,7 @@ type AccountFieeServer interface {
 	VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
 	// submit info
 	SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error)
-	// -----------------------------客服聊天系统--------------------------------
+	//-----------------------------客服聊天系统--------------------------------
 	CreateChatUser(context.Context, *ChatUserData) (*CreateChatUserResp, error)
 	UpdateChatUser(context.Context, *ChatUserData) (*CommonMsg, error)
 	SaveChatUser(context.Context, *ChatUserData) (*CommonMsg, error)
@@ -3074,5 +3074,5 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
 		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "accountFiee.proto",
+	Metadata: "api/accountFiee/accountFiee.proto",
 }

pkg/service/account.go

@@ -654,6 +654,9 @@ func (a *AccountFieeProvider) UserList(ctx context.Context, in *account.UserList
 	if in.Domain != "" {
 		modelObj.Where("domain = ? ", in.Domain)
 	}
+	if len(in.Ids) != 0 {
+		modelObj.Where("user.id in (?) ", in.Ids)
+	}
 	if in.SubNum != "" {
 		modelObj.Where("sub_num like ? ", "%"+in.SubNum+"%")
 	}
@@ -674,6 +677,9 @@ func (a *AccountFieeProvider) UserList(ctx context.Context, in *account.UserList
 	if in.Sex != "" {
 		modelObj.Where("RealName.sex = ?", in.Sex)
 	}
+	if in.BlurNameTel != "" {
+		modelObj.Where("RealName.name like ? or tel_num like ? ", "%"+in.BlurNameTel+"%", "%"+in.BlurNameTel+"%")
+	}
 	modelObj.Count(&count)
 	if in.Page > 0 && in.PageSize > 0 {
 		modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize))
@@ -770,8 +776,8 @@ func (a *AccountFieeProvider) GenerateSliderCaptcha(_ context.Context, in *accou
 
 	utils.CutByTemplate(canvasImage, blockImage, blockWidth, blockHeight, blockX, blockY)
 	fmt.Println("1---", 0)
-	fmt.Println("2---", blockY)
-	fmt.Println("2---", blockX)
+	fmt.Println("2---Y", blockY)
+	fmt.Println("2---X", blockX)
 
 	// 生成UUID
 	nonceStr := fmt.Sprintf("%x", rand2.New(rand2.NewSource(time.Now().UnixNano())).Uint64())