From 5893ba77b5b5e865fc1fea68f680d421c11dbba0 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Sun, 7 Apr 2024 12:34:51 +0800
Subject: [PATCH] Simplify the Docker Compose configuration, remove unnecessary
 environment variables, and eliminate the gateway service.

---
 config/kafka.yml     |  2 +-
 config/log.yml       |  2 +-
 config/mongodb.yml   |  2 +-
 config/redis.yml     |  2 +-
 config/share.yml     | 13 +++++++++++++
 config/zookeeper.yml | 13 +------------
 6 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 config/share.yml

diff --git a/config/kafka.yml b/config/kafka.yml
index 57b9e55a7..02b23c142 100644
--- a/config/kafka.yml
+++ b/config/kafka.yml
@@ -1,6 +1,6 @@
 username: ''
 password: ''
-addr: [ 172.28.0.1:19094 ]
+addr: [ localhost:19094 ]
 toRedis:
   topic: "toRedis"
 toMongo:
diff --git a/config/log.yml b/config/log.yml
index 88d60152b..a615e07c8 100644
--- a/config/log.yml
+++ b/config/log.yml
@@ -1,4 +1,4 @@
-storageLocation: /data/workspaces/open-im-server/_output/logs/
+storageLocation: ./_output/logs/
 rotationTime: 24
 remainRotationCount: 2
 remainLogLevel: 6
diff --git a/config/mongodb.yml b/config/mongodb.yml
index 6b4fd915d..12f1f66a5 100644
--- a/config/mongodb.yml
+++ b/config/mongodb.yml
@@ -1,5 +1,5 @@
 uri: ''
-address: [ 172.28.0.1:37017 ]
+address: [ localhost:37017 ]
 database: openim_v3
 username: openIM
 password: openIM123
diff --git a/config/redis.yml b/config/redis.yml
index 617c05358..0a93ca1ba 100644
--- a/config/redis.yml
+++ b/config/redis.yml
@@ -1,5 +1,5 @@
 redis:
-  address: [ 172.28.0.1:16379 ]
+  address: [ localhost:16379 ]
   username: ''
   password: openIM123
   clusterMode: false
diff --git a/config/share.yml b/config/share.yml
new file mode 100644
index 000000000..2258e8778
--- /dev/null
+++ b/config/share.yml
@@ -0,0 +1,13 @@
+env: zookeeper
+rpcRegisterName:
+  User: User
+  Friend: Friend
+  Msg: Msg
+  Push: Push
+  MessageGateway: MessageGateway
+  Group: Group
+  Auth: Auth
+  Conversation: Conversation
+  Third: Third
+
+
diff --git a/config/zookeeper.yml b/config/zookeeper.yml
index ec740af16..33f52d7ca 100644
--- a/config/zookeeper.yml
+++ b/config/zookeeper.yml
@@ -1,17 +1,6 @@
 
 schema: openim
-address: [ 172.28.0.1:12181 ]
+address: [ localhost:12181 ]
 username: ''
 password: ''
 
-env: zookeeper
-rpcRegisterName:
-  User: User
-  Friend: Friend
-  Msg: Msg
-  Push: Push
-  MessageGateway: MessageGateway
-  Group: Group
-  Auth: Auth
-  Conversation: Conversation
-  Third: Third