135 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
wangchuxiao
e888910f3c db 2023-03-15 18:41:22 +08:00
wangchuxiao
74d1d760aa db 2023-03-15 18:35:06 +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
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
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
wangchuxiao
726f83a683 zap 2023-03-14 18:54:43 +08:00
wangchuxiao
5a3cea56fa zap 2023-03-14 18:50:49 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
withchao
b5a080623c special error 2023-03-14 15:42:52 +08:00
withchao
6d03169f12 special error 2023-03-14 14:25:02 +08:00
wangchuxiao
eeffefc9fc zap 2023-03-14 11:09:55 +08:00
wangchuxiao
8c931818fd connID to md5 2023-03-13 19:54:19 +08:00
wangchuxiao
a018245d43 connID to md5 2023-03-13 19:47:49 +08:00
wangchuxiao
8b3ca92457 connID to md5 2023-03-13 19:41:35 +08:00
wangchuxiao
2986227f1c connID to md5 2023-03-13 19:36:19 +08:00
wangchuxiao
0b1c198dfe connID to md5 2023-03-13 18:58:45 +08:00
wangchuxiao
54a74c0b82 connID to md5 2023-03-13 18:55:00 +08:00
wangchuxiao
e28e6891d4 connID to md5 2023-03-13 18:41:14 +08:00
wangchuxiao
83b7794836 connID to md5 2023-03-13 18:36:11 +08:00
Gordon
9a68a9645a rpc add data 2023-03-13 14:21:41 +08:00
Gordon
59b99edf79 rpc add data 2023-03-13 14:18:33 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00
withchao
3ea0d1f765 s3 complete 2023-03-06 16:40:57 +08:00
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
2023-03-03 17:45:15 +08:00
wangchuxiao
96d9b25b57 proto modify 2023-03-03 17:42:26 +08:00
withchao
e93425c574 api rpc third 2023-03-03 17:20:36 +08:00
wangchuxiao
66aaa9b152 config path 2023-02-24 11:06:49 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
wangchuxiao
4fc00109ef push 2023-02-23 17:28:57 +08:00
withchao
b4443c843a GetSuperGroupOpenNotDisturbUserID -> GetRecvMsgNotNotifyUserIDs 2023-02-23 11:04:51 +08:00
withchao
3bae8edb39 conversation 2023-02-22 14:31:30 +08:00
skiffer-git
5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
skiffer-git
ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git
6201e5c206 Error code standardization 2023-02-21 13:14:19 +08:00
skiffer-git
be1bf240ad Error code standardization 2023-02-21 12:59:44 +08:00
skiffer-git
e27d66cd2e Error code standardization 2023-02-21 10:29:09 +08:00
withchao
f5fbe1d852 gorm conn 2023-02-21 10:16:58 +08:00
withchao
5bb42593ba Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:44:28 +08:00