tidy code

This commit is contained in:
wenxu12345
2021-12-28 21:17:41 +08:00
parent 39ceb20332
commit 47a3c3c253
5 changed files with 34 additions and 14 deletions
@@ -1,6 +1,7 @@
package im_mysql_model
import (
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
"time"
)
@@ -23,6 +24,9 @@ func InsertIntoGroupMember(toInsertInfo GroupMember) error {
return err
}
toInsertInfo.JoinSource = time.Now()
if toInsertInfo.RoleLevel == 0 {
toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
}
err = dbConn.Table("group_member").Create(toInsertInfo).Error
if err != nil {
return err
@@ -138,7 +142,7 @@ func GetGroupOwnerInfoByGroupID(groupID string) (*GroupMember, error) {
return nil, err
}
for _, v := range omList {
if v.RoleLevel == 1 {
if v.RoleLevel == constant.GroupOwner {
return &v, nil
}
}
@@ -1,6 +1,7 @@
package im_mysql_model
import (
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
"time"
)
@@ -88,7 +89,7 @@ func GetGroupApplicationList(userID string) ([]GroupRequest, error) {
return nil, err
}
for _, v := range memberList {
if v.RoleLevel > 0 {
if v.RoleLevel > constant.GroupOrdinaryUsers {
list, err := GetGroupRequestByGroupID(v.GroupID)
if err != nil {
continue
@@ -2,6 +2,7 @@ package im_mysql_model
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
"Open_IM/pkg/utils"
"fmt"
@@ -15,13 +16,13 @@ func init() {
user, err := GetUserByUserID(v)
if err != nil {
fmt.Println("GetUserByUserID failed ", err.Error(), v, user)
}else{
} else {
continue
}
var appMgr User
appMgr.UserID = v
appMgr.Nickname = "AppManager" + utils.IntToString(k+1)
appMgr.AppMangerLevel = 2
appMgr.AppMangerLevel = constant.AppAdmin
err = UserRegister(appMgr)
if err != nil {
fmt.Println("AppManager insert error", err.Error())
@@ -36,7 +37,9 @@ func UserRegister(user User) error {
return err
}
user.CreateTime = time.Now()
if user.AppMangerLevel == 0 {
user.AppMangerLevel = constant.AppOrdinaryUsers
}
err = dbConn.Table("user").Create(&user).Error
if err != nil {
return err