From ee12f9cb68f341ada9c929865e168a56dd1928a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=A3=AB=E6=B6=B5?= <630892807@qq.com>
Date: Sat, 24 Oct 2020 12:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B6=88=E6=81=AF=E5=92=8C?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/message.go | 16 +++++++++-------
 models/messages.go    |  7 +++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/controller/message.go b/controller/message.go
index 74b339e..2941e52 100644
--- a/controller/message.go
+++ b/controller/message.go
@@ -145,9 +145,9 @@ func SendMessageV2(c *gin.Context) {
 		return
 	}
 	models.CreateMessage(kefuInfo.Name, vistorInfo.VisitorId, content, cType)
-
+	var msg TypeMessage
 	if cType == "kefu" {
-		guest, ok := clientList[vistorInfo.VisitorId]
+		guest, ok := ws.ClientList[vistorInfo.VisitorId]
 		if guest == nil || !ok {
 			c.JSON(200, gin.H{
 				"code": 200,
@@ -155,9 +155,9 @@ func SendMessageV2(c *gin.Context) {
 			})
 			return
 		}
-		conn := guest.conn
+		conn := guest.Conn
 
-		msg := TypeMessage{
+		msg = TypeMessage{
 			Type: "message",
 			Data: ClientMessage{
 				Name:    kefuInfo.Nickname,
@@ -170,6 +170,7 @@ func SendMessageV2(c *gin.Context) {
 		}
 		str, _ := json.Marshal(msg)
 		conn.WriteMessage(websocket.TextMessage, str)
+
 	}
 	if cType == "visitor" {
 		kefuConns, ok := ws.KefuList[kefuInfo.Name]
@@ -180,7 +181,7 @@ func SendMessageV2(c *gin.Context) {
 			})
 			return
 		}
-		msg := TypeMessage{
+		msg = TypeMessage{
 			Type: "message",
 			Data: ClientMessage{
 				Avator:  vistorInfo.Avator,
@@ -197,8 +198,9 @@ func SendMessageV2(c *gin.Context) {
 		}
 	}
 	c.JSON(200, gin.H{
-		"code": 200,
-		"msg":  "ok",
+		"code":   200,
+		"msg":    "ok",
+		"result": msg,
 	})
 }
 func SendVisitorNotice(c *gin.Context) {
diff --git a/models/messages.go b/models/messages.go
index 215100f..0ea6c29 100644
--- a/models/messages.go
+++ b/models/messages.go
@@ -54,6 +54,13 @@ func FindLastMessage(visitorIds []string) []Message {
 	return messages
 }
 
+//查询最后一条消息
+func FindLastMessageByVisitorId(visitorId string) Message {
+	var m Message
+	DB.Select("content").Where("visitor_id=?", visitorId).Order("id desc").First(&m)
+	return m
+}
+
 //查询条数
 func CountMessage() uint {
 	var count uint