blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-28 14:42:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
chenqinghe 2021-12-29 21:57:54 +08:00
commit 8439d79b29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.docker.yaml
View File

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

4
docker-compose.yaml
View File

@ -64,7 +64,7 @@ services:
TZ: Asia/Shanghai TZ: Asia/Shanghai
KAFKA_BROKER_ID: 0 KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: open_im_zookeeper:2181 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 KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
depends_on: depends_on:
- zookeeper - zookeeper
@ -142,4 +142,4 @@ services:
networks: networks:
open_im_net: open_im_net:
driver: bridge driver: bridge