wangchuxiao
|
d1c07f2e5c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
fd19cd89a3
|
friend
|
3 years ago |
withchao
|
58206f983e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
withchao
|
2e24846e15
|
wrap
|
3 years ago |
|
wangchuxiao
|
7c8c809fb8
|
errcode
|
3 years ago |
|
wangchuxiao
|
c9fd336812
|
friend
|
3 years ago |
|
wangchuxiao
|
04347bcc0d
|
friend
|
3 years ago |
|
wangchuxiao
|
19f5354721
|
page
|
3 years ago |
|
wangchuxiao
|
c8fd03a693
|
friend
|
3 years ago |
|
wangchuxiao
|
40333d62e3
|
friend
|
3 years ago |
|
wangchuxiao
|
a765160ee3
|
friend
|
3 years ago |
|
wangchuxiao
|
40da937c4c
|
friend
|
3 years ago |
|
wangchuxiao
|
91e2f3caeb
|
err
|
3 years ago |
|
wangchuxiao
|
befd5c8636
|
err
|
3 years ago |
|
wangchuxiao
|
1921e5b030
|
err
|
3 years ago |
|
wangchuxiao
|
506a417b0b
|
err
|
3 years ago |
|
wangchuxiao
|
9716d478bd
|
freind
|
3 years ago |
|
wangchuxiao
|
553606d2a8
|
err
|
3 years ago |
|
wangchuxiao
|
7fd9a84271
|
error
|
3 years ago |
|
withchao
|
26341a5187
|
Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# internal/rpc/friend/friend.go
|
3 years ago |
|
withchao
|
2ce1bc84f2
|
pkg
|
3 years ago |
|
wangchuxiao
|
67e1faefd8
|
friend db
|
3 years ago |
|
withchao
|
835cd6d14a
|
pkg
|
3 years ago |
|
wangchuxiao
|
ea9c9a496b
|
friend
|
3 years ago |
|
wangchuxiao
|
2966afca6b
|
friend
|
3 years ago |
|
wangchuxiao
|
47637175d7
|
friend
|
3 years ago |
|
wangchuxiao
|
3f65376a35
|
fix friend
|
3 years ago |
|
wangchuxiao
|
ba6dddf986
|
fix add friend
|
3 years ago |
|
wangchuxiao
|
d2cd3618e0
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
e7b1377444
|
black bug
|
3 years ago |
|
wangchuxiao
|
73e6fbbe91
|
black bug
|
3 years ago |
Gordon
|
5c38ffa15e
|
user update
|
3 years ago |
|
Gordon
|
a60dc3189c
|
user update
|
3 years ago |
|
Gordon
|
007e0cff26
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
Gordon
|
1117488eec
|
user update
|
3 years ago |
|
wangchuxiao
|
57c082c545
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
5a886f6837
|
db
|
3 years ago |
|
Gordon
|
f3937499fa
|
user update
|
3 years ago |
|
withchao
|
0fd1e785fe
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
withchao
|
1f935531f6
|
code error
|
3 years ago |
|
wangchuxiao
|
d725b9538f
|
db
|
3 years ago |
|
Gordon
|
ce87ef0a04
|
conversation update
|
3 years ago |
|
Gordon
|
1f03ebdbe7
|
user update
|
3 years ago |
|
Gordon
|
6ce1c6c048
|
user update
|
3 years ago |
|
Gordon
|
9a0f9c2270
|
user update
|
3 years ago |
|
Gordon
|
baae7875aa
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
Gordon
|
e99753f188
|
user update
|
3 years ago |
|
wangchuxiao
|
a8dd306196
|
db
|
3 years ago |
|
wangchuxiao
|
642743957e
|
db
|
3 years ago |
|
wangchuxiao
|
be847d5d5e
|
db
|
3 years ago |
|
wangchuxiao
|
690a2195da
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/friend.go
|
3 years ago |
|
wangchuxiao
|
63f5169dbe
|
db
|
3 years ago |
|
withchao
|
a529ba4f5b
|
packet name pb
|
3 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
|
3 years ago |
|
withchao
|
17de3e7927
|
packet name pb
|
3 years ago |
|
wangchuxiao
|
a0f3307fe3
|
db
|
3 years ago |
|
wangchuxiao
|
e888910f3c
|
db
|
3 years ago |
|
wangchuxiao
|
cc93335d7f
|
db
|
3 years ago |
|
wangchuxiao
|
74d1d760aa
|
db
|
3 years ago |
|
wangchuxiao
|
2a60974ebd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
51d8c0ba51
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
Gordon
|
970e6c40b4
|
parse token
|
3 years ago |
|
Gordon
|
7b17ed6303
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
Gordon
|
808cd69429
|
parse token
|
3 years ago |
|
wangchuxiao
|
cbfe679f06
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
42c9cc61ab
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
d75d1f57e4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
Gordon
|
460cf8d8ba
|
parse token
|
3 years ago |
|
Gordon
|
b8ef0b3513
|
parse token
|
3 years ago |
|
wangchuxiao
|
becd3eb8f1
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
8dea2cacf4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
d5b721be30
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
14e3e561ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
4866e88eab
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
fab8277086
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
e2421d7aa2
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
ea8de45a6c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
6c1525bd62
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
wangchuxiao
|
15d48fb0ad
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
Gordon
|
cb4b41476b
|
log update
|
3 years ago |
|
Gordon
|
4680b1e6be
|
log update
|
3 years ago |
|
Gordon
|
8d8c5071b5
|
remove statistic
|
3 years ago |
|
withchao
|
eba9b8ad44
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
withchao
|
e9865539de
|
s3
|
3 years ago |
|
wangchuxiao
|
3bc6e66b1a
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
6de048d84f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
fd2fb3dcaa
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
3 years ago |
|
wangchuxiao
|
2a49abc74a
|
zap
|
3 years ago |
|
Gordon
|
d827c9c598
|
log update
|
3 years ago |
|
Gordon
|
37999fe322
|
log update
|
3 years ago |
|
withchao
|
316fa10257
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
withchao
|
384cca3689
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
3 years ago |
|
wangchuxiao
|
19f3a9e077
|
zap
|
3 years ago |
|
wangchuxiao
|
64db33a6fd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
|
Gordon
|
16561e1589
|
log update
|
3 years ago |
|
wangchuxiao
|
9995b1c8ab
|
zap
|
3 years ago |
|
withchao
|
acb7a8be2d
|
s3
|
3 years ago |
|
withchao
|
188dc6d322
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/storage.go
|
3 years ago |
|
withchao
|
6a95025e41
|
s3
|
3 years ago |
|
wangchuxiao
|
df78784ede
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
3 years ago |
