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
|
714a68fc44
|
zap
|
2 years ago |
|
wangchuxiao
|
a3410beaec
|
zap
|
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
|
745c96349d
|
log
|
2 years ago |
|
wangchuxiao
|
7f861fa5c3
|
log
|
2 years ago |
|
withchao
|
aca2843224
|
pb path
|
2 years ago |
|
wangchuxiao
|
5447f27c80
|
script
|
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
|
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
|
9ce50095b5
|
cobra
|
2 years ago |
|
wangchuxiao
|
ca1cdbdeb7
|
cobra
|
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 |
|
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 |
|
wangchuxiao
|
6bb8160a99
|
test cobra
|
2 years ago |
|
wangchuxiao
|
6eb13df2e2
|
test cobra
|
2 years ago |
|
wangchuxiao
|
32af58e861
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# cmd/cmdutils/main.go
|
2 years ago |
|
wangchuxiao
|
ea614167a6
|
test cobra
|
2 years ago |
|
withchao
|
d80cf34f26
|
rpc mw
|
2 years ago |
|
withchao
|
102ab98276
|
rpc mw
|
2 years ago |
|
withchao
|
555fc52acc
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
4c5613084c
|
error
|
2 years ago |
|
wangchuxiao
|
d6704aed80
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
52d8ec6aee
|
test cobra
|
2 years ago |
|
withchao
|
3fe9ee22fe
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
1513933922
|
error
|
2 years ago |
|
wangchuxiao
|
6ad93962aa
|
test cobra
|
2 years ago |
|
wangchuxiao
|
373b317b1a
|
test cobra
|
2 years ago |
|
wangchuxiao
|
757fd4bf0b
|
test cobra
|
2 years ago |
|
wangchuxiao
|
5604ec9902
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
6ca1d403b2
|
test cobra
|
2 years ago |
|
withchao
|
5ca36ebc10
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3ea0d1f765
|
s3 complete
|
2 years ago |
|
wangchuxiao
|
9575ba74e8
|
makefile
|
2 years ago |
|
wangchuxiao
|
23c24308f7
|
makefile
|
2 years ago |
|
wangchuxiao
|
8ae9c2a278
|
test name
|
2 years ago |
|
wangchuxiao
|
612fe2173e
|
modify dictory
|
2 years ago |
|
wangchuxiao
|
a6562e5a0e
|
modify dictory
|
2 years ago |
|
wangchuxiao
|
77b2d4aad0
|
modify dictory
|
2 years ago |
|
wangchuxiao
|
15ff930661
|
modify dictory
|
2 years ago |
|
withchao
|
b2ea5036db
|
solve error
|
2 years ago |
|
withchao
|
cdb8197156
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
b74e6b52f3
|
solve error
|
2 years ago |
|
wangchuxiao
|
3a23153e48
|
proto modify
|
2 years ago |
|
wangchuxiao
|
f177715ada
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/api/auth.go
internal/api/route.go
internal/api/user.go
internal/rpc/third/third.go
|
2 years ago |
|
wangchuxiao
|
96d9b25b57
|
proto modify
|
2 years ago |
|
withchao
|
e93425c574
|
api rpc third
|
2 years ago |
|
wangchuxiao
|
d991947d4c
|
proto modify
|
2 years ago |
|
wangchuxiao
|
8d0148c4ba
|
proto modify
|
2 years ago |
|
wangchuxiao
|
4ac9943565
|
conf
|
2 years ago |
|
wangchuxiao
|
4c426c7c7c
|
config modify
|
2 years ago |
|
withchao
|
ae8478dc5e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/msg/delete.go
# internal/rpc/msg/send_pull.go
# pkg/common/db/cache/msg.go
# pkg/common/db/cache/redis.go
# pkg/common/db/cache/redis_test.go
|
2 years ago |
|
wangchuxiao
|
ffaf0bd021
|
config path
|
2 years ago |
|
wangchuxiao
|
2a0ad5c7af
|
config path
|
2 years ago |
|
wangchuxiao
|
92764b3727
|
config path
|
2 years ago |
|
wangchuxiao
|
66aaa9b152
|
config path
|
2 years ago |
|
wangchuxiao
|
bb94a7947c
|
config path
|
2 years ago |
|
wangchuxiao
|
dd7a7d9cda
|
config path
|
2 years ago |
|
wangchuxiao
|
7930c230e4
|
config path
|
2 years ago |
|
wangchuxiao
|
a26ca657fe
|
config path
|
2 years ago |
|
wangchuxiao
|
8bdf86172f
|
push
|
2 years ago |
|
wangchuxiao
|
76565cded1
|
push
|
2 years ago |
|
wangchuxiao
|
be11da75ae
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/msg/delete.go
# pkg/common/db/controller/msg.go
# pkg/common/db/table/unrelation/extend_msg_set.go
|
2 years ago |
|
wangchuxiao
|
f586ab1ac2
|
push
|
2 years ago |
|
withchao
|
c8004279a4
|
msg database
|
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 |
|
wangchuxiao
|
9c76722c90
|
push
|
2 years ago |
|
withchao
|
2af2716c2c
|
msg database
|
2 years ago |
|
wangchuxiao
|
4fc00109ef
|
push
|
2 years ago |
|
withchao
|
2359d7ab37
|
msg database
|
2 years ago |
|
withchao
|
eac2619c33
|
msg
|
2 years ago |
|
withchao
|
b4443c843a
|
GetSuperGroupOpenNotDisturbUserID -> GetRecvMsgNotNotifyUserIDs
|
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 |
|
withchao
|
1d6e2ac000
|
callback
|
2 years ago |
|
withchao
|
f3e37650c6
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3bae8edb39
|
conversation
|
2 years ago |
skiffer-git
|
28fb738410
|
Error code standardization
|
2 years ago |
|
withchao
|
cd00d91eee
|
group db
|
2 years ago |
|
skiffer-git
|
62a2cf2976
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
5751062605
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
ae40c8c8c0
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
9e4b59034d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6201e5c206
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
be1bf240ad
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
e27d66cd2e
|
Error code standardization
|
2 years ago |
|
withchao
|
f5fbe1d852
|
gorm conn
|
2 years ago |
|
withchao
|
5bb42593ba
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
762c49625c
|
group db tx
|
2 years ago |
|
skiffer-git
|
9b0682705e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
7338b633c8
|
Error code standardization
|
2 years ago |
|
Gordon
|
141cfef1b6
|
conversation update
|
2 years ago |
|
wangchuxiao
|
2b38381296
|
fix mongoDB bug
|
2 years ago |
|
withchao
|
6ef8228064
|
group build pass
|
2 years ago |
|
wangchuxiao
|
5be441f4fd
|
errcode
|
2 years ago |
|
withchao
|
da9f4bb78e
|
rpc
|
2 years ago |
|
withchao
|
98769fefae
|
grammar
|
2 years ago |
|
withchao
|
5e6f9448bc
|
gorm db
|
2 years ago |
|
withchao
|
ff542e83fe
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
20ba4e33e8
|
db
|
2 years ago |
|
Gordon
|
1f7d2d73c7
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
ffdc7b8f9d
|
msggateway refactor
|
2 years ago |
|
wenxu12345
|
dc33071478
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
29a1f5b4f7
|
errcode
|
2 years ago |
|
wangchuxiao
|
0d0a90a14b
|
errcode
|
2 years ago |
|
wangchuxiao
|
52a0a8aca4
|
errcode
|
2 years ago |
|
wangchuxiao
|
b2cdf4279d
|
errcode
|
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 |
|
skiffer-git
|
64caafd6b6
|
Error code standardization
|
2 years ago |
|
withchao
|
0f776fb2f3
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
e147dc5b1b
|
callback start
|
2 years ago |
|
skiffer-git
|
c63b543a4a
|
Error code standardization
|
2 years ago |
|
withchao
|
bba819854c
|
group
|
2 years ago |
|
withchao
|
446ac63898
|
callback
|
2 years ago |
|
withchao
|
1ae1f77a14
|
msg cb
|
2 years ago |
|
skiffer-git
|
b27aa040f7
|
Error code standardization
|
2 years ago |
|
withchao
|
b4f967ea97
|
check.go
|
2 years ago |
|
withchao
|
d7ea41fa1a
|
msg rpc
|
2 years ago |
|
skiffer-git
|
a9dec0c832
|
Error code standardization
|
2 years ago |
|
withchao
|
048d4b83e1
|
rpc start
|
2 years ago |
|
withchao
|
884d28b9a8
|
msg send pull
|
2 years ago |
|
withchao
|
991a4d1d95
|
msg del
|
2 years ago |
|
withchao
|
52e393dc45
|
msg status
|
2 years ago |
|
skiffer-git
|
452d9840bf
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
adc84b68e7
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/common/notification/conversation_notification.go
# internal/common/notification/work_moments_notification.go
# internal/rpc/conversation/conversaion.go
# internal/rpc/group/callback.go
# internal/rpc/group/group.go
# internal/rpc/office/office.go
|
2 years ago |
|
skiffer-git
|
cba70e3196
|
Error code standardization
|
2 years ago |
|
Gordon
|
0f5cfbb2dc
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
a3593379f6
|
conversation update
|
2 years ago |
|
wangchuxiao
|
85ebf24325
|
errcode
|
2 years ago |
|
withchao
|
dbf41bf21f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/group/callback.go
|
2 years ago |
|
withchao
|
09c6fbdfe4
|
group
|
2 years ago |
|
wangchuxiao
|
b7107edc71
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
wangchuxiao
|
a92dd54354
|
errcode
|
2 years ago |
|
wangchuxiao
|
2e3bb941b0
|
errcode
|
2 years ago |
|
skiffer-git
|
f985689a39
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
7e1b69cc3c
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
4aaac8595a
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
0e97285e0a
|
errcode
|
2 years ago |
|
withchao
|
1e1c6de56e
|
group nickname
|
2 years ago |
|
wangchuxiao
|
79c30fdc69
|
errcode
|
2 years ago |
|
withchao
|
5d7809624c
|
group cache
|
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
|
a15051bfde
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
d6d6afb788
|
group update batch
|
2 years ago |
|
skiffer-git
|
bfc202f31f
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d26daa23f1
|
`Error code standardization`
|
2 years ago |
|
withchao
|
5da1195274
|
group cache
|
2 years ago |
|
withchao
|
ab30c77836
|
group db
|
2 years ago |
|
wangchuxiao
|
8a1702fcf7
|
errcode
|
2 years ago |
|
wangchuxiao
|
ccc7e6b3c8
|
errcode
|
2 years ago |
|
wangchuxiao
|
1075754458
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/api/group/group.go
internal/api/group/super_group.go
pkg/common/db/controller/user.go
|
2 years ago |
|
wangchuxiao
|
414915eb3b
|
errcode
|
2 years ago |
|
skiffer-git
|
772a46e041
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
22f4d8f66d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
96ef753c77
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
ca6b704377
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
8c6c7ee21f
|
errcode
|
2 years ago |
|
skiffer-git
|
ac284b696a
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# pkg/common/db/controller/user.go
|
2 years ago |
|
skiffer-git
|
9a7ed2d24d
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
62f0d1043d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/cache/conversation.go
pkg/common/db/cache/group.go
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
4826810c2a
|
errcode
|
2 years ago |
|
withchao
|
41d62937ff
|
group rpc
|
2 years ago |
|
withchao
|
f20e9e71b7
|
group complete
|
2 years ago |
|
withchao
|
b3ae69ce94
|
conversation.go
|
2 years ago |
|
withchao
|
ec43f2847e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
324a0ae0ae
|
super group rpc
|
2 years ago |
|
wangchuxiao
|
db51bc87e2
|
errcode
|
2 years ago |
|
wangchuxiao
|
6d700765d2
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
2193d380ca
|
errcode
|
2 years ago |
|
withchao
|
f5adb7a17e
|
group database
|
2 years ago |
|
withchao
|
3423b224fd
|
group db
|
2 years ago |
|
withchao
|
77edbe1edd
|
group controller
|
2 years ago |
|
skiffer-git
|
0565474732
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# go.sum
|
2 years ago |
|
skiffer-git
|
0a2e55311c
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
84c59cecfb
|
errcode
|
2 years ago |
|
wangchuxiao
|
8fc54a7379
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/cache/conversation.go
|
2 years ago |
|
wangchuxiao
|
f4baf847ca
|
errcode
|
2 years ago |
|
withchao
|
66b6d5fc2f
|
group db
|
2 years ago |
|
withchao
|
cfa5420d9d
|
group func name
|
2 years ago |
|
withchao
|
1716de808f
|
realization group rpc
|
2 years ago |
|
withchao
|
26794503c3
|
realization group rpc
|
2 years ago |
|
withchao
|
4645eec8b6
|
realization group rpc
|
2 years ago |
|
withchao
|
4f96cc9b1b
|
group rpc
|
2 years ago |
|
withchao
|
210d04d488
|
rpc GroupApplicationResponse
|
2 years ago |
|
withchao
|
d91039c99d
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
bec4a89f7b
|
1
|
2 years ago |
|
skiffer-git
|
d59c4367fb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
22c63ecdbd
|
Error code standardization
|
2 years ago |
|
Gordon
|
99504eec2e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
|
2 years ago |
|
skiffer-git
|
795a90a194
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1aa3ac9399
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/friend.go
# pkg/common/db/relation/friend_model_k.go
# pkg/common/db/relation/friend_request_model.go
|
2 years ago |
|
withchao
|
a2c4bccdb6
|
1
|
2 years ago |
|
skiffer-git
|
3320f81c8f
|
Error code standardization
|
2 years ago |
|
Gordon
|
3b4c227519
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
withchao
|
4d4a451926
|
1
|
2 years ago |
|
withchao
|
adfcfac711
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/relation.go
|
2 years ago |
|
withchao
|
8e49d7e567
|
1
|
2 years ago |
|
wangchuxiao
|
b637a29348
|
errcode
|
2 years ago |
|
Gordon
|
e167d80469
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
Gordon
|
730be9db47
|
conversation update
|
2 years ago |
|
wangchuxiao
|
01f7262d3a
|
errcode
|
2 years ago |
|
wangchuxiao
|
83eba5a9ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
47b725ac69
|
errcode
|
2 years ago |
|
skiffer-git
|
5402d33519
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
174c3e5fae
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
f6cc91d7db
|
errcode
|
2 years ago |
|
withchao
|
c55785783d
|
1
|
2 years ago |
|
wangchuxiao
|
803ecd3f92
|
errcode
|
2 years ago |
|
wangchuxiao
|
5bb731f884
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/black.go
|
2 years ago |
|
skiffer-git
|
6658566144
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
2e19e3109e
|
Error code standardization
|
2 years ago |
|
withchao
|
2b1868f558
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3651274d68
|
1
|
2 years ago |
|
skiffer-git
|
1d42c220af
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
skiffer-git
|
cbe68507f3
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
c2fbcd1f22
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
withchao
|
d67515f53f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
wangchuxiao
|
d4952ebc16
|
errcode
|
2 years ago |
|
withchao
|
0f3691893e
|
1
|
2 years ago |
|
skiffer-git
|
fb436e7713
|
Error code standardization
|
2 years ago |
|
Gordon
|
aafe17a0f3
|
friend update
|
2 years ago |
|
Gordon
|
80bde864c1
|
friend update
|
2 years ago |
|
Gordon
|
7c92de7899
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
e550c9a874
|
friend update
|
2 years ago |
|
withchao
|
4bea4252ff
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
39463e68e3
|
Error code standardization
|
2 years ago |
|
withchao
|
26e130122c
|
1
|
2 years ago |
|
wangchuxiao
|
4ad6b74d75
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
wangchuxiao
|
40470bc320
|
errcode
|
2 years ago |
|
skiffer-git
|
d44c286ff3
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
bac9ba000e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
00bd22041b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b3e141a3ce
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
e0d05e1fa8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
4c931fba5c
|
errcode
|
2 years ago |
|
skiffer-git
|
954e01c951
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
4e580cb848
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
618ff03cbe
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
b18fb5cd31
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6aa4974e29
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
026649f875
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d50248ffd2
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b881924144
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
1693359010
|
errcode
|
2 years ago |
|
wangchuxiao
|
1e3e243a7f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
c1d6f5809b
|
errcode
|
2 years ago |
|
wangchuxiao
|
1ba5cde076
|
errcode
|
2 years ago |
|
withchao
|
5c99bdf14f
|
1
|
2 years ago |
|
wangchuxiao
|
79b5d4b8bd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/friend/friend.go
|
2 years ago |
|
wangchuxiao
|
67c082ab7b
|
errcode
|
2 years ago |
|
skiffer-git
|
ec23d22d6d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d9eb55d9df
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
f38dc3b1f1
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
26ed14d1d3
|
errcode
|
2 years ago |
|
wangchuxiao
|
5b8f66404c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/relation/user_model_k.go
|
2 years ago |
|
wangchuxiao
|
21a1e7dff2
|
errcode
|
2 years ago |
|
skiffer-git
|
0bec6eeb57
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d49022c16a
|
Error code standardization
|
2 years ago |
|
withchao
|
4c6e02f805
|
1
|
2 years ago |
|
withchao
|
b83260ca30
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
0a81dd040f
|
1
|
2 years ago |
|
skiffer-git
|
c7237a64bb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1d25a5e53f
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
d6edb4aa8c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
704b18d900
|
errcode
|
2 years ago |
|
skiffer-git
|
00b4538b0a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b162909147
|
Error code standardization
|
2 years ago |
|
withchao
|
cf4499e958
|
1
|
2 years ago |
|
withchao
|
399e1520d6
|
1
|
2 years ago |
|
withchao
|
56a89ad33b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
f65cd2aefc
|
1
|
2 years ago |
|
skiffer-git
|
7b0eeb3049
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/utils/convert.go
|
2 years ago |
|
skiffer-git
|
39fc655b1a
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
069b978b23
|
errcode
|
2 years ago |
|
wangchuxiao
|
15166f53b0
|
errcode
|
2 years ago |
|
wangchuxiao
|
b021089360
|
errcode
|
2 years ago |
|
wangchuxiao
|
52ceb7682d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/controller/group.go
pkg/common/db/relation/group_member_model_k.go
|
2 years ago |
|
withchao
|
4e10b361ed
|
1
|
2 years ago |
|
wangchuxiao
|
eebf7ca893
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
945449108d
|
errcode
|
2 years ago |
|
withchao
|
ebd329558c
|
1
|
2 years ago |
|
wangchuxiao
|
5e4e960524
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
pkg/common/db/relation/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
68d595b558
|
errcode
|
2 years ago |
|
withchao
|
5bf8f6728e
|
1
|
2 years ago |
|
withchao
|
c760b520ff
|
1
|
2 years ago |
|
withchao
|
601fac7a04
|
1
|
2 years ago |
