32 Commits

Author SHA1 Message Date
wangchuxiao
ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
withchao
c331d6f200 code error 2023-03-16 18:54:01 +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
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
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
withchao
6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao
4f0813889c log 2023-03-10 11:59:50 +08:00
wangchuxiao
cfefc757af log 2023-03-09 20:12:58 +08:00
wangchuxiao
549a0aceb0 log 2023-03-09 20:05:18 +08:00
wangchuxiao
9ce50095b5 cobra 2023-03-08 17:29:03 +08:00
withchao
d80cf34f26 rpc mw 2023-03-07 17:21:48 +08:00
withchao
102ab98276 rpc mw 2023-03-07 16:57:49 +08:00
withchao
db89a13f65 solve error 2023-03-03 19:51:03 +08:00
wangchuxiao
080dfa5563 proto modify 2023-03-03 19:45:15 +08:00
wangchuxiao
de6fbf82e2 proto modify 2023-03-03 19:44:34 +08:00
wangchuxiao
3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
wangchuxiao
d06235d28e proto modify 2023-03-03 18:08:26 +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
withchao
6150419842 api 2023-03-02 14:41:59 +08:00
withchao
886818e54c api pack move 2023-02-28 14:20:26 +08:00
withchao
1538917089 api 2023-02-28 11:38:05 +08:00
withchao
4cf29ad565 group api 2023-02-27 18:11:00 +08:00
withchao
586a113994 apitorpc group 2023-02-27 15:13:39 +08:00
withchao
0411a5045b api to rpc 2023-02-27 14:44:14 +08:00
wangchuxiao
92764b3727 config path 2023-02-24 11:13:16 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00