Merge remote-tracking branch 'origin/ver3' into ver3

config/config.yaml

@@ -41,7 +41,7 @@ kafka:
   offlineMsgToMongo:
     topic: "offlineMsgToMongoMysql"       #不建议修改
   msgToPush:
-    topic: "msqToPush"                    #不建议修改
+    topic: "msgToPush"                    #不建议修改
   msgToModify:
     topic: "msgToModify"                  #不建议修改
   consumerGroupID:                        #消费者组，不建议修改

docker-compose.yaml

@@ -75,7 +75,7 @@ services:
       TZ: Asia/Shanghai
       KAFKA_BROKER_ID: 0
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1"
+      KAFKA_CREATE_TOPICS: "latestMsgToRedis:8:1,msgToPush:8:1,offlineMsgToMongoMysql:8:1"
       KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092
       KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"