393 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
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
b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao
6afb47ba06 zap 2023-03-14 15:35:58 +08:00
wangchuxiao
bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
wangchuxiao
eb946ad181 log 2023-03-13 15:39:47 +08:00
wangchuxiao
6187b15a88 log 2023-03-13 13:21:55 +08:00
wangchuxiao
4792ab7489 log 2023-03-13 13:16:53 +08:00
wangchuxiao
9fcfdc9fab log 2023-03-13 12:34:56 +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
662254f30f fix cron 2023-03-10 18:37:36 +08:00
wangchuxiao
acadfd2c35 script 2023-03-09 15:17:46 +08:00
wangchuxiao
ae2e09e48b script 2023-03-09 14:59:45 +08:00
wangchuxiao
82f499f942 script 2023-03-09 14:54:05 +08:00
wangchuxiao
10cf431ccf script 2023-03-09 14:43:09 +08:00
wangchuxiao
0c98231fcd script 2023-03-09 13:26:58 +08:00
wangchuxiao
046d645ef6 script 2023-03-09 12:50:39 +08:00
wangchuxiao
8904ebccbc script 2023-03-09 12:46:56 +08:00
wangchuxiao
fae6fdc3ed script 2023-03-09 12:34:08 +08:00
wangchuxiao
d3b711e91b script 2023-03-08 19:25:27 +08:00
Gordon
7f3ee77116 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/msggateway/main.go
#	go.sum
#	internal/msggateway/init.go
2023-03-08 18:42:25 +08:00
Gordon
52e03b0149 gateway update 2023-03-08 18:39:18 +08:00
wangchuxiao
540c33ba74 script 2023-03-08 18:38:35 +08:00
wangchuxiao
9ce50095b5 cobra 2023-03-08 17:29:03 +08:00
wangchuxiao
f8ad35a6f7 cobra 2023-03-08 13:34:12 +08:00
wangchuxiao
e55167d0bf test cobra 2023-03-08 11:45:54 +08:00
wangchuxiao
e7f6f0f93e test cobra 2023-03-07 20:32:57 +08:00
wangchuxiao
2c91185102 test cobra 2023-03-07 20:31:40 +08:00
wangchuxiao
320c978e94 test cobra 2023-03-07 20:07:13 +08:00
wangchuxiao
f5309ee3b8 test cobra 2023-03-07 19:56:22 +08:00
wangchuxiao
6bb8160a99 test cobra 2023-03-07 18:32:20 +08:00
wangchuxiao
6eb13df2e2 test cobra 2023-03-07 18:06:57 +08:00
wangchuxiao
32af58e861 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	cmd/cmdutils/main.go
2023-03-07 18:01:36 +08:00
wangchuxiao
ea614167a6 test cobra 2023-03-07 17:59:34 +08:00
withchao
d80cf34f26 rpc mw 2023-03-07 17:21:48 +08:00
withchao
555fc52acc Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-07 12:19:38 +08:00
withchao
4c5613084c error 2023-03-07 12:19:30 +08:00
wangchuxiao
52d8ec6aee test cobra 2023-03-07 12:12:16 +08:00
wangchuxiao
373b317b1a test cobra 2023-03-06 18:47:48 +08:00
wangchuxiao
757fd4bf0b test cobra 2023-03-06 18:41:59 +08:00
wangchuxiao
5a77f91fa0 test cobra 2023-03-06 18:35:17 +08:00
wangchuxiao
757a668047 test cobra 2023-03-06 18:29:44 +08:00
wangchuxiao
6ca1d403b2 test cobra 2023-03-06 18:26:23 +08:00
wangchuxiao
8143d589aa makefile 2023-03-06 16:00:23 +08:00
wangchuxiao
bfb67ed6b7 makefile 2023-03-06 15:03:29 +08:00
wangchuxiao
15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
wangchuxiao
df6eb2e6f1 modify dictory 2023-03-06 11:09:56 +08:00