withchao
|
26341a5187
|
Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# internal/rpc/friend/friend.go
|
2 years ago |
withchao
|
2ce1bc84f2
|
pkg
|
2 years ago |
wangchuxiao
|
67e1faefd8
|
friend db
|
2 years ago |
withchao
|
835cd6d14a
|
pkg
|
2 years ago |
wangchuxiao
|
ea9c9a496b
|
friend
|
2 years ago |
wangchuxiao
|
2966afca6b
|
friend
|
2 years ago |
wangchuxiao
|
47637175d7
|
friend
|
2 years ago |
wangchuxiao
|
3f65376a35
|
fix friend
|
2 years ago |
wangchuxiao
|
ba6dddf986
|
fix add friend
|
2 years ago |
wangchuxiao
|
d2cd3618e0
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
wangchuxiao
|
e7b1377444
|
black bug
|
2 years ago |
wangchuxiao
|
73e6fbbe91
|
black bug
|
2 years ago |
Gordon
|
5c38ffa15e
|
user update
|
2 years ago |
Gordon
|
a60dc3189c
|
user update
|
2 years ago |
Gordon
|
007e0cff26
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
Gordon
|
1117488eec
|
user update
|
2 years ago |
wangchuxiao
|
57c082c545
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
wangchuxiao
|
5a886f6837
|
db
|
2 years ago |
Gordon
|
f3937499fa
|
user update
|
2 years ago |
withchao
|
0fd1e785fe
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
withchao
|
1f935531f6
|
code error
|
2 years ago |
wangchuxiao
|
d725b9538f
|
db
|
2 years ago |
Gordon
|
ce87ef0a04
|
conversation update
|
2 years ago |
Gordon
|
1f03ebdbe7
|
user update
|
2 years ago |
Gordon
|
6ce1c6c048
|
user update
|
2 years ago |
Gordon
|
9a0f9c2270
|
user update
|
2 years ago |
Gordon
|
baae7875aa
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
Gordon
|
e99753f188
|
user update
|
2 years ago |
wangchuxiao
|
a8dd306196
|
db
|
2 years ago |
wangchuxiao
|
642743957e
|
db
|
2 years ago |
wangchuxiao
|
be847d5d5e
|
db
|
2 years ago |
wangchuxiao
|
690a2195da
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/friend.go
|
2 years ago |
wangchuxiao
|
63f5169dbe
|
db
|
2 years ago |
withchao
|
a529ba4f5b
|
packet name pb
|
2 years ago |
withchao
|
1680b96b65
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# cmd/api/main.go
# internal/api/a2r/api2rpc.go
# internal/apiresp/resp.go
# internal/msgtransfer/online_history_msg_handler.go
# internal/push/consumer_init.go
# pkg/common/db/controller/conversation.go
# pkg/common/mw/gin.go
# pkg/statistics/statistics.go
|
2 years ago |
withchao
|
17de3e7927
|
packet name pb
|
2 years ago |
wangchuxiao
|
a0f3307fe3
|
db
|
2 years ago |
wangchuxiao
|
e888910f3c
|
db
|
2 years ago |
wangchuxiao
|
cc93335d7f
|
db
|
2 years ago |
wangchuxiao
|
74d1d760aa
|
db
|
2 years ago |
wangchuxiao
|
2a60974ebd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
wangchuxiao
|
51d8c0ba51
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
Gordon
|
970e6c40b4
|
parse token
|
2 years ago |
Gordon
|
7b17ed6303
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
Gordon
|
808cd69429
|
parse token
|
2 years ago |
wangchuxiao
|
cbfe679f06
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
wangchuxiao
|
42c9cc61ab
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
wangchuxiao
|
d75d1f57e4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
Gordon
|
460cf8d8ba
|
parse token
|
2 years ago |
Gordon
|
b8ef0b3513
|
parse token
|
2 years ago |