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
|
69f147a70c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
a0f3307fe3
|
db
|
2 years ago |
Gordon
|
574399669c
|
log remove
|
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
|
f2d33991e1
|
parse token
|
2 years ago |
|
Gordon
|
b8ef0b3513
|
parse token
|
2 years ago |
|
Gordon
|
5b4cc786ed
|
log update
|
2 years ago |
|
Gordon
|
a40ad5df68
|
log update
|
2 years ago |
|
Gordon
|
a03bdb35ff
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
41fb79d995
|
remove statistic
|
2 years ago |
|
withchao
|
eba9b8ad44
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
e9865539de
|
s3
|
2 years ago |
|
Gordon
|
a74c60927f
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
49f855e1d1
|
log update
|
2 years ago |
|
wangchuxiao
|
fcbcfbb17c
|
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 |
|
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
|
fdf20f31c3
|
zap
|
2 years ago |
|
wangchuxiao
|
104b5748b8
|
zap
|
2 years ago |
|
wangchuxiao
|
c33dab0e30
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
withchao
|
9bb30406ee
|
api error
|
2 years ago |
|
wangchuxiao
|
845f858e7a
|
zap
|
2 years ago |
|
wangchuxiao
|
6afb47ba06
|
zap
|
2 years ago |
|
wangchuxiao
|
4547e809bf
|
connID to md5
|
2 years ago |
|
wangchuxiao
|
27a1197a97
|
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
|
cf29bd6227
|
zk add client options
|
2 years ago |
|
Gordon
|
8a44305440
|
zk add client options
|
2 years ago |
|
Gordon
|
fed4dbd54f
|
zk add client options
|
2 years ago |
|
wangchuxiao
|
6187b15a88
|
log
|
2 years ago |
|
Gordon
|
63cf4a60ae
|
ctx error
|
2 years ago |
|
Gordon
|
e243012438
|
ctx error
|
2 years ago |
|
Gordon
|
bc2ae99ba7
|
test
|
2 years ago |
|
Gordon
|
cddf35fb2b
|
test
|
2 years ago |
|
Gordon
|
6780be6d56
|
test
|
2 years ago |
|
Gordon
|
01a27008a1
|
Revert "test"
This reverts commit b61ab1201a.
|
2 years ago |
|
Gordon
|
b61ab1201a
|
test
|
2 years ago |
|
Gordon
|
ef0b9a9ebe
|
test
|
2 years ago |
|
Gordon
|
768f1ce032
|
test
|
2 years ago |
|
Gordon
|
abc303d1b3
|
add log
|
2 years ago |
|
wangchuxiao
|
662254f30f
|
fix cron
|
2 years ago |
|
wangchuxiao
|
d545a7f753
|
fix cron
|
2 years ago |
|
wangchuxiao
|
c558bfa3ee
|
log
|
2 years ago |
|
wangchuxiao
|
4f0813889c
|
log
|
2 years ago |
|
wangchuxiao
|
c0afe5d24a
|
log
|
2 years ago |
|
wangchuxiao
|
f6600edea0
|
log
|
2 years ago |
|
wangchuxiao
|
cfefc757af
|
log
|
2 years ago |
|
wangchuxiao
|
549a0aceb0
|
log
|
2 years ago |
|
wangchuxiao
|
78034dc83a
|
log
|
2 years ago |
|
wangchuxiao
|
c15edd11ad
|
log
|
2 years ago |
|
wangchuxiao
|
7f861fa5c3
|
log
|
2 years ago |
|
withchao
|
6f3320ab55
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
aca2843224
|
pb path
|
2 years ago |
|
Gordon
|
4ac827020d
|
gateway update
|
2 years ago |
|
wangchuxiao
|
7e622ae784
|
script
|
2 years ago |
|
wangchuxiao
|
946fba17ef
|
script
|
2 years ago |
|
wangchuxiao
|
a957f2227b
|
script
|
2 years ago |
|
wangchuxiao
|
ae2e09e48b
|
script
|
2 years ago |
|
wangchuxiao
|
a3aa965b37
|
script
|
2 years ago |
|
wangchuxiao
|
0c98231fcd
|
script
|
2 years ago |
|
wangchuxiao
|
8904ebccbc
|
script
|
2 years ago |
|
wangchuxiao
|
12a0ab8ae8
|
script
|
2 years ago |
|
wangchuxiao
|
0aa0b257ee
|
script
|
2 years ago |
|
wangchuxiao
|
90974298cd
|
script
|
2 years ago |
|
wangchuxiao
|
e10b0743dc
|
script
|
2 years ago |
|
wangchuxiao
|
b9edc90349
|
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
|
4beb348333
|
cobra
|
2 years ago |
|
wangchuxiao
|
9ce50095b5
|
cobra
|
2 years ago |
|
wangchuxiao
|
ca1cdbdeb7
|
cobra
|
2 years ago |
|
wangchuxiao
|
f8ad35a6f7
|
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
|
4c5613084c
|
error
|
2 years ago |
|
withchao
|
3fe9ee22fe
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
1513933922
|
error
|
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
|
b26f115e67
|
makefile
|
2 years ago |
|
wangchuxiao
|
5b175377ee
|
makefile
|
2 years ago |
|
wangchuxiao
|
23c24308f7
|
makefile
|
2 years ago |
|
wangchuxiao
|
a2674bfe9f
|
modify dictory
|
2 years ago |
|
wangchuxiao
|
612fe2173e
|
modify dictory
|
2 years ago |
|
wangchuxiao
|
77b2d4aad0
|
modify dictory
|
2 years ago |
|
withchao
|
56306f33d7
|
validator
|
2 years ago |
|
wangchuxiao
|
e07c9077ca
|
proto modify
|
2 years ago |
|
wangchuxiao
|
a862fa3960
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
0ed07dfa2a
|
proto modify
|
2 years ago |
|
withchao
|
db89a13f65
|
solve error
|
2 years ago |
|
wangchuxiao
|
080dfa5563
|
proto modify
|
2 years ago |
|
wangchuxiao
|
de6fbf82e2
|
proto modify
|
2 years ago |
|
withchao
|
cdb8197156
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
b74e6b52f3
|
solve error
|
2 years ago |
|
wangchuxiao
|
3a93f60555
|
proto modify
|
2 years ago |
|
wangchuxiao
|
ebe689324b
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
3a23153e48
|
proto modify
|
2 years ago |
|
withchao
|
ebd1de919d
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/api/auth.go
|
2 years ago |
|
withchao
|
4deedb6856
|
api to rpc
|
2 years ago |
|
withchao
|
5e845c8fb6
|
api to rpc
|
2 years ago |
|
wangchuxiao
|
d06235d28e
|
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 |
|
withchao
|
6150419842
|
api
|
2 years ago |
|
wangchuxiao
|
bff7d0923a
|
proto modify
|
2 years ago |
|
wangchuxiao
|
d991947d4c
|
proto modify
|
2 years ago |
|
wangchuxiao
|
8d0148c4ba
|
proto modify
|
2 years ago |
|
wangchuxiao
|
0c417d3471
|
pb
|
2 years ago |
|
withchao
|
886818e54c
|
api pack move
|
2 years ago |
|
withchao
|
1538917089
|
api
|
2 years ago |
|
withchao
|
cae6c53b01
|
api resp
|
2 years ago |
|
withchao
|
4cf29ad565
|
group api
|
2 years ago |
|
withchao
|
586a113994
|
apitorpc group
|
2 years ago |
|
withchao
|
0411a5045b
|
api to rpc
|
2 years ago |
|
withchao
|
03ccd0131a
|
api2rpc
|
2 years ago |
|
withchao
|
e513a09e45
|
api2rpc
|
2 years ago |
|
withchao
|
08fdac83fc
|
api2rpc
|
2 years ago |
|
withchao
|
0547f25ecb
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/config/config.go
|
2 years ago |
|
withchao
|
c019dd5f1e
|
api2rpc
|
2 years ago |
|
wangchuxiao
|
4c426c7c7c
|
config modify
|
2 years ago |
|
withchao
|
d7640ca864
|
api2rpc
|
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
|
3106f671af
|
config path
|
2 years ago |
|
wangchuxiao
|
1e43ad2fc0
|
config path
|
2 years ago |
|
wangchuxiao
|
7930c230e4
|
config path
|
2 years ago |
|
wangchuxiao
|
c74841fd96
|
config path
|
2 years ago |
|
wangchuxiao
|
9f8833baa1
|
config path
|
2 years ago |
|
wangchuxiao
|
a26ca657fe
|
config path
|
2 years ago |
|
wangchuxiao
|
8bdf86172f
|
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
|
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
|
dae0c25a57
|
push
|
2 years ago |
|
wangchuxiao
|
432627353c
|
push
|
2 years ago |
|
withchao
|
22c372a9d0
|
GetSuperGroupOpenNotDisturbUserID
|
2 years ago |
|
Gordon
|
d54cab5d03
|
gateway update
|
2 years ago |
skiffer-git
|
d56fef0a88
|
Error code standardization
|
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 |
|
withchao
|
e94bf6216c
|
utils
|
2 years ago |
|
withchao
|
f9e09d67bb
|
utils
|
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
|
7e9b8f6808
|
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
|
5bb42593ba
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
762c49625c
|
group db tx
|
2 years ago |
|
skiffer-git
|
7338b633c8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
c318c62542
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d9359817c1
|
Error code standardization
|
2 years ago |
|
withchao
|
6ef8228064
|
group build pass
|
2 years ago |
|
wangchuxiao
|
5be441f4fd
|
errcode
|
2 years ago |
|
withchao
|
da9f4bb78e
|
rpc
|
2 years ago |
|
Gordon
|
1f7d2d73c7
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
ffdc7b8f9d
|
msggateway refactor
|
2 years ago |
|
withchao
|
fe2cf94d36
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
4683712e05
|
object storage
|
2 years ago |
|
wenxu12345
|
dc33071478
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
b6d19dba00
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
29a1f5b4f7
|
errcode
|
2 years ago |
|
Gordon
|
1ff8ba7fc2
|
message update
|
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
|
c93aa15473
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
5baf05ba5e
|
Error code standardization
|
2 years ago |
|
Gordon
|
83950263ad
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
71f1fcee57
|
msggateway refactor
|
2 years ago |
