From fda6cd5354f8c8cbde808b94cd38d7e93c9fcb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98hanzhixiao=E2=80=99?= <‘709674996@qq.com’>
Date: Thu, 13 Jul 2023 18:30:18 +0800
Subject: [PATCH] fix conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
---
 config/config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index cbbcf9e18..bf52f845b 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -23,7 +23,7 @@ zookeeper:
   password:                               #密码
 
 mysql:
-  address: [ 127.0.0.1:3306 ]            #目前仅支持单机
+  address: [ 127.0.0.1:13306 ]            #目前仅支持单机
   username: root                          #用户名
   password:                      #密码
   database: openIM_v3                     #不建议修改
@@ -42,7 +42,7 @@ mongo:
   maxPoolSize: 100
 
 redis:
-  address: [ 127.0.0.1:6379 ]            #
+  address: [ 127.0.0.1:16379 ]            #
   username:                               #only redis version 6.0+ need username
   password: openIM123                     #密码