blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-25 19:22:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

Browse Source
This commit is contained in:
wangchuxiao 2022-08-11 16:51:37 +08:00
commit cc3f53d572
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/demo/register/send_code.go
View File

@ -34,11 +34,12 @@ func init() {
} }
type paramsVerificationCode struct { type paramsVerificationCode struct {
Email string `json:"email"` Email string `json:"email"`
PhoneNumber string `json:"phoneNumber"` PhoneNumber string `json:"phoneNumber"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
UsedFor int `json:"usedFor"` UsedFor int `json:"usedFor"`
AreaCode string `json:"areaCode"` AreaCode string `json:"areaCode"`
InvitationCode string `json:"invitationCode"`
} }
func SendVerificationCode(c *gin.Context) { func SendVerificationCode(c *gin.Context) {

1
internal/demo/register/set_password.go
View File

@ -30,6 +30,7 @@ type ParamsSetPassword struct {
FaceURL string `json:"faceURL"` FaceURL string `json:"faceURL"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
AreaCode string `json:"areaCode"` AreaCode string `json:"areaCode"`
InvitationCode string `json:"invitationCode"`
} }
func SetPassword(c *gin.Context) { func SetPassword(c *gin.Context) {

1
internal/msg_gateway/gate/ws_server.go
View File

@ -144,7 +144,6 @@ func (ws *WServer) MultiTerminalLoginCheckerWithLock(uid string, platformID int,
rwLock.Lock() rwLock.Lock()
defer rwLock.Unlock() defer rwLock.Unlock()
log.NewInfo(operationID, utils.GetSelfFuncName(), " rpc args: ", uid, platformID, token) log.NewInfo(operationID, utils.GetSelfFuncName(), " rpc args: ", uid, platformID, token)
return
switch config.Config.MultiLoginPolicy { switch config.Config.MultiLoginPolicy {
case constant.AllLoginButSameTermKick: case constant.AllLoginButSameTermKick:
if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn] if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]

16
pkg/common/db/model_struct.go
View File

@ -3,11 +3,17 @@ package db
import "time" import "time"
type Register struct { type Register struct {
Account string `gorm:"column:account;primary_key;type:char(255)" json:"account"` Account string `gorm:"column:account;primary_key;type:char(255)" json:"account"`
Password string `gorm:"column:password;type:varchar(255)" json:"password"` Password string `gorm:"column:password;type:varchar(255)" json:"password"`
Ex string `gorm:"column:ex;size:1024" json:"ex"` Ex string `gorm:"column:ex;size:1024" json:"ex"`
UserID string `gorm:"column:user_id;type:varchar(255)" json:"userID"` UserID string `gorm:"column:user_id;type:varchar(255)" json:"userID"`
AreaCode string `gorm:"column:area_code;type:varchar(255)"` AreaCode string `gorm:"column:area_code;type:varchar(255)"`
InvitationCode string `gorm:"column:invitation_code;type:varchar(255)"`
}
type Invitation struct {
InvitationCode string `gorm:"column:invitation_code;primary_key;type:varchar(255)"`
CreateTime time.Time `gorm:"column:create_time"`
} }
// //

2
pkg/common/db/mysql.go
View File

@ -78,7 +78,7 @@ func initMysqlDB() {
&GroupMember{}, &GroupMember{},
&GroupRequest{}, &GroupRequest{},
&User{}, &User{},
&Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{}) &Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{}, &Invitation{})
db.Set("gorm:table_options", "CHARSET=utf8") db.Set("gorm:table_options", "CHARSET=utf8")
db.Set("gorm:table_options", "collation=utf8_unicode_ci") db.Set("gorm:table_options", "collation=utf8_unicode_ci")