mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-06 04:15:46 +08:00
fix conflict
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
parent
90d226c290
commit
fda6cd5354
@ -23,7 +23,7 @@ zookeeper:
|
|||||||
password: #密码
|
password: #密码
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
address: [ 127.0.0.1:3306 ] #目前仅支持单机
|
address: [ 127.0.0.1:13306 ] #目前仅支持单机
|
||||||
username: root #用户名
|
username: root #用户名
|
||||||
password: #密码
|
password: #密码
|
||||||
database: openIM_v3 #不建议修改
|
database: openIM_v3 #不建议修改
|
||||||
@ -42,7 +42,7 @@ mongo:
|
|||||||
maxPoolSize: 100
|
maxPoolSize: 100
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
address: [ 127.0.0.1:6379 ] #
|
address: [ 127.0.0.1:16379 ] #
|
||||||
username: #only redis version 6.0+ need username
|
username: #only redis version 6.0+ need username
|
||||||
password: openIM123 #密码
|
password: openIM123 #密码
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user