Merge remote-tracking branch 'origin/tuoyun' into tuoyun

pkg/common/constant/constant.go

@@ -78,13 +78,13 @@ const (
 	ExpiredToken = 3
 
 	//MultiTerminalLogin
-	//全端登录，但是同端互斥
+	//Full-end login, but the same end is mutually exclusive
 	AllLoginButSameTermKick = 1
-	//所有端中只能有一端能够登录
+	//Only one of the endpoints can log in
 	SingleTerminalLogin = 2
-	//web端可以同时在线，其他端只能有一端登录
+	//The web side can be online at the same time, and the other side can only log in at one end
 	WebAndOther = 3
-	//Pc端互斥，移动端互斥，但是web端可以同时在线
+	//The PC side is mutually exclusive, and the mobile side is mutually exclusive, but the web side can be online at the same time
 	PcMobileAndWeb = 4
 
 	OnlineStatus  = "online"

pkg/common/db/mysql_model/im_mysql_msg_model/receive_model.go

@@ -1,19 +0,0 @@
-/*
-** description("").
-** copyright('tuoyun,www.tuoyun.net').
-** author("fg,Gordon@tuoyun.net").
-** time(2021/3/4 11:18).
- */
-package im_mysql_msg_model
-
-import (
-	"time"
-)
-
-// Receive Inbox table structure
-type Receive struct {
-	UserId     string `gorm:"primary_key"` // 收件箱主键ID
-	Seq        int64  `gorm:"primary_key"` // 收件箱主键ID
-	MsgId      string
-	CreateTime *time.Time
-}