WH01243 3 роки тому
батько
коміт
5ae1c713d0
2 змінених файлів з 21 додано та 15 видалено
  1. 5 9
      api/messagecenter/messagecenter.go
  2. 16 6
      service/message_mail_box.go

+ 5 - 9
api/messagecenter/messagecenter.go

@@ -1,26 +1,23 @@
 package main
+
 import (
 	mc "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
 	"app.yhyue.com/moapp/jybase/go-xweb/log"
-	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"fmt"
 	"github.com/zeromicro/go-zero/rest"
 	. "messagecenter/api/messagecenter/common"
 	_ "messagecenter/api/messagecenter/common"
 	"messagecenter/api/messagecenter/internal/handler"
 	"messagecenter/api/messagecenter/internal/svc"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
 func main() {
 	//注册代理服务
-	closeNotify, err := node.NewNode(C.Gateway.Etcd...).Register(C.Gateway.ServerCode, mc.InterfaceToStr(C.Port))
+	/*closeNotify, err := node.NewNode(C.Gateway.Etcd...).Register(C.Gateway.ServerCode, mc.InterfaceToStr(C.Port))
 	if err != nil {
 		panic(err)
-	}
+	}*/
 	//
 	go func() {
 		err := endless.ListenAndServe(":"+mc.InterfaceToStr(C.WebRpcPort), nil, func() {})
@@ -32,14 +29,13 @@ func main() {
 	server := rest.MustNewServer(C.RestConf)
 	defer server.Stop()
 
-
 	handler.RegisterHandlers(server, ctx)
 
 	fmt.Printf("Starting server at %s:%d...\n", C.Host, C.Port)
 	server.Start()
 
-	quit := make(chan os.Signal, 1)
+	/*quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 	<-quit
-	closeNotify()
+	closeNotify()*/
 }

+ 16 - 6
service/message_mail_box.go

@@ -93,7 +93,7 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
 		if in.ItemType == 4 || in.ItemType == 5 || in.ItemType == 6 {
 			//客服或者机器人聊天
 			if in.OwnType == 1 {
-				// (用户发送)客服接收信息
+				// (用户发送)客服接
 				messageMailBox["own_type"] = 1
 				messageMailBox["send_user_type"] = 2
 				messageMailBox["receive_user_type"] = 1
@@ -101,13 +101,17 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
 				messageMailBox["send_user_id"] = in.NewUserId
 				messageMailBox["receive_user_id"] = in.ReceiveId
 			} else {
-				//用户接收信息(客服发送)
+				//客服发送(用户接收信息)
 				messageMailBox["own_type"] = 2
 				messageMailBox["send_user_type"] = 1
 				messageMailBox["receive_user_type"] = 2
 				messageMailBox["own_id"] = in.ReceiveId
 				messageMailBox["send_user_id"] = in.SendId
 				messageMailBox["receive_user_id"] = in.ReceiveId
+				if in.ItemType == 4 {
+					messageMailBox["receive_user_id"] = in.NewUserId
+					messageMailBox["own_id"] = in.NewUserId
+				}
 			}
 		} else {
 			messageMailBox["own_type"] = 2
@@ -139,7 +143,7 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
 		if in.ItemType == 4 || in.ItemType == 5 || in.ItemType == 6 {
 			//客服或者机器人聊天
 			if in.OwnType == 1 {
-				//用户发送信息自己保存(接受者为客服)
+				//用户发送(用户接受)
 				messageMailBox["own_type"] = 2
 				messageMailBox["send_user_type"] = 2
 				messageMailBox["receive_user_type"] = 1
@@ -147,13 +151,16 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
 				messageMailBox["send_user_id"] = in.NewUserId
 				messageMailBox["receive_user_id"] = in.ReceiveId
 			} else {
-				//客服发送信息(接受者用户)
+				//客服发送信息(用户接受)
 				messageMailBox["own_type"] = 1
 				messageMailBox["send_user_type"] = 1
 				messageMailBox["receive_user_type"] = 2
 				messageMailBox["own_id"] = in.SendId
 				messageMailBox["send_user_id"] = in.SendId
 				messageMailBox["receive_user_id"] = in.ReceiveId
+				if in.ItemType == 4 {
+					messageMailBox["receive_user_id"] = in.NewUserId
+				}
 			}
 		} else {
 			messageMailBox["own_type"] = 2
@@ -214,9 +221,12 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) (*[]map[strin
 	//自己头像处理
 	if in.UserType == 2 && count > 0 {
 		userData := Mysql.FindOne("base_user", map[string]interface{}{"id": in.NewUserId}, "headimg", "")
-		for key := range *data {
-			(*data)[key]["ownImg"] = (*userData)["headimg"]
+		if userData != nil {
+			for key := range *data {
+				(*data)[key]["ownImg"] = (*userData)["headimg"]
+			}
 		}
+
 	}
 	updateMap := map[string]interface{}{}
 	if len(*data) > 0 {