Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/chat_producer

.env

@@ -5,21 +5,22 @@ APP_ENV=dev
 HOST = http://101.254.114.211:13306/
 DB_DRIVER=mysql
  
-DB_HOST=101.254.114.211
+DB_DRIVER=mysql
+DB_HOST=192.168.1.234
 DB_PORT=13306
 DB_DATABASE=hyperf
 DB_USERNAME=root
-DB_PASSWORD=xKmapDpKCxMMSkbe
+DB_PASSWORD=zxt_mysql_dev
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
-REDIS_HOST=101.254.114.211
+REDIS_HOST=192.168.1.234
 REDIS_AUTH=YPWWnFnNebc7427B
 REDIS_PORT=26739
 REDIS_DB=0
 
-AMQP_HOST=103.105.201.2
+AMQP_HOST=192.168.1.234
 AMQP_PORT=5673
 AMQP_USER=rabbitmq
 AMQP_PASSWORD=H8eDTAk6LY7EjJ8y

app/JsonRpc/ChatService.php

@@ -820,8 +820,10 @@ class ChatService implements ChatServiceInterface
         $result = ChatTopic::where($where)
             ->leftJoin('user', 'user.id', '=', 'chat_topics.user_id')
             ->leftJoin('chat_topics_reply', 'chat_topics.id', '=', 'chat_topics_reply.topic_id')
+            ->leftJoin('chat_topic_class', 'chat_topics.type', '=', 'chat_topic_class.id')
             ->select(
                 'chat_topics.*',
+                'chat_topic_class.topicname as type_name',
                 'user.nickname',
                 'user.avatar',
                 'user.user_name',