fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
2026-05-19 00:09:02 +08:00 · 2023-07-13 18:37:59 +08:00
parent fda6cd5354
commit 4bd97149c3
3 changed files with 1 additions and 3 deletions
@@ -25,7 +25,7 @@ zookeeper:
 mysql:
  address: [ 127.0.0.1:13306 ]            #目前仅支持单机
  username: root                          #用户名
-  password:                      #密码
+  password: openIM123                     #密码
  database: openIM_v3                     #不建议修改
  maxOpenConn: 1000                       #最大连接数
  maxIdleConn: 100                        #最大空闲连接数