From 843a704c6f041b668cf7c6083d85c231916c9506 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 15:16:42 +0800
Subject: [PATCH 01/13] remove \r

---
 scripts/create-topic.sh | 10 ----------
 scripts/mongo-init.sh   |  6 ------
 2 files changed, 16 deletions(-)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index 206075fb8..2b0b69c07 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -12,16 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 # Wait for Kafka to be ready
-
 KAFKA_SERVER=localhost:9092
-
 MAX_ATTEMPTS=300
 attempt_num=1
-
 echo "Waiting for Kafka to be ready..."
-
 until /opt/bitnami/kafka/bin/kafka-topics.sh --list --bootstrap-server $KAFKA_SERVER; do
   echo "Attempt $attempt_num of $MAX_ATTEMPTS: Kafka not ready yet..."
   if [ $attempt_num -eq $MAX_ATTEMPTS ]; then
@@ -31,14 +26,10 @@ until /opt/bitnami/kafka/bin/kafka-topics.sh --list --bootstrap-server $KAFKA_SE
   attempt_num=$((attempt_num+1))
   sleep 1
 done
-
 echo "Kafka is ready. Creating topics..."
-
-
 topics=("toRedis" "toMongo" "toPush")
 partitions=8
 replicationFactor=1
-
 for topic in "${topics[@]}"; do
   if /opt/bitnami/kafka/bin/kafka-topics.sh --create \
     --bootstrap-server $KAFKA_SERVER \
@@ -51,5 +42,4 @@ for topic in "${topics[@]}"; do
     echo "Failed to create topic $topic."
   fi
 done
-
 echo "All topics created."
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index 01199c480..de3eae5cb 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 mongosh <<EOF
 use admin
 var rootUsername = '$MONGO_INITDB_ROOT_USERNAME';
@@ -23,7 +22,6 @@ if (authResult) {
   print('Authentication failed for root user: ' + rootUsername + ' with password: ' + rootPassword);
   quit(1);
 }
-
 var dbName = '$MONGO_INITDB_DATABASE';
 db = db.getSiblingDB(dbName);
 var openimUsername = '$MONGO_OPENIM_USERNAME';
@@ -35,7 +33,6 @@ var createUserResult = db.createUser({
     { role: 'readWrite', db: dbName }
   ]
 });
-
 if (createUserResult.ok == 1) {
   print('User creation successful. User: ' + openimUsername + ', Database: ' + dbName);
 } else {
@@ -43,6 +40,3 @@ if (createUserResult.ok == 1) {
   quit(1);
 }
 EOF
-
-
-

From 802052d37fc792fff8feaf079694083c3f3aab9f Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 15:26:15 +0800
Subject: [PATCH 02/13] remove \r

---
 scripts/create-topic.sh | 61 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index 2b0b69c07..de3eae5cb 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # Copyright © 2023 OpenIM. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,34 +11,32 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Wait for Kafka to be ready
-KAFKA_SERVER=localhost:9092
-MAX_ATTEMPTS=300
-attempt_num=1
-echo "Waiting for Kafka to be ready..."
-until /opt/bitnami/kafka/bin/kafka-topics.sh --list --bootstrap-server $KAFKA_SERVER; do
-  echo "Attempt $attempt_num of $MAX_ATTEMPTS: Kafka not ready yet..."
-  if [ $attempt_num -eq $MAX_ATTEMPTS ]; then
-    echo "Kafka not ready after $MAX_ATTEMPTS attempts, exiting"
-    exit 1
-  fi
-  attempt_num=$((attempt_num+1))
-  sleep 1
-done
-echo "Kafka is ready. Creating topics..."
-topics=("toRedis" "toMongo" "toPush")
-partitions=8
-replicationFactor=1
-for topic in "${topics[@]}"; do
-  if /opt/bitnami/kafka/bin/kafka-topics.sh --create \
-    --bootstrap-server $KAFKA_SERVER \
-    --replication-factor $replicationFactor \
-    --partitions $partitions \
-    --topic $topic
-  then
-    echo "Topic $topic created."
-  else
-    echo "Failed to create topic $topic."
-  fi
-done
-echo "All topics created."
+mongosh <<EOF
+use admin
+var rootUsername = '$MONGO_INITDB_ROOT_USERNAME';
+var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+var authResult = db.auth(rootUsername, rootPassword);
+if (authResult) {
+  print('Authentication successful for root user: ' + rootUsername);
+} else {
+  print('Authentication failed for root user: ' + rootUsername + ' with password: ' + rootPassword);
+  quit(1);
+}
+var dbName = '$MONGO_INITDB_DATABASE';
+db = db.getSiblingDB(dbName);
+var openimUsername = '$MONGO_OPENIM_USERNAME';
+var openimPassword = '$MONGO_OPENIM_PASSWORD';
+var createUserResult = db.createUser({
+  user: openimUsername,
+  pwd: openimPassword,
+  roles: [
+    { role: 'readWrite', db: dbName }
+  ]
+});
+if (createUserResult.ok == 1) {
+  print('User creation successful. User: ' + openimUsername + ', Database: ' + dbName);
+} else {
+  print('User creation failed for user: ' + openimUsername + ' in database: ' + dbName);
+  quit(1);
+}
+EOF

From 309a7275c705e7f12e6d5e85779527eac4cac937 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 15:30:14 +0800
Subject: [PATCH 03/13] remove \r

---
 scripts/create-topic.sh | 71 ++++++++++++++++++++++++-----------------
 scripts/mongo-init.sh   |  6 ++++
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index de3eae5cb..206075fb8 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # Copyright © 2023 OpenIM. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,32 +12,44 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-mongosh <<EOF
-use admin
-var rootUsername = '$MONGO_INITDB_ROOT_USERNAME';
-var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
-var authResult = db.auth(rootUsername, rootPassword);
-if (authResult) {
-  print('Authentication successful for root user: ' + rootUsername);
-} else {
-  print('Authentication failed for root user: ' + rootUsername + ' with password: ' + rootPassword);
-  quit(1);
-}
-var dbName = '$MONGO_INITDB_DATABASE';
-db = db.getSiblingDB(dbName);
-var openimUsername = '$MONGO_OPENIM_USERNAME';
-var openimPassword = '$MONGO_OPENIM_PASSWORD';
-var createUserResult = db.createUser({
-  user: openimUsername,
-  pwd: openimPassword,
-  roles: [
-    { role: 'readWrite', db: dbName }
-  ]
-});
-if (createUserResult.ok == 1) {
-  print('User creation successful. User: ' + openimUsername + ', Database: ' + dbName);
-} else {
-  print('User creation failed for user: ' + openimUsername + ' in database: ' + dbName);
-  quit(1);
-}
-EOF
+
+# Wait for Kafka to be ready
+
+KAFKA_SERVER=localhost:9092
+
+MAX_ATTEMPTS=300
+attempt_num=1
+
+echo "Waiting for Kafka to be ready..."
+
+until /opt/bitnami/kafka/bin/kafka-topics.sh --list --bootstrap-server $KAFKA_SERVER; do
+  echo "Attempt $attempt_num of $MAX_ATTEMPTS: Kafka not ready yet..."
+  if [ $attempt_num -eq $MAX_ATTEMPTS ]; then
+    echo "Kafka not ready after $MAX_ATTEMPTS attempts, exiting"
+    exit 1
+  fi
+  attempt_num=$((attempt_num+1))
+  sleep 1
+done
+
+echo "Kafka is ready. Creating topics..."
+
+
+topics=("toRedis" "toMongo" "toPush")
+partitions=8
+replicationFactor=1
+
+for topic in "${topics[@]}"; do
+  if /opt/bitnami/kafka/bin/kafka-topics.sh --create \
+    --bootstrap-server $KAFKA_SERVER \
+    --replication-factor $replicationFactor \
+    --partitions $partitions \
+    --topic $topic
+  then
+    echo "Topic $topic created."
+  else
+    echo "Failed to create topic $topic."
+  fi
+done
+
+echo "All topics created."
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index de3eae5cb..01199c480 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 mongosh <<EOF
 use admin
 var rootUsername = '$MONGO_INITDB_ROOT_USERNAME';
@@ -22,6 +23,7 @@ if (authResult) {
   print('Authentication failed for root user: ' + rootUsername + ' with password: ' + rootPassword);
   quit(1);
 }
+
 var dbName = '$MONGO_INITDB_DATABASE';
 db = db.getSiblingDB(dbName);
 var openimUsername = '$MONGO_OPENIM_USERNAME';
@@ -33,6 +35,7 @@ var createUserResult = db.createUser({
     { role: 'readWrite', db: dbName }
   ]
 });
