mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-11-05 20:03:38 +08:00
Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions
This commit is contained in:
commit
7b262510f5
@ -174,20 +174,18 @@ linters-settings:
|
|||||||
# - ^print.*$
|
# - ^print.*$
|
||||||
- 'fmt\.Print.*'
|
- 'fmt\.Print.*'
|
||||||
- fmt.Println.* # too much log noise
|
- fmt.Println.* # too much log noise
|
||||||
|
- painc
|
||||||
# - ginkgo\\.F.* # these are used just for local development
|
# - ginkgo\\.F.* # these are used just for local development
|
||||||
# # Exclude godoc examples from forbidigo checks. Default is true.
|
# # Exclude godoc examples from forbidigo checks. Default is true.
|
||||||
# exclude_godoc_examples: false
|
# exclude_godoc_examples: false
|
||||||
funlen:
|
funlen:
|
||||||
lines: 150
|
lines: 220
|
||||||
statements: 80
|
statements: 80
|
||||||
gci:
|
|
||||||
# put imports beginning with prefix after 3rd-party packages;
|
|
||||||
# only support one prefix
|
|
||||||
# if not set, use goimports.local-prefixes
|
|
||||||
prefix: github.com/openimsdk/open-im-server
|
|
||||||
gocognit:
|
gocognit:
|
||||||
# minimal code complexity to report, 30 by default (but we recommend 10-20)
|
# minimal code complexity to report, 30 by default (but we recommend 10-20)
|
||||||
min-complexity: 30
|
min-complexity: 30
|
||||||
|
|
||||||
goconst:
|
goconst:
|
||||||
# minimal length of string constant, 3 by default
|
# minimal length of string constant, 3 by default
|
||||||
min-len: 3
|
min-len: 3
|
||||||
@ -213,9 +211,6 @@ linters-settings:
|
|||||||
# By default list of stable checks is used.
|
# By default list of stable checks is used.
|
||||||
enabled-checks:
|
enabled-checks:
|
||||||
#- rangeValCopy
|
#- rangeValCopy
|
||||||
- nestingreduce
|
|
||||||
- truncatecmp
|
|
||||||
- unnamedresult
|
|
||||||
- ruleguard
|
- ruleguard
|
||||||
|
|
||||||
# Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
|
# Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
|
||||||
@ -285,9 +280,12 @@ linters-settings:
|
|||||||
# list of regexps for excluding particular comment lines from check
|
# list of regexps for excluding particular comment lines from check
|
||||||
exclude:
|
exclude:
|
||||||
# example: exclude comments which contain numbers
|
# example: exclude comments which contain numbers
|
||||||
# - '[0-9]+'
|
- '[0-9]+'
|
||||||
|
- 'func\s+\w+'
|
||||||
|
- 'FIXME:'
|
||||||
|
- '.*func.*'
|
||||||
# check that each sentence starts with a capital letter
|
# check that each sentence starts with a capital letter
|
||||||
capital: false
|
capital: true
|
||||||
godox:
|
godox:
|
||||||
# report any comments starting with keywords, this is useful for TODO or FIXME comments that
|
# report any comments starting with keywords, this is useful for TODO or FIXME comments that
|
||||||
# might be left in the code accidentally and should be resolved before merging
|
# might be left in the code accidentally and should be resolved before merging
|
||||||
@ -310,15 +308,15 @@ linters-settings:
|
|||||||
# by default
|
# by default
|
||||||
extra-rules: false
|
extra-rules: false
|
||||||
|
|
||||||
goheader:
|
# goheader:
|
||||||
values:
|
# values:
|
||||||
const:
|
# const:
|
||||||
# define here const type values in format k:v, for example:
|
# define here const type values in format k:v, for example:
|
||||||
# COMPANY: MY COMPANY
|
# COMPANY: MY COMPANY
|
||||||
regexp:
|
# regexp:
|
||||||
# define here regexp type values, for example
|
# define here regexp type values, for example
|
||||||
# AUTHOR: .*@mycompany\.com
|
# AUTHOR: .*@mycompany\.com
|
||||||
template: # |-
|
# template: # |-
|
||||||
# put here copyright header template for source code files, for example:
|
# put here copyright header template for source code files, for example:
|
||||||
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
|
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
|
||||||
#
|
#
|
||||||
@ -336,8 +334,9 @@ linters-settings:
|
|||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
template-path:
|
# template-path:
|
||||||
# also as alternative of directive 'template' you may put the path to file with the template source
|
# also as alternative of directive 'template' you may put the path to file with the template source
|
||||||
|
|
||||||
goimports:
|
goimports:
|
||||||
# put imports beginning with prefix after 3rd-party packages;
|
# put imports beginning with prefix after 3rd-party packages;
|
||||||
# it's a comma-separated list of prefixes
|
# it's a comma-separated list of prefixes
|
||||||
@ -347,10 +346,11 @@ linters-settings:
|
|||||||
settings:
|
settings:
|
||||||
mnd:
|
mnd:
|
||||||
# the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
|
# the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
|
||||||
checks: argument,case,condition,operation,return,assign
|
# checks:
|
||||||
# ignored-numbers: 1000
|
# ignored-numbers: 1000
|
||||||
# ignored-files: magic_.*.go
|
ignored-files: magic_.*.go, test_.*.go, .*_test.go
|
||||||
# ignored-functions: math.*
|
ignored-functions: math.*
|
||||||
|
|
||||||
gomoddirectives:
|
gomoddirectives:
|
||||||
# Allow local `replace` directives. Default is false.
|
# Allow local `replace` directives. Default is false.
|
||||||
replace-local: true
|
replace-local: true
|
||||||
@ -362,6 +362,7 @@ linters-settings:
|
|||||||
retract-allow-no-explanation: false
|
retract-allow-no-explanation: false
|
||||||
# Forbid the use of the `exclude` directives. Default is false.
|
# Forbid the use of the `exclude` directives. Default is false.
|
||||||
exclude-forbidden: false
|
exclude-forbidden: false
|
||||||
|
|
||||||
gomodguard:
|
gomodguard:
|
||||||
allowed:
|
allowed:
|
||||||
modules:
|
modules:
|
||||||
@ -650,7 +651,7 @@ linters-settings:
|
|||||||
# if it's called for subdir of a project it can't find external interfaces. All text editor integrations
|
# if it's called for subdir of a project it can't find external interfaces. All text editor integrations
|
||||||
# with golangci-lint call it on a directory with the changed file.
|
# with golangci-lint call it on a directory with the changed file.
|
||||||
check-exported: false
|
check-exported: false
|
||||||
unused:
|
# unused:
|
||||||
# treat code as a program (not a library) and report unused exported identifiers; default is false.
|
# treat code as a program (not a library) and report unused exported identifiers; default is false.
|
||||||
# XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
|
# XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
|
||||||
# if it's called for subdir of a project it can't find funcs usages. All text editor integrations
|
# if it's called for subdir of a project it can't find funcs usages. All text editor integrations
|
||||||
@ -677,6 +678,7 @@ linters-settings:
|
|||||||
- encoding/*
|
- encoding/*
|
||||||
- github.com/pkg/*
|
- github.com/pkg/*
|
||||||
- github.com/openimsdk/*
|
- github.com/openimsdk/*
|
||||||
|
- github.com/OpenIMSDK/*
|
||||||
|
|
||||||
wsl:
|
wsl:
|
||||||
# If true append is only allowed to be cuddled if appending value is
|
# If true append is only allowed to be cuddled if appending value is
|
||||||
@ -737,13 +739,15 @@ linters:
|
|||||||
- dupword
|
- dupword
|
||||||
- errname
|
- errname
|
||||||
- gci
|
- gci
|
||||||
- goheader
|
- gocritic
|
||||||
- goprintffuncname
|
- goprintffuncname
|
||||||
|
- gomnd
|
||||||
|
- goconst
|
||||||
- gosec
|
- gosec
|
||||||
- misspell # Spelling mistakes
|
- misspell # Spelling mistakes
|
||||||
- staticcheck # Static analysis
|
- staticcheck # Static analysis
|
||||||
- unused # Checks for unused code
|
- unused # Checks for unused code
|
||||||
- goimports # Checks if imports are correctly sorted and formatted
|
# - goimports # Checks if imports are correctly sorted and formatted
|
||||||
- godot # Checks for comment punctuation
|
- godot # Checks for comment punctuation
|
||||||
- bodyclose # Ensures HTTP response body is closed
|
- bodyclose # Ensures HTTP response body is closed
|
||||||
- stylecheck # Style checker for Go code
|
- stylecheck # Style checker for Go code
|
||||||
|
|||||||
@ -115,7 +115,7 @@ func (o *GroupApi) GetGroupAbstractInfo(c *gin.Context) {
|
|||||||
a2r.Call(group.GroupClient.GetGroupAbstractInfo, o.Client, c)
|
a2r.Call(group.GroupClient.GetGroupAbstractInfo, o.Client, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (g *Group) SetGroupMemberNickname(c *gin.Context) {
|
// func (g *Group) SetGroupMemberNickname(c *gin.Context) {
|
||||||
// a2r.Call(group.GroupClient.SetGroupMemberNickname, g.userClient, c)
|
// a2r.Call(group.GroupClient.SetGroupMemberNickname, g.userClient, c)
|
||||||
//}
|
//}
|
||||||
//
|
//
|
||||||
|
|||||||
@ -86,7 +86,7 @@ func (d *GWebSocket) WriteMessage(messageType int, message []byte) error {
|
|||||||
return d.conn.WriteMessage(messageType, message)
|
return d.conn.WriteMessage(messageType, message)
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (d *GWebSocket) setSendConn(sendConn *websocket.Conn) {
|
// func (d *GWebSocket) setSendConn(sendConn *websocket.Conn) {
|
||||||
// d.sendConn = sendConn
|
// d.sendConn = sendConn
|
||||||
//}
|
//}
|
||||||
|
|
||||||
@ -145,6 +145,6 @@ func (d *GWebSocket) SetPingHandler(handler PingPongHandler) {
|
|||||||
d.conn.SetPingHandler(handler)
|
d.conn.SetPingHandler(handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (d *GWebSocket) CheckSendConnDiffNow() bool {
|
// func (d *GWebSocket) CheckSendConnDiffNow() bool {
|
||||||
// return d.conn == d.sendConn
|
// return d.conn == d.sendConn
|
||||||
//}
|
//}
|
||||||
|
|||||||
@ -45,7 +45,7 @@ const (
|
|||||||
taskURL = "/push/list/message"
|
taskURL = "/push/list/message"
|
||||||
batchPushURL = "/push/list/alias"
|
batchPushURL = "/push/list/alias"
|
||||||
|
|
||||||
// codes.
|
// Codes.
|
||||||
tokenExpireCode = 10001
|
tokenExpireCode = 10001
|
||||||
tokenExpireTime = 60 * 60 * 23
|
tokenExpireTime = 60 * 60 * 23
|
||||||
taskIDTTL = 1000 * 60 * 60 * 24
|
taskIDTTL = 1000 * 60 * 60 * 24
|
||||||
|
|||||||
@ -32,7 +32,7 @@ func (a *Audience) set(key string, v []string) {
|
|||||||
a.audience = make(map[string][]string)
|
a.audience = make(map[string][]string)
|
||||||
a.Object = a.audience
|
a.Object = a.audience
|
||||||
}
|
}
|
||||||
//v, ok = this.audience[key]
|
// v, ok = this.audience[key]
|
||||||
//if ok {
|
//if ok {
|
||||||
// return
|
// return
|
||||||
//}
|
//}
|
||||||
|
|||||||
@ -314,7 +314,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
|
|||||||
|
|
||||||
// Get user IDs with "Do Not Disturb" enabled in super large groups.
|
// Get user IDs with "Do Not Disturb" enabled in super large groups.
|
||||||
func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbconversation.GetRecvMsgNotNotifyUserIDsReq) (*pbconversation.GetRecvMsgNotNotifyUserIDsResp, error) {
|
func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbconversation.GetRecvMsgNotNotifyUserIDsReq) (*pbconversation.GetRecvMsgNotNotifyUserIDsResp, error) {
|
||||||
//userIDs, err := c.conversationDatabase.FindRecvMsgNotNotifyUserIDs(ctx, req.GroupID)
|
// userIDs, err := c.conversationDatabase.FindRecvMsgNotNotifyUserIDs(ctx, req.GroupID)
|
||||||
//if err != nil {
|
//if err != nil {
|
||||||
// return nil, err
|
// return nil, err
|
||||||
//}
|
//}
|
||||||
@ -433,7 +433,7 @@ func (c *conversationServer) conversationSort(conversations map[int64]string, re
|
|||||||
keys = append(keys, key)
|
keys = append(keys, key)
|
||||||
}
|
}
|
||||||
|
|
||||||
sort.Slice(keys[:], func(i, j int) bool {
|
sort.Slice(keys, func(i, j int) bool {
|
||||||
return keys[i] > keys[j]
|
return keys[i] > keys[j]
|
||||||
})
|
})
|
||||||
index := 0
|
index := 0
|
||||||
|
|||||||
@ -107,7 +107,7 @@ func Start(config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryReg
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *groupServer) GetJoinedGroupIDs(ctx context.Context, req *pbgroup.GetJoinedGroupIDsReq) (*pbgroup.GetJoinedGroupIDsResp, error) {
|
func (s *groupServer) GetJoinedGroupIDs(ctx context.Context, req *pbgroup.GetJoinedGroupIDsReq) (*pbgroup.GetJoinedGroupIDsResp, error) {
|
||||||
//TODO implement me
|
// TODO implement me
|
||||||
panic("implement me")
|
panic("implement me")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -155,7 +155,7 @@ func (m *msgServer) MarkConversationAsRead(ctx context.Context, req *msg.MarkCon
|
|||||||
for i := hasReadSeq + 1; i <= req.HasReadSeq; i++ {
|
for i := hasReadSeq + 1; i <= req.HasReadSeq; i++ {
|
||||||
seqs = append(seqs, i)
|
seqs = append(seqs, i)
|
||||||
}
|
}
|
||||||
//avoid client missed call MarkConversationMessageAsRead by order
|
// avoid client missed call MarkConversationMessageAsRead by order
|
||||||
for _, val := range req.Seqs {
|
for _, val := range req.Seqs {
|
||||||
if !utils2.Contain(val, seqs...) {
|
if !utils2.Contain(val, seqs...) {
|
||||||
seqs = append(seqs, val)
|
seqs = append(seqs, val)
|
||||||
|
|||||||
@ -101,7 +101,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa
|
|||||||
atUserID = utils.DifferenceString([]string{constant.AtAllString}, msg.AtUserIDList)
|
atUserID = utils.DifferenceString([]string{constant.AtAllString}, msg.AtUserIDList)
|
||||||
if len(atUserID) == 0 { // just @everyone
|
if len(atUserID) == 0 { // just @everyone
|
||||||
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAll}
|
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAll}
|
||||||
} else { //@Everyone and @other people
|
} else { // @Everyone and @other people
|
||||||
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAllAtMe}
|
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAllAtMe}
|
||||||
err = m.Conversation.SetConversations(ctx, atUserID, conversation)
|
err = m.Conversation.SetConversations(ctx, atUserID, conversation)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -32,7 +32,7 @@ type (
|
|||||||
// MessageInterceptorChain defines a chain of message interceptor functions.
|
// MessageInterceptorChain defines a chain of message interceptor functions.
|
||||||
MessageInterceptorChain []MessageInterceptorFunc
|
MessageInterceptorChain []MessageInterceptorFunc
|
||||||
|
|
||||||
// msgServer encapsulates dependencies required for message handling.
|
// MsgServer encapsulates dependencies required for message handling.
|
||||||
msgServer struct {
|
msgServer struct {
|
||||||
RegisterCenter discoveryregistry.SvcDiscoveryRegistry // Service discovery registry for service registration.
|
RegisterCenter discoveryregistry.SvcDiscoveryRegistry // Service discovery registry for service registration.
|
||||||
MsgDatabase controller.CommonMsgDatabase // Interface for message database operations.
|
MsgDatabase controller.CommonMsgDatabase // Interface for message database operations.
|
||||||
@ -51,7 +51,7 @@ func (m *msgServer) addInterceptorHandler(interceptorFunc ...MessageInterceptorF
|
|||||||
m.Handlers = append(m.Handlers, interceptorFunc...)
|
m.Handlers = append(m.Handlers, interceptorFunc...)
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (m *msgServer) execInterceptorHandler(ctx context.Context, config *config.GlobalConfig, req *msg.SendMsgReq) error {
|
// func (m *msgServer) execInterceptorHandler(ctx context.Context, config *config.GlobalConfig, req *msg.SendMsgReq) error {
|
||||||
// for _, handler := range m.Handlers {
|
// for _, handler := range m.Handlers {
|
||||||
// msgData, err := handler(ctx, config, req)
|
// msgData, err := handler(ctx, config, req)
|
||||||
// if err != nil {
|
// if err != nil {
|
||||||
|
|||||||
@ -26,7 +26,6 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -55,7 +55,7 @@ type userServer struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *userServer) GetGroupOnlineUser(ctx context.Context, req *pbuser.GetGroupOnlineUserReq) (*pbuser.GetGroupOnlineUserResp, error) {
|
func (s *userServer) GetGroupOnlineUser(ctx context.Context, req *pbuser.GetGroupOnlineUserReq) (*pbuser.GetGroupOnlineUserResp, error) {
|
||||||
//TODO implement me
|
// TODO implement me
|
||||||
panic("implement me")
|
panic("implement me")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ import (
|
|||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
)
|
)
|
||||||
|
|
||||||
//func (c *MsgTool) ConversationsDestructMsgs() {
|
// func (c *MsgTool) ConversationsDestructMsgs() {
|
||||||
// log.ZInfo(context.Background(), "start msg destruct cron task")
|
// log.ZInfo(context.Background(), "start msg destruct cron task")
|
||||||
// ctx := mcontext.NewCtx(utils.GetSelfFuncName())
|
// ctx := mcontext.NewCtx(utils.GetSelfFuncName())
|
||||||
// conversations, err := c.conversationDatabase.GetConversationIDsNeedDestruct(ctx)
|
// conversations, err := c.conversationDatabase.GetConversationIDsNeedDestruct(ctx)
|
||||||
|
|||||||
@ -121,7 +121,7 @@ func InitMsgTool(config *config.GlobalConfig) (*MsgTool, error) {
|
|||||||
return msgTool, nil
|
return msgTool, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (c *MsgTool) AllConversationClearMsgAndFixSeq() {
|
// func (c *MsgTool) AllConversationClearMsgAndFixSeq() {
|
||||||
// ctx := mcontext.NewCtx(utils.GetSelfFuncName())
|
// ctx := mcontext.NewCtx(utils.GetSelfFuncName())
|
||||||
// log.ZInfo(ctx, "============================ start del cron task ============================")
|
// log.ZInfo(ctx, "============================ start del cron task ============================")
|
||||||
// conversationIDs, err := c.conversationDatabase.GetAllConversationIDs(ctx)
|
// conversationIDs, err := c.conversationDatabase.GetAllConversationIDs(ctx)
|
||||||
|
|||||||
@ -23,7 +23,6 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/tokenverify"
|
"github.com/OpenIMSDK/tools/tokenverify"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
"github.com/golang-jwt/jwt/v4"
|
"github.com/golang-jwt/jwt/v4"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,6 @@ package callbackstruct
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
common "github.com/OpenIMSDK/protocol/sdkws"
|
common "github.com/OpenIMSDK/protocol/sdkws"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
|
"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -16,9 +16,8 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/OpenIMSDK/protocol/constant"
|
"github.com/OpenIMSDK/protocol/constant"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/internal/api"
|
"github.com/openimsdk/open-im-server/v3/internal/api"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -17,10 +17,9 @@ package cmd
|
|||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
|
||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/constant"
|
"github.com/OpenIMSDK/protocol/constant"
|
||||||
"github.com/openimsdk/open-im-server/v3/internal/msggateway"
|
"github.com/openimsdk/open-im-server/v3/internal/msggateway"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,6 @@ package cmd
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/constant"
|
"github.com/OpenIMSDK/protocol/constant"
|
||||||
"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
|
"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
|||||||
@ -19,9 +19,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
var Config GlobalConfig
|
var Config GlobalConfig
|
||||||
|
|||||||
@ -21,10 +21,9 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/constant"
|
"github.com/OpenIMSDK/protocol/constant"
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
|
"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed version
|
//go:embed version
|
||||||
|
|||||||
@ -128,7 +128,7 @@ func Pb2DBGroupInfo(m *sdkws.GroupInfo) *relation.GroupModel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//func Pb2DbGroupMember(m *sdkws.UserInfo) *relation.GroupMemberModel {
|
// func Pb2DbGroupMember(m *sdkws.UserInfo) *relation.GroupMemberModel {
|
||||||
// return &relation.GroupMemberModel{
|
// return &relation.GroupMemberModel{
|
||||||
// UserID: m.UserID,
|
// UserID: m.UserID,
|
||||||
// Nickname: m.Nickname,
|
// Nickname: m.Nickname,
|
||||||
|
|||||||
18
pkg/common/db/cache/conversation.go
vendored
18
pkg/common/db/cache/conversation.go
vendored
@ -30,7 +30,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
//conversationKey = "CONVERSATION:"
|
// ConversationKey = "CONVERSATION:"
|
||||||
//conversationIDsKey = "CONVERSATION_IDS:"
|
//conversationIDsKey = "CONVERSATION_IDS:"
|
||||||
//conversationIDsHashKey = "CONVERSATION_IDS_HASH:"
|
//conversationIDsHashKey = "CONVERSATION_IDS_HASH:"
|
||||||
//conversationHasReadSeqKey = "CONVERSATION_HAS_READ_SEQ:"
|
//conversationHasReadSeqKey = "CONVERSATION_HAS_READ_SEQ:"
|
||||||
@ -66,13 +66,13 @@ type ConversationCache interface {
|
|||||||
GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error)
|
GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error)
|
||||||
DelUserRecvMsgOpt(ownerUserID, conversationID string) ConversationCache
|
DelUserRecvMsgOpt(ownerUserID, conversationID string) ConversationCache
|
||||||
// get one super group recv msg but do not notification userID list
|
// get one super group recv msg but do not notification userID list
|
||||||
//GetSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error)
|
// GetSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error)
|
||||||
DelSuperGroupRecvMsgNotNotifyUserIDs(groupID string) ConversationCache
|
DelSuperGroupRecvMsgNotNotifyUserIDs(groupID string) ConversationCache
|
||||||
// get one super group recv msg but do not notification userID list hash
|
// get one super group recv msg but do not notification userID list hash
|
||||||
//GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error)
|
// GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error)
|
||||||
DelSuperGroupRecvMsgNotNotifyUserIDsHash(groupID string) ConversationCache
|
DelSuperGroupRecvMsgNotNotifyUserIDsHash(groupID string) ConversationCache
|
||||||
|
|
||||||
//GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
|
// GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
|
||||||
DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache
|
DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache
|
||||||
|
|
||||||
GetConversationsByConversationID(ctx context.Context,
|
GetConversationsByConversationID(ctx context.Context,
|
||||||
@ -104,7 +104,7 @@ type ConversationRedisCache struct {
|
|||||||
expireTime time.Duration
|
expireTime time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
//func NewNewConversationRedis(
|
// func NewNewConversationRedis(
|
||||||
// rdb redis.UniversalClient,
|
// rdb redis.UniversalClient,
|
||||||
// conversationDB *relation.ConversationGorm,
|
// conversationDB *relation.ConversationGorm,
|
||||||
// options rockscache.Options,
|
// options rockscache.Options,
|
||||||
@ -236,7 +236,7 @@ func (c *ConversationRedisCache) DelConversations(ownerUserID string, conversati
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
func (c *ConversationRedisCache) GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
|
func (c *ConversationRedisCache) GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
|
||||||
//var keys []string
|
// var keys []string
|
||||||
//for _, conversarionID := range conversationIDs {
|
//for _, conversarionID := range conversationIDs {
|
||||||
// keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
|
// keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
|
||||||
//}
|
//}
|
||||||
@ -262,7 +262,7 @@ func (c *ConversationRedisCache) GetUserAllConversations(ctx context.Context, ow
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
//var keys []string
|
// var keys []string
|
||||||
//for _, conversarionID := range conversationIDs {
|
//for _, conversarionID := range conversationIDs {
|
||||||
// keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
|
// keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
|
||||||
//}
|
//}
|
||||||
@ -285,7 +285,7 @@ func (c *ConversationRedisCache) GetUserRecvMsgOpt(ctx context.Context, ownerUse
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
|
// func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
|
||||||
// return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsKey(groupID), c.expireTime, func(ctx context.Context) (userIDs []string, err error) {
|
// return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsKey(groupID), c.expireTime, func(ctx context.Context) (userIDs []string, err error) {
|
||||||
// return c.conversationDB.FindSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
|
// return c.conversationDB.FindSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
|
||||||
// })
|
// })
|
||||||
@ -316,7 +316,7 @@ func (c *ConversationRedisCache) DelSuperGroupRecvMsgNotNotifyUserIDs(groupID st
|
|||||||
return cache
|
return cache
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error) {
|
// func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error) {
|
||||||
// return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID), c.expireTime, func(ctx context.Context) (hash uint64, err error) {
|
// return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID), c.expireTime, func(ctx context.Context) (hash uint64, err error) {
|
||||||
// userIDs, err := c.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
|
// userIDs, err := c.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
|
||||||
// if err != nil {
|
// if err != nil {
|
||||||
|
|||||||
2
pkg/common/db/cache/friend.go
vendored
2
pkg/common/db/cache/friend.go
vendored
@ -29,7 +29,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
friendExpireTime = time.Second * 60 * 60 * 12
|
friendExpireTime = time.Second * 60 * 60 * 12
|
||||||
//friendIDsKey = "FRIEND_IDS:"
|
// FriendIDsKey = "FRIEND_IDS:"
|
||||||
//TwoWayFriendsIDsKey = "COMMON_FRIENDS_IDS:"
|
//TwoWayFriendsIDsKey = "COMMON_FRIENDS_IDS:"
|
||||||
//friendKey = "FRIEND_INFO:".
|
//friendKey = "FRIEND_INFO:".
|
||||||
)
|
)
|
||||||
|
|||||||
2
pkg/common/db/cache/group.go
vendored
2
pkg/common/db/cache/group.go
vendored
@ -32,7 +32,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
groupExpireTime = time.Second * 60 * 60 * 12
|
groupExpireTime = time.Second * 60 * 60 * 12
|
||||||
//groupInfoKey = "GROUP_INFO:"
|
// GroupInfoKey = "GROUP_INFO:"
|
||||||
//groupMemberIDsKey = "GROUP_MEMBER_IDS:"
|
//groupMemberIDsKey = "GROUP_MEMBER_IDS:"
|
||||||
//groupMembersHashKey = "GROUP_MEMBERS_HASH2:"
|
//groupMembersHashKey = "GROUP_MEMBERS_HASH2:"
|
||||||
//groupMemberInfoKey = "GROUP_MEMBER_INFO:"
|
//groupMemberInfoKey = "GROUP_MEMBER_INFO:"
|
||||||
|
|||||||
2
pkg/common/db/cache/init_redis.go
vendored
2
pkg/common/db/cache/init_redis.go
vendored
@ -29,7 +29,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// singleton pattern.
|
// Singleton pattern.
|
||||||
redisClient redis.UniversalClient
|
redisClient redis.UniversalClient
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
2
pkg/common/db/cache/meta_cache.go
vendored
2
pkg/common/db/cache/meta_cache.go
vendored
@ -240,7 +240,7 @@ func batchGetCache2[T any, K comparable](
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//func batchGetCacheMap[T any](
|
// func batchGetCacheMap[T any](
|
||||||
// ctx context.Context,
|
// ctx context.Context,
|
||||||
// rcClient *rockscache.Client,
|
// rcClient *rockscache.Client,
|
||||||
// keys, originKeys []string,
|
// keys, originKeys []string,
|
||||||
|
|||||||
8
pkg/common/db/cache/msg.go
vendored
8
pkg/common/db/cache/msg.go
vendored
@ -38,10 +38,10 @@ const (
|
|||||||
conversationUserMinSeq = "CON_USER_MIN_SEQ:"
|
conversationUserMinSeq = "CON_USER_MIN_SEQ:"
|
||||||
hasReadSeq = "HAS_READ_SEQ:"
|
hasReadSeq = "HAS_READ_SEQ:"
|
||||||
|
|
||||||
//appleDeviceToken = "DEVICE_TOKEN".
|
// AppleDeviceToken = "DEVICE_TOKEN".
|
||||||
getuiToken = "GETUI_TOKEN"
|
getuiToken = "GETUI_TOKEN"
|
||||||
getuiTaskID = "GETUI_TASK_ID"
|
getuiTaskID = "GETUI_TASK_ID"
|
||||||
//signalCache = "SIGNAL_CACHE:"
|
// SignalCache = "SIGNAL_CACHE:"
|
||||||
//signalListCache = "SIGNAL_LIST_CACHE:".
|
//signalListCache = "SIGNAL_LIST_CACHE:".
|
||||||
FCM_TOKEN = "FCM_TOKEN:"
|
FCM_TOKEN = "FCM_TOKEN:"
|
||||||
|
|
||||||
@ -507,7 +507,7 @@ func (c *msgCache) UserDeleteMsgs(ctx context.Context, conversationID string, se
|
|||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
//pipe := c.rdb.Pipeline()
|
// pipe := c.rdb.Pipeline()
|
||||||
//for _, seq := range seqs {
|
//for _, seq := range seqs {
|
||||||
// delUserListKey := c.getMessageDelUserListKey(conversationID, seq)
|
// delUserListKey := c.getMessageDelUserListKey(conversationID, seq)
|
||||||
// userDelListKey := c.getUserDelList(conversationID, userID)
|
// userDelListKey := c.getUserDelList(conversationID, userID)
|
||||||
@ -567,7 +567,7 @@ func (c *msgCache) DelUserDeleteMsgsList(ctx context.Context, conversationID str
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//for _, seq := range seqs {
|
// for _, seq := range seqs {
|
||||||
// delUsers, err := c.rdb.SMembers(ctx, c.getMessageDelUserListKey(conversationID, seq)).Result()
|
// delUsers, err := c.rdb.SMembers(ctx, c.getMessageDelUserListKey(conversationID, seq)).Result()
|
||||||
// if err != nil {
|
// if err != nil {
|
||||||
// log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq)
|
// log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq)
|
||||||
|
|||||||
4
pkg/common/db/cache/user.go
vendored
4
pkg/common/db/cache/user.go
vendored
@ -35,7 +35,7 @@ import (
|
|||||||
|
|
||||||
const (
|
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:"
|
olineStatusKey = "ONLINE_STATUS:"
|
||||||
userOlineStatusExpireTime = time.Second * 60 * 60 * 24
|
userOlineStatusExpireTime = time.Second * 60 * 60 * 24
|
||||||
@ -58,7 +58,7 @@ type UserCache interface {
|
|||||||
type UserCacheRedis struct {
|
type UserCacheRedis struct {
|
||||||
metaCache
|
metaCache
|
||||||
rdb redis.UniversalClient
|
rdb redis.UniversalClient
|
||||||
//userDB relationtb.UserModelInterface
|
// userDB relationtb.UserModelInterface
|
||||||
userDB relationtb.UserModelInterface
|
userDB relationtb.UserModelInterface
|
||||||
expireTime time.Duration
|
expireTime time.Duration
|
||||||
rcClient *rockscache.Client
|
rcClient *rockscache.Client
|
||||||
|
|||||||
@ -19,11 +19,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewBlackMongo(db *mongo.Database) (relation.BlackModelInterface, error) {
|
func NewBlackMongo(db *mongo.Database) (relation.BlackModelInterface, error) {
|
||||||
|
|||||||
@ -22,11 +22,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewConversationMongo(db *mongo.Database) (*ConversationMgo, error) {
|
func NewConversationMongo(db *mongo.Database) (*ConversationMgo, error) {
|
||||||
@ -142,7 +141,7 @@ func (c *ConversationMgo) GetConversationsByConversationID(ctx context.Context,
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *ConversationMgo) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relation.ConversationModel, error) {
|
func (c *ConversationMgo) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relation.ConversationModel, error) {
|
||||||
//"is_msg_destruct = 1 && msg_destruct_time != 0 && (UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) || latest_msg_destruct_time is NULL)"
|
// "is_msg_destruct = 1 && msg_destruct_time != 0 && (UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) || latest_msg_destruct_time is NULL)"
|
||||||
return mgoutil.Find[*relation.ConversationModel](ctx, c.coll, bson.M{
|
return mgoutil.Find[*relation.ConversationModel](ctx, c.coll, bson.M{
|
||||||
"is_msg_destruct": 1,
|
"is_msg_destruct": 1,
|
||||||
"msg_destruct_time": bson.M{"$ne": 0},
|
"msg_destruct_time": bson.M{"$ne": 0},
|
||||||
|
|||||||
@ -19,11 +19,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// FriendMgo implements FriendModelInterface using MongoDB as the storage backend.
|
// FriendMgo implements FriendModelInterface using MongoDB as the storage backend.
|
||||||
|
|||||||
@ -19,11 +19,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewFriendRequestMongo(db *mongo.Database) (relation.FriendRequestModelInterface, error) {
|
func NewFriendRequestMongo(db *mongo.Database) (relation.FriendRequestModelInterface, error) {
|
||||||
|
|||||||
@ -22,11 +22,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewGroupMongo(db *mongo.Database) (relation.GroupModelInterface, error) {
|
func NewGroupMongo(db *mongo.Database) (relation.GroupModelInterface, error) {
|
||||||
|
|||||||
@ -21,11 +21,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewGroupMember(db *mongo.Database) (relation.GroupMemberModelInterface, error) {
|
func NewGroupMember(db *mongo.Database) (relation.GroupMemberModelInterface, error) {
|
||||||
@ -68,7 +67,7 @@ func (g *GroupMemberMgo) Update(ctx context.Context, groupID string, userID stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (g *GroupMemberMgo) Find(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) (groupMembers []*relation.GroupMemberModel, err error) {
|
func (g *GroupMemberMgo) Find(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) (groupMembers []*relation.GroupMemberModel, err error) {
|
||||||
//TODO implement me
|
// TODO implement me
|
||||||
panic("implement me")
|
panic("implement me")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -20,11 +20,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewGroupRequestMgo(db *mongo.Database) (relation.GroupRequestModelInterface, error) {
|
func NewGroupRequestMgo(db *mongo.Database) (relation.GroupRequestModelInterface, error) {
|
||||||
|
|||||||
@ -20,11 +20,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewLogMongo(db *mongo.Database) (relation.LogInterface, error) {
|
func NewLogMongo(db *mongo.Database) (relation.LogInterface, error) {
|
||||||
|
|||||||
@ -19,11 +19,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewS3Mongo(db *mongo.Database) (relation.ObjectInfoModelInterface, error) {
|
func NewS3Mongo(db *mongo.Database) (relation.ObjectInfoModelInterface, error) {
|
||||||
|
|||||||
@ -22,12 +22,11 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/mgoutil"
|
"github.com/OpenIMSDK/tools/mgoutil"
|
||||||
"github.com/OpenIMSDK/tools/pagination"
|
"github.com/OpenIMSDK/tools/pagination"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
"go.mongodb.org/mongo-driver/bson"
|
"go.mongodb.org/mongo-driver/bson"
|
||||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewUserMongo(db *mongo.Database) (relation.UserModelInterface, error) {
|
func NewUserMongo(db *mongo.Database) (relation.UserModelInterface, error) {
|
||||||
|
|||||||
@ -15,10 +15,10 @@
|
|||||||
package cont
|
package cont
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// hashPath defines the storage path for hash data within the 'openim' directory.
|
// HashPath defines the storage path for hash data within the 'openim' directory.
|
||||||
hashPath = "openim/data/hash/"
|
hashPath = "openim/data/hash/"
|
||||||
|
|
||||||
// tempPath specifies the directory for temporary files in the 'openim' structure.
|
// TempPath specifies the directory for temporary files in the 'openim' structure.
|
||||||
tempPath = "openim/temp/"
|
tempPath = "openim/temp/"
|
||||||
|
|
||||||
// DirectPath indicates the directory for direct uploads or access within the 'openim' structure.
|
// DirectPath indicates the directory for direct uploads or access within the 'openim' structure.
|
||||||
@ -32,7 +32,7 @@ const (
|
|||||||
// facilitating secure, authorized file transfers without requiring direct access to the storage credentials.
|
// facilitating secure, authorized file transfers without requiring direct access to the storage credentials.
|
||||||
UploadTypePresigned = 2
|
UploadTypePresigned = 2
|
||||||
|
|
||||||
// partSeparator is used as a delimiter in multipart upload processes,
|
// PartSeparator is used as a delimiter in multipart upload processes,
|
||||||
// separating individual file parts.
|
// separating individual file parts.
|
||||||
partSeparator = ","
|
partSeparator = ","
|
||||||
)
|
)
|
||||||
|
|||||||
@ -30,9 +30,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/tencentyun/cos-go-sdk-v5"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
|
||||||
|
"github.com/tencentyun/cos-go-sdk-v5"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@ -32,7 +32,6 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/aliyun/aliyun-oss-go-sdk/oss"
|
"github.com/aliyun/aliyun-oss-go-sdk/oss"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -33,7 +33,7 @@ type BlackModel struct {
|
|||||||
type BlackModelInterface interface {
|
type BlackModelInterface interface {
|
||||||
Create(ctx context.Context, blacks []*BlackModel) (err error)
|
Create(ctx context.Context, blacks []*BlackModel) (err error)
|
||||||
Delete(ctx context.Context, blacks []*BlackModel) (err error)
|
Delete(ctx context.Context, blacks []*BlackModel) (err error)
|
||||||
//UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]any) (err error)
|
// UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]any) (err error)
|
||||||
//Update(ctx context.Context, blacks []*BlackModel) (err error)
|
//Update(ctx context.Context, blacks []*BlackModel) (err error)
|
||||||
Find(ctx context.Context, blacks []*BlackModel) (blackList []*BlackModel, err error)
|
Find(ctx context.Context, blacks []*BlackModel) (blackList []*BlackModel, err error)
|
||||||
Take(ctx context.Context, ownerUserID, blockUserID string) (black *BlackModel, err error)
|
Take(ctx context.Context, ownerUserID, blockUserID string) (black *BlackModel, err error)
|
||||||
|
|||||||
@ -36,10 +36,10 @@ type GroupMemberModel struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type GroupMemberModelInterface interface {
|
type GroupMemberModelInterface interface {
|
||||||
//NewTx(tx any) GroupMemberModelInterface
|
// NewTx(tx any) GroupMemberModelInterface
|
||||||
Create(ctx context.Context, groupMembers []*GroupMemberModel) (err error)
|
Create(ctx context.Context, groupMembers []*GroupMemberModel) (err error)
|
||||||
Delete(ctx context.Context, groupID string, userIDs []string) (err error)
|
Delete(ctx context.Context, groupID string, userIDs []string) (err error)
|
||||||
//DeleteGroup(ctx context.Context, groupIDs []string) (err error)
|
// DeleteGroup(ctx context.Context, groupIDs []string) (err error)
|
||||||
Update(ctx context.Context, groupID string, userID string, data map[string]any) (err error)
|
Update(ctx context.Context, groupID string, userID string, data map[string]any) (err error)
|
||||||
UpdateRoleLevel(ctx context.Context, groupID string, userID string, roleLevel int32) error
|
UpdateRoleLevel(ctx context.Context, groupID string, userID string, roleLevel int32) error
|
||||||
FindMemberUserID(ctx context.Context, groupID string) (userIDs []string, err error)
|
FindMemberUserID(ctx context.Context, groupID string) (userIDs []string, err error)
|
||||||
@ -47,11 +47,11 @@ type GroupMemberModelInterface interface {
|
|||||||
TakeOwner(ctx context.Context, groupID string) (groupMember *GroupMemberModel, err error)
|
TakeOwner(ctx context.Context, groupID string) (groupMember *GroupMemberModel, err error)
|
||||||
SearchMember(ctx context.Context, keyword string, groupID string, pagination pagination.Pagination) (total int64, groupList []*GroupMemberModel, err error)
|
SearchMember(ctx context.Context, keyword string, groupID string, pagination pagination.Pagination) (total int64, groupList []*GroupMemberModel, err error)
|
||||||
FindRoleLevelUserIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
|
FindRoleLevelUserIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
|
||||||
//MapGroupMemberNum(ctx context.Context, groupIDs []string) (count map[string]uint32, err error)
|
// MapGroupMemberNum(ctx context.Context, groupIDs []string) (count map[string]uint32, err error)
|
||||||
//FindJoinUserID(ctx context.Context, groupIDs []string) (groupUsers map[string][]string, err error)
|
//FindJoinUserID(ctx context.Context, groupIDs []string) (groupUsers map[string][]string, err error)
|
||||||
FindUserJoinedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
|
FindUserJoinedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
|
||||||
TakeGroupMemberNum(ctx context.Context, groupID string) (count int64, err error)
|
TakeGroupMemberNum(ctx context.Context, groupID string) (count int64, err error)
|
||||||
//FindUsersJoinedGroupID(ctx context.Context, userIDs []string) (map[string][]string, error)
|
// FindUsersJoinedGroupID(ctx context.Context, userIDs []string) (map[string][]string, error)
|
||||||
FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
|
FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
|
||||||
IsUpdateRoleLevel(data map[string]any) bool
|
IsUpdateRoleLevel(data map[string]any) bool
|
||||||
}
|
}
|
||||||
|
|||||||
@ -65,7 +65,7 @@ type UserModelInterface interface {
|
|||||||
CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
|
CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
|
||||||
// Get user total quantity every day
|
// Get user total quantity every day
|
||||||
CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
|
CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
|
||||||
//CRUD user command
|
// CRUD user command
|
||||||
AddUserCommand(ctx context.Context, userID string, Type int32, UUID string, value string, ex string) error
|
AddUserCommand(ctx context.Context, userID string, Type int32, UUID string, value string, ex string) error
|
||||||
DeleteUserCommand(ctx context.Context, userID string, Type int32, UUID string) error
|
DeleteUserCommand(ctx context.Context, userID string, Type int32, UUID string) error
|
||||||
UpdateUserCommand(ctx context.Context, userID string, Type int32, UUID string, val map[string]any) error
|
UpdateUserCommand(ctx context.Context, userID string, Type int32, UUID string, val map[string]any) error
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
package unrelation
|
package unrelation
|
||||||
|
|
||||||
//import (
|
// import (
|
||||||
// "context"
|
// "context"
|
||||||
//)
|
//)
|
||||||
//
|
//
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
package unrelation
|
package unrelation
|
||||||
|
|
||||||
//
|
//
|
||||||
//import (
|
// import (
|
||||||
// "context"
|
// "context"
|
||||||
//
|
//
|
||||||
// "go.mongodb.org/mongo-driver/bson"
|
// "go.mongodb.org/mongo-driver/bson"
|
||||||
|
|||||||
@ -23,7 +23,6 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
|
openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -41,7 +40,7 @@ func NewZookeeperDiscoveryRegister(zkConf *config.Zookeeper) (discoveryregistry.
|
|||||||
openkeeper.WithUserNameAndPassword(username, password),
|
openkeeper.WithUserNameAndPassword(username, password),
|
||||||
openkeeper.WithRoundRobin(),
|
openkeeper.WithRoundRobin(),
|
||||||
openkeeper.WithTimeout(10),
|
openkeeper.WithTimeout(10),
|
||||||
//openkeeper.WithLogger(log.NewZkLogger()),
|
// openkeeper.WithLogger(log.NewZkLogger()),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
uriFormat := "address:%s, username:%s, password:%s, schema:%s."
|
uriFormat := "address:%s, username:%s, password:%s, schema:%s."
|
||||||
|
|||||||
@ -30,7 +30,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// define http client.
|
// Define http client.
|
||||||
client = &http.Client{
|
client = &http.Client{
|
||||||
Timeout: 15 * time.Second, // max timeout is 15s
|
Timeout: 15 * time.Second, // max timeout is 15s
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ var (
|
|||||||
gitMajor string = "" // major version, always numeric
|
gitMajor string = "" // major version, always numeric
|
||||||
gitMinor string = "" // minor version, numeric possibly followed by "+"
|
gitMinor string = "" // minor version, numeric possibly followed by "+"
|
||||||
|
|
||||||
// semantic version, derived by build scripts (see
|
// Semantic version, derived by build scripts (see
|
||||||
// https://github.com/kubernetes/sig-release/blob/master/release-engineering/versioning.md#kubernetes-release-versioning
|
// https://github.com/kubernetes/sig-release/blob/master/release-engineering/versioning.md#kubernetes-release-versioning
|
||||||
// https://kubernetes.io/releases/version-skew-policy/
|
// https://kubernetes.io/releases/version-skew-policy/
|
||||||
// for a detailed discussion of this field)
|
// for a detailed discussion of this field)
|
||||||
|
|||||||
@ -35,7 +35,7 @@ type Output struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type OpenIMClientVersion struct {
|
type OpenIMClientVersion struct {
|
||||||
ClientVersion string `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"` //sdk core version
|
ClientVersion string `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"` // sdk core version
|
||||||
}
|
}
|
||||||
|
|
||||||
// String returns info as a human-friendly version string.
|
// String returns info as a human-friendly version string.
|
||||||
|
|||||||
@ -21,11 +21,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/openimsdk/localcache"
|
"github.com/openimsdk/localcache"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
|
"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/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewConversationLocalCache(client rpcclient.ConversationRpcClient, cli redis.UniversalClient) *ConversationLocalCache {
|
func NewConversationLocalCache(client rpcclient.ConversationRpcClient, cli redis.UniversalClient) *ConversationLocalCache {
|
||||||
|
|||||||
@ -19,11 +19,10 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/openimsdk/localcache"
|
"github.com/openimsdk/localcache"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
|
"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/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewFriendLocalCache(client rpcclient.FriendRpcClient, cli redis.UniversalClient) *FriendLocalCache {
|
func NewFriendLocalCache(client rpcclient.FriendRpcClient, cli redis.UniversalClient) *FriendLocalCache {
|
||||||
|
|||||||
@ -21,11 +21,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/openimsdk/localcache"
|
"github.com/openimsdk/localcache"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
|
"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/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewGroupLocalCache(client rpcclient.GroupRpcClient, cli redis.UniversalClient) *GroupLocalCache {
|
func NewGroupLocalCache(client rpcclient.GroupRpcClient, cli redis.UniversalClient) *GroupLocalCache {
|
||||||
|
|||||||
@ -21,11 +21,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/openimsdk/localcache"
|
"github.com/openimsdk/localcache"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
|
"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/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewUserLocalCache(client rpcclient.UserRpcClient, cli redis.UniversalClient) *UserLocalCache {
|
func NewUserLocalCache(client rpcclient.UserRpcClient, cli redis.UniversalClient) *UserLocalCache {
|
||||||
|
|||||||
@ -19,9 +19,8 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/auth"
|
"github.com/OpenIMSDK/protocol/auth"
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry, rpcRegisterName string) *Auth {
|
func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry, rpcRegisterName string) *Auth {
|
||||||
|
|||||||
@ -21,10 +21,9 @@ import (
|
|||||||
pbconversation "github.com/OpenIMSDK/protocol/conversation"
|
pbconversation "github.com/OpenIMSDK/protocol/conversation"
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Conversation struct {
|
type Conversation struct {
|
||||||
|
|||||||
@ -20,9 +20,8 @@ import (
|
|||||||
"github.com/OpenIMSDK/protocol/friend"
|
"github.com/OpenIMSDK/protocol/friend"
|
||||||
sdkws "github.com/OpenIMSDK/protocol/sdkws"
|
sdkws "github.com/OpenIMSDK/protocol/sdkws"
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Friend struct {
|
type Friend struct {
|
||||||
|
|||||||
@ -24,7 +24,6 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -26,11 +26,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/log"
|
"github.com/OpenIMSDK/tools/log"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/protobuf/proto"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
|
"google.golang.org/protobuf/proto"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newContentTypeConf(conf *config.Notification) map[int32]config.NotificationConf {
|
func newContentTypeConf(conf *config.Notification) map[int32]config.NotificationConf {
|
||||||
@ -69,7 +68,7 @@ func newContentTypeConf(conf *config.Notification) map[int32]config.Notification
|
|||||||
constant.BlackAddedNotification: conf.BlackAdded,
|
constant.BlackAddedNotification: conf.BlackAdded,
|
||||||
constant.BlackDeletedNotification: conf.BlackDeleted,
|
constant.BlackDeletedNotification: conf.BlackDeleted,
|
||||||
constant.FriendInfoUpdatedNotification: conf.FriendInfoUpdated,
|
constant.FriendInfoUpdatedNotification: conf.FriendInfoUpdated,
|
||||||
constant.FriendsInfoUpdateNotification: conf.FriendInfoUpdated, //use the same FriendInfoUpdated
|
constant.FriendsInfoUpdateNotification: conf.FriendInfoUpdated, // use the same FriendInfoUpdated
|
||||||
// conversation
|
// conversation
|
||||||
constant.ConversationChangeNotification: conf.ConversationChanged,
|
constant.ConversationChangeNotification: conf.ConversationChanged,
|
||||||
constant.ConversationUnreadNotification: conf.ConversationChanged,
|
constant.ConversationUnreadNotification: conf.ConversationChanged,
|
||||||
|
|||||||
@ -218,7 +218,7 @@ func (f *FriendNotificationSender) BlackDeletedNotification(ctx context.Context,
|
|||||||
ToUserID: req.BlackUserID,
|
ToUserID: req.BlackUserID,
|
||||||
}}
|
}}
|
||||||
if err := f.Notification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips); err != nil {
|
if err := f.Notification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips); err != nil {
|
||||||
//err
|
// err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,9 +19,8 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/push"
|
"github.com/OpenIMSDK/protocol/push"
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Push struct {
|
type Push struct {
|
||||||
|
|||||||
@ -19,9 +19,8 @@ import (
|
|||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/third"
|
"github.com/OpenIMSDK/protocol/third"
|
||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Third struct {
|
type Third struct {
|
||||||
|
|||||||
@ -23,11 +23,10 @@ import (
|
|||||||
"github.com/OpenIMSDK/tools/discoveryregistry"
|
"github.com/OpenIMSDK/tools/discoveryregistry"
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
"github.com/OpenIMSDK/tools/errs"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
"google.golang.org/grpc"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/authverify"
|
"github.com/openimsdk/open-im-server/v3/pkg/authverify"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
// User represents a structure holding connection details for the User RPC client.
|
// User represents a structure holding connection details for the User RPC client.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user