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 |
|
wangchuxiao
|
becd3eb8f1
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
8dea2cacf4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
d5b721be30
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
14e3e561ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
4866e88eab
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
fab8277086
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
e2421d7aa2
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
ea8de45a6c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
6c1525bd62
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
15d48fb0ad
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
Gordon
|
cb4b41476b
|
log update
|
2 years ago |
|
Gordon
|
4680b1e6be
|
log update
|
2 years ago |
|
Gordon
|
8d8c5071b5
|
remove statistic
|
2 years ago |
|
withchao
|
eba9b8ad44
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
e9865539de
|
s3
|
2 years ago |
|
wangchuxiao
|
3bc6e66b1a
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
6de048d84f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
fd2fb3dcaa
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
wangchuxiao
|
2a49abc74a
|
zap
|
2 years ago |
|
Gordon
|
d827c9c598
|
log update
|
2 years ago |
|
Gordon
|
37999fe322
|
log update
|
2 years ago |
|
withchao
|
316fa10257
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
384cca3689
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
wangchuxiao
|
19f3a9e077
|
zap
|
2 years ago |
|
wangchuxiao
|
64db33a6fd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
Gordon
|
16561e1589
|
log update
|
2 years ago |
|
wangchuxiao
|
9995b1c8ab
|
zap
|
2 years ago |
|
withchao
|
acb7a8be2d
|
s3
|
2 years ago |
|
withchao
|
188dc6d322
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/storage.go
|
2 years ago |
|
withchao
|
6a95025e41
|
s3
|
2 years ago |
|
wangchuxiao
|
df78784ede
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
6b98f27656
|
zap
|
2 years ago |
|
Gordon
|
e96ae5907e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
0c5e5207e6
|
log update
|
2 years ago |
|
wangchuxiao
|
f6f4409357
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
714a68fc44
|
zap
|
2 years ago |
|
wangchuxiao
|
a3410beaec
|
zap
|
2 years ago |
|
Gordon
|
85b6f00b66
|
log update
|
2 years ago |
|
Gordon
|
a2b7c4da7e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/mw/rpc_server_interceptor.go
|
2 years ago |
|
Gordon
|
b7413dffb2
|
log update
|
2 years ago |
|
wangchuxiao
|
726f83a683
|
zap
|
2 years ago |
|
wangchuxiao
|
5a3cea56fa
|
zap
|
2 years ago |
|
wangchuxiao
|
104b5748b8
|
zap
|
2 years ago |
|
wangchuxiao
|
1d04b6c924
|
zap
|
2 years ago |
|
wangchuxiao
|
b3031ea529
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
b2e4dce77a
|
zap
|
2 years ago |
|
Gordon
|
e6c02fcb8f
|
conversation update
|
2 years ago |
|
wangchuxiao
|
5310f60422
|
zap
|
2 years ago |
|
wangchuxiao
|
5c6141d0e6
|
zap
|
2 years ago |
|
withchao
|
b8a1b6644b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
b5a080623c
|
special error
|
2 years ago |
|
wangchuxiao
|
dffc8da28f
|
zap
|
2 years ago |
|
wangchuxiao
|
8c87b0c595
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/mw/rpc.go
|
2 years ago |
|
wangchuxiao
|
6afb47ba06
|
zap
|
2 years ago |
|
withchao
|
e9eea7cd9a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
ce72365842
|
special error
|
2 years ago |
|
wangchuxiao
|
d0211ebd89
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
2f6c5c6fe2
|
zap
|
2 years ago |
|
withchao
|
0536a5fee2
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
c3b109ad4a
|
special error
|
2 years ago |
|
wangchuxiao
|
3f74d076f2
|
zap
|
2 years ago |
|
withchao
|
8dd2d3054f
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
6d03169f12
|
special error
|
2 years ago |
|
wangchuxiao
|
9d80220d68
|
zap
|
2 years ago |
|
wangchuxiao
|
2c08e1c361
|
zap
|
2 years ago |
|
wangchuxiao
|
656206c95a
|
zap
|
2 years ago |
|
wangchuxiao
|
2d476021a6
|
zap
|
2 years ago |
|
wangchuxiao
|
b67ce3c462
|
zap
|
2 years ago |
|
wangchuxiao
|
311cdbfdae
|
zap
|
2 years ago |
|
wangchuxiao
|
102c300f24
|
zap
|
2 years ago |
|
wangchuxiao
|
daffe8a7b7
|
zap
|
2 years ago |
|
wangchuxiao
|
eeffefc9fc
|
zap
|
2 years ago |
|
wangchuxiao
|
8c931818fd
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
a018245d43
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
8b3ca92457
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
2986227f1c
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
0b1c198dfe
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
54a74c0b82
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
e28e6891d4
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
83b7794836
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
4547e809bf
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
bd4c6b1a97
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
217765be6e
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
eb946ad181
|
log
|
2 years ago |
|
Gordon
|
9a68a9645a
|
rpc add data
|
2 years ago |
|
Gordon
|
59b99edf79
|
rpc add data
|
2 years ago |
|
Gordon
|
8867c5e14a
|
rpc add data
|
2 years ago |
|
Gordon
|
cf29bd6227
|
zk add client options
|
2 years ago |
|
wangchuxiao
|
380ba11af0
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
Gordon
|
863e32898a
|
ctx error
|
2 years ago |
|
wangchuxiao
|
639e0c403a
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
9fcfdc9fab
|
log
|
2 years ago |
|
Gordon
|
78a30a7663
|
user bug fix
|
2 years ago |
|
Gordon
|
9645d16b2d
|
test
|
2 years ago |
|
Gordon
|
53d13ee17c
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
3e8edce014
|
test
|
2 years ago |
|
wangchuxiao
|
0b086e19a9
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
Gordon
|
d9b1bc6c41
|
test
|
2 years ago |
|
wangchuxiao
|
9709271ae3
|
log
|
2 years ago |
|
wangchuxiao
|
04068d25cb
|
fix cron
|
2 years ago |
|
wangchuxiao
|
c7a8536278
|
fix cron
|
2 years ago |
|
wangchuxiao
|
d73ab781fe
|
fix cron
|
2 years ago |
|
wangchuxiao
|
a348af74fa
|
fix cron
|
2 years ago |
|
wangchuxiao
|
ee738e11cd
|
fix cron
|
2 years ago |
|
wangchuxiao
|
8ea9484255
|
fix cron
|
2 years ago |
|
wangchuxiao
|
012a173629
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
e326acb578
|
fix cron
|
2 years ago |
|
Gordon
|
ef0b9a9ebe
|
test
|
2 years ago |
|
wangchuxiao
|
c624880863
|
fix cron
|
2 years ago |
|
wangchuxiao
|
bebe89162f
|
fix cron
|
2 years ago |
|
wangchuxiao
|
fd186e9e82
|
fix cron
|
2 years ago |
|
wangchuxiao
|
6f09dfecd6
|
fix cron
|
2 years ago |
|
wangchuxiao
|
662254f30f
|
fix cron
|
2 years ago |
|
wangchuxiao
|
d545a7f753
|
fix cron
|
2 years ago |
|
wangchuxiao
|
a9c093ac59
|
log
|
2 years ago |
|
wangchuxiao
|
49e7f15130
|
log
|
2 years ago |
|
wangchuxiao
|
f6600edea0
|
log
|
2 years ago |
|
wangchuxiao
|
549a0aceb0
|
log
|
2 years ago |
|
wangchuxiao
|
745c96349d
|
log
|
2 years ago |
|
wangchuxiao
|
7f861fa5c3
|
log
|
2 years ago |
|
withchao
|
aca2843224
|
pb path
|
2 years ago |
|
withchao
|
232a1be53e
|
protobuf
|
2 years ago |
|
withchao
|
2cd0b34f5b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
wangchuxiao
|
5447f27c80
|
script
|
2 years ago |
|
withchao
|
1e24f651c8
|
protobuf
|
2 years ago |
|
wangchuxiao
|
acadfd2c35
|
script
|
2 years ago |
|
wangchuxiao
|
955e776d3f
|
script
|
2 years ago |
|
wangchuxiao
|
ae2e09e48b
|
script
|
2 years ago |
|
wangchuxiao
|
82f499f942
|
script
|
2 years ago |
|
wangchuxiao
|
3bcc696826
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
10cf431ccf
|
script
|
2 years ago |
|
withchao
|
7776db83ea
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
8368b670e1
|
protobuf
|
2 years ago |
|
wangchuxiao
|
48722ebe36
|
script
|
2 years ago |
|
wangchuxiao
|
f693b6f335
|
script
|
2 years ago |
|
wangchuxiao
|
1f089cbbe3
|
script
|
2 years ago |
|
wangchuxiao
|
b828f1d3d1
|
script
|
2 years ago |
|
wangchuxiao
|
0c98231fcd
|
script
|
2 years ago |
|
wangchuxiao
|
944b1a6680
|
script
|
2 years ago |
|
wangchuxiao
|
8904ebccbc
|
script
|
2 years ago |
|
wangchuxiao
|
fae6fdc3ed
|
script
|
2 years ago |
|
wangchuxiao
|
889f3031bf
|
script
|
2 years ago |
|
wangchuxiao
|
ee11636d7e
|
script
|
2 years ago |
|
wangchuxiao
|
471b9cbea6
|
script
|
2 years ago |
|
wangchuxiao
|
90c6130bc6
|
script
|
2 years ago |
|
wangchuxiao
|
3421610acb
|
script
|
2 years ago |
|
wangchuxiao
|
4c25686060
|
script
|
2 years ago |
|
wangchuxiao
|
2bc2b4cf24
|
script
|
2 years ago |
|
wangchuxiao
|
9aea3b4981
|
script
|
2 years ago |
|
wangchuxiao
|
12a0ab8ae8
|
script
|
2 years ago |
|
wangchuxiao
|
2ccf040fbb
|
script
|
2 years ago |
|
wangchuxiao
|
e10b0743dc
|
script
|
2 years ago |
|
wangchuxiao
|
040fd345e0
|
script
|
2 years ago |
|
wangchuxiao
|
4c5210af59
|
script
|
2 years ago |
|
wangchuxiao
|
6d4cee96c8
|
script
|
2 years ago |
|
wangchuxiao
|
d3b711e91b
|
script
|
2 years ago |
|
Gordon
|
7f3ee77116
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# cmd/msggateway/main.go
# go.sum
# internal/msggateway/init.go
|
2 years ago |
|
Gordon
|
52e03b0149
|
gateway update
|
2 years ago |
|
wangchuxiao
|
1043142970
|
cobra
|
2 years ago |
|
wangchuxiao
|
4c4a8341c4
|
cobra
|
2 years ago |
|
wangchuxiao
|
a87a8c1fb3
|
cobra
|
2 years ago |
|
wangchuxiao
|
9ce50095b5
|
cobra
|
2 years ago |
|
wangchuxiao
|
345bf3a882
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
ca1cdbdeb7
|
cobra
|
2 years ago |
|
withchao
|
5813d13fe4
|
pb package name add OpenIMServer
|
2 years ago |
|
wangchuxiao
|
ff6a503f53
|
cobra
|
2 years ago |
|
wangchuxiao
|
f8ad35a6f7
|
cobra
|
2 years ago |
|
wangchuxiao
|
107f4c950b
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
e55167d0bf
|
test cobra
|
2 years ago |
|
withchao
|
5df6847f7d
|
version
|
2 years ago |
|
withchao
|
c63f7c9e48
|
utils todo
|
2 years ago |
|
wangchuxiao
|
60876e865b
|
test cobra
|
2 years ago |
|
wangchuxiao
|
30e9b44054
|
test cobra
|
2 years ago |
|
wangchuxiao
|
f0943276cb
|
test cobra
|
2 years ago |
|
wangchuxiao
|
5dfda23ded
|
test cobra
|
2 years ago |
|
wangchuxiao
|
2c91185102
|
test cobra
|
2 years ago |
|
wangchuxiao
|
c1746fb32e
|
test cobra
|
2 years ago |
|
wangchuxiao
|
380bf1cc8c
|
test cobra
|
2 years ago |
|
wangchuxiao
|
320c978e94
|
test cobra
|
2 years ago |
|
wangchuxiao
|
f5309ee3b8
|
test cobra
|
2 years ago |