+
 if (createUserResult.ok == 1) {
   print('User creation successful. User: ' + openimUsername + ', Database: ' + dbName);
 } else {
@@ -40,3 +43,6 @@ if (createUserResult.ok == 1) {
   quit(1);
 }
 EOF
+
+
+

From d517f3fc97498e5ba3d30b66ef0e33e1b18f9e4f Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 15:35:55 +0800
Subject: [PATCH 04/13] remove \r

---
 scripts/create-topic.sh | 1 +
 scripts/mongo-init.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index 206075fb8..b6a24a73d 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -53,3 +53,4 @@ for topic in "${topics[@]}"; do
 done
 
 echo "All topics created."
+
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index 01199c480..3fac5be4e 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -46,3 +46,4 @@ EOF
 
 
 
+

From 5cfb7c884d774bfb79dc70e9f097e94ad4e5f6f2 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 22 Apr 2024 15:43:25 +0800
Subject: [PATCH 05/13] remove \r

---
 bootstrap.sh            | 0
 scripts/create-topic.sh | 1 +
 scripts/mongo-init.sh   | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100644
new mode 100755
diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index b6a24a73d..a719147a2 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -54,3 +54,4 @@ done
 
 echo "All topics created."
 
+
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index 3fac5be4e..01199c480 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -46,4 +46,3 @@ EOF
 
 
 
-

From cc0c9eb076fd3e7f22352dd6e8df6f532568145d Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 22 Apr 2024 15:52:12 +0800
Subject: [PATCH 06/13] remove \r

---
 scripts/create-topic.sh | 2 --
 scripts/mongo-init.sh   | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index a719147a2..206075fb8 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -53,5 +53,3 @@ for topic in "${topics[@]}"; do
 done
 
 echo "All topics created."
-
-
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index 01199c480..f9a86f0d2 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -43,6 +43,3 @@ if (createUserResult.ok == 1) {
   quit(1);
 }
 EOF
-
-
-

From 44f928da6798959366d7608fb25690cad2a5e2e2 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 22 Apr 2024 16:03:06 +0800
Subject: [PATCH 07/13] remove \r

---
 scripts/create-topic.sh | 1 +
 scripts/mongo-init.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index 206075fb8..b6a24a73d 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -53,3 +53,4 @@ for topic in "${topics[@]}"; do
 done
 
 echo "All topics created."
+
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index f9a86f0d2..bc111c2a9 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -43,3 +43,4 @@ if (createUserResult.ok == 1) {
   quit(1);
 }
 EOF
+

From b2895c49798b9d341cad17dc37b05bb5c8f8ec9a Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 16:23:20 +0800
Subject: [PATCH 08/13] remove \r

---
 scripts/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 scripts/.gitattributes

diff --git a/scripts/.gitattributes b/scripts/.gitattributes
new file mode 100644
index 000000000..dfdb8b771
--- /dev/null
+++ b/scripts/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf

From 7de5e261f1337679bc7f60d5e57ecc3af6e569d1 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 22 Apr 2024 16:24:37 +0800
Subject: [PATCH 09/13] remove \r

---
 scripts/create-topic.sh | 1 +
 scripts/mongo-init.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index b6a24a73d..a719147a2 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -54,3 +54,4 @@ done
 
 echo "All topics created."
 
+
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index bc111c2a9..ce2b86d90 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -44,3 +44,4 @@ if (createUserResult.ok == 1) {
 }
 EOF
 
+

From 77cbadb336fb67d77692bce25837b26c093551d0 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 16:31:11 +0800
Subject: [PATCH 10/13] remove \r

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..dfdb8b771
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf

From 64f4cd103c1b902637ebc28c7969fa0ac8289726 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Mon, 22 Apr 2024 17:00:19 +0800
Subject: [PATCH 11/13] fix bug: get localIP

---
 go.mod                 |  4 ++--
 go.sum                 | 23 +++++++++++++++++++++--
 scripts/.gitattributes |  1 -
 3 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 scripts/.gitattributes

diff --git a/go.mod b/go.mod
index 8ada8f2e7..b2f922bb2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3
 
-go 1.20
+go 1.21.2
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
@@ -15,7 +15,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openimsdk/localcache v0.0.1
 	github.com/openimsdk/protocol v0.0.64
-	github.com/openimsdk/tools v0.0.47-alpha.42
+	github.com/openimsdk/tools v0.0.47-alpha.43
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0
diff --git a/go.sum b/go.sum
index 0ef6209fc..d7a08afa6 100644
--- a/go.sum
+++ b/go.sum
@@ -22,10 +22,13 @@ github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mo
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@@ -43,6 +46,7 @@ github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5P
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
+github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -66,12 +70,15 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -90,6 +97,7 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -137,11 +145,13 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
@@ -194,6 +204,7 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
+github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kelindar/bitmap v1.5.2 h1:XwX7CTvJtetQZ64zrOkApoZZHBJRkjE23NfqUALA/HE=
@@ -209,7 +220,9 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
@@ -270,8 +283,8 @@ github.com/openimsdk/gomake v0.0.6 h1:bJmQWDHBj8PQ7oGJ2SL3Gsx0k5CdI/BPfGzlGcV105
 github.com/openimsdk/gomake v0.0.6/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
 github.com/openimsdk/protocol v0.0.64 h1:OrjSs4CgKN9VLvJvrAsc37O7Ru0E0VllXZQSmG/ab7U=
 github.com/openimsdk/protocol v0.0.64/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
-github.com/openimsdk/tools v0.0.47-alpha.42 h1:wM6t9otTLhXECq8aQcYaZGvBgo/ZAmbNTqVt3g3NHGg=
-github.com/openimsdk/tools v0.0.47-alpha.42/go.mod h1:P4oGP1Pd+d4ctbLD5U/XQTgl8yu8Hd3skx640Fr69ko=
+github.com/openimsdk/tools v0.0.47-alpha.43 h1:4RfyX+aLBEGOEIfc0CrzETwQUDd3aTsFpA26S/TpgXw=
+github.com/openimsdk/tools v0.0.47-alpha.43/go.mod h1:P4oGP1Pd+d4ctbLD5U/XQTgl8yu8Hd3skx640Fr69ko=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -282,6 +295,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -298,6 +312,7 @@ github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -376,6 +391,7 @@ go.opentelemetry.io/otel v1.23.0/go.mod h1:YCycw9ZeKhcJFrb34iVSkyT0iczq/zYDtZYFu
 go.opentelemetry.io/otel/metric v1.23.0 h1:pazkx7ss4LFVVYSxYew7L5I6qvLXHA0Ap2pwV+9Cnpo=
 go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms20Jb7Bbp+HiTo=
 go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
 go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI=
 go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
@@ -383,6 +399,7 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -489,6 +506,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.165.0 h1:zd5d4JIIIaYYsfVy1HzoXYZ9rWCSBxxAglbczzo7Bgc=
 google.golang.org/api v0.165.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -526,6 +544,7 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
diff --git a/scripts/.gitattributes b/scripts/.gitattributes
deleted file mode 100644
index dfdb8b771..000000000
--- a/scripts/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.sh text eol=lf

From 75a3b9199ae0bcf8713c21825878e04938fd0e0f Mon Sep 17 00:00:00 2001
From: xuan <146319162+wxuanF@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:09:36 +0800
Subject: [PATCH 12/13] update some ci file (#2200)

* Update openimci.yml

* Update golangci-lint.yml

* Update e2e-test.yml
---
 .github/workflows/e2e-test.yml      |  45 ++--
 .github/workflows/golangci-lint.yml |   8 +-
 .github/workflows/openimci.yml      | 381 ++++++++++------------------
 3 files changed, 169 insertions(+), 265 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index f98221e41..62df69ed5 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -73,14 +73,22 @@ jobs:
 
     - name: Docker Operations
       run: |
-        sudo make init
         sudo docker compose up -d
+        sudo bash bootstrap.sh
+        sudo mage
         sudo sleep 20
 
     - name: Module Operations
       run: |
-        sudo make tidy
-        sudo make tools.verify.go-gitlint
+        sudo go mod tidy
+        echo "===========> Verifying go-gitlint is installed"
+        if [ ! -f ./_output/tools/go-gitlint ]; then
+          export GOBIN=$(pwd)/_output/tools
+          echo "===========> Installing The default installation path is /home/ubuntu/DF/open-im-server/_output/tools/go-gitlint"
+          sudo go install github.com/marmotedu/go-gitlint/cmd/go-gitlint@latest
+          echo "===========> go-gitlint is installed in /home/ubuntu/DF/open-im-server/_output/tools/go-gitlint"
+        fi
+
 
     - name: Build, Start(make build && make start)
       run: |
@@ -90,7 +98,8 @@ jobs:
       run: |
         sudo ./scripts/install/install.sh -s
 
-    - name: Exec OpenIM API test (make test-api)
+#    - name: Exec OpenIM API test (make test-api)
+    - name: Exec OpenIM test (make test)
       run: |
         mkdir -p ./tmp
         touch ./tmp/test.md
@@ -98,23 +107,27 @@ jobs:
         echo "## OpenIM API Test" >> ./tmp/test.md
         echo "<details><summary>Command Output for OpenIM API Test</summary>" >> ./tmp/test.md
         echo "<pre><code>" >> ./tmp/test.md
-        sudo make test-api | tee -a ./tmp/test.md
+        echo "===========> Run api test"
+        ./scripts/install/test.sh
+        echo "===========> Run api test" >> ./tmp/test.md
+        ./scripts/install/test.sh >> ./tmp/test.md
         echo "</code></pre>" >> ./tmp/test.md
         echo "</details>" >> ./tmp/test.md
 
-        sudo make test-api
+        echo "===========> Run api test"
+        ./scripts/install/test.sh
 
-    - name: Exec OpenIM E2E Test (make test-e2e)
-      run: |
-        echo "" >> ./tmp/test.md
-        echo "## OpenIM E2E Test" >> ./tmp/test.md
-        echo "<details><summary>Command Output for OpenIM E2E Test</summary>" >> ./tmp/test.md
-        echo "<pre><code>" >> ./tmp/test.md
-        sudo make test-e2e | tee -a ./tmp/test.md
-        echo "</code></pre>" >> ./tmp/test.md
-        echo "</details>" >> ./tmp/test.md
+ #   - name: Exec OpenIM E2E Test (make test-e2e)
+ #     run: |
+ #       echo "" >> ./tmp/test.md
+ #       echo "## OpenIM E2E Test" >> ./tmp/test.md
+ #       echo "<details><summary>Command Output for OpenIM E2E Test</summary>" >> ./tmp/test.md
+ #       echo "<pre><code>" >> ./tmp/test.md
+ #       sudo make test-e2e | tee -a ./tmp/test.md
+ #       echo "</code></pre>" >> ./tmp/test.md
+ #       echo "</details>" >> ./tmp/test.md
 
-        sudo make test-e2e
+ #       sudo make test-e2e
 
     - name: Comment PR with file
       uses: thollander/actions-comment-pull-request@v2
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 31e491d6b..64bd498c5 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -29,7 +29,13 @@ jobs:
             go-version: '1.21'
             cache: false
         - name: OpenIM Scripts Verification(make verify)
-          run: sudo make verify
+          run: |
+            cd scripts
+            for script in verify-*; do
+              if [ -x "$script" ]; then
+                ./"$script"
+              fi
+            done
         - name: golangci-lint
           uses: golangci/golangci-lint-action@v4.0.0
           with:
diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml
index f47283997..033868a2e 100644
--- a/.github/workflows/openimci.yml
+++ b/.github/workflows/openimci.yml
@@ -1,3 +1,4 @@
+
 # Copyright © 2023 OpenIM open source community. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,8 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-name: OpenIM CI Aotu Build and Install
+name: OpenIM CI Auto Build
 
 on: 
   push:
@@ -37,269 +37,154 @@ on:
         - "**.md"
         - "docs/**"
 
-env:
-  GO_VERSION: "1.19"
-  GOLANGCI_VERSION: "v1.50.1"
-
 jobs:
-  openim:
-    name: Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    permissions:
-        contents: write
-        pull-requests: write
-    environment:
-      name: openim
-    strategy:
-      matrix:
-        go_version: ["1.19","1.20","1.21"]
-        os: [ubuntu-latest]
-    steps:
-    - name: Setup
-      uses: actions/checkout@v4
-
-    - name: Set up Go ${{ matrix.go_version }}
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go_version }}
-      id: go
-
-    - name: Install Task
-      uses: arduino/setup-task@v1
-      with:
-        version: '3.x' # If available, use the latest major version that's compatible
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Code Typecheck Detector
-      uses: kubecub/typecheck@main
-
-    - name: Conformity Checker for Project
-      uses: kubecub/standardizer@main
-
-    - name: Module Operations
-      run: |
-        sudo make tidy
-        sudo make tools.verify.go-gitlint
-
-    - name: Format Code
-      run: sudo make format
-      continue-on-error: true
-
-    - name: Generate Files
-      run: make gen
-      continue-on-error: true
-
-    - name: Build Source
-      run: sudo make build
-
-    - name: Build multiarch PLATFORMS
-      if: startsWith(github.ref, 'refs/heads/release-')
-      run: |
-        sudo make multiarch
-
-    - name: Cleanup Build
-      run: sudo make clean
-
-    - name: Set Current Directory
-      id: set_directory
-      run: echo "::set-output name=directory::$(pwd)"
-      continue-on-error: true
-
-    - name: Collect and Display Test Coverage
-      id: collect_coverage
-      run: |
-        cd ${{ steps.set_directory.outputs.directory }}
-        make cover
-        echo "::set-output name=coverage_file::./_output/tmp/coverage.out"
-        echo "Test Coverage:"
-        cat ${{ steps.collect_coverage.outputs.coverage_file }}
-      continue-on-error: true
-
-  openim-start:
-    name: Test OpenIM install/start on ${{ matrix.os }}-${{ matrix.arch }}
-    runs-on: ${{ matrix.os }}
-    permissions:
-        contents: write
-        pull-requests: write
-    environment:
-      name: openim
-    strategy:
-      matrix:
-        go_version: ["1.21"]
-        os: ["ubuntu-latest"]
-    steps:
-    - name: Checkout and Install OpenIM
-      uses: actions/checkout@v4
-    - name: Install Task
-      uses: arduino/setup-task@v1
-      with:
-        version: '3.x' # If available, use the latest major version that's compatible
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Run OpenIM make install start
-      run: |
-        sudo make install
-
-    # - name: Check the OpenIM environment and status
-    #   run: |
-    #     sudo docker images
-    #     sudo docker ps
 
