feat: modify send api

Author: qloog

handler/v1/im/send.go

@@ -4,7 +4,7 @@ import (
 	"github.com/1024casts/fastim/internal/idl"
 	"github.com/gin-gonic/gin"
 
-	"github.com/1024casts/snake/pkg/errno"
+	"github.com/1024casts/fastim/pkg/errno"
 	"github.com/1024casts/snake/pkg/log"
 
 	"github.com/1024casts/fastim/handler"
@@ -56,7 +56,7 @@ func Send(c *gin.Context) {
 	YUserId := req.UserId
 	YUser, err := userSrv.GetUserById(YUserId)
 	if err != nil {
-		log.Warnf("[send] get user info err: %+v, yuser_id:%d", err, YUserId)
+		log.Warnf("[send] get user info err: %+v, yuser_id: %d", err, YUserId)
 		handler.SendResponse(c, errno.InternalServerError, nil)
 		return
 	}

internal/idl/chat.go

@@ -4,17 +4,18 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/1024casts/banhui/model"
+	"github.com/1024casts/fastim/internal/model"
 )
 
+// TransChatInput trans chat input data
 type TransChatInput struct {
-	CurUser   *model.UserModel
-	User      *model.UserModel // 对方用户信息
+	CurUser   *model.UserBaseModel
+	User      *model.UserBaseModel // 对方用户信息
 	Msg       *model.MsgModel
 	NewMsgNum int
 }
 
-// 组装数据并输出
+// TransChat 组装数据并输出
 // 对外暴露的user结构，都应该经过此结构进行转换
 func TransChat(input *TransChatInput) (*model.ChatInfo, error) {
 	transUserInput := &TransUserInput{

internal/model/chat.go

@@ -20,10 +20,10 @@ func (c *ChatModel) TableName() string {
 }
 
 type ChatInfo struct {
-	//User      *UserInfo `json:"user"`
-	Msg       *MsgInfo `json:"msg"`
-	ShowTime  string   `json:"show_time"`
-	NewMsgNum int      `json:"new_msg_num"`
+	User      *UserInfo `json:"user"`
+	Msg       *MsgInfo  `json:"msg"`
+	ShowTime  string    `json:"show_time"`
+	NewMsgNum int       `json:"new_msg_num"`
 }
 
 type UserChatList struct {

internal/model/user_base.go

@@ -1,6 +1,9 @@
 package model
 
-import "time"
+import (
+	"sync"
+	"time"
+)
 
 type UserBaseModel struct {
 	BaseModel
@@ -26,3 +29,30 @@ type UserBaseModel struct {
 func (u *UserBaseModel) TableName() string {
 	return "user_base"
 }
+
+type UserInfo struct {
+	Id             uint64 `json:"id"`
+	Phone          int    `json:"phone"`
+	Username       string `json:"username"`
+	Avatar         string `json:"avatar"`
+	Sex            int    `json:"sex"`
+	PostCount      int    `json:"post_count"`
+	CommentCount   int    `json:"comment_count"`
+	ReplyCount     int    `json:"reply_count"`
+	FeedCount      int    `json:"feed_count"`
+	FollowingCount int    `json:"following_count"`
+	FollowerCount  int    `json:"follower_count"`
+	ClassCount     int    `json:"class_count"`    // 总班级数
+	LikeCount      int    `json:"like_count"`     // 总的喜欢数
+	PointCount     int    `json:"point_count"`    // 总的斑点数
+	ActivityCount  int    `json:"activity_count"` // 活动数
+	IsFollow       int    `json:"is_follow"`      // 是否关注用户
+	IsFollowed     int    `json:"is_followed"`    // 是否被粉丝关注
+	InviteStatus   int    `json:"invite_status"`  // 邀请状态（在班级中邀请的)）
+	CreatedAt      string `json:"created_at"`
+}
+
+type UserList struct {
+	Lock  *sync.Mutex
+	IdMap map[uint64]*UserInfo
+}

pkg/errno/code.go

@@ -0,0 +1,31 @@
+package errno
+
+//nolint: golint
+var (
+	// Common errors
+	OK                  = &Errno{Code: 0, Message: "OK"}
+	InternalServerError = &Errno{Code: 10001, Message: "Internal server error"}
+	ErrBind             = &Errno{Code: 10002, Message: "Error occurred while binding the request body to the struct."}
+	ErrParam            = &Errno{Code: 10003, Message: "参数有误"}
+	ErrSignParam        = &Errno{Code: 10004, Message: "签名参数有误"}
+
+	ErrValidation         = &Errno{Code: 20001, Message: "Validation failed."}
+	ErrDatabase           = &Errno{Code: 20002, Message: "Database error."}
+	ErrToken              = &Errno{Code: 20003, Message: "Error occurred while signing the JSON web token."}
+	ErrInvalidTransaction = &Errno{Code: 20004, Message: "invalid transaction."}
+
+	// user errors
+	ErrEncrypt               = &Errno{Code: 20101, Message: "Error occurred while encrypting the user password."}
+	ErrUserNotFound          = &Errno{Code: 20102, Message: "The user was not found."}
+	ErrTokenInvalid          = &Errno{Code: 20103, Message: "The token was invalid."}
+	ErrPasswordIncorrect     = &Errno{Code: 20104, Message: "The password was incorrect."}
+	ErrAreaCodeEmpty         = &Errno{Code: 20105, Message: "手机区号不能为空"}
+	ErrPhoneEmpty            = &Errno{Code: 20106, Message: "手机号不能为空"}
+	ErrGenVCode              = &Errno{Code: 20107, Message: "生成验证码错误"}
+	ErrSendSMS               = &Errno{Code: 20108, Message: "发送短信错误"}
+	ErrSendSMSTooMany        = &Errno{Code: 20109, Message: "已超出当日限制，请明天再试"}
+	ErrVerifyCode            = &Errno{Code: 20110, Message: "验证码错误"}
+	ErrEmailOrPassword       = &Errno{Code: 20111, Message: "邮箱或密码错误"}
+	ErrTwicePasswordNotMatch = &Errno{Code: 20112, Message: "两次密码输入不一致"}
+	ErrRegisterFailed        = &Errno{Code: 20113, Message: "注册失败"}
+)

pkg/errno/errno.go

@@ -0,0 +1,41 @@
+package errno
+
+import "fmt"
+
+// Errno 返回错误码和消息的结构体
+type Errno struct {
+	Code    int
+	Message string
+}
+
+func (err Errno) Error() string {
+	return err.Message
+}
+
+// Err represents an error
+type Err struct {
+	Code    int
+	Message string
+	Err     error
+}
+
+func (err *Err) Error() string {
+	return fmt.Sprintf("Err - code: %d, message: %s, error: %s", err.Code, err.Message, err.Err)
+}
+
+// DecodeErr 对错误进行解码，返回错误code和错误提示
+func DecodeErr(err error) (int, string) {
+	if err == nil {
+		return OK.Code, OK.Message
+	}
+
+	switch typed := err.(type) {
+	case *Err:
+		return typed.Code, typed.Message
+	case *Errno:
+		return typed.Code, typed.Message
+	default:
+	}
+
+	return InternalServerError.Code, err.Error()
+}