diff --git a/.env b/.env
index 3199b3714..a71332d5e 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,3 @@
-
MONGO_IMAGE=mongo:6.0.2
REDIS_IMAGE=redis:7.0.0
ZOOKEEPER_IMAGE=bitnami/zookeeper:3.8
diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go
index 9fd71d989..a4902570a 100644
--- a/internal/msggateway/client.go
+++ b/internal/msggateway/client.go
@@ -397,11 +397,9 @@ func (c *Client) writePongMsg(appData string) error {
return nil
}
- log.ZDebug(c.ctx, "write Pong Msg in Server", "appData", appData)
c.w.Lock()
defer c.w.Unlock()
- log.ZDebug(c.ctx, "write Pong Msg in Server", "appData", appData)
err := c.conn.SetWriteDeadline(writeWait)
if err != nil {
log.ZWarn(c.ctx, "SetWriteDeadline in Server have error", errs.Wrap(err), "writeWait", writeWait, "appData", appData)
@@ -412,6 +410,5 @@ func (c *Client) writePongMsg(appData string) error {
log.ZWarn(c.ctx, "Write Message have error", errs.Wrap(err), "Pong msg", PongMessage)
}
- log.ZDebug(c.ctx, "write message is success", "appdata", appData, "closed err", c.closedErr)
return errs.Wrap(err)
}
diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go
index f31c4587c..f877aa64a 100644
--- a/internal/rpc/group/callback.go
+++ b/internal/rpc/group/callback.go
@@ -16,6 +16,8 @@ package group
import (
"context"
+ "time"
+
"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -27,7 +29,6 @@ import (
"github.com/openimsdk/tools/log"
"github.com/openimsdk/tools/mcontext"
"github.com/openimsdk/tools/utils/datautil"
- "time"
)
// CallbackBeforeCreateGroup callback before create group.
@@ -100,27 +101,45 @@ func (s *groupServer) webhookAfterCreateGroup(ctx context.Context, after *config
s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterCreateGroupResp{}, after)
}
-func (s *groupServer) webhookBeforeMemberJoinGroup(ctx context.Context, before *config.BeforeConfig, groupMember *model.GroupMember, groupEx string) error {
+func (s *groupServer) webhookBeforeMembersJoinGroup(ctx context.Context, before *config.BeforeConfig, groupMembers []*model.GroupMember, groupID string, groupEx string) error {
return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
- cbReq := &callbackstruct.CallbackBeforeMemberJoinGroupReq{
- CallbackCommand: callbackstruct.CallbackBeforeMemberJoinGroupCommand,
- GroupID: groupMember.GroupID,
- UserID: groupMember.UserID,
- Ex: groupMember.Ex,
+ groupMembersMap := datautil.SliceToMap(groupMembers, func(e *model.GroupMember) string {
+ return e.UserID
+ })
+ var groupMembersCallback []*callbackstruct.CallbackGroupMember
+
+ for _, member := range groupMembers {
+ groupMembersCallback = append(groupMembersCallback, &callbackstruct.CallbackGroupMember{
+ UserID: member.UserID,
+ Ex: member.Ex,
+ })
+ }
+
+ cbReq := &callbackstruct.CallbackBeforeMembersJoinGroupReq{
+ CallbackCommand: callbackstruct.CallbackBeforeMembersJoinGroupCommand,
+ GroupID: groupID,
+ MembersList: groupMembersCallback,
GroupEx: groupEx,
}
- resp := &callbackstruct.CallbackBeforeMemberJoinGroupResp{}
+ resp := &callbackstruct.CallbackBeforeMembersJoinGroupResp{}
+
if err := s.webhookClient.SyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, resp, before); err != nil {
return err
}
- if resp.MuteEndTime != nil {
- groupMember.MuteEndTime = time.UnixMilli(*resp.MuteEndTime)
+ for _, memberCallbackResp := range resp.MemberCallbackList {
+ if _, ok := groupMembersMap[(*memberCallbackResp.UserID)]; ok {
+ if memberCallbackResp.MuteEndTime != nil {
+ groupMembersMap[(*memberCallbackResp.UserID)].MuteEndTime = time.UnixMilli(*memberCallbackResp.MuteEndTime)
+ }
+
+ datautil.NotNilReplace(&groupMembersMap[(*memberCallbackResp.UserID)].FaceURL, memberCallbackResp.FaceURL)
+ datautil.NotNilReplace(&groupMembersMap[(*memberCallbackResp.UserID)].Ex, memberCallbackResp.Ex)
+ datautil.NotNilReplace(&groupMembersMap[(*memberCallbackResp.UserID)].Nickname, memberCallbackResp.Nickname)
+ datautil.NotNilReplace(&groupMembersMap[(*memberCallbackResp.UserID)].RoleLevel, memberCallbackResp.RoleLevel)
+ }
}
- datautil.NotNilReplace(&groupMember.FaceURL, resp.FaceURL)
- datautil.NotNilReplace(&groupMember.Ex, resp.Ex)
- datautil.NotNilReplace(&groupMember.Nickname, resp.Nickname)
- datautil.NotNilReplace(&groupMember.RoleLevel, resp.RoleLevel)
+
return nil
})
}
@@ -244,10 +263,13 @@ func (s *groupServer) webhookBeforeInviteUserToGroup(ctx context.Context, before
return err
}
- if len(resp.RefusedMembersAccount) > 0 {
- // Handle the scenario where certain members are refused
- // You might want to update the req.Members list or handle it as per your business logic
- }
+ // Handle the scenario where certain members are refused
+ // You might want to update the req.Members list or handle it as per your business logic
+
+ // if len(resp.RefusedMembersAccount) > 0 {
+ // implement members are refused
+ // }
+
return nil
})
}
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 6790d0958..aa12c9d0f 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -246,7 +246,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR
return nil, err
}
- joinGroup := func(userID string, roleLevel int32) error {
+ joinGroupFunc := func(userID string, roleLevel int32) {
groupMember := &model.GroupMember{
GroupID: group.GroupID,
UserID: userID,
@@ -258,25 +258,23 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR
MuteEndTime: time.UnixMilli(0),
}
- if err := s.webhookBeforeMemberJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, groupMember, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
- return err
- }
groupMembers = append(groupMembers, groupMember)
- return nil
}
- if err := joinGroup(req.OwnerUserID, constant.GroupOwner); err != nil {
+
+ joinGroupFunc(req.OwnerUserID, constant.GroupOwner)
+
+ for _, userID := range req.AdminUserIDs {
+ joinGroupFunc(userID, constant.GroupAdmin)
+ }
+
+ for _, userID := range req.MemberUserIDs {
+ joinGroupFunc(userID, constant.GroupOrdinaryUsers)
+ }
+
+ if err := s.webhookBeforeMembersJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, groupMembers, group.GroupID, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
return nil, err
}
- for _, userID := range req.AdminUserIDs {
- if err := joinGroup(userID, constant.GroupAdmin); err != nil {
- return nil, err
- }
- }
- for _, userID := range req.MemberUserIDs {
- if err := joinGroup(userID, constant.GroupOrdinaryUsers); err != nil {
- return nil, err
- }
- }
+
if err := s.db.CreateGroup(ctx, []*model.Group{group}, groupMembers); err != nil {
return nil, err
}
@@ -442,12 +440,13 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
MuteEndTime: time.UnixMilli(0),
}
- if err := s.webhookBeforeMemberJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, member, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
- return nil, err
- }
groupMembers = append(groupMembers, member)
-
}
+
+ if err := s.webhookBeforeMembersJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, groupMembers, group.GroupID, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
+ return nil, err
+ }
+
if err := s.db.CreateGroup(ctx, nil, groupMembers); err != nil {
return nil, err
}
@@ -811,9 +810,9 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup
MuteEndTime: time.Unix(0, 0),
InviterUserID: groupRequest.InviterUserID,
OperatorUserID: mcontext.GetOpUserID(ctx),
- Ex: groupRequest.Ex,
}
- if err := s.webhookBeforeMemberJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, member, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
+
+ if err := s.webhookBeforeMembersJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, []*model.GroupMember{member}, group.GroupID, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
return nil, err
}
}
@@ -882,7 +881,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
MuteEndTime: time.UnixMilli(0),
}
- if err := s.webhookBeforeMemberJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, groupMember, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
+ if err := s.webhookBeforeMembersJoinGroup(ctx, &s.config.WebhooksConfig.BeforeMemberJoinGroup, []*model.GroupMember{groupMember}, group.GroupID, group.Ex); err != nil && err != servererrs.ErrCallbackContinue {
return nil, err
}
@@ -898,6 +897,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
return &pbgroup.JoinGroupResp{}, nil
}
+
groupRequest := model.GroupRequest{
UserID: req.InviterUserID,
ReqMsg: req.ReqMessage,
diff --git a/pkg/callbackstruct/constant.go b/pkg/callbackstruct/constant.go
index 66e1598cd..ab393dd36 100644
--- a/pkg/callbackstruct/constant.go
+++ b/pkg/callbackstruct/constant.go
@@ -56,7 +56,7 @@ const (
CallbackBeforeUpdateUserInfoCommand = "callbackBeforeUpdateUserInfoCommand"
CallbackBeforeCreateGroupCommand = "callbackBeforeCreateGroupCommand"
CallbackAfterCreateGroupCommand = "callbackAfterCreateGroupCommand"
- CallbackBeforeMemberJoinGroupCommand = "callbackBeforeMemberJoinGroupCommand"
+ CallbackBeforeMembersJoinGroupCommand = "callbackBeforeMembersJoinGroupCommand"
CallbackBeforeSetGroupMemberInfoCommand = "callbackBeforeSetGroupMemberInfoCommand"
CallbackAfterSetGroupMemberInfoCommand = "callbackAfterSetGroupMemberInfoCommand"
)
diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go
index e78d45ab4..23a73ebd2 100644
--- a/pkg/callbackstruct/group.go
+++ b/pkg/callbackstruct/group.go
@@ -59,16 +59,20 @@ type CallbackAfterCreateGroupResp struct {
CommonCallbackResp
}
-type CallbackBeforeMemberJoinGroupReq struct {
- CallbackCommand `json:"callbackCommand"`
- GroupID string `json:"groupID"`
- UserID string `json:"userID"`
- Ex string `json:"ex"`
- GroupEx string `json:"groupEx"`
+type CallbackGroupMember struct {
+ UserID string `json:"userID"`
+ Ex string `json:"ex"`
}
-type CallbackBeforeMemberJoinGroupResp struct {
- CommonCallbackResp
+type CallbackBeforeMembersJoinGroupReq struct {
+ CallbackCommand `json:"callbackCommand"`
+ GroupID string `json:"groupID"`
+ MembersList []*CallbackGroupMember `json:"memberList"`
+ GroupEx string `json:"groupEx"`
+}
+
+type MemberJoinGroupCallBack struct {
+ UserID *string `json:"userID"`
Nickname *string `json:"nickname"`
FaceURL *string `json:"faceURL"`
RoleLevel *int32 `json:"roleLevel"`
@@ -76,6 +80,11 @@ type CallbackBeforeMemberJoinGroupResp struct {
Ex *string `json:"ex"`
}
+type CallbackBeforeMembersJoinGroupResp struct {
+ CommonCallbackResp
+ MemberCallbackList []*MemberJoinGroupCallBack `json:"memberCallbackList"`
+}
+
type CallbackBeforeSetGroupMemberInfoReq struct {
CallbackCommand `json:"callbackCommand"`
GroupID string `json:"groupID"`
diff --git a/pkg/common/cmd/api.go b/pkg/common/cmd/api.go
index ecdb0dd3a..4088ecd09 100644
--- a/pkg/common/cmd/api.go
+++ b/pkg/common/cmd/api.go
@@ -16,8 +16,9 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/api"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -38,7 +39,7 @@ func NewApiCmd() *ApiCmd {
DiscoveryConfigFilename: &apiConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/auth.go b/pkg/common/cmd/auth.go
index 7d75a7da6..b35a95f39 100644
--- a/pkg/common/cmd/auth.go
+++ b/pkg/common/cmd/auth.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/auth"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -40,7 +41,7 @@ func NewAuthRpcCmd() *AuthRpcCmd {
DiscoveryConfigFilename: &authConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/conversation.go b/pkg/common/cmd/conversation.go
index 57ffa52bc..bdb4447f4 100644
--- a/pkg/common/cmd/conversation.go
+++ b/pkg/common/cmd/conversation.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/conversation"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -43,7 +44,7 @@ func NewConversationRpcCmd() *ConversationRpcCmd {
DiscoveryConfigFilename: &conversationConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/cron_task.go b/pkg/common/cmd/cron_task.go
index fd4447524..d6c5e472e 100644
--- a/pkg/common/cmd/cron_task.go
+++ b/pkg/common/cmd/cron_task.go
@@ -16,8 +16,9 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/tools"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -38,7 +39,7 @@ func NewCronTaskCmd() *CronTaskCmd {
DiscoveryConfigFilename: &cronTaskConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/friend.go b/pkg/common/cmd/friend.go
index 8be1f7745..1bc9e6c54 100644
--- a/pkg/common/cmd/friend.go
+++ b/pkg/common/cmd/friend.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/friend"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -44,7 +45,7 @@ func NewFriendRpcCmd() *FriendRpcCmd {
DiscoveryConfigFilename: &friendConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/group.go b/pkg/common/cmd/group.go
index 20124be95..9b0fbf8de 100644
--- a/pkg/common/cmd/group.go
+++ b/pkg/common/cmd/group.go
@@ -16,10 +16,11 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/group"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/versionctx"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -45,7 +46,7 @@ func NewGroupRpcCmd() *GroupRpcCmd {
DiscoveryConfigFilename: &groupConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/msg.go b/pkg/common/cmd/msg.go
index 91f7931fb..bfd29398e 100644
--- a/pkg/common/cmd/msg.go
+++ b/pkg/common/cmd/msg.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/msg"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -45,7 +46,7 @@ func NewMsgRpcCmd() *MsgRpcCmd {
DiscoveryConfigFilename: &msgConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go
index 29d3fba33..6363bfbf9 100644
--- a/pkg/common/cmd/msg_gateway.go
+++ b/pkg/common/cmd/msg_gateway.go
@@ -16,9 +16,9 @@ package cmd
import (
"context"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/internal/msggateway"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
@@ -42,7 +42,7 @@ func NewMsgGatewayCmd() *MsgGatewayCmd {
DiscoveryConfigFilename: &msgGatewayConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go
index 0d48281e5..364393413 100644
--- a/pkg/common/cmd/msg_transfer.go
+++ b/pkg/common/cmd/msg_transfer.go
@@ -16,8 +16,9 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -42,7 +43,7 @@ func NewMsgTransferCmd() *MsgTransferCmd {
DiscoveryConfigFilename: &msgTransferConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/push.go b/pkg/common/cmd/push.go
index 6e6014021..c9b8b1c24 100644
--- a/pkg/common/cmd/push.go
+++ b/pkg/common/cmd/push.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/push"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -45,7 +46,7 @@ func NewPushRpcCmd() *PushRpcCmd {
DiscoveryConfigFilename: &pushConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
ret.pushConfig.FcmConfigPath = ret.ConfigPath()
return ret.runE()
diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go
index 84e985697..b43f86557 100644
--- a/pkg/common/cmd/root.go
+++ b/pkg/common/cmd/root.go
@@ -19,6 +19,7 @@ import (
"path/filepath"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/errs"
"github.com/openimsdk/tools/log"
"github.com/spf13/cobra"
@@ -138,13 +139,13 @@ func (r *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
r.log.StorageLocation,
r.log.RemainRotationCount,
r.log.RotationTime,
- config.Version,
+ version.Version,
r.log.IsSimplify,
)
if err != nil {
return errs.Wrap(err)
}
- return errs.Wrap(log.InitConsoleLogger(r.processName, r.log.RemainLogLevel, r.log.IsJson, config.Version))
+ return errs.Wrap(log.InitConsoleLogger(r.processName, r.log.RemainLogLevel, r.log.IsJson, version.Version))
}
diff --git a/pkg/common/cmd/third.go b/pkg/common/cmd/third.go
index b6731f1ff..a301b738f 100644
--- a/pkg/common/cmd/third.go
+++ b/pkg/common/cmd/third.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/third"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -44,7 +45,7 @@ func NewThirdRpcCmd() *ThirdRpcCmd {
DiscoveryConfigFilename: &thirdConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/cmd/user.go b/pkg/common/cmd/user.go
index 674f9e3a6..9a614afca 100644
--- a/pkg/common/cmd/user.go
+++ b/pkg/common/cmd/user.go
@@ -16,9 +16,10 @@ package cmd
import (
"context"
+
"github.com/openimsdk/open-im-server/v3/internal/rpc/user"
- "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+ "github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/system/program"
"github.com/spf13/cobra"
)
@@ -45,7 +46,7 @@ func NewUserRpcCmd() *UserRpcCmd {
DiscoveryConfigFilename: &userConfig.Discovery,
}
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
- ret.ctx = context.WithValue(context.Background(), "version", config.Version)
+ ret.ctx = context.WithValue(context.Background(), "version", version.Version)
ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
return ret.runE()
}
diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go
index 28e9f5db6..08f82ac7d 100644
--- a/pkg/common/config/parse.go
+++ b/pkg/common/config/parse.go
@@ -15,7 +15,6 @@
package config
import (
- _ "embed"
"os"
"path/filepath"
@@ -26,9 +25,6 @@ import (
"gopkg.in/yaml.v3"
)
-//go:embed version
-var Version string
-
const (
FileName = "config.yaml"
NotificationFileName = "notification.yaml"
diff --git a/pkg/common/config/version b/pkg/common/config/version
deleted file mode 100644
index 240bba906..000000000
--- a/pkg/common/config/version
+++ /dev/null
@@ -1 +0,0 @@
-3.7.0
\ No newline at end of file
diff --git a/version/version b/version/version
new file mode 100644
index 000000000..0be1fc7d2
--- /dev/null
+++ b/version/version
@@ -0,0 +1 @@
+3.8.0
\ No newline at end of file
diff --git a/version/version.go b/version/version.go
new file mode 100644
index 000000000..23b3a82f5
--- /dev/null
+++ b/version/version.go
@@ -0,0 +1,6 @@
+package version
+
+import _ "embed"
+
+//go:embed version
+var Version string