71 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
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
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
wangchuxiao
3bc6e66b1a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:30:04 +08:00
wangchuxiao
6de048d84f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:16:52 +08:00
wangchuxiao
2a49abc74a zap 2023-03-14 20:05:48 +08:00
wangchuxiao
9995b1c8ab zap 2023-03-14 19:41:26 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao
b2e4dce77a zap 2023-03-14 18:07:32 +08:00
wangchuxiao
5310f60422 zap 2023-03-14 17:51:11 +08:00
wangchuxiao
5c6141d0e6 zap 2023-03-14 16:19:28 +08:00
wangchuxiao
6afb47ba06 zap 2023-03-14 15:35:58 +08:00
wangchuxiao
2f6c5c6fe2 zap 2023-03-14 14:35:31 +08:00
wangchuxiao
3f74d076f2 zap 2023-03-14 14:29:34 +08:00
wangchuxiao
9d80220d68 zap 2023-03-14 13:35:41 +08:00
wangchuxiao
2c08e1c361 zap 2023-03-14 13:32:35 +08:00
wangchuxiao
656206c95a zap 2023-03-14 13:26:49 +08:00
wangchuxiao
2d476021a6 zap 2023-03-14 12:36:53 +08:00
wangchuxiao
b67ce3c462 zap 2023-03-14 12:33:26 +08:00
wangchuxiao
311cdbfdae zap 2023-03-14 12:21:12 +08:00
wangchuxiao
102c300f24 zap 2023-03-14 12:11:22 +08:00
wangchuxiao
daffe8a7b7 zap 2023-03-14 12:07:25 +08:00
wangchuxiao
eeffefc9fc zap 2023-03-14 11:09:55 +08:00
wangchuxiao
83b7794836 connID to md5 2023-03-13 18:36:11 +08:00
wangchuxiao
bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
wangchuxiao
9fcfdc9fab log 2023-03-13 12:34:56 +08:00
wangchuxiao
9709271ae3 log 2023-03-13 10:21:50 +08:00
wangchuxiao
04068d25cb fix cron 2023-03-13 10:14:02 +08:00
wangchuxiao
c7a8536278 fix cron 2023-03-13 10:10:50 +08:00
wangchuxiao
d73ab781fe fix cron 2023-03-13 10:03:23 +08:00
wangchuxiao
7f861fa5c3 log 2023-03-09 16:36:47 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
wangchuxiao
29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
withchao
d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
wangchuxiao
26ed14d1d3 errcode 2023-01-30 11:14:18 +08:00
wangchuxiao
21a1e7dff2 errcode 2023-01-30 11:10:26 +08:00
wangchuxiao
cc1a9e1d4a log 2023-01-12 18:21:39 +08:00
wangchuxiao
fcb7639833 log 2023-01-12 18:14:33 +08:00
wangchuxiao
82c32d24a1 log 2023-01-12 18:09:13 +08:00
wangchuxiao
022da8bdbd log 2023-01-12 17:49:36 +08:00
wangchuxiao
35774878db log 2023-01-12 17:26:10 +08:00
wangchuxiao
653fce11da log 2023-01-12 17:08:10 +08:00
wangchuxiao
fd7b0da269 log 2023-01-12 16:45:50 +08:00
wangchuxiao
09244e757f log 2023-01-12 16:06:21 +08:00
wangchuxiao
6205c67b70 log 2023-01-12 15:55:44 +08:00
Gordon
5c503e71ed message update 2022-11-02 15:32:36 +08:00
Gordon
765e8d4f79 log test 2022-09-10 00:15:31 +08:00
Gordon
cf14b19bf6 log test 2022-09-09 23:40:35 +08:00
wangchuxiao
bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00