IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,248 Commits 35 Branches 142 Tags
92d941b74773cd0fb7a71718e8580ea359f52291
Commit Graph

1780 Commits

Author SHA1 Message Date
Gordon 007e0cff26 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 17:44:03 +08:00
Gordon 1117488eec user update 2023-03-16 17:43:30 +08:00
wangchuxiao 57c082c545 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 17:01:31 +08:00
wangchuxiao 5a886f6837 db 2023-03-16 17:01:17 +08:00
Gordon f3937499fa user update 2023-03-16 17:00:10 +08:00
withchao 0fd1e785fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 16:33:33 +08:00
withchao 1f935531f6 code error 2023-03-16 16:32:42 +08:00
wangchuxiao d725b9538f db 2023-03-16 16:23:56 +08:00
Gordon ce87ef0a04 conversation update 2023-03-16 15:10:23 +08:00
Gordon 1f03ebdbe7 user update 2023-03-16 12:53:29 +08:00
Gordon 6ce1c6c048 user update 2023-03-16 12:42:34 +08:00
Gordon 9a0f9c2270 user update 2023-03-16 12:32:25 +08:00
Gordon baae7875aa Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 12:07:57 +08:00
Gordon e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao a8dd306196 db 2023-03-16 12:00:14 +08:00
wangchuxiao 642743957e db 2023-03-16 11:43:08 +08:00
wangchuxiao be847d5d5e db 2023-03-16 11:41:38 +08:00
wangchuxiao 690a2195da Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/controller/friend.go
 2023-03-16 11:03:57 +08:00
wangchuxiao 63f5169dbe db 2023-03-16 11:03:14 +08:00
withchao a529ba4f5b packet name pb 2023-03-16 10:52:50 +08:00
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
wangchuxiao a0f3307fe3 db 2023-03-16 10:45:56 +08:00
wangchuxiao e888910f3c db 2023-03-15 18:41:22 +08:00
wangchuxiao cc93335d7f db 2023-03-15 18:36:00 +08:00
wangchuxiao 74d1d760aa db 2023-03-15 18:35:06 +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 970e6c40b4 parse token 2023-03-15 17:01:54 +08:00
Gordon 7b17ed6303 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 16:52:58 +08:00
Gordon 808cd69429 parse token 2023-03-15 16:52:29 +08:00
wangchuxiao cbfe679f06 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 16:51:44 +08:00
wangchuxiao 42c9cc61ab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:51:29 +08:00
wangchuxiao d75d1f57e4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:45:17 +08:00
Gordon 460cf8d8ba parse token 2023-03-15 16:39:11 +08:00
Gordon b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
wangchuxiao becd3eb8f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:30:10 +08:00
wangchuxiao 8dea2cacf4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:29:04 +08:00
wangchuxiao d5b721be30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:10:34 +08:00
wangchuxiao 14e3e561ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:56:37 +08:00
wangchuxiao 4866e88eab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:56:13 +08:00
wangchuxiao fab8277086 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:40:19 +08:00
wangchuxiao e2421d7aa2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:33:23 +08:00
wangchuxiao ea8de45a6c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:29:58 +08:00
wangchuxiao 6c1525bd62 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 15:27:01 +08:00
wangchuxiao 15d48fb0ad Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:26:37 +08:00
Gordon cb4b41476b log update 2023-03-15 13:41:58 +08:00
Gordon 4680b1e6be log update 2023-03-15 13:37:17 +08:00
Gordon 8d8c5071b5 remove statistic 2023-03-15 12:03:14 +08:00
withchao eba9b8ad44 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:25:18 +08:00