blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 02:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

ws update

Browse Source
This commit is contained in:
Gordon 2023-03-23 15:56:47 +08:00
parent a5380a971b
commit 393dfa5902
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/msggateway/context.go
View File

@ -32,17 +32,18 @@ func (c *UserConnContext) Err() error {
func (c *UserConnContext) Value(key any) any { func (c *UserConnContext) Value(key any) any {
switch key { switch key {
case constant.OpUserID: case constant.OpUserID:
c.GetUserID() return c.GetUserID()
case constant.OperationID: case constant.OperationID:
c.GetOperationID() return c.GetOperationID()
case constant.ConnID: case constant.ConnID:
c.GetConnID() return c.GetConnID()
case constant.OpUserPlatform: case constant.OpUserPlatform:
constant.PlatformIDToName(utils.StringToInt(c.GetPlatformID())) return constant.PlatformIDToName(utils.StringToInt(c.GetPlatformID()))
case constant.RemoteAddr:
return c.RemoteAddr
default: default:
return "" return ""
} }
return ""
} }
func newContext(respWriter http.ResponseWriter, req *http.Request) *UserConnContext { func newContext(respWriter http.ResponseWriter, req *http.Request) *UserConnContext {

1
pkg/common/constant/constant.go
View File

@ -278,6 +278,7 @@ const Token = "token"
const RpcCustomHeader = "customHeader" // rpc中间件自定义ctx参数 const RpcCustomHeader = "customHeader" // rpc中间件自定义ctx参数
const CheckKey = "CheckKey" const CheckKey = "CheckKey"
const TriggerID = "triggerID" const TriggerID = "triggerID"
const RemoteAddr = "remoteAddr"
const ( const (
UnreliableNotification = 1 UnreliableNotification = 1

8
pkg/common/log/zap.go
View File

@ -148,6 +148,8 @@ func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) [
opUserID := mcontext.GetOpUserID(ctx) opUserID := mcontext.GetOpUserID(ctx)
connID := mcontext.GetConnID(ctx) connID := mcontext.GetConnID(ctx)
triggerID := mcontext.GetTriggerID(ctx) triggerID := mcontext.GetTriggerID(ctx)
opUserPlatform := mcontext.GetOpUserPlatform(ctx)
remoteAddr := mcontext.GetRemoteAddr(ctx)
if opUserID != "" { if opUserID != "" {
keysAndValues = append([]interface{}{constant.OpUserID, opUserID}, keysAndValues...) keysAndValues = append([]interface{}{constant.OpUserID, opUserID}, keysAndValues...)
} }
@ -160,6 +162,12 @@ func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) [
if triggerID != "" { if triggerID != "" {
keysAndValues = append([]interface{}{constant.TriggerID, triggerID}, keysAndValues...) keysAndValues = append([]interface{}{constant.TriggerID, triggerID}, keysAndValues...)
} }
if opUserPlatform != "" {
keysAndValues = append([]interface{}{constant.OpUserPlatform, opUserPlatform}, keysAndValues...)
}
if remoteAddr != "" {
keysAndValues = append([]interface{}{constant.RemoteAddr, remoteAddr}, keysAndValues...)
}
return keysAndValues return keysAndValues
} }

9
pkg/common/mcontext/ctx.go
View File

@ -81,6 +81,15 @@ func GetOpUserPlatform(ctx context.Context) string {
} }
return "" return ""
} }
func GetRemoteAddr(ctx context.Context) string {
if ctx.Value(constant.RemoteAddr) != "" {
s, ok := ctx.Value(constant.RemoteAddr).(string)
if ok {
return s
}
}
return ""
}
func GetMustCtxInfo(ctx context.Context) (operationID, opUserID, platform, connID string, err error) { func GetMustCtxInfo(ctx context.Context) (operationID, opUserID, platform, connID string, err error) {
operationID, ok := ctx.Value(constant.OperationID).(string) operationID, ok := ctx.Value(constant.OperationID).(string)