From e24b0e21149ebd316d3ee5ad9baf1ea5d09e4468 Mon Sep 17 00:00:00 2001
From: pluto <83957921+plutoyty@users.noreply.github.com>
Date: Fri, 28 Jul 2023 17:54:29 +0800
Subject: [PATCH 1/9] Get user online status (#693)

* Resolving code conflicts after project directory changes and Add subscribe and unsubscribe mongodb operations

* Organize and update module dependencies

* Get user online status

* Get user online status

* Get user online status
---
 internal/api/route.go            |  1 +
 internal/api/user.go             |  4 ++
 internal/rpc/user/user.go        | 15 ++++--
 pkg/common/db/cache/user.go      | 85 ++++++++++++++++++++++++++++++--
 pkg/common/db/controller/user.go | 16 ++++++
 5 files changed, 114 insertions(+), 7 deletions(-)

diff --git a/internal/api/route.go b/internal/api/route.go
index 0f46f0f0c..1926b55f1 100644
--- a/internal/api/route.go
+++ b/internal/api/route.go
@@ -81,6 +81,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		userRouterGroup.POST("/get_users_online_token_detail", ParseToken, u.GetUsersOnlineTokenDetail)
 		userRouterGroup.POST("/subscribe_users_status", ParseToken, u.UnSubscriberStatus)
 		userRouterGroup.POST("/unsubscribe_users_status", ParseToken, u.UnSubscriberStatus)
+		userRouterGroup.POST("/get_users_status", ParseToken, u.GetUserStatus)
 
 	}
 	// friend routing group
diff --git a/internal/api/user.go b/internal/api/user.go
index 108ccac69..3eb136b3d 100644
--- a/internal/api/user.go
+++ b/internal/api/user.go
@@ -194,3 +194,7 @@ func (u *UserApi) SubscriberStatus(c *gin.Context) {
 func (u *UserApi) UnSubscriberStatus(c *gin.Context) {
 	a2r.Call(user.UserClient.SubscribeOrCancelUsersStatus, u.Client, c)
 }
+
+func (u *UserApi) GetUserStatus(c *gin.Context) {
+	a2r.Call(user.UserClient.GetUserStatus, u.Client, c)
+}
diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
index 576492566..53598db0b 100644
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@@ -261,11 +261,18 @@ func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbus
 }
 
 func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp, err error) {
-	//TODO implement me
-	panic("implement me")
+	//TODO 是否加一个参数校验-判断req.userID的数量，每一个获取加一个限制，一次请求限制500？
+	onlineStatusList, err := s.UserDatabase.GetUserStatus(ctx, req.UserIDs)
+	if err != nil {
+		return nil, err
+	}
+	return &pbuser.GetUserStatusResp{StatusList: onlineStatusList}, nil
 }
 
 func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp, err error) {
-	//TODO implement me
-	panic("implement me")
+	err = s.UserDatabase.SetUserStatus(ctx, req.StatusList)
+	if err != nil {
+		return nil, err
+	}
+	return &pbuser.SetUserStatusResp{}, nil
 }
diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go
index 455bc9ebe..5c76af22f 100644
--- a/pkg/common/db/cache/user.go
+++ b/pkg/common/db/cache/user.go
@@ -16,6 +16,9 @@ package cache
 
 import (
 	"context"
+	"encoding/json"
+	"github.com/OpenIMSDK/protocol/user"
+	"strconv"
 	"time"
 
 	"github.com/dtm-labs/rockscache"
@@ -25,9 +28,12 @@ import (
 )
 
 const (
-	userExpireTime          = time.Second * 60 * 60 * 12
-	userInfoKey             = "USER_INFO:"
-	userGlobalRecvMsgOptKey = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
+	userExpireTime            = time.Second * 60 * 60 * 12
+	userInfoKey               = "USER_INFO:"
+	userGlobalRecvMsgOptKey   = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
+	olineStatusKey            = "ONLINE_STATUS:"
+	userOlineStatusExpireTime = time.Second * 60 * 60 * 24
+	statusMod                 = 500
 )
 
 type UserCache interface {
@@ -38,10 +44,13 @@ type UserCache interface {
 	DelUsersInfo(userIDs ...string) UserCache
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache
+	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
+	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
 }
 
 type UserCacheRedis struct {
 	metaCache
+	rdb        redis.UniversalClient
 	userDB     relationTb.UserModelInterface
 	expireTime time.Duration
 	rcClient   *rockscache.Client
@@ -54,6 +63,7 @@ func NewUserCacheRedis(
 ) UserCache {
 	rcClient := rockscache.NewClient(rdb, options)
 	return &UserCacheRedis{
+		rdb:        rdb,
 		metaCache:  NewMetaCacheRedis(rcClient),
 		userDB:     userDB,
 		expireTime: userExpireTime,
@@ -63,6 +73,7 @@ func NewUserCacheRedis(
 
 func (u *UserCacheRedis) NewCache() UserCache {
 	return &UserCacheRedis{
+		rdb:        u.rdb,
 		metaCache:  NewMetaCacheRedis(u.rcClient, u.metaCache.GetPreDelKeys()...),
 		userDB:     u.userDB,
 		expireTime: u.expireTime,
@@ -145,3 +156,71 @@ func (u *UserCacheRedis) DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache {
 	cache.AddKeys(keys...)
 	return cache
 }
+
+func (u *UserCacheRedis) getOnlineStatusKey(userID string) string {
+	return olineStatusKey + userID
+}
+
+// GetUserStatus get user status
+func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
+	var res []*user.OnlineStatus
+	for _, userID := range userIDs {
+		UserIDNum, err := strconv.Atoi(userID)
+		if err != nil {
+			return nil, err
+		}
+		var modKey = strconv.Itoa(UserIDNum % statusMod)
+		var onlineStatus user.OnlineStatus
+		key := olineStatusKey + modKey
+		result, err := u.rdb.HGet(ctx, key, userID).Result()
+		if err != nil {
+			if err == redis.Nil {
+				// key or field does not exist
+				res = append(res, &user.OnlineStatus{
+					UserID:     userID,
+					Status:     0,
+					PlatformID: -1,
+				})
+				continue
+			} else {
+				return nil, err
+			}
+		}
+		err = json.Unmarshal([]byte(result), &onlineStatus)
+		if err != nil {
+			return nil, err
+		}
+		onlineStatus.UserID = userID
+		res = append(res, &onlineStatus)
+	}
+	return res, nil
+}
+
+// SetUserStatus Set the user status and save it in redis
+func (u *UserCacheRedis) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
+	for _, status := range list {
+		var isNewKey int64
+		UserIDNum, err := strconv.Atoi(status.UserID)
+		if err != nil {
+			return err
+		}
+		var modKey = strconv.Itoa(UserIDNum % statusMod)
+		key := olineStatusKey + modKey
+		jsonData, err := json.Marshal(status)
+		if err != nil {
+			return err
+		}
+		isNewKey, err = u.rdb.Exists(ctx, key).Result()
+		if err != nil {
+			return err
+		}
+		_, err = u.rdb.HSet(ctx, key, status.UserID, string(jsonData)).Result()
+		if err != nil {
+			return err
+		}
+		if isNewKey > 0 {
+			u.rdb.Expire(ctx, key, userOlineStatusExpireTime)
+		}
+	}
+	return nil
+}
diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go
index 83942ce22..5b303ebd7 100644
--- a/pkg/common/db/controller/user.go
+++ b/pkg/common/db/controller/user.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/protocol/constant"
+	"github.com/OpenIMSDK/protocol/user"
 	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -56,6 +57,10 @@ type UserDatabase interface {
 	GetAllSubscribeList(ctx context.Context, userID string) ([]string, error)
 	// GetSubscribedList Get all subscribed lists
 	GetSubscribedList(ctx context.Context, userID string) ([]string, error)
+	// GetUserStatus Get the online status of the user
+	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
+	// SetUserStatus Set the user status and store the user status in redis
+	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
 }
 
 type userDatabase struct {
@@ -195,3 +200,14 @@ func (u *userDatabase) GetSubscribedList(ctx context.Context, userID string) ([]
 	//TODO 获取所有被订阅
 	return nil, nil
 }
+
+// GetUserStatus get user status
+func (u *userDatabase) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
+	onlineStatusList, err := u.cache.GetUserStatus(ctx, userIDs)
+	return onlineStatusList, err
+}
+
+// SetUserStatus Set the user status and save it in redis
+func (u *userDatabase) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
+	return u.cache.SetUserStatus(ctx, list)
+}

From 788b381508fbf65f3fd0bc3342d28b628716abfe Mon Sep 17 00:00:00 2001
From: WangchuXiao <wangchuxiao97@outlook.com>
Date: Fri, 28 Jul 2023 21:43:29 +0800
Subject: [PATCH 2/9] fix bug: When the previously applied group has a
 disbanded group, applying to add the group again will fail (#698)

* docs: add readme docs

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* feat: add script yaml

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* feat: add script yaml

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* feat: add test

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* feat: add test

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* fix bug: reject group req bug

* feat: add go relase

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* fix bug: join group failed

* fix bug: join group failed

---------

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
Co-authored-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 internal/rpc/group/group.go           | 2 +-
 pkg/common/db/controller/group.go     | 5 +++++
 pkg/common/db/relation/group_model.go | 4 ++++
 pkg/common/db/table/relation/group.go | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 65beae37e..a7680dfaa 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -1040,7 +1040,7 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou
 	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationTb.GroupRequestModel) string {
 		return e.GroupID
 	}))
-	groups, err := s.GroupDatabase.FindGroup(ctx, groupIDs)
+	groups, err := s.GroupDatabase.FindNotDismissedGroup(ctx, groupIDs)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go
index e2b5f90b3..ba4ae18df 100644
--- a/pkg/common/db/controller/group.go
+++ b/pkg/common/db/controller/group.go
@@ -39,6 +39,7 @@ type GroupDatabase interface {
 	CreateGroup(ctx context.Context, groups []*relationTb.GroupModel, groupMembers []*relationTb.GroupMemberModel) error
 	TakeGroup(ctx context.Context, groupID string) (group *relationTb.GroupModel, err error)
 	FindGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error)
+	FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error)
 	SearchGroup(
 		ctx context.Context,
 		keyword string,
@@ -581,3 +582,7 @@ func (g *groupDatabase) CountRangeEverydayTotal(ctx context.Context, start time.
 func (g *groupDatabase) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (int64, []*relationTb.GroupRequestModel, error) {
 	return g.groupRequestDB.FindGroupRequests(ctx, groupID, userIDs)
 }
+
+func (g *groupDatabase) FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error) {
+	return g.groupDB.FindNotDismissedGroup(ctx, groupIDs)
+}
diff --git a/pkg/common/db/relation/group_model.go b/pkg/common/db/relation/group_model.go
index 697427e04..853f5dccd 100644
--- a/pkg/common/db/relation/group_model.go
+++ b/pkg/common/db/relation/group_model.go
@@ -99,3 +99,7 @@ func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time
 	}
 	return v, nil
 }
+
+func (g *GroupGorm) FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relation.GroupModel, err error) {
+	return groups, utils.Wrap(g.DB.Where("group_id in (?) and status != ?", groupIDs, constant.GroupStatusDismissed).Find(&groups).Error, "")
+}
diff --git a/pkg/common/db/table/relation/group.go b/pkg/common/db/table/relation/group.go
index 2bafb53ec..6759e0d35 100644
--- a/pkg/common/db/table/relation/group.go
+++ b/pkg/common/db/table/relation/group.go
@@ -51,6 +51,7 @@ type GroupModelInterface interface {
 	UpdateMap(ctx context.Context, groupID string, args map[string]interface{}) (err error)
 	UpdateStatus(ctx context.Context, groupID string, status int32) (err error)
 	Find(ctx context.Context, groupIDs []string) (groups []*GroupModel, err error)
+	FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*GroupModel, err error)
 	Take(ctx context.Context, groupID string) (group *GroupModel, err error)
 	Search(
 		ctx context.Context,

From a5eb4dd499181146fbe0509a2a6d3d8887d25d12 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Fri, 28 Jul 2023 22:49:55 +0800
Subject: [PATCH 3/9] fix: docker images (#701)

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 .env                         |  4 ++--
 Dockerfile                   |  4 ++--
 docker-compose.yaml          |  4 ++--
 scripts/make-rules/golang.mk | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 910d864b8..412b75076 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 USER=root
 PASSWORD=openIM123
-MINIO_ENDPOINT=http://113.99.98.99:10005
-API_URL=http://113.99.98.99:10002/object/
+MINIO_ENDPOINT=http://127.0.0.1:10005
+API_URL=http://127.0.0.1:10002/object/
 DATA_DIR=./
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8a230a431..85afdf98b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN /bin/sh -c "make build"
 FROM alpine
 
 RUN echo "https://mirrors.aliyun.com/alpine/v3.4/main" > /etc/apk/repositories && \
-    apk --no-cache add tzdata ca-certificates
+    apk --no-cache add tzdata ca-certificates bash
 
 # Set directory to map logs, config files, scripts, and SDK
 VOLUME ["/Open-IM-Server/logs", "/Open-IM-Server/config", "/Open-IM-Server/scripts", "/Open-IM-Server/db/sdk"]
@@ -34,4 +34,4 @@ COPY --from=builder /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-S
 
 WORKDIR /Open-IM-Server/scripts
 
-CMD ["docker_start_all.sh"]
\ No newline at end of file
+CMD ["./docker_start_all.sh"]
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cd80dbf19..d5565ca52 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -100,7 +100,7 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openimsdk/openim-server:v3.0
+    image: ghcr.io/openimsdk/openim-server:v3.1.0
     container_name: openim-server
     volumes:
       - ./logs:/Open-IM-Server/logs
@@ -124,7 +124,7 @@ services:
         max-file: "2"
 
   openim_chat:
-    image: ghcr.io/openimsdk/openim-chat:v1.0.0
+    image: ghcr.io/openimsdk/openim-chat:v1.1.0
     container_name: openim_chat
     restart: always
     depends_on:
diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk
index 00e0fee47..aebf70e68 100644
--- a/scripts/make-rules/golang.mk
+++ b/scripts/make-rules/golang.mk
@@ -131,11 +131,11 @@ go.build.%:
 		$(BIN_DIR)/platforms/$(OS)/$(ARCH)/$(COMMAND)$(GO_OUT_EXT) $(ROOT_DIR)/cmd/$(COMMAND)/main.go; \
 	fi
 
-## go.install: Install deployment openim
-.PHONY: go.install
-go.install:
-	@echo "===========> Installing deployment openim"
-	@$(ROOT_DIR)/scripts/install_im_server.sh
+# ## go.install: Install deployment openim
+# .PHONY: go.install
+# go.install:
+# 	@echo "===========> Installing deployment openim"
+# 	@$(ROOT_DIR)/scripts/install_im_server.sh
 
 ## go.check: Check OpenIM deployment
 .PHONY: go.check

From f894a4546e54562a8bc823d3791b7a5edff10ebe Mon Sep 17 00:00:00 2001
From: Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Sat, 29 Jul 2023 12:15:12 +0800
Subject: [PATCH 4/9] fix: get userid function call rpc and message gateway add
 status change callback (#699)

* fix: to start im or chat, ZooKeeper must be started first.

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: go mod update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: get all userID

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: msggateway add online status call

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

---------

Signed-off-by: Gordon <1432970085@qq.com>
Signed-off-by: withchao <993506633@qq.com>
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: withchao <993506633@qq.com>
---
 go.mod                             |  2 +-
 go.sum                             |  4 ++--
 internal/api/user.go               |  2 +-
 internal/msggateway/n_ws_server.go | 35 +++++++++++++++++++++++-------
 pkg/rpcclient/user.go              |  4 ++++
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index c18eabd08..c7a2b8309 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@ require (
 require github.com/google/uuid v1.3.0
 
 require (
-	github.com/OpenIMSDK/protocol v0.0.2
+	github.com/OpenIMSDK/protocol v0.0.3
 	github.com/OpenIMSDK/tools v0.0.5
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
diff --git a/go.sum b/go.sum
index a93a1687a..2ad7b17ff 100644
--- a/go.sum
+++ b/go.sum
@@ -16,8 +16,8 @@ cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5og
 firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
 firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OpenIMSDK/protocol v0.0.2 h1:O53/WiqLCHF9aWPLI32GPF82hn7suM8PkhrtL89Klrw=
-github.com/OpenIMSDK/protocol v0.0.2/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/protocol v0.0.3 h1:CFQtmnyW+1dYKVFaVaHcJ6oYuMiMdNfU2gC1xz3K/9I=
+github.com/OpenIMSDK/protocol v0.0.3/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
 github.com/OpenIMSDK/tools v0.0.5 h1:yBVHJ3EpIDcp8VFKPjuGr6MQvFa3t4JByZ+vmeC06/Q=
 github.com/OpenIMSDK/tools v0.0.5/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
diff --git a/internal/api/user.go b/internal/api/user.go
index 3eb136b3d..41f6fd4c9 100644
--- a/internal/api/user.go
+++ b/internal/api/user.go
@@ -51,7 +51,7 @@ func (u *UserApi) GetUsersPublicInfo(c *gin.Context) {
 }
 
 func (u *UserApi) GetAllUsersID(c *gin.Context) {
-	a2r.Call(user.UserClient.GetDesignateUsers, u.Client, c)
+	a2r.Call(user.UserClient.GetAllUserID, u.Client, c)
 }
 
 func (u *UserApi) AccountCheck(c *gin.Context) {
diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go
index c324f8a22..67c8132ca 100644
--- a/internal/msggateway/n_ws_server.go
+++ b/internal/msggateway/n_ws_server.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"net/http"
 	"strconv"
 	"sync"
@@ -74,6 +75,7 @@ type WsServer struct {
 	hubServer         *Server
 	validate          *validator.Validate
 	cache             cache.MsgModel
+	userClient        *rpcclient.UserRpcClient
 	Compressor
 	Encoder
 	MessageHandler
@@ -86,6 +88,28 @@ type kickHandler struct {
 
 func (ws *WsServer) SetDiscoveryRegistry(client discoveryregistry.SvcDiscoveryRegistry) {
 	ws.MessageHandler = NewGrpcHandler(ws.validate, client)
+	u := rpcclient.NewUserRpcClient(client)
+	ws.userClient = &u
+}
+func (ws *WsServer) SetUserOnlineStatus(ctx context.Context, client *Client, status int32) {
+	err := ws.userClient.SetUserStatus(ctx, client.UserID, status, client.PlatformID)
+	if err != nil {
+		log.ZWarn(ctx, "SetUserStatus err", err)
+	}
+	switch status {
+	case constant.Online:
+		err := CallbackUserOnline(ctx, client.UserID, client.PlatformID, client.IsBackground, client.ctx.GetConnID())
+		if err != nil {
+			log.ZWarn(ctx, "CallbackUserOnline err", err)
+		}
+	case constant.Offline:
+		err := CallbackUserOffline(ctx, client.UserID, client.PlatformID, client.ctx.GetConnID())
+		if err != nil {
+			log.ZWarn(ctx, "CallbackUserOffline err", err)
+		}
+
+	}
+
 }
 
 func (ws *WsServer) SetCacheHandler(cache cache.MsgModel) {
@@ -186,6 +210,7 @@ func (ws *WsServer) registerClient(client *Client) {
 			atomic.AddInt64(&ws.onlineUserConnNum, 1)
 		}
 	}
+	ws.SetUserOnlineStatus(client.ctx, client, constant.Online)
 	log.ZInfo(
 		client.ctx,
 		"user online",
@@ -292,14 +317,8 @@ func (ws *WsServer) unregisterClient(client *Client) {
 		atomic.AddInt64(&ws.onlineUserNum, -1)
 	}
 	atomic.AddInt64(&ws.onlineUserConnNum, -1)
-	log.ZInfo(
-		client.ctx,
-		"user offline",
-		"close reason",
-		client.closedErr,
-		"online user Num",
-		ws.onlineUserNum,
-		"online user conn Num",
+	ws.SetUserOnlineStatus(client.ctx, client, constant.Offline)
+	log.ZInfo(client.ctx, "user offline", "close reason", client.closedErr, "online user Num", ws.onlineUserNum, "online user conn Num",
 		ws.onlineUserConnNum,
 	)
 }
diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go
index 1ce4fd53c..6ca60dc75 100644
--- a/pkg/rpcclient/user.go
+++ b/pkg/rpcclient/user.go
@@ -154,3 +154,7 @@ func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumbe
 	}
 	return resp.UserIDs, nil
 }
+func (u *UserRpcClient) SetUserStatus(ctx context.Context, userID string, status int32, platformID int) error {
+	_, err := u.Client.SetUserStatus(ctx, &user.SetUserStatusReq{StatusList: []*user.OnlineStatus{{UserID: userID, Status: status, PlatformID: int32(platformID)}}})
+	return err
+}

From 1ec33afe3f3549c2ee329f74a7ea147910edf002 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Sat, 29 Jul 2023 14:07:59 +0800
Subject: [PATCH 5/9] Update version.md (#703)

---
 docs/conversions/version.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/conversions/version.md b/docs/conversions/version.md
index bf1062b77..8c6caf5ec 100644
--- a/docs/conversions/version.md
+++ b/docs/conversions/version.md
@@ -14,6 +14,10 @@ In the OpenIM repository, the versioning adheres to the `MAJOR.MINOR.PATCH` form
 
 ## Milestones and Branching
 
++ [OpenIM Milestones](https://github.com/OpenIMSDK/Open-IM-Server/milestones)
++ [OpenIM Tags](https://github.com/OpenIMSDK/Open-IM-Server/tags)
++ [OpenIM Branches](https://github.com/OpenIMSDK/Open-IM-Server/branches)
+
 When a significant milestone like v3.1.0 is achieved, a new branch `release-v3.1` is created. This branch contains all the code pertaining to this stable release. All bug fixes and features intended for the next version, v3.2.0, are merged into this branch.
 
 The release of `PATCH` versions (Z in `X.Y.Z`) are driven by bug fixes, and these can be rolled out depending on the bug's priority or over a scheduled time. On the other hand, `MINOR` versions (Y in `X.Y.Z`) are released based on the project's roadmap, milestone completion, or on a scheduled timeline. Importantly, the API of minor versions is always backward-compatible.
@@ -59,3 +63,4 @@ Remember, communication with your team is key throughout this process, keeping e
 
 ## Docker images version management
 
++ [OpenIM Docker Images Administration](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md)

From 2166c71c1fdcf2cb8fccf5e547d7d7d92888831b Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Sat, 29 Jul 2023 19:20:09 +0800
Subject: [PATCH 6/9] Update version.md (#704)

---
 docs/conversions/version.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/conversions/version.md b/docs/conversions/version.md
index 8c6caf5ec..06e34543b 100644
--- a/docs/conversions/version.md
+++ b/docs/conversions/version.md
@@ -2,6 +2,26 @@
 
 Our project, OpenIM, follows the [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/) standards.
 
+OpenIM, the open source project, employs a comprehensive version management system to ensure the reliability and traceability of our software. Our version management consists of three main components: the `main` branch, the `release` branch, and `tag` management.
+
+## Main Branch
+
+The `main` branch is where all the latest code resides. It's the hub of activity, embodying all the cutting-edge features that are currently being developed or updated. However, since it's subject to frequent changes and updates, it may not always represent the most stable version of the software. Access the `main` branch [here](https://github.com/openimsdk/openim-server/tree/main).
+
+## Release Branch
+
+On the other hand, we have the `release` branch. For instance, in the context of version 3.1, we maintain a `release-v3.1` branch. Unlike the `main` branch, the release branch is designed to be a continuously stable and updated version of the software. This provides a reliable option for users who prefer stability over the latest, but potentially unstable, features. Access the `release-v3.1` branch [here](https://github.com/openimsdk/openim-server/tree/release-v3.1).
+
+## Tag Management
+
+Finally, there's `tag` management. Despite having both `main` and `release` branches, `tag` serves a crucial role. Tags are immutable, i.e., they remain unchanged once created. Therefore, if you need a specific version of the software, you can use the corresponding tag. Check out the available tags [here](https://github.com/openimsdk/openim-server/tags).
+
+Moreover, our Docker image versions are closely tied with these three components. For instance, a tag might correspond to the Docker image `ghcr.io/openimsdk/openim-server:v3.1.0`, a release would be `ghcr.io/openimsdk/openim-server:release-v3.0`, and the main branch might be represented as `ghcr.io/openimsdk/openim-server:main` or `ghcr.io/openimsdk/openim-server:latest`.
+
+To find out more, or to contribute to our project, please visit our GitHub repository at [OpenIM Server](https://github.com/openimsdk/openim-server).
+
+We believe that this approach offers a balanced blend of innovation and stability, enabling us to provide the best possible software to our users.
+
 ## OpenIM version
 
 OpenIM manages two primary branches: `main` and `release`. The project uses Semantic Versioning 2.0.0 to tag different versions of the software, each indicating a significant milestone in the software's development.

From 80d888f88684da87a6456d530e516e541e917630 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Sat, 29 Jul 2023 21:04:14 +0800
Subject: [PATCH 7/9] docs: update create CODE_OF_CONDUCT.md (#705)

---
 CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..c5e93d7b5
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+3293172751nss@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

From 6480f9f0b57cfc795ca43457fe0040f04eaa0909 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Sat, 29 Jul 2023 21:26:27 +0800
Subject: [PATCH 8/9] fix: docker images (#706)

* fix: docker images

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

* fix: chat scripts config

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

---------

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 .goreleaser.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index fc7c0cd01..31cdbd085 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -487,10 +487,14 @@ release:
 
     ## Helping out
 
-    We release logs are recorded on [✨ CHANGELOG](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CHANGELOG/CHANGELOG.md)
+    We release logs are recorded on [✨ CHANGELOG](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CHANGELOG/CHANGELOG.md)--config_folder_path
+
+    For information on versions of OpenIM and how to maintain branches, read [📚this article](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md)
 
     This release is only possible thanks to **all** the support of some **awesome people**!
 
+    https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md
+
     **Want to be one of them 😘?**
 
     Contributions to this project are welcome! Please see [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md) for details.

From 6414a0fafd1d32c51d37d843f62eb4ac9fd9b9f5 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Sat, 29 Jul 2023 21:30:47 +0800
Subject: [PATCH 9/9] Update docker-compose.yaml (#707)

---
 docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d5565ca52..394232df3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -100,7 +100,7 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openimsdk/openim-server:v3.1.0
+    image: ghcr.io/openimsdk/openim-server:latest
     container_name: openim-server
     volumes:
       - ./logs:/Open-IM-Server/logs
@@ -124,7 +124,7 @@ services:
         max-file: "2"
 
   openim_chat:
-    image: ghcr.io/openimsdk/openim-chat:v1.1.0
+    image: ghcr.io/openimsdk/openim-chat:latest
     container_name: openim_chat
     restart: always
     depends_on: