IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 12:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

group

Browse Source
This commit is contained in:
wangchuxiao
2022-01-27 01:08:02 +08:00
parent b992faa468
commit 0ed393b1a5
14 changed files with 588 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/mysql_model/im_mysql_model/group_model.go
+19 -6
View File
@@ -66,7 +66,7 @@ func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]db.Group
return groups, err
}
dbConn.LogMode(true)
err = dbConn.Table("groups").Where("name=?", groupName).Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&groups).Error
err = dbConn.Table("groups").Where("name=?", groupName).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error
return groups, err
}
@@ -77,7 +77,7 @@ func GetGroups(pageNumber, showNumber int) ([]db.Group, error) {
return groups, err
}
dbConn.LogMode(true)
if err = dbConn.Table("groups").Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&groups).Error; err != nil {
if err = dbConn.Table("groups").Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error; err != nil {
return groups, err
}
return groups, nil
@@ -121,14 +121,27 @@ func SetGroupMaster(userId, groupId string) error {
}
dbConn.LogMode(true)
groupMember := db.GroupMember{
UserID: userId,
UserID: userId,
GroupID: groupId,
}
updateInfo := db.GroupMember{
RoleLevel:constant.GroupOwner,
RoleLevel: constant.GroupOwner,
}
if err := dbConn.Find(&groupMember).Update(updateInfo).Error; err != nil {
return err
}
return nil
}
return nil
}
func GetGroupsCountNum() (int, error) {
dbConn, err := db.DB.MysqlDB.DefaultGormDB()
if err != nil {
return 0, err
}
dbConn.LogMode(true)
var count int
if err := dbConn.Model(&db.Group{}).Count(&count).Error; err != nil {
return 0, err
}
return count, nil
}
pkg/common/db/mysql_model/im_mysql_model/user_model.go
+23 -23
View File
@@ -90,7 +90,7 @@ func UpdateUserInfo(user db.Users) error {
if err != nil {
return err
}
dbConn.LogMode(true)
err = dbConn.Table("users").Where("user_id=?", user.UserID).Update(&user).Error
return err
}
@@ -130,7 +130,7 @@ func GetUsers(showNumber, pageNumber int32) ([]db.Users, error) {
return users, err
}
dbConn.LogMode(true)
err = dbConn.Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&users).Error
err = dbConn.Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&users).Error
if err != nil {
return users, err
}
@@ -156,14 +156,14 @@ func AddUser(userId, phoneNumber, name string) error {
return err
}
user := db.Users{
PhoneNumber:phoneNumber,
Birth:time.Now(),
CreateTime:time.Now(),
UserID: userId,
Nickname:name,
PhoneNumber: phoneNumber,
Birth: time.Now(),
CreateTime: time.Now(),
UserID: userId,
Nickname: name,
}
result := dbConn.Create(&user)
return result.Error
return result.Error
}
func UserIsBlock(userId string) (bool, error) {
@@ -181,7 +181,7 @@ func UserIsBlock(userId string) (bool, error) {
func BlockUser(userId, endDisableTime string) error {
user, err := GetUserByUserID(userId)
if err != nil || user.UserID=="" {
if err != nil || user.UserID == "" {
return err
}
dbConn, err := db.DB.MysqlDB.DefaultGormDB()
@@ -202,9 +202,9 @@ func BlockUser(userId, endDisableTime string) error {
return nil
}
blockUser = db.BlackList{
UserId: userId,
UserId: userId,
BeginDisableTime: time.Now(),
EndDisableTime: end,
EndDisableTime: end,
}
result := dbConn.Create(&blockUser)
return result.Error
@@ -221,25 +221,25 @@ func UnBlockUser(userId string) error {
}
type BlockUserInfo struct {
User db.Users
User db.Users
BeginDisableTime time.Time
EndDisableTime time.Time
EndDisableTime time.Time
}
func GetBlockUserById(userId string) (BlockUserInfo, error) {
dbConn, err := db.DB.MysqlDB.DefaultGormDB()
var blockUserInfo BlockUserInfo
blockUser := db.BlackList{
UserId:userId,
UserId: userId,
}
if err != nil {
return blockUserInfo, err
}
if err = dbConn.Find(&blockUser).Error; err != nil{
if err = dbConn.Find(&blockUser).Error; err != nil {
return blockUserInfo, err
}
user := db.Users{
UserID:blockUser.UserId,
UserID: blockUser.UserId,
}
if err := dbConn.Find(&user).Error; err != nil {
return blockUserInfo, err
@@ -258,18 +258,18 @@ func GetBlockUsers(showNumber, pageNumber int32) ([]BlockUserInfo, error) {
return blockUserInfos, err
}
dbConn.LogMode(true)
err = dbConn.Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&blockUsers).Error
err = dbConn.Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&blockUsers).Error
for _, blockUser := range blockUsers {
var user db.Users
if err := dbConn.Table("users").Where("user_id=?", blockUser.UserId).First(&user).Error; err == nil{
if err := dbConn.Table("users").Where("user_id=?", blockUser.UserId).First(&user).Error; err == nil {
blockUserInfos = append(blockUserInfos, BlockUserInfo{
User: db.Users{
UserID: user.UserID,
Nickname: user.Nickname,
FaceURL: user.FaceURL,
UserID: user.UserID,
Nickname: user.Nickname,
FaceURL: user.FaceURL,
},
BeginDisableTime: blockUser.BeginDisableTime,
EndDisableTime: blockUser.EndDisableTime,
EndDisableTime: blockUser.EndDisableTime,
})
}
}
@@ -287,4 +287,4 @@ func GetBlockUsersNumCount() (int, error) {
return 0, err
}
return count, nil
}
}
pkg/common/log/logrus.go
+10 -9
View File
@@ -2,14 +2,14 @@ package log
import (
"Open_IM/pkg/common/config"
"bufio"
"fmt"
"os"
"time"
nested "github.com/antonfisher/nested-logrus-formatter"
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
"github.com/rifflock/lfshook"
"github.com/sirupsen/logrus"
"os"
"time"
)
var logger *Logger
@@ -32,12 +32,13 @@ func loggerInit(moduleName string) *Logger {
//All logs will be printed
logger.SetLevel(logrus.Level(config.Config.Log.RemainLogLevel))
//Close std console output
src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
if err != nil {
panic(err.Error())
}
writer := bufio.NewWriter(src)
logger.SetOutput(writer)
// src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
// if err != nil {
// panic(err.Error())
// }
// writer := bufio.NewWriter(src)
// logger.SetOutput(writer)
logger.SetOutput(os.Stdout)
//Log Console Print Style Setting
logger.SetFormatter(&nested.Formatter{
TimestampFormat: "2006-01-02 15:04:05.000",