v2

penqee · Apr 8, 2024 · e969752 · e969752
1 parent 6b06c68
commit e969752
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/videoweb/.golangci.yml b/videoweb/.golangci.yml
@@ -5,15 +5,13 @@ linters:
     - gosimple
     - govet
     - ineffassign
-    - staticcheck
     - unused
-    - errchkjson
     - errname
     - asciicheck
     - bodyclose
     - exhaustive
-    - nilerr
-    - nestif
+
+
 linters-settings:
   govet:
     enable:

diff --git a/videoweb/cmd/chat/service/model.go b/videoweb/cmd/chat/service/model.go
@@ -55,6 +55,7 @@ func newClient(conn *websocket.Conn, uid string) *Client {
 func (c *Client) SendHistory(msgs []*model.Message) {
   var err error
   for _, item := range msgs {
+
 	buf := make([]byte, 0)
 
 	if buf, err = json.Marshal(item); err == nil {

diff --git a/videoweb/cmd/chat/service/run.go b/videoweb/cmd/chat/service/run.go
@@ -22,19 +22,20 @@ func MessageHandler() {
 
 	  if broadcast.Type == e.SingleChat { //单聊
 		msgJSON, _ := json.Marshal(broadcast)
+
 		//存储到数据库
 
 		if !Clients[ClientsSingleMap[broadcast.FromUid]] { //对方有无上线
 		  err := rabbitmq.PublishMsg(msgJSON, broadcast.Target)
 		  if err != nil {
 			log.Println(err)
-			return
+			continue
 		  }
 		  log.Println("对方未上线")
 		  err = msgDao.StoreSingleChatMsg(broadcast.FromUid, broadcast.Target, broadcast.Content, false)
 		  if err != nil {
 			log.Println(err)
-			return
+			continue
 		  }
 		  continue
 		}
@@ -43,7 +44,7 @@ func MessageHandler() {
 		  err := msgDao.StoreSingleChatMsg(broadcast.FromUid, broadcast.Target, broadcast.Content, true)
 		  if err != nil {
 			log.Println(err)
-			return
+			continue
 		  }
 		default:
 		  close(ClientsSingleMap[broadcast.FromUid].send)
@@ -52,9 +53,9 @@ func MessageHandler() {
 		}
 
 	  } else if broadcast.Type == e.GroupChat { //群聊
-
+		var err error
 		var members = make([]string, e.MaxStore)
-		members, err := cache.RedisClient.SMembers(context.Background(), broadcast.Target).Result()
+		members, err = cache.RedisClient.SMembers(context.Background(), broadcast.Target).Result()
 		if err != nil {
 		  log.Println(err)
 		}

diff --git a/videoweb/cmd/chat/service/ws.go b/videoweb/cmd/chat/service/ws.go
@@ -39,8 +39,8 @@ func (c *Client) read() {
 	  break
 	}
 
-	msgToBroadcast := new(MsgFromBroadcast)
-	msgToBroadcast = &MsgFromBroadcast{
+	//msgToBroadcast := new(MsgFromBroadcast)
+	msgToBroadcast := &MsgFromBroadcast{
 	  Type:    msg.Type,
 	  Content: msg.Content,
 	  Target:  c.Target,