63 Commits

Author SHA1 Message Date
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
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
withchao
da9f4bb78e rpc 2023-02-20 10:10:02 +08:00
withchao
5e6f9448bc gorm db 2023-02-16 17:20:08 +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
Gordon
0f5cfbb2dc Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 20:58:54 +08:00
Gordon
a3593379f6 conversation update 2023-02-10 20:57:45 +08:00
withchao
dbf41bf21f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/callback.go
2023-02-10 19:18:29 +08:00
withchao
09c6fbdfe4 group 2023-02-10 19:17:33 +08:00
wangchuxiao
4aaac8595a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-02-10 15:47:02 +08:00
wangchuxiao
0e97285e0a errcode 2023-02-10 15:46:29 +08:00
withchao
1e1c6de56e group nickname 2023-02-10 15:36:25 +08:00
withchao
5d7809624c group cache 2023-02-10 10:48:49 +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
withchao
a15051bfde Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 19:42:16 +08:00
withchao
d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
skiffer-git
bfc202f31f Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 17:57:02 +08:00
skiffer-git
d26daa23f1 Error code standardization 2023-02-09 17:55:59 +08:00
withchao
5da1195274 group cache 2023-02-09 17:54:31 +08:00
wangchuxiao
8a1702fcf7 errcode 2023-02-09 16:15:18 +08:00
wangchuxiao
ccc7e6b3c8 errcode 2023-02-09 16:11:18 +08:00
wangchuxiao
414915eb3b errcode 2023-02-09 14:40:49 +08:00
wangchuxiao
62f0d1043d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/cache/conversation.go
	pkg/common/db/cache/group.go
	pkg/common/db/controller/group.go
2023-02-09 10:57:57 +08:00
wangchuxiao
4826810c2a errcode 2023-02-09 10:55:21 +08:00
withchao
f20e9e71b7 group complete 2023-02-08 20:08:22 +08:00
withchao
b3ae69ce94 conversation.go 2023-02-08 19:18:11 +08:00
wangchuxiao
db51bc87e2 errcode 2023-02-08 18:29:11 +08:00
wangchuxiao
84c59cecfb errcode 2023-02-07 18:46:19 +08:00
wangchuxiao
8fc54a7379 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/cache/conversation.go
2023-02-07 18:45:54 +08:00
wangchuxiao
f4baf847ca errcode 2023-02-07 18:43:43 +08:00
withchao
a2c4bccdb6 1 2023-02-03 16:10:51 +08:00
Gordon
3b4c227519 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 15:54:23 +08:00
wangchuxiao
b637a29348 errcode 2023-02-03 12:16:48 +08:00
Gordon
e167d80469 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 10:26:26 +08:00
Gordon
730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao
01f7262d3a errcode 2023-02-02 19:43:51 +08:00
wangchuxiao
47b725ac69 errcode 2023-02-02 19:40:54 +08:00
wangchuxiao
f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
wangchuxiao
c2fbcd1f22 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
2023-02-01 17:13:06 +08:00
withchao
0f3691893e 1 2023-02-01 17:07:56 +08:00
wangchuxiao
40470bc320 errcode 2023-02-01 11:23:01 +08:00