Merge branch 'refs/heads/feature-im'

dao/im.go

@@ -78,9 +78,9 @@ func GetMsgGroupByIndex(group_id, index int) ([]GroupMessage, error) {
 
 }
 
-func GetGroupRequestUsers(user_id int) []FriendRequest {
+func GetGroupRequestUsers(user_id int) []GroupRequest {
-	var users []FriendRequest
+	var users []GroupRequest
-	DB.Debug().Raw("select id,im_id,name,email FROM (SELECT im_id,from_user_id,group_id FROM (( SELECT id as im_id,from_user_id,group_id FROM messages WHERE type=? and status=? ) as m JOIN groups as g on g.id=m.group_id ) where g.auth_id=? ) as e JOIN users as u ON e.from_user_id=u.id", proto.MSG_TYPE_GROUP_ADD, 0, user_id).Scan(&users)
+	DB.Debug().Raw("select id,im_id,name,email,group_id FROM (SELECT im_id,from_user_id,group_id FROM (( SELECT id as im_id,from_user_id,group_id FROM messages WHERE type=? and status=? ) as m JOIN groups as g on g.id=m.group_id ) where g.auth_id=? ) as e JOIN users as u ON e.from_user_id=u.id", proto.MSG_TYPE_GROUP_ADD, 0, user_id).Scan(&users)
 	return users
 }
 
@@ -278,6 +278,11 @@ type FriendRequest struct {
 	Age   int    `json:"age"`
 }
 
+type GroupRequest struct {
+	FriendRequest
+	GroupID int `json:"group_id"`
+}
+
 func GetFriendRequest(user_id int) []FriendRequest {
 	var users []FriendRequest
 	DB.Debug().Raw("select users.id,users.name,users.email,users.age,messages.id as im_id from users join messages on users.id = messages.from_user_id where messages.to_user_id = ? and messages.type = ? and status = ?", user_id, proto.MSG_TYPE_FRIEND, 0).Scan(&users)

service/imService.go

@@ -317,7 +317,7 @@ func GetGroupByNameLike(name string) []dao.Group {
 	return groups
 }
 
-func GetGroupRequestUsers(user_id int) []dao.FriendRequest {
+func GetGroupRequestUsers(user_id int) []dao.GroupRequest {
 	//获取群聊请求
 	users := dao.GetGroupRequestUsers(user_id)
 	return users