From 3c05d4124661e234950d02c334a5ff2e84414100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 16 Oct 2020 15:56:38 +0800
Subject: [PATCH] addmessagegroup

---
 business/model/message.go             |  1 +
 controllers/event.go                  | 15 ++++++++++++++-
 routers/commentsRouter_controllers.go |  9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/business/model/message.go b/business/model/message.go
index d1d2adee3..fb805ce31 100644
--- a/business/model/message.go
+++ b/business/model/message.go
@@ -86,6 +86,7 @@ type MessageGroupMember struct {
 
 	GroupID      int    `orm:"column(group_id)" json:"groupID"`            //组ID
 	MemberUserID string `orm:"column(member_user_id)" json:"memberUserID"` //成员用户ID
+	Type         int    `json:"type"`                                      //组员类型，管理员？
 }
 
 func (*MessageGroupMember) TableIndex() [][]string {
diff --git a/controllers/event.go b/controllers/event.go
index 4761d79bf..acd48c15a 100644
--- a/controllers/event.go
+++ b/controllers/event.go
@@ -84,7 +84,7 @@ func (c *EventController) TestWebsocket() {
 	}
 	defer ws.Close()
 	var (
-		vendorOrderID = c.GetString("vendorOrderID")
+		vendorOrderID = c.GetString("userID")
 		msgMap        = make(map[string]*model.ImMessageRecord)
 	)
 	//将当前客户端放入map中
@@ -102,6 +102,7 @@ func (c *EventController) TestWebsocket() {
 		}
 	}
 
+	//找到当前用户的组
 	c.EnableRender = false //Beego不启用渲染
 
 	var s *model.ImMessageRecord
@@ -182,3 +183,15 @@ func (c *EventController) GetImMessageRecord() {
 		return retVal, "", err
 	})
 }
+
+// @Title 加入用户组
+// @Description 加入用户组
+// @Param	token			header		string	true	"认证token"
+// @Param	groupID		 	formData	string	true	"组号"
+// @Param	userID		 	formData	string	true	"被邀请人ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AddMessageGroup [post]
+func (c *EventController) AddMessageGroup() {
+
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 729344a9e..7993c34bc 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -124,6 +124,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"],
+        beego.ControllerComments{
+            Method: "AddMessageGroup",
+            Router: `/AddMessageGroup`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"],
         beego.ControllerComments{
             Method: "GetImMessageRecord",