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

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
Gordon 2022-05-25 20:29:41 +08:00
commit a84298de86
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deploy_k8s/ingress.yaml
View File

@ -9,7 +9,7 @@ metadata:
name: sdk-server-ingress name: sdk-server-ingress
spec: spec:
rules: rules:
- host: sdk-server.openim.xxx.com - host: k8s.open-im-test.rentsoft.cn
http: http:
paths: paths:
- backend: - backend:
@ -17,7 +17,7 @@ spec:
name: sdk-server name: sdk-server
port: port:
number: 10003 number: 10003
path: / path: /sdk-server
pathType: Prefix pathType: Prefix
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
@ -30,7 +30,7 @@ metadata:
name: msg-gateway-ingress name: msg-gateway-ingress
spec: spec:
rules: rules:
- host: msg-gateway.openim.xxx.com - host: k8s.open-im-test.rentsoft.cn
http: http:
paths: paths:
- backend: - backend:
@ -38,7 +38,7 @@ spec:
name: msg-gateway name: msg-gateway
port: port:
number: 10001 number: 10001
path: / path: /msg-gateway
pathType: Prefix pathType: Prefix
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
@ -47,7 +47,7 @@ metadata:
name: api-ingress name: api-ingress
spec: spec:
rules: rules:
- host: api.openim.xxx.com - host: k8s.open-im-test.rentsoft.cn
http: http:
paths: paths:
- backend: - backend:
@ -55,7 +55,7 @@ spec:
name: api name: api
port: port:
number: 10002 number: 10002
path: / path: /api
pathType: Prefix pathType: Prefix
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
@ -64,7 +64,7 @@ metadata:
name: demo-ingress name: demo-ingress
spec: spec:
rules: rules:
- host: demo.openim.xxx.com - host: k8s.open-im-test.rentsoft.cn
http: http:
paths: paths:
- backend: - backend:
@ -72,7 +72,7 @@ spec:
name: demo name: demo
port: port:
number: 10004 number: 10004
path: / path: /demo
pathType: Prefix pathType: Prefix
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
@ -81,7 +81,7 @@ metadata:
name: cms-api-ingress name: cms-api-ingress
spec: spec:
rules: rules:
- host: cms-api.openim.xxx.com - host: k8s.open-im-test.rentsoft.cn
http: http:
paths: paths:
- backend: - backend:
@ -89,5 +89,5 @@ spec:
name: cms-api name: cms-api
port: port:
number: 10006 number: 10006
path: / path: /cms-api
pathType: Prefix pathType: Prefix

13
test/mongo/mongo_utils.go
View File

@ -2,7 +2,6 @@ package mongo
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/db"
server_api_params "Open_IM/pkg/proto/sdk_ws" server_api_params "Open_IM/pkg/proto/sdk_ws"
"context" "context"
"fmt" "fmt"
@ -16,10 +15,20 @@ var (
Client *mongo.Client Client *mongo.Client
) )
type MsgInfo struct {
SendTime int64
Msg []byte
}
type UserChat struct {
UID string
Msg []MsgInfo
}
func GetUserAllChat(uid string) { func GetUserAllChat(uid string) {
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
collection := Client.Database(config.Config.Mongo.DBDatabase).Collection("msg") collection := Client.Database(config.Config.Mongo.DBDatabase).Collection("msg")
var userChatList []db.UserChat var userChatList []UserChat
uid = uid + ":" uid = uid + ":"
filter := bson.M{"uid": bson.M{"$regex": uid}} filter := bson.M{"uid": bson.M{"$regex": uid}}
//filter := bson.M{"uid": "17726378428:0"} //filter := bson.M{"uid": "17726378428:0"}