From af37abb394d75d5b45db40e2414115c9edf40071 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Tue, 2 Nov 2021 17:37:51 +0800
Subject: [PATCH] docker-compose modify

---
 config/config.yaml  | 12 ++++++------
 docker-compose.yaml | 20 ++++++++++----------
 script/check_all.sh |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index 4a53e1958..a33797cc4 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -5,10 +5,10 @@ serverversion: 1.0.0
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openIM
-  etcdAddr: [ 127.0.0.1:2379 ]
+  etcdAddr: [ 127.0.0.1:32379 ]
 
 mysql:
-  dbMysqlAddress: [ 127.0.0.1:3306 ]
+  dbMysqlAddress: [ 127.0.0.1:33306 ]
   dbMysqlUserName: root
   dbMysqlPassword: openIM
   dbMysqlDatabaseName: openIM
@@ -19,7 +19,7 @@ mysql:
   dbMaxLifeTime: 120
 
 mongo:
-  dbAddress: [ 127.0.0.1:27017 ]
+  dbAddress: [ 127.0.0.1:37017 ]
   dbDirect: false
   dbTimeout: 10
   dbDatabase: openIM
@@ -30,7 +30,7 @@ mongo:
   dbRetainChatRecords: 7
 
 redis:
-  dbAddress: 127.0.0.1:6379
+  dbAddress: 127.0.0.1:36379
   dbMaxIdle: 128
   dbMaxActive: 0
   dbIdleTimeout: 120
@@ -38,10 +38,10 @@ redis:
 
 kafka:
   ws2mschat:
-    addr: [ 127.0.0.1:9092 ]
+    addr: [ 127.0.0.1:39092 ]
     topic: "ws2ms_chat"
   ms2pschat:
-    addr: [ 127.0.0.1:9092 ]
+    addr: [ 127.0.0.1:39092 ]
     topic: "ms2ps_chat"
   consumergroupid:
     msgToMongo: mongo
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a9fa9a1c9..183f5a051 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
   mysql:
     image: mysql:5.7
     ports:
-      - 3306:3306
+      - 33306:33306
     container_name: mysql
     volumes:
       - ./components/mysql/data:/var/lib/mysql
@@ -17,7 +17,7 @@ services:
   mongodb:
     image: mongo
     ports:
-      - 27017:27017
+      - 37017:37017
     container_name: mongo
     volumes:
       - ./components/mongodb/data:/data/db
@@ -28,7 +28,7 @@ services:
   redis:
     image: redis
     ports:
-      - 6379:6379
+      - 36379:36379
     container_name: redis
     volumes:
       - ./components/redis/data:/data
@@ -45,7 +45,7 @@ services:
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
-      - 2181:2181
+      - 32181:32181
     container_name: zookeeper
     volumes:
       - /etc/localtime:/etc/localtime
@@ -61,9 +61,9 @@ services:
     environment:
       TZ: Asia/Shanghai
       KAFKA_BROKER_ID: 0
-      KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://127.0.0.1:9092
-      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
+      KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:32181
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://127.0.0.1:39092
+      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:39092
     network_mode: "host"
     depends_on:
       - zookeeper
@@ -71,8 +71,8 @@ services:
   etcd:
     image: quay.io/coreos/etcd
     ports:
-      - 2379:2379
-      - 2380:2380
+      - 32379:32379
+      - 32380:32380
     container_name: etcd
     volumes:
       - /etc/timezone:/etc/timezone
@@ -80,7 +80,7 @@ services:
     environment:
       ETCDCTL_API: 3
     restart: always
-    command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new
+    command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:32379 --advertise-client-urls http://0.0.0.0:32379 --listen-peer-urls http://0.0.0.0:32380 --initial-advertise-peer-urls http://0.0.0.0:32380 --initial-cluster etcd0=http://0.0.0.0:32380 --initial-cluster-token tkn --initial-cluster-state new
 
 
   #fixme-----build from dockerfile---------
diff --git a/script/check_all.sh b/script/check_all.sh
index 3c57577c4..63fe31711 100644
--- a/script/check_all.sh
+++ b/script/check_all.sh
@@ -33,7 +33,7 @@ done
 #Check launched service process
 check=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | wc -l)
 if [ $check -eq ${msg_transfer_service_num} ]; then
-  echo -e ${GREEN_PREFIX}"service has been starting,belongs service is openImMsgTransfer"${COLOR_SUFFIX}
+  echo -e ${GREEN_PREFIX}"none  port service has been starting,belongs service is openImMsgTransfer"${COLOR_SUFFIX}
 else
   echo -e ${RED_PREFIX}"openImMsgTransfer service does not start normally, num err"${COLOR_SUFFIX}
         echo -e ${RED_PREFIX}"please check ../logs/openIM.log "${COLOR_SUFFIX}