fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
2026-05-15 06:25:58 +08:00 · 2023-07-13 17:04:10 +08:00
parent 02e6b7ec18
commit 25eabde3f6
6 changed files with 27 additions and 20 deletions
@@ -23,9 +23,9 @@ zookeeper:
  password:                               #密码

 mysql:
-  address: [ 127.0.0.1:13306 ]            #目前仅支持单机
+  address: [ 127.0.0.1:3306 ]            #目前仅支持单机
  username: root                          #用户名
-  password: openIM123                     #密码
+  password:                      #密码
  database: openIM_v3                     #不建议修改
  maxOpenConn: 1000                       #最大连接数
  maxIdleConn: 100                        #最大空闲连接数
@@ -42,7 +42,7 @@ mongo:
  maxPoolSize: 100

 redis:
-  address: [ 127.0.0.1:16379 ]            #
+  address: [ 127.0.0.1:6379 ]            #
  username:                               #only redis version 6.0+ need username
  password: openIM123                     #密码