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

..

apistruct

errcode

2023-02-10 18:13:58 +08:00

callbackstruct

callback

2023-02-15 15:50:52 +08:00

common

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

2023-02-15 16:03:31 +08:00

discoveryregistry

errcode

2023-02-09 16:11:18 +08:00

proto

Error code standardization

2023-02-14 22:04:03 +08:00

statistics

statistic update

2022-05-18 21:58:32 +08:00

utils

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

2023-02-15 16:03:31 +08:00