resolve conflict

pull/113/head
chenqinghe 4 years ago
commit 8439d79b29

@ -140,8 +140,8 @@ tokenpolicy:
accessSecret: "open_im_server"
# Token effective time seconds as a unit
#Seven days 7*24*60*60
accessExpire: 604800
accessExpire: 7
messagecallback:
callbackSwitch: false
callbackUrl: "http://www.xxx.com/msg/judge"
callbackUrl: "http://www.xxx.com/msg/judge"

@ -64,7 +64,7 @@ services:
TZ: Asia/Shanghai
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: open_im_zookeeper:2181
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://open_im_zookeeper:9092
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://open_im_kafka:9092
KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
depends_on:
- zookeeper
@ -142,4 +142,4 @@ services:
networks:
open_im_net:
driver: bridge
driver: bridge

Loading…
Cancel
Save