wangchuxiao
|
f586ab1ac2
|
push
|
2 years ago |
withchao
|
2f1c064413
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/msgtransfer/online_history_msg_handler.go
# internal/msgtransfer/online_msg_to_mongo_handler.go
# internal/push/init.go
# pkg/common/db/cache/redis.go
# pkg/common/db/controller/msg.go
|
2 years ago |
|
withchao
|
2af2716c2c
|
msg database
|
2 years ago |
|
wangchuxiao
|
4fc00109ef
|
push
|
2 years ago |
|
wangchuxiao
|
432627353c
|
push
|
2 years ago |
|
wangchuxiao
|
e1a27e6aea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
cmd/api/main.go
go.mod
internal/push/fcm/push.go
internal/push/getui/push.go
internal/push/logic/init.go
internal/push/logic/push_to_client.go
internal/push/push_rpc_server.go
internal/rpc/conversation/conversaion.go
pkg/common/db/controller/group.go
pkg/proto/push/push.pb.go
|
2 years ago |
|
wangchuxiao
|
94d50a6c71
|
push
|
2 years ago |
|
wangchuxiao
|
5be441f4fd
|
errcode
|
2 years ago |
wenxu12345
|
dc33071478
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
1b3eaed0e5
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
cmd/rpc/auth/main.go
cmd/rpc/friend/main.go
cmd/rpc/group/main.go
cmd/rpc/msg/main.go
cmd/rpc/user/main.go
internal/rpc/auth/auth.go
internal/rpc/conversation/conversaion.go
internal/rpc/friend/friend.go
internal/rpc/group/callback.go
internal/rpc/group/group.go
internal/rpc/msg/pull_message.go
internal/rpc/msg/query_msg.go
internal/rpc/msg/rpc_chat.go
internal/rpc/msg/send_msg.go
internal/rpc/user/user.go
pkg/common/db/cache/redis.go
pkg/common/db/controller/msg.go
pkg/common/http/http_client.go
|
2 years ago |
|
wangchuxiao
|
6619183a48
|
errcode
|
2 years ago |
|
withchao
|
ed466387e4
|
callback
|
2 years ago |
|
wangchuxiao
|
6eb231aae4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go
pkg/proto/group/group.proto
|
2 years ago |
|
wangchuxiao
|
759432794f
|
errcode
|
2 years ago |
|
withchao
|
d6d6afb788
|
group update batch
|
2 years ago |
|
wangchuxiao
|
414915eb3b
|
errcode
|
2 years ago |
|
wangchuxiao
|
4a32e98e62
|
errcode
|
2 years ago |
|
wangchuxiao
|
67c082ab7b
|
errcode
|
2 years ago |
|
wangchuxiao
|
40438f529a
|
del files
|
2 years ago |
|
wangchuxiao
|
51529eece3
|
del files
|
2 years ago |
|
skiffer-git
|
46c3b5a6ea
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
07a6439082
|
fix Pb2String
|
2 years ago |
|
wangchuxiao
|
eb49b27e16
|
Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
4fd31e4367
|
getui
|
2 years ago |
Gordon
|
1026a6b2b6
|
Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
# config/config.yaml
# pkg/common/constant/constant.go
# pkg/proto/sdk_ws/ws.pb.go
# pkg/proto/sdk_ws/ws.proto
|
2 years ago |
|
wangchuxiao
|
e8dc5ce085
|
push
|
2 years ago |
|
wangchuxiao
|
fb72f4b1ae
|
push
|
2 years ago |
|
wangchuxiao
|
6bf0a3a804
|
push
|
2 years ago |
|
wangchuxiao
|
4bcaa5eaca
|
push
|
2 years ago |
|
wangchuxiao
|
8ca6584299
|
push
|
2 years ago |
|
wangchuxiao
|
e86e8820f3
|
push
|
2 years ago |
|
wangchuxiao
|
07c300f35f
|
push
|
2 years ago |
|
wangchuxiao
|
b08936c27e
|
push
|
2 years ago |
|
wangchuxiao
|
0b4b408552
|
push
|
2 years ago |
|
wangchuxiao
|
36e37052e0
|
push
|
2 years ago |
|
wangchuxiao
|
9a3373a43d
|
push
|
2 years ago |
|
wangchuxiao
|
428e5a7a4e
|
push
|
2 years ago |
|
wangchuxiao
|
7445b84756
|
push
|
2 years ago |
|
wangchuxiao
|
49b21fb577
|
push
|
2 years ago |
|
wangchuxiao
|
1f7e788585
|
push
|
2 years ago |
|
wangchuxiao
|
e80afa610d
|
getui
|
2 years ago |
|
Gordon
|
7c9b4576f0
|
platform update
|
2 years ago |
|
Gordon
|
ad814b6cbb
|
add web push
|
2 years ago |
|
Gordon
|
f2a35fb833
|
callback add seq
|
2 years ago |
|
Gordon
|
6f69653a8b
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
14fd7444e8
|
callback add seq
|
2 years ago |
|
wangchuxiao
|
6f22b37e1d
|
fix groupMuted send msg
|
2 years ago |
|
wangchuxiao
|
bb1babad11
|
config
|
2 years ago |
|
wangchuxiao
|
3a3412486a
|
fix callback bug
|
2 years ago |
|
Gordon
|
eba25f1bb8
|
ws add logout remove push token
|
2 years ago |
|
wangchuxiao
|
16b3ea8b7e
|
callback update
|
2 years ago |
|
wangchuxiao
|
942afd7fec
|
callback update
|
2 years ago |
|
wangchuxiao
|
de271d5b76
|
callback update
|
2 years ago |
|
wangchuxiao
|
32561b5616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
9964650014
|
Merge branch 'main' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
3345b6e242
|
fix bug
|
2 years ago |
|
Gordon
|
51fa675e90
|
callback update
|
2 years ago |
liu ming
|
e000dc18aa
|
添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
|
2 years ago |
|
Gordon
|
cad23f1672
|
online push info callback update
|
2 years ago |
|
Gordon
|
18e92ccbd3
|
push update
|
2 years ago |
|
wangchuxiao
|
af2baba1e3
|
merge shichuang
|
2 years ago |
|
wangchuxiao
|
78ce5c3f69
|
prometheus
|
2 years ago |
|
wangchuxiao
|
1f81bd121f
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
02fa9142fe
|
prometheus
|
2 years ago |
|
skiffer-git
|
d6abbacbf7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# internal/rpc/msg/rpcChat.go
# pkg/common/prometheus/gather.go
|
2 years ago |
|
skiffer-git
|
979100850c
|
prometheus for statistics
|
2 years ago |
|
wangchuxiao
|
144cf279f9
|
prome
|
2 years ago |
|
wangchuxiao
|
aa6b439e8c
|
prome
|
2 years ago |
|
wangchuxiao
|
a1f79f4508
|
prome
|
2 years ago |
|
wangchuxiao
|
ef66b10501
|
prome
|
2 years ago |
|
Gordon
|
b5deceaa3b
|
put client msg id to offline callback
|
2 years ago |
|
Gordon
|
07e1de2f62
|
put client msg id to offline callback
|
2 years ago |
|
wangchuxiao
|
3d184c95ba
|
Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
6754fdb580
|
getui
|
2 years ago |
|
Gordon
|
4a2a9eb997
|
fcm push modify
|
2 years ago |
|
wangchuxiao
|
82a8f18e88
|
merge cms into v2.3.0release
|
2 years ago |
|
Gordon
|
f6137dfc34
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
6dfbb90b80
|
fix signal
|
2 years ago |
|
Gordon
|
3f87958328
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
a0e689c437
|
fcm ios push badge
|
2 years ago |
|
skiffer-git
|
e990118475
|
fix bug :pushMsg.MsgData.OfflinePushInfo==nil
|
2 years ago |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
d622f1df3d
|
fcm
|
2 years ago |
|
wangchuxiao
|
caea072f7d
|
fcm
|
2 years ago |
|
wangchuxiao
|
04b22c1a76
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
26d9d7630c
|
fcm
|
2 years ago |
|
skiffer-git
|
e5a7810d6e
|
add group member cache in msg rpc
|
2 years ago |
|
skiffer-git
|
99e913637a
|
add group member cache in push
|
2 years ago |
|
skiffer-git
|
67319031ea
|
log
|
2 years ago |
|
skiffer-git
|
6ff8fc7f87
|
merge code : Filter push data by time
|
2 years ago |
|
skiffer-git
|
0f0e99b42e
|
merge code : Filter push data by time
|
2 years ago |
|
Gordon
|
93f8ed223e
|
group file update
|
2 years ago |
|
wangchuxiao
|
9590d2865a
|
conversation
|
2 years ago |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
Gordon
|
9a82dd356c
|
callback add offline info
|
2 years ago |
|
wangchuxiao
|
943a5b36e3
|
Merge branch 'del' into v2.3.0release
|
2 years ago |
|
Gordon
|
eee98c5175
|
revoke super group message and push message modify
|
2 years ago |
|
wangchuxiao
|
d0a200f652
|
etcd
|
2 years ago |
|
wangchuxiao
|
6f2451edd3
|
etcd
|
2 years ago |
|
wangchuxiao
|
64e1361ef5
|
fix signal bug
|
2 years ago |
