25 Commits

Author SHA1 Message Date
wangchuxiao
be11da75ae Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/delete.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/table/unrelation/extend_msg_set.go
2023-02-23 19:17:23 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
withchao
2f1c064413 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	internal/push/init.go
#	pkg/common/db/cache/redis.go
#	pkg/common/db/controller/msg.go
2023-02-23 18:42:56 +08:00
wangchuxiao
9c76722c90 push 2023-02-23 18:20:45 +08:00
withchao
2af2716c2c msg database 2023-02-23 18:17:17 +08:00
wangchuxiao
4fc00109ef push 2023-02-23 17:28:57 +08:00
wangchuxiao
e1a27e6aea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	cmd/api/main.go
	go.mod
	internal/push/fcm/push.go
	internal/push/getui/push.go
	internal/push/logic/init.go
	internal/push/logic/push_to_client.go
	internal/push/push_rpc_server.go
	internal/rpc/conversation/conversaion.go
	pkg/common/db/controller/group.go
	pkg/proto/push/push.pb.go
2023-02-22 19:52:53 +08:00
wangchuxiao
94d50a6c71 push 2023-02-22 19:51:14 +08:00
skiffer-git
7338b633c8 Error code standardization 2023-02-20 17:13:15 +08:00
withchao
6ef8228064 group build pass 2023-02-20 10:49:39 +08:00
wangchuxiao
29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
wangchuxiao
0d0a90a14b errcode 2023-02-15 17:00:43 +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
skiffer-git
64caafd6b6 Error code standardization 2023-02-14 20:01:44 +08:00
withchao
bba819854c group 2023-02-14 16:33:18 +08:00
withchao
048d4b83e1 rpc start 2023-02-13 17:44:22 +08:00
wangchuxiao
6eb231aae4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go
	pkg/proto/group/group.proto
2023-02-09 20:39:12 +08:00
wangchuxiao
759432794f errcode 2023-02-09 20:36:34 +08:00
skiffer-git
d26daa23f1 Error code standardization 2023-02-09 17:55:59 +08:00
wangchuxiao
414915eb3b errcode 2023-02-09 14:40:49 +08:00
wangchuxiao
47b725ac69 errcode 2023-02-02 19:40:54 +08:00
wangchuxiao
15166f53b0 errcode 2023-01-29 11:37:11 +08:00
wangchuxiao
3751e633e4 groupdb 2023-01-17 16:36:34 +08:00
wangchuxiao
822db2a63e groupdb 2023-01-16 20:14:26 +08:00