219 Commits

Author SHA1 Message Date
withchao
b74e6b52f3 solve error 2023-03-03 18:59:28 +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
wangchuxiao
d991947d4c proto modify 2023-03-02 12:00:31 +08:00
wangchuxiao
8d0148c4ba proto modify 2023-03-01 15:32:26 +08:00
wangchuxiao
ffaf0bd021 config path 2023-02-24 11:37:40 +08:00
wangchuxiao
2a0ad5c7af config path 2023-02-24 11:15:40 +08:00
wangchuxiao
92764b3727 config path 2023-02-24 11:13:16 +08:00
wangchuxiao
66aaa9b152 config path 2023-02-24 11:06:49 +08:00
wangchuxiao
bb94a7947c config path 2023-02-24 11:01:33 +08:00
wangchuxiao
dd7a7d9cda config path 2023-02-24 10:47:36 +08:00
wangchuxiao
8bdf86172f push 2023-02-23 19:20:58 +08:00
wangchuxiao
76565cded1 push 2023-02-23 19:19:01 +08:00
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
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
withchao
2359d7ab37 msg database 2023-02-23 11:57:54 +08:00
withchao
eac2619c33 msg 2023-02-23 11:26:46 +08:00
withchao
b4443c843a GetSuperGroupOpenNotDisturbUserID -> GetRecvMsgNotNotifyUserIDs 2023-02-23 11:04:51 +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
withchao
f3e37650c6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-22 14:38:27 +08:00
withchao
3bae8edb39 conversation 2023-02-22 14:31:30 +08:00
skiffer-git
28fb738410 Error code standardization 2023-02-22 12:17:59 +08:00
withchao
cd00d91eee group db 2023-02-22 11:35:24 +08:00
skiffer-git
62a2cf2976 Error code standardization 2023-02-22 10:52:51 +08:00
skiffer-git
5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
skiffer-git
ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git
9e4b59034d Error code standardization 2023-02-21 14:30:08 +08:00
skiffer-git
6201e5c206 Error code standardization 2023-02-21 13:14:19 +08:00
skiffer-git
be1bf240ad Error code standardization 2023-02-21 12:59:44 +08:00
skiffer-git
e27d66cd2e Error code standardization 2023-02-21 10:29:09 +08:00
withchao
5bb42593ba Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:44:28 +08:00
withchao
762c49625c group db tx 2023-02-20 17:43:09 +08:00
skiffer-git
9b0682705e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:13:37 +08:00
skiffer-git
7338b633c8 Error code standardization 2023-02-20 17:13:15 +08:00
Gordon
141cfef1b6 conversation update 2023-02-20 16:42:52 +08:00
withchao
20ba4e33e8 db 2023-02-16 17:08:24 +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
52a0a8aca4 errcode 2023-02-15 16:09:00 +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
skiffer-git
64caafd6b6 Error code standardization 2023-02-14 20:01:44 +08:00
withchao
e147dc5b1b callback start 2023-02-14 19:28:57 +08:00
withchao
d7ea41fa1a msg rpc 2023-02-13 18:14:26 +08:00