4783 Commits

Author SHA1 Message Date
wangchuxiao
b6d19dba00 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-16 15:21:08 +08:00
wangchuxiao
29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
Gordon
1ff8ba7fc2 message update 2023-02-15 19:57:16 +08:00
withchao
f517e63fca Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-15 17:01:10 +08:00
withchao
bedb9e117b code error 2023-02-15 17:00:55 +08:00
wangchuxiao
0d0a90a14b errcode 2023-02-15 17:00:43 +08:00
wangchuxiao
52a0a8aca4 errcode 2023-02-15 16:09:00 +08:00
wangchuxiao
3cc8e6a0a0 errcode 2023-02-15 16:06:12 +08:00
wangchuxiao
b2cdf4279d errcode 2023-02-15 16:05:54 +08:00
wangchuxiao
1b3eaed0e5 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	cmd/rpc/auth/main.go
	cmd/rpc/friend/main.go
	cmd/rpc/group/main.go
	cmd/rpc/msg/main.go
	cmd/rpc/user/main.go
	internal/rpc/auth/auth.go
	internal/rpc/conversation/conversaion.go
	internal/rpc/friend/friend.go
	internal/rpc/group/callback.go
	internal/rpc/group/group.go
	internal/rpc/msg/pull_message.go
	internal/rpc/msg/query_msg.go
	internal/rpc/msg/rpc_chat.go
	internal/rpc/msg/send_msg.go
	internal/rpc/user/user.go
	pkg/common/db/cache/redis.go
	pkg/common/db/controller/msg.go
	pkg/common/http/http_client.go
2023-02-15 16:03:31 +08:00
wangchuxiao
6619183a48 errcode 2023-02-15 15:52:32 +08:00
withchao
ed466387e4 callback 2023-02-15 15:50:52 +08:00
skiffer-git
c93aa15473 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 22:04:29 +08:00
skiffer-git
5baf05ba5e Error code standardization 2023-02-14 22:04:03 +08:00
Gordon
83950263ad Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 21:08:55 +08:00
Gordon
71f1fcee57 msggateway refactor 2023-02-14 21:08:36 +08:00
skiffer-git
64caafd6b6 Error code standardization 2023-02-14 20:01:44 +08:00
skiffer-git
e070a602f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 19:34:39 +08:00
skiffer-git
dea9a4c8fa Error code standardization 2023-02-14 19:34:19 +08:00
withchao
0f776fb2f3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 19:29:15 +08:00
withchao
e147dc5b1b callback start 2023-02-14 19:28:57 +08:00
skiffer-git
c63b543a4a Error code standardization 2023-02-14 17:20:39 +08:00
withchao
e83a070e81 group 2023-02-14 16:37:10 +08:00
withchao
d4b125d010 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-02-14 16:36:08 +08:00
withchao
bba819854c group 2023-02-14 16:33:18 +08:00
skiffer-git
f40ae89c8c Error code standardization 2023-02-14 16:21:25 +08:00
skiffer-git
12eba46dab Error code standardization 2023-02-14 16:07:35 +08:00
withchao
446ac63898 callback 2023-02-14 15:20:02 +08:00
withchao
7c00d0f621 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-02-14 15:18:22 +08:00
skiffer-git
8f30818328 Error code standardization 2023-02-14 15:17:56 +08:00
withchao
5d66ff951c Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 15:07:24 +08:00
withchao
1ae1f77a14 msg cb 2023-02-14 15:02:45 +08:00
skiffer-git
c237510080 Error code standardization 2023-02-14 12:10:15 +08:00
skiffer-git
9eb0ee55f3 Error code standardization 2023-02-14 12:06:58 +08:00
skiffer-git
731112e61b Error code standardization 2023-02-14 11:55:50 +08:00
skiffer-git
461fd5f1ff Error code standardization 2023-02-14 11:49:42 +08:00
withchao
8435508f35 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 11:47:39 +08:00
skiffer-git
20829cdd28 Error code standardization 2023-02-14 11:41:04 +08:00
withchao
4d8e19c6bb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 11:40:41 +08:00
withchao
f5c4e755eb rpc start 2023-02-14 11:37:19 +08:00
skiffer-git
05d00a8174 Error code standardization 2023-02-14 11:33:10 +08:00
skiffer-git
b7d724a5e4 Error code standardization 2023-02-14 10:57:52 +08:00
skiffer-git
42c0e014e7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 10:34:55 +08:00
skiffer-git
e1b6e054f0 Error code standardization 2023-02-14 10:34:34 +08:00
withchao
a61a3253a5 group rpc GetGroupMemberRoleLevel 2023-02-14 10:33:15 +08:00
skiffer-git
c5f1c940d8 Error code standardization 2023-02-14 09:05:38 +08:00
skiffer-git
b7645ffda6 Error code standardization 2023-02-13 21:45:45 +08:00
skiffer-git
b27aa040f7 Error code standardization 2023-02-13 21:36:08 +08:00
skiffer-git
4cb7a286b9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-13 20:58:22 +08:00
skiffer-git
1ed62aad97 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/common/notification/conversation.go
#	internal/rpc/msg/send_msg.go
2023-02-13 20:57:44 +08:00