From fdc80475f5425f71c9d2276184647ec54a6c39a9 Mon Sep 17 00:00:00 2001
From: raoyuandong <837215079@qq.com>
Date: Sat, 17 Apr 2021 16:37:07 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 918c1c19c9dcb9472572b1ef9d3117a18dfb9c7d.
---
 app/Amqp/Consumer/ChatMessageConsumer.php | 20 ++++++++++----------
 composer.json                             |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Amqp/Consumer/ChatMessageConsumer.php b/app/Amqp/Consumer/ChatMessageConsumer.php
index 7ca4730..ee86724 100644
--- a/app/Amqp/Consumer/ChatMessageConsumer.php
+++ b/app/Amqp/Consumer/ChatMessageConsumer.php
@@ -370,19 +370,19 @@ class ChatMessageConsumer extends ConsumerMessage
     private function formatTalkMessage(array $data): array
     {
         $message = [
-            "id"           => 0,  // 消息记录ID
-            "source"       => 1,  // 消息来源[1:好友私信;2:群聊]
+            "id"           => 0,// 消息记录ID
+            "source"       => 1,// 消息来源[1:好友私信;2:群聊]
             "msg_type"     => 1,
-            "user_id"      => 0,  // 发送者用户ID
-            "receive_id"   => 0,  // 接收者ID[好友ID或群ID]
-            "content"      => '', // 文本消息
-            "is_revoke"    => 0,  // 消息是否撤销
+            "user_id"      => 0,// 发送者用户ID
+            "receive_id"   => 0,// 接收者ID[好友ID或群ID]
+            "content"      => '',// 文本消息
+            "is_revoke"    => 0,// 消息是否撤销
 
             // 发送消息人的信息
-            "nickname"     => "", // 用户昵称
-            "avatar"       => "", // 用户头像
-            "group_name"   => "", // 群组名称
-            "group_avatar" => "", // 群组头像
+            "nickname"     => "",// 用户昵称
+            "avatar"       => "",// 用户头像
+            "group_name"   => "",// 群组名称
+            "group_avatar" => "",// 群组头像
 
             // 不同的消息类型
             "file"         => [],
diff --git a/composer.json b/composer.json
index eabff06..c8c5680 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "phper666/jwt-auth": "^3.0",
         "hyperf/filesystem": "^2.0",
         "hashids/hashids": "^4.0",
-        "ext-json": "*",
+        "ext-json": "^1.6",
         "hyperf/view": "^2.0",
         "hyperf/view-engine": "^2.0",
         "phpmailer/phpmailer": "^6.2"