-    - name: Check the OpenIM environment and status
-      if: runner.os == 'Linux' && matrix.arch == 'amd64'
-      id: docker_info
-      run: |
-        sleep 30
-        echo "images<<EOF" >> $GITHUB_ENV
-        sudo docker images >> $GITHUB_ENV
-        echo "EOF" >> $GITHUB_ENV
-        echo "containers<<EOF" >> $GITHUB_ENV
-        sudo docker ps >> $GITHUB_ENV
-        echo "EOF" >> $GITHUB_ENV
-
-    - name: Comment PR
-      uses: thollander/actions-comment-pull-request@v2
-      if: runner.os == 'Linux' && matrix.arch == 'amd64'
-      with:
-        message: |
-          > [!TIP]
-          > Run make install to check the status
-
-          ### Docker Images:
-          <details><summary>Click to expand docker images</summary>
-          ```bash
-          ${{ env.images }}
-          ```
-          </details>
-
-          ### Docker Processes:
-          <details><summary>Click to expand docker ps</summary>
-          ```bash
-          ${{ env.containers }}
-          ```
-          </details>
-        GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
-
-  execute-scripts:
-    name: Execute OpenIM Script On ${{ matrix.os }}-${{ matrix.arch }}
-    runs-on: ${{ matrix.os }}
+  build-linux:
+    name: Execute OpenIM Script On Linux
+    runs-on: ubuntu-latest
     permissions:
