Merge pull request #2177 from openimsdk/cubxxw-patch-2

update release-v3.1  images

.env

@@ -1,5 +1,5 @@
 USER=root
 PASSWORD=openIM123
-MINIO_ENDPOINT=http://113.99.98.99:10005
+MINIO_ENDPOINT=http://127.0.0.1:10005
-API_URL=http://113.99.98.99:10002/object/
+API_URL=http://127.0.0.1:10002/object/
 DATA_DIR=./

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"]
+CMD ["./docker_start_all.sh"]

README.md

@@ -8,7 +8,6 @@
     ⭐️  Open source Instant Messaging Server ⭐️ <br>
 <h3>
 
-
 <p align=center>
 <a href="https://goreportcard.com/report/github.com/OpenIMSDK/Open-IM-Server"><img src="https://goreportcard.com/badge/github.com/OpenIMSDK/Open-IM-Server" alt="A+"></a>
 <a href="https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22"><img src="https://img.shields.io/github/issues/OpenIMSDK/Open-IM-Server/good%20first%20issue?logo=%22github%22" alt="good first"></a>

docker-compose.yaml

@@ -100,7 +100,7 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openimsdk/openim-server:v3.0
+    image: ghcr.io/openimsdk/openim-server:release-v3.1
     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.1
     container_name: openim_chat
     restart: always
     depends_on:

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

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)
+}

internal/msggateway/message_handler.go

@@ -39,7 +39,13 @@ type Req struct {
 }
 
 func (r *Req) String() string {
-	return utils.StructToJsonString(r)
+	var tReq Req
+	tReq.ReqIdentifier = r.ReqIdentifier
+	tReq.Token = r.Token
+	tReq.SendID = r.SendID
+	tReq.OperationID = r.OperationID
+	tReq.MsgIncr = r.MsgIncr
+	return utils.StructToJsonString(tReq)
 }
 
 type Resp struct {
@@ -52,6 +58,12 @@ type Resp struct {
 }
 
 func (r *Resp) String() string {
+	var tResp Resp
+	tResp.ReqIdentifier = r.ReqIdentifier
+	tResp.MsgIncr = r.MsgIncr
+	tResp.OperationID = r.OperationID
+	tResp.ErrCode = r.ErrCode
+	tResp.ErrMsg = r.ErrMsg
 	return utils.StructToJsonString(r)
 }
 

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
 	}

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
+	//TODO 是否加一个参数校验-判断req.userID的数量，每一个获取加一个限制，一次请求限制500？
-	panic("implement me")
+	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
+	err = s.UserDatabase.SetUserStatus(ctx, req.StatusList)
-	panic("implement me")
+	if err != nil {
+		return nil, err
+	}
+	return &pbuser.SetUserStatusResp{}, nil
 }

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
+	userExpireTime            = time.Second * 60 * 60 * 12
-	userInfoKey             = "USER_INFO:"
+	userInfoKey               = "USER_INFO:"
-	userGlobalRecvMsgOptKey = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
+	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
+}

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)
+}

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)
+}

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, "")
+}

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,

scripts/install_im_server.sh

@@ -37,12 +37,24 @@ function onCtrlC () {
     exit 1
 }
 
+# Load environment variables from .env file
+source ${OPENIM_ROOT}/.env
+
 # Get the public internet IP address
 internet_ip=$(curl ifconfig.me -s)
 echo -e "${PURPLE_PREFIX}=========> Your public internet IP address is ${internet_ip} ${COLOR_SUFFIX} \n"
 
-# Load environment variables from .env file
+# Replace local IP address with the public IP address in .env file
-source ${OPENIM_ROOT}/.env
+if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
+    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
+fi
+
+if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
+    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
+fi 
+
+
+
 
 echo -e "${PURPLE_PREFIX}=========> Your minio endpoint is ${MINIO_ENDPOINT} ${COLOR_SUFFIX} \n"
 
@@ -59,15 +71,6 @@ echo -e "${PURPLE_PREFIX}=========> env_check.sh ${COLOR_SUFFIX} \n"
 
 ${SCRIPTS_ROOT}/env_check.sh
 
-# Replace local IP address with the public IP address in .env file
-if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
-    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
-fi
-
-if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
-    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
-fi 
-
 # Go back to the previous directory
 cd ${OPENIM_ROOT}
 

scripts/make-rules/golang.mk

@@ -17,7 +17,7 @@
 #
 
 GO := go
-GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20
+GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21
 
 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \
 	-X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \