blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,218 Commits 40 Branches 130 Tags
Commit Graph

2660 Commits

Author SHA1 Message Date
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
 2023-03-16 10:51:00 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
Gordon
574399669c log remove 2023-03-16 10:20:40 +08:00
wangchuxiao
2a60974ebd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 17:59:56 +08:00
wangchuxiao
51d8c0ba51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 17:59:38 +08:00
Gordon
f2d33991e1 parse token 2023-03-15 17:11:23 +08:00
Gordon
b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
Gordon
5b4cc786ed log update 2023-03-15 14:50:23 +08:00
Gordon
a40ad5df68 log update 2023-03-15 14:38:11 +08:00
Gordon
a03bdb35ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:40:54 +08:00
Gordon
41fb79d995 remove statistic 2023-03-15 11:40:22 +08:00
withchao
eba9b8ad44 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:25:18 +08:00
withchao
e9865539de s3 2023-03-15 11:24:59 +08:00
Gordon
a74c60927f Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:09:31 +08:00
Gordon
49f855e1d1 log update 2023-03-15 11:09:01 +08:00
wangchuxiao
fcbcfbb17c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-14 20:09:26 +08:00
wangchuxiao
2a49abc74a zap 2023-03-14 20:05:48 +08:00
withchao
188dc6d322 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/controller/storage.go
 2023-03-14 19:39:34 +08:00
withchao
6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao
fdf20f31c3 zap 2023-03-14 18:55:32 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao
c33dab0e30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 16:14:19 +08:00
withchao
9bb30406ee api error 2023-03-14 16:13:00 +08:00
wangchuxiao
845f858e7a zap 2023-03-14 16:09:20 +08:00
wangchuxiao
6afb47ba06 zap 2023-03-14 15:35:58 +08:00
wangchuxiao
4547e809bf connID to md5 2023-03-13 18:23:43 +08:00
wangchuxiao
27a1197a97 connID to md5 2023-03-13 18:08:24 +08:00
wangchuxiao
bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
wangchuxiao
217765be6e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 15:39:54 +08:00
wangchuxiao
eb946ad181 log 2023-03-13 15:39:47 +08:00
Gordon
cf29bd6227 zk add client options 2023-03-13 13:59:39 +08:00
Gordon
8a44305440 zk add client options 2023-03-13 13:52:25 +08:00
Gordon
fed4dbd54f zk add client options 2023-03-13 13:31:40 +08:00
wangchuxiao
6187b15a88 log 2023-03-13 13:21:55 +08:00
Gordon
63cf4a60ae ctx error 2023-03-13 13:05:50 +08:00
Gordon
e243012438 ctx error 2023-03-13 12:59:44 +08:00
Gordon
bc2ae99ba7 test 2023-03-13 11:40:16 +08:00
Gordon
cddf35fb2b test 2023-03-13 11:32:32 +08:00
Gordon
6780be6d56 test 2023-03-13 11:25:52 +08:00
Gordon
01a27008a1 Revert "test" 
This reverts commit b61ab1201ae4aeb649b49b93df0fac9753010377.
 2023-03-10 21:04:38 +08:00
Gordon
b61ab1201a test 2023-03-10 20:33:37 +08:00
Gordon
ef0b9a9ebe test 2023-03-10 20:16:27 +08:00
Gordon
768f1ce032 test 2023-03-10 20:04:53 +08:00
Gordon
abc303d1b3 add log 2023-03-10 19:34:24 +08:00
wangchuxiao
662254f30f fix cron 2023-03-10 18:37:36 +08:00
wangchuxiao
d545a7f753 fix cron 2023-03-10 16:47:22 +08:00
wangchuxiao
c558bfa3ee log 2023-03-10 15:06:57 +08:00
wangchuxiao
4f0813889c log 2023-03-10 11:59:50 +08:00
wangchuxiao
c0afe5d24a log 2023-03-10 11:47:53 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00