-        contents: write
-        pull-requests: write
+      contents: write
+      pull-requests: write
     environment:
       name: openim
     strategy:
       matrix:
-        go_version: ["1.21"]
-        os: ["ubuntu-latest", "macos-latest"]
         arch: [arm64, armv7, amd64]
+    
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Set up Go ${{ matrix.go_version }}
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go_version }}
-      id: go
+    - uses: actions/checkout@v3
 
-    - name: Install Task
-      uses: arduino/setup-task@v1
+    - name: Set up Go
+      uses: actions/setup-go@v4
       with:
-        version: '3.x' # If available, use the latest major version that's compatible
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-    # - name: Install latest Bash (macOS only)
-    #   if: runner.os == 'macOS' && matrix.arch == 'arm64'
-    #   run: |
-    #     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    #     brew update
-    
-    #     brew install bash
-    #     brew install gnu-sed
-    
-    #     echo "/usr/local/bin" >> $GITHUB_PATH
-    #     echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
-    #   continue-on-error: true
+        go-version: '1.21'
 
-    - name: Set up Docker for Ubuntu
-      if: runner.os == 'Linux'
+    - name: Set up Docker for Linux
       run: |
-        sudo make init
         sudo docker compose up -d
-        sudo sleep 20
-
-    # - name: Set up Docker for macOS
-    #   if: runner.os == 'macOS' && matrix.arch == 'arm64'
-    #   run: |
-    #     brew install --cask docker
-    #     open /Applications/Docker.app
-
-    #     sleep 10
-    #     docker-compose --version || brew install docker-compose
+        sudo sleep 30  # Increased sleep time for better stability
+      timeout-minutes: 20  # Increased timeout for Docker setup
 
-    #     docker-compose up -d
-    #     sleep 20
 
-    - name: Module Operations for Ubuntu
-      if: runner.os == 'Linux'
-      run: |
-        sudo make tidy
-        sudo make tools.verify.go-gitlint
-
-    # - name: Module Operations for macOS
-    #   if: runner.os == 'macOS'
-    #   run: |
-    #     make tidy
-    #     make tools.verify.go-gitlint
-
-    - name: Build, Start, Check Services and Print Logs for Ubuntu
-      if: runner.os == 'Linux'
-      run: |
-        sudo make build
-        sudo make start
-        sudo make check
-
-    - name: Restart Services and Print Logs for Ubuntu
-      if: runner.os == 'Linux' && matrix.arch == 'amd64'
-      run: |
-        sudo make restart
-        sudo make check
-
-    - name: Build, Start, Check Services and Print Logs for macOS
-      if: runner.os == 'macOS' && matrix.arch == 'arm64'
-      run: |
-        make build
-
-  openim-test-build-image:
-    name: Build OpenIM Docker Image
-    runs-on: ubuntu-latest
-    permissions:
-        contents: write
-        pull-requests: write
-    environment:
-      name: openim
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set up Go ${{ matrix.go_version }}
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go_version }}
-      id: go
-
-    - name: Install Task
-      uses: arduino/setup-task@v1
-      with:
-        version: '3.x' # If available, use the latest major version that's compatible
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: init
+      run: sudo bash bootstrap.sh
+      timeout-minutes: 20
 
-    - name: Test Docker Build
+    - name: Build, Start, Check Services and Print Logs for Linux
       run: |
-        sudo make init
-        sudo make image
+        sudo mage
+        sudo mage start
+        sudo mage check
+        
 
-    - name: Get OpenIM Docker Images Status
-      id: docker_processes
+    - name: Restart Services and Print Logs
       run: |
-        sudo docker images
-        sudo docker ps
+        sudo mage stop
+        sudo mage start
+        sudo mage check
+
+
+#  build-mac:
+#    name: Execute OpenIM Script On macOS
+#    runs-on: macos-latest
+#    permissions:
+#      contents: write
+#      pull-requests: write
+#    environment:
+#      name: openim
+#    strategy:
+#      matrix:
+#        arch: [arm64, armv7, amd64]
+#    
+#    steps:
+#    - uses: actions/checkout@v3
+
+#    - name: Set up Go
+#      uses: actions/setup-go@v4
+#      with:
+#        go-version: '1.21'
+
+        
+#        while ! docker system info > /dev/null 2>&1; do
+#          echo "Waiting for Docker to start..."
+#          sleep 10  # Increased delay to ensure Docker starts properly
+#        done
+
+#    - name: Install Docker
+#      run: |
+#        brew install docker
+#        brew install docker-compose
+#        sleep 10
+#        docker-compose up -d
+#        sleep 30
+#      timeout-minutes: 20 
+#        
+
+#    - name: init
+#      run: sudo bash bootstrap.sh
+#      timeout-minutes: 20
+
+#    - name: Build, Start, Check Services and Print Logs for Linux
+#      run: |
+#        sudo mage
+#        sudo mage start
+#        sudo mage check
+        
+#    - name: Restart Services and Print Logs
+#      run: |
+#        sudo mage stop
+#        sudo mage start
+#        sudo mage check
+
+#  build-windows:
+#    name: Execute OpenIM Script On Windows
+#    runs-on: windows-latest
+#    permissions:
+#      contents: write
+#      pull-requests: write
+#    environment:
+#      name: openim
+#    strategy:
+#      matrix:
+#        arch: [arm64, armv7, amd64]
+#    
+#    steps:
+#    - uses: actions/checkout@v3
+
+#    - name: Set up Go
+#      uses: actions/setup-go@v4
+#      with:
+#        go-version: '1.21'
+
+#    - name: Set up Docker for Windows
+#      run: |
+#        $images = @("zookeeper", "redis", "kafka")
+#        foreach ($image in $images) {
+#          $tag = "$image:latest"
+#          docker pull $tag | Out-Null
+#          if ($LASTEXITCODE -ne 0) {
+#            Write-Host "Skipping $image as it is not available for Windows"
+#          } else {
+#            Write-Host "Successfully pulled $image"
+#          }
+#        }
+#        docker compose up -d
+#        Start-Sleep -Seconds 30
+#      timeout-minutes: 20
+#      shell: pwsh
+
+#    - name: init
+#      run: bootstrap.bat
+#      timeout-minutes: 20
+
+#    - name: Build, Start, Check Services and Print Logs for Linux
+#      run: |
+#        mage
+#        mage start
+#        mage check        
+
+#    - name: Restart Services and Print Logs
+#      run: |
+#        mage stop
+#        mage start
+#        mage check

From 653b48479d0387cfaea3117bc195ad5c1c0fbfcc Mon Sep 17 00:00:00 2001
From: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:11:24 +0800
Subject: [PATCH 13/13] 3.6.1 code conventions (#2202)

* refactor: webhooks update.

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* feat: s3 api addr

* refactor: webhooks update.

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* Adjust configuration settings

* refactor: webhooks update.

* refactor: kafka update.

* Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service.

* refactor: kafka update.

* refactor: kafka update.

* Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service.

* Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service.

* Windows can compile and run.

* Windows can compile and run.

* refactor: kafka update.

* feat: msg cache split

* refactor: webhooks update

* refactor: webhooks update

* refactor: friends update

* refactor: group update

* refactor: third update

* refactor: api update

* refactor: crontab update

* refactor: msggateway update

* mage

* mage

* refactor: all module update.

* check

* refactor: all module update.

* load config

* load config

* load config

* load config

* refactor: all module update.

* refactor: all module update.

* refactor: all module update.

* refactor: all module update.

* refactor: all module update.

* Optimize Docker configuration and script.

* refactor: all module update.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* refactor: all module update.

* Optimize Docker configuration and script.

* refactor: all module update.

* refactor: all module update.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* update tools

* update tools

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* update protocol

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* refactor: all module update.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* Optimize Docker configuration and script.

* refactor: api remove token auth by redis directly.

* Code Refactoring

* refactor: websocket auth change to call rpc of auth.

* refactor: kick online user and remove token change to call auth rpc.

* refactor: kick online user and remove token change to call auth rpc.

* refactor: remove msggateway redis.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor webhook

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor webhook

* refactor: cmd update.

* refactor: cmd update.

* fix: runtime: goroutine stack exceeds

* refactor: cmd update.

* refactor notification

* refactor notification

* refactor

* refactor: cmd update.

* refactor: cmd update.

* refactor

* refactor

* refactor

* protojson

* protojson

* protojson

* go mod

* wrapperspb

* refactor: cmd update.

* refactor: cmd update.

* refactor: cmd update.

* refactor: context update.

* refactor: websocket update info.

* refactor: websocket update info.

* refactor: websocket update info.

* refactor: websocket update info.

* refactor: api name change.

* refactor: debug info.

* refactor: debug info.

* refactor: debug info.

* fix: update file

* refactor

* refactor

* refactor: debug info.

* refactor: debug info.

* refactor: debug info.

* refactor: debug info.

* refactor: debug info.

* refactor: debug info.

* fix: callback update.

* fix: callback update.

* refactor

* fix: update message.

* fix: msg cache timeout.

* refactor

* refactor

* fix: push update.

* fix: push update.

* fix: push update.

* fix: push update.

* fix: push update.

* fix: push update.

* refactor

* refactor

* fix: push update.

* fix: websocket handle error remove when upgrade error.

* fix: priority url

* fix: minio config

* refactor: add zk logger.

* refactor

* fix: minio config

* refactor

* refactor

* refactor

* refactor

* refactor: remove zk logger.

* refactor: update tools version.

* refactor

* refactor: update server version to 3.7.0.

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor

* refactor: zk log debug.

* refactor: zk log debug.

* refactor: zk log debug.

* refactor: zk log debug.

* refactor: zk log debug.

* refactor

* refactor

* refactor

* refactor: log level change.

* refactor: 3.7.0 code conventions.

---------

Co-authored-by: skiffer-git <44203734@qq.com>
Co-authored-by: withchao <993506633@qq.com>
---
 .dockerignore                                 |  5 +-
 Dockerfile                                    | 59 +++++++++++------
 bootstrap.sh                                  |  0
 config/README.md                              | 63 +++++++++++++++++++
 config/minio.yml                              |  8 +--
 go.mod                                        | 11 ++--
 go.sum                                        | 27 ++------
 internal/api/init.go                          |  4 --
 internal/msgtransfer/init.go                  |  5 --
 .../msgtransfer/online_history_msg_handler.go |  2 +-
 internal/push/push_handler.go                 |  6 +-
 internal/rpc/third/third.go                   | 16 -----
 pkg/common/config/config.go                   | 23 ++++---
 pkg/common/config/load_config_test.go         |  4 +-
 pkg/common/config/version                     |  2 +-
 .../discoveryregister/discoveryregister.go    |  1 +
 pkg/localcache/cache.go                       |  4 +-
 pkg/localcache/go.mod                         |  5 --
 pkg/localcache/go.sum                         |  1 -
 pkg/localcache/option.go                      |  2 +-
 pkg/rpccache/conversation.go                  |  2 +-
 pkg/rpccache/friend.go                        |  2 +-
 pkg/rpccache/group.go                         |  2 +-
 pkg/rpccache/user.go                          |  2 +-
 scripts/create-topic.sh                       |  2 -
 scripts/docker-start-all.sh                   |  9 +--
 scripts/mongo-init.sh                         |  1 +
 27 files changed, 149 insertions(+), 119 deletions(-)
 mode change 100755 => 100644 bootstrap.sh
 create mode 100644 config/README.md
 delete mode 100644 pkg/localcache/go.mod
 delete mode 100644 pkg/localcache/go.sum

diff --git a/.dockerignore b/.dockerignore
index 263798e07..cf6c3cd59 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,9 +5,8 @@
 .git
 
 # Ignore build artifacts
-_output/
 logs/
-
+_output/
 # Ignore non-essential documentation
 README.md
 README-zh_CN.md
@@ -18,8 +17,6 @@ CHANGELOG/
 # Ignore testing and linting configuration
 .golangci.yml
 
-# Ignore deployment-related files
-docker-compose.yaml
 
 # Ignore assets
 assets/
diff --git a/Dockerfile b/Dockerfile
index 9b1021216..746dddf65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,49 @@
-# Build Stage
-FROM golang:1.20 AS builder
+# Use Go 1.21 Alpine as the base image for building the application
+FROM golang:1.21-alpine as builder
 
-# Set go mod installation source and proxy
-ARG GO111MODULE=on
+# Define the base directory for the application as an environment variable
+ENV SERVER_DIR=/openim-server
 
-ENV GO111MODULE=$GO111MODULE
-ENV GOPROXY=$GOPROXY
+# Set the working directory inside the container based on the environment variable
+WORKDIR $SERVER_DIR
 
-# Set up the working directory
-WORKDIR /openim/openim-server
+# Set the Go proxy to improve dependency resolution speed
+ENV GOPROXY=https://goproxy.io,direct
 
+# Copy all files from the current directory into the container
+COPY . .
 
-# Copy all files to the container
-ADD . .
+RUN go mod download
 
-RUN make clean
-RUN make build
+# Install Mage to use for building the application
+RUN go install github.com/magefile/mage@v1.15.0
 
-FROM ghcr.io/openim-sigs/openim-ubuntu-image:latest
+# Optionally build your application if needed
+RUN mage build
 
-WORKDIR ${SERVER_WORKDIR}
+# Using Alpine Linux with Go environment for the final image
+FROM golang:1.21-alpine
 
-# Copy scripts and binary files to the production image
-COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin
-COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
-COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
-COPY --from=builder ${SERVER_WORKDIR}/deployments /openim/openim-server/deployments
+# Install necessary packages, such as bash
+RUN apk add --no-cache bash
 
-CMD ["/openim/openim-server/scripts/docker-start-all.sh"]
+# Set the environment and work directory
+ENV SERVER_DIR=/openim-server
+WORKDIR $SERVER_DIR
+
+
+# Copy the compiled binaries and mage from the builder image to the final image
+COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
+COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
+COPY --from=builder /go/bin/mage /usr/local/bin/mage
+COPY --from=builder $SERVER_DIR/magefile_windows.go $SERVER_DIR/
+COPY --from=builder $SERVER_DIR/magefile_unix.go $SERVER_DIR/
+COPY --from=builder $SERVER_DIR/magefile.go $SERVER_DIR/
+COPY --from=builder $SERVER_DIR/start-config.yml $SERVER_DIR/
+COPY --from=builder $SERVER_DIR/go.mod $SERVER_DIR/
+COPY --from=builder $SERVER_DIR/go.sum $SERVER_DIR/
+
+RUN go get github.com/openimsdk/gomake@v0.0.9
+
+# Set the command to run when the container starts
+ENTRYPOINT ["sh", "-c", "mage start && tail -f /dev/null"]
diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100755
new mode 100644
diff --git a/config/README.md b/config/README.md
new file mode 100644
index 000000000..048d7fe36
--- /dev/null
+++ b/config/README.md
@@ -0,0 +1,63 @@
+---
+title: 'OpenIM Configuration Files and Common Configuration Item Modifications Guide'
+
+## Configuration Files Explanation
+
+| Configuration File              | Description                                                  |
+| ------------------------------- | ------------------------------------------------------------ |
+| **kafka.yml**                   | Configurations for Kafka username, password, address, etc.   |
+| **redis.yml**                   | Configurations for Redis password, address, etc.             |
+| **minio.yml**                   | Configurations for MinIO username, password, address, and external IP/domain; failing to modify external IP or domain may cause image file sending failures |
+| **zookeeper.yml**               | Configurations for ZooKeeper user, password, address, etc.   |
+| **mongodb.yml**                 | Configurations for MongoDB username, password, address, etc. |
+| **log.yml**                     | Configurations for log level and storage directory.          |
+| **notification.yml**            | Configurations for events like adding friends, creating groups, etc. |
+| **share.yml**                   | Common configurations needed by various OpenIM services, such as secret. |
+| **webhooks.yml**                | Configurations for URLs in Webhook.                          |
+| **local-cache.yml**             | Local cache configurations.                                  |
+| **openim-rpc-third.yml**        | Configurations for listening IP, port, and storage settings for images and videos in openim-rpc-third service. |
+| **openim-rpc-user.yml**         | Configurations for listening IP and port in openim-rpc-user service. |
+| **openim-api.yml**              | Configurations for listening IP, port, etc., in openim-api service. |
+| **openim-crontask.yml**         | Configurations for openim-crontask service.                  |
+| **openim-msggateway.yml**       | Configurations for listening IP, port, etc., in openim-msggateway service. |
+| **openim-msgtransfer.yml**      | Configurations for openim-msgtransfer service.               |
+| **openim-push.yml**             | Configurations for listening IP, port, and offline push settings in openim-push service. |
+| **openim-rpc-auth.yml**         | Configurations for listening IP, port, and token expiration settings in openim-rpc-auth service. |
+| **openim-rpc-conversation.yml** | Configurations for listening IP, port, etc., in openim-rpc-conversation service. |
+| **openim-rpc-friend.yml**       | Configurations for listening IP, port, etc., in openim-rpc-friend service. |
+| **openim-rpc-group.yml**        | Configurations for listening IP, port, etc., in openim-rpc-group service. |
+| **openim-rpc-msg.yml**          | Configurations for listening IP, port, and whether to verify friendship before sending messages in openim-rpc-msg service. |
+
+## Common Configuration Item Modifications
+
+| Configuration Item Modification                       | Configuration File      |
+| ----------------------------------------------------- | ----------------------- |
+| Using MinIO for image and video file object storage   | `minio.yml`             |
+| Adjusting production environment logs                 | `log.yml`               |
+| Verifying friendship before sending messages          | `openim-rpc-msg.yml`    |
+| Modifying secret                                      | `share.yml`             |
+| Using OSS, COS, AWS, Kodo for image and video storage | `openim-rpc-third.yml`  |
+| Setting multiple login policy                         | `openim-msggateway.yml` |
+| Setting up offline push                               | `openim-push.yml`       |
+
+## Starting Multiple Instances of an OpenIM Service
+
+To start multiple instances of an OpenIM service, simply increase the corresponding port numbers and modify the `start-config.yml` file in the project root directory. Restart the service to take effect. For example, the configuration to start 2 instances of `openim-rpc-user` is as follows:
+
+```yaml
+rpc:
+  registerIP: ''
+  listenIP: 0.0.0.0
+  ports: [ 10110, 10111 ]
+
+prometheus:
+  enable: true
+  ports: [ 20100, 20101 ]
+```
+
+Modify `start-config.yml`:
+
+```yaml
+serviceBinaries:
+  openim-rpc-user: 2
+```
diff --git a/config/minio.yml b/config/minio.yml
index 0cabb7f36..0a80bb845 100644
--- a/config/minio.yml
+++ b/config/minio.yml
@@ -1,9 +1,7 @@
 bucket: "openim"
-port: 10005
 accessKeyID: "root"
 secretAccessKey: "openIM123"
 sessionToken: ''
-internalIP: localhost
-externalIP: 150.109.93.151
-url: https://image.rentsoft.cn/
-publicRead: false
+internalAddress: "minio:9000"
+externalAddress: "http://external_ip:10005"
+publicRead: false
\ No newline at end of file
diff --git a/go.mod b/go.mod
index b2f922bb2..891125a89 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3
 
-go 1.21.2
+go 1.20
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
@@ -13,9 +13,8 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/localcache v0.0.1
 	github.com/openimsdk/protocol v0.0.64
-	github.com/openimsdk/tools v0.0.47-alpha.43
+	github.com/openimsdk/tools v0.0.49-alpha.2
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0
@@ -32,9 +31,10 @@ require (
 	github.com/IBM/sarama v1.43.0
 	github.com/fatih/color v1.14.1
 	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/kelindar/bitmap v1.5.2
 	github.com/likexian/gokit v0.25.13
-	github.com/openimsdk/gomake v0.0.6
+	github.com/openimsdk/gomake v0.0.9
 	github.com/redis/go-redis/v9 v9.4.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
@@ -83,7 +83,6 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -173,5 +172,3 @@ require (
 	golang.org/x/crypto v0.21.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
-
-replace github.com/openimsdk/localcache => ./pkg/localcache
diff --git a/go.sum b/go.sum
index d7a08afa6..5dc0cc524 100644
--- a/go.sum
+++ b/go.sum
@@ -22,13 +22,10 @@ github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mo
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
-github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@@ -46,7 +43,6 @@ github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5P
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
-github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -70,15 +66,12 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
-github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -97,7 +90,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -145,13 +137,11 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
@@ -204,7 +194,6 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
-github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kelindar/bitmap v1.5.2 h1:XwX7CTvJtetQZ64zrOkApoZZHBJRkjE23NfqUALA/HE=
@@ -220,9 +209,7 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
@@ -279,12 +266,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/openimsdk/gomake v0.0.6 h1:bJmQWDHBj8PQ7oGJ2SL3Gsx0k5CdI/BPfGzlGcV105s=
-github.com/openimsdk/gomake v0.0.6/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
+github.com/openimsdk/gomake v0.0.9 h1:ouf25ygN2PMQ68Gfgns/EQRPiLPnp+77SIr68GfE+n4=
+github.com/openimsdk/gomake v0.0.9/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
 github.com/openimsdk/protocol v0.0.64 h1:OrjSs4CgKN9VLvJvrAsc37O7Ru0E0VllXZQSmG/ab7U=
 github.com/openimsdk/protocol v0.0.64/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
-github.com/openimsdk/tools v0.0.47-alpha.43 h1:4RfyX+aLBEGOEIfc0CrzETwQUDd3aTsFpA26S/TpgXw=
-github.com/openimsdk/tools v0.0.47-alpha.43/go.mod h1:P4oGP1Pd+d4ctbLD5U/XQTgl8yu8Hd3skx640Fr69ko=
+github.com/openimsdk/tools v0.0.49-alpha.2 h1:8IfV6o2ySU7C54sh/MG7ctEp1h3lSNe03OCUDWSk5Ws=
+github.com/openimsdk/tools v0.0.49-alpha.2/go.mod h1:P4oGP1Pd+d4ctbLD5U/XQTgl8yu8Hd3skx640Fr69ko=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -295,7 +282,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -312,7 +298,6 @@ github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -391,7 +376,6 @@ go.opentelemetry.io/otel v1.23.0/go.mod h1:YCycw9ZeKhcJFrb34iVSkyT0iczq/zYDtZYFu
 go.opentelemetry.io/otel/metric v1.23.0 h1:pazkx7ss4LFVVYSxYew7L5I6qvLXHA0Ap2pwV+9Cnpo=
 go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms20Jb7Bbp+HiTo=
 go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
 go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI=
 go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
@@ -399,7 +383,6 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -506,7 +489,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.165.0 h1:zd5d4JIIIaYYsfVy1HzoXYZ9rWCSBxxAglbczzo7Bgc=
 google.golang.org/api v0.165.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -544,7 +526,6 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
diff --git a/internal/api/init.go b/internal/api/init.go
index dcce69a12..6e784da9a 100644
--- a/internal/api/init.go
+++ b/internal/api/init.go
@@ -64,10 +64,6 @@ func Start(ctx context.Context, index int, config *Config) error {
 		return errs.WrapMsg(err, "failed to register discovery service")
 	}
 
-	if err = client.CreateRpcRootNodes(config.Share.RpcRegisterName.GetServiceNames()); err != nil {
-		return errs.WrapMsg(err, "failed to create RPC root nodes")
-	}
-
 	var (
 		netDone = make(chan struct{}, 1)
 		netErr  error
diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go
index 685e847b8..68d953e90 100644
--- a/internal/msgtransfer/init.go
+++ b/internal/msgtransfer/init.go
@@ -80,11 +80,6 @@ func Start(ctx context.Context, index int, config *Config) error {
 	if err != nil {
 		return err
 	}
-
-	if err := client.CreateRpcRootNodes(config.Share.RpcRegisterName.GetServiceNames()); err != nil {
-		return err
-	}
-
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
 	//todo MsgCacheTimeout
diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go
index 9960aa518..8691e92ab 100644
--- a/internal/msgtransfer/online_history_msg_handler.go
+++ b/internal/msgtransfer/online_history_msg_handler.go
@@ -394,7 +394,7 @@ func (och *OnlineHistoryRedisConsumerHandler) ConsumeClaim(
 			break
 		}
 	}
-	log.ZDebug(context.Background(), "online new session msg come", "highWaterMarkOffset",
+	log.ZInfo(context.Background(), "online new session msg come", "highWaterMarkOffset",
 		claim.HighWaterMarkOffset(), "topic", claim.Topic(), "partition", claim.Partition())
 
 	var (
diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go
index 2246fb3f6..e09b0b2ec 100644
--- a/internal/push/push_handler.go
+++ b/internal/push/push_handler.go
@@ -96,7 +96,7 @@ func (c *ConsumerHandler) handleMs2PsChat(ctx context.Context, msg []byte) {
 	var err error
 	switch msgFromMQ.MsgData.SessionType {
 	case constant.ReadGroupChatType:
-		err = c.Push2SuperGroup(ctx, pbData.MsgData.GroupID, pbData.MsgData)
+		err = c.Push2Group(ctx, pbData.MsgData.GroupID, pbData.MsgData)
 	default:
 		var pushUserIDList []string
 		isSenderSync := datautil.GetSwitchFromOptions(pbData.MsgData.Options, constant.IsSenderSync)
@@ -108,7 +108,7 @@ func (c *ConsumerHandler) handleMs2PsChat(ctx context.Context, msg []byte) {
 		err = c.Push2User(ctx, pushUserIDList, pbData.MsgData)
 	}
 	if err != nil {
-		log.ZError(ctx, "push failed", err, "msg", pbData.String())
+		log.ZWarn(ctx, "push failed", err, "msg", pbData.String())
 	}
 }
 
@@ -179,7 +179,7 @@ func (c *ConsumerHandler) shouldPushOffline(_ context.Context, msg *sdkws.MsgDat
 	return true
 }
 
-func (c *ConsumerHandler) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws.MsgData) (err error) {
+func (c *ConsumerHandler) Push2Group(ctx context.Context, groupID string, msg *sdkws.MsgData) (err error) {
 	log.ZDebug(ctx, "Get super group msg from msg_transfer and push msg", "msg", msg.String(), "groupID", groupID)
 	var pushToUserIDs []string
 	if err = c.webhookBeforeGroupOnlinePush(ctx, &c.config.WebhooksConfig.BeforeGroupOnlinePush, groupID, msg,
diff --git a/internal/rpc/third/third.go b/internal/rpc/third/third.go
index ad87fa6f5..9bf8cafa9 100644
--- a/internal/rpc/third/third.go
+++ b/internal/rpc/third/third.go
@@ -18,7 +18,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"net/url"
 	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
@@ -29,7 +28,6 @@ import (
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/redisutil"
 	"github.com/openimsdk/tools/discovery"
-	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/s3"
 	"github.com/openimsdk/tools/s3/cos"
 	"github.com/openimsdk/tools/s3/minio"
@@ -38,7 +36,6 @@ import (
 )
 
 type thirdServer struct {
-	apiURL        string
 	thirdDatabase controller.ThirdDatabase
 	s3dataBase    controller.S3Database
 	userRpcClient rpcclient.UserRpcClient
@@ -73,18 +70,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	if err != nil {
 		return err
 	}
-	apiURL := config.MinioConfig.URL
-	if apiURL == "" {
-		return errs.Wrap(fmt.Errorf("api is empty"))
-	}
-	if _, err := url.Parse(config.MinioConfig.URL); err != nil {
-		return err
-	}
-	if apiURL[len(apiURL)-1] != '/' {
-		apiURL += "/"
-	}
-	apiURL += "object/"
-
 	// Select the oss method according to the profile policy
 	enable := config.RpcConfig.Object.Enable
 	var o s3.Interface
@@ -103,7 +88,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	}
 	cache.InitLocalCache(&config.LocalCacheConfig)
 	third.RegisterThirdServer(server, &thirdServer{
-		apiURL:        apiURL,
 		thirdDatabase: controller.NewThirdDatabase(cache.NewThirdCache(rdb), logdb),
 		userRpcClient: rpcclient.NewUserRpcClient(client, config.Share.RpcRegisterName.User, config.Share.IMAdminUserID),
 		s3dataBase:    controller.NewS3Database(rdb, o, s3db),
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 19edccbab..df2639cab 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -22,6 +22,7 @@ import (
 	"github.com/openimsdk/tools/s3/cos"
 	"github.com/openimsdk/tools/s3/minio"
 	"github.com/openimsdk/tools/s3/oss"
+	"net"
 	"time"
 )
 
@@ -52,13 +53,11 @@ type Log struct {
 
 type Minio struct {
 	Bucket          string `mapstructure:"bucket"`
-	Port            int    `mapstructure:"port"`
 	AccessKeyID     string `mapstructure:"accessKeyID"`
 	SecretAccessKey string `mapstructure:"secretAccessKey"`
 	SessionToken    string `mapstructure:"sessionToken"`
-	InternalIP      string `mapstructure:"internalIP"`
-	ExternalIP      string `mapstructure:"externalIP"`
-	URL             string `mapstructure:"url"`
+	InternalAddress string `mapstructure:"internalAddress"`
+	ExternalAddress string `mapstructure:"externalAddress"`
 	PublicRead      bool   `mapstructure:"publicRead"`
 }
 
@@ -477,16 +476,24 @@ func (k *Kafka) Build() *kafka.Config {
 	}
 }
 func (m *Minio) Build() *minio.Config {
-	return &minio.Config{
+	conf := minio.Config{
 		Bucket:          m.Bucket,
-		Endpoint:        fmt.Sprintf("http://%s:%d", m.InternalIP, m.Port),
 		AccessKeyID:     m.AccessKeyID,
 		SecretAccessKey: m.SecretAccessKey,
 		SessionToken:    m.SessionToken,
-		SignEndpoint:    fmt.Sprintf("http://%s:%d", m.ExternalIP, m.Port),
 		PublicRead:      m.PublicRead,
 	}
-
+	if _, _, err := net.SplitHostPort(m.InternalAddress); err == nil {
+		conf.Endpoint = fmt.Sprintf("http://%s", m.InternalAddress)
+	} else {
+		conf.Endpoint = m.InternalAddress
+	}
+	if _, _, err := net.SplitHostPort(m.ExternalAddress); err == nil {
+		conf.SignEndpoint = fmt.Sprintf("http://%s", m.ExternalAddress)
+	} else {
+		conf.SignEndpoint = m.ExternalAddress
+	}
+	return &conf
 }
 func (c *Cos) Build() *cos.Config {
 	return &cos.Config{
diff --git a/pkg/common/config/load_config_test.go b/pkg/common/config/load_config_test.go
index 575448393..256214565 100644
--- a/pkg/common/config/load_config_test.go
+++ b/pkg/common/config/load_config_test.go
@@ -31,6 +31,8 @@ func TestLoadOpenIMRpcUserConfig(t *testing.T) {
 	var user User
 	err := LoadConfig("../../../config/openim-rpc-user.yml", "IMENV_OPENIM_RPC_USER", &user)
 	assert.Nil(t, err)
+	//export IMENV_OPENIM_RPC_USER_RPC_LISTENIP="0.0.0.0"
 	assert.Equal(t, "0.0.0.0", user.RPC.ListenIP)
-	assert.Equal(t, []int{10110}, user.RPC.Ports)
+	//export IMENV_OPENIM_RPC_USER_RPC_PORTS="10110,10111,10112"
+	assert.Equal(t, []int{10110, 10111, 10112}, user.RPC.Ports)
 }
diff --git a/pkg/common/config/version b/pkg/common/config/version
index 084e244ce..240bba906 100644
--- a/pkg/common/config/version
+++ b/pkg/common/config/version
@@ -1 +1 @@
-3.6.0
\ No newline at end of file
+3.7.0
\ No newline at end of file
diff --git a/pkg/common/discoveryregister/discoveryregister.go b/pkg/common/discoveryregister/discoveryregister.go
index b664ee34e..38d7382fa 100644
--- a/pkg/common/discoveryregister/discoveryregister.go
+++ b/pkg/common/discoveryregister/discoveryregister.go
@@ -33,6 +33,7 @@ const (
 func NewDiscoveryRegister(zookeeperConfig *config.ZooKeeper, share *config.Share) (discovery.SvcDiscoveryRegistry, error) {
 	switch share.Env {
 	case zookeeperConst:
+
 		return zookeeper.NewZkClient(
 			zookeeperConfig.Address,
 			zookeeperConfig.Schema,
diff --git a/pkg/localcache/cache.go b/pkg/localcache/cache.go
index 91c490922..0e040ad38 100644
--- a/pkg/localcache/cache.go
+++ b/pkg/localcache/cache.go
@@ -19,8 +19,8 @@ import (
 	"hash/fnv"
 	"unsafe"
 
-	"github.com/openimsdk/localcache/link"
-	"github.com/openimsdk/localcache/lru"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache/link"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache/lru"
 )
 
 type Cache[V any] interface {
diff --git a/pkg/localcache/go.mod b/pkg/localcache/go.mod
deleted file mode 100644
index 5f0793042..000000000
--- a/pkg/localcache/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/openimsdk/localcache
-
-go 1.19
-
-require github.com/hashicorp/golang-lru/v2 v2.0.7
diff --git a/pkg/localcache/go.sum b/pkg/localcache/go.sum
deleted file mode 100644
index b1d8cf8c4..000000000
--- a/pkg/localcache/go.sum
+++ /dev/null
@@ -1 +0,0 @@
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
diff --git a/pkg/localcache/option.go b/pkg/localcache/option.go
index e60d5aa07..00bb9d044 100644
--- a/pkg/localcache/option.go
+++ b/pkg/localcache/option.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/openimsdk/localcache/lru"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache/lru"
 )
 
 func defaultOption() *option {
diff --git a/pkg/rpccache/conversation.go b/pkg/rpccache/conversation.go
index 196657b4b..55897a8da 100644
--- a/pkg/rpccache/conversation.go
+++ b/pkg/rpccache/conversation.go
@@ -17,9 +17,9 @@ package rpccache
 import (
 	"context"
 
-	"github.com/openimsdk/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 	pbconversation "github.com/openimsdk/protocol/conversation"
 	"github.com/openimsdk/tools/errs"
diff --git a/pkg/rpccache/friend.go b/pkg/rpccache/friend.go
index 557b5cffc..3e9e7863a 100644
--- a/pkg/rpccache/friend.go
+++ b/pkg/rpccache/friend.go
@@ -17,9 +17,9 @@ package rpccache
 import (
 	"context"
 
-	"github.com/openimsdk/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 	"github.com/openimsdk/tools/log"
 	"github.com/redis/go-redis/v9"
diff --git a/pkg/rpccache/group.go b/pkg/rpccache/group.go
index daf76a7a0..7ba22beb8 100644
--- a/pkg/rpccache/group.go
+++ b/pkg/rpccache/group.go
@@ -17,9 +17,9 @@ package rpccache
 import (
 	"context"
 
-	"github.com/openimsdk/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/errs"
diff --git a/pkg/rpccache/user.go b/pkg/rpccache/user.go
index b31f187db..0a7a4e4b8 100644
--- a/pkg/rpccache/user.go
+++ b/pkg/rpccache/user.go
@@ -17,9 +17,9 @@ package rpccache
 import (
 	"context"
 
-	"github.com/openimsdk/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/errs"
diff --git a/scripts/create-topic.sh b/scripts/create-topic.sh
index a719147a2..206075fb8 100755
--- a/scripts/create-topic.sh
+++ b/scripts/create-topic.sh
@@ -53,5 +53,3 @@ for topic in "${topics[@]}"; do
 done
 
 echo "All topics created."
-
-
diff --git a/scripts/docker-start-all.sh b/scripts/docker-start-all.sh
index 8d91cd771..116038b53 100755
--- a/scripts/docker-start-all.sh
+++ b/scripts/docker-start-all.sh
@@ -21,9 +21,6 @@
 #fixme This scripts is the total startup scripts
 #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
 
-OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-source "${OPENIM_ROOT}/scripts/install/common.sh"
-openim::log::info "\n# Use Docker to start all OpenIM service"
-trap 'openim::util::onCtrlC' INT
-"${OPENIM_ROOT}"/scripts/start-all.sh 2>&1 &
-tail -f ${DOCKER_LOG_FILE}
+cd /openim/openim-server
+mage start
+tail -f /dev/null
diff --git a/scripts/mongo-init.sh b/scripts/mongo-init.sh
index ce2b86d90..01199c480 100755
--- a/scripts/mongo-init.sh
+++ b/scripts/mongo-init.sh
@@ -45,3 +45,4 @@ if (createUserResult.ok == 1) {
 EOF
 
 
+