135 Commits

Author SHA1 Message Date
withchao
762c49625c group db tx 2023-02-20 17:43:09 +08:00
Gordon
141cfef1b6 conversation update 2023-02-20 16:42:52 +08:00
withchao
6ef8228064 group build pass 2023-02-20 10:49:39 +08:00
withchao
5e6f9448bc gorm db 2023-02-16 17:20:08 +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
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
c63b543a4a Error code standardization 2023-02-14 17:20:39 +08:00
withchao
bba819854c group 2023-02-14 16:33:18 +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
wangchuxiao
a92dd54354 errcode 2023-02-10 18:13:58 +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
ab30c77836 group db 2023-02-09 16:33:40 +08:00
skiffer-git
772a46e041 Error code standardization 2023-02-09 13:06:22 +08:00
skiffer-git
ca6b704377 Error code standardization 2023-02-09 12:52:47 +08:00
wangchuxiao
8c6c7ee21f errcode 2023-02-09 11:25:19 +08:00
withchao
41d62937ff group rpc 2023-02-09 10:27:55 +08:00
withchao
f20e9e71b7 group complete 2023-02-08 20:08:22 +08:00
wangchuxiao
6d700765d2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-08 17:56:21 +08:00
wangchuxiao
2193d380ca errcode 2023-02-08 17:56:04 +08:00
withchao
f5adb7a17e group database 2023-02-08 17:23:14 +08:00
withchao
3423b224fd group db 2023-02-08 15:25:25 +08:00
skiffer-git
0565474732 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	go.sum
2023-02-07 20:30:55 +08:00
skiffer-git
0a2e55311c Error code standardization 2023-02-07 20:28:34 +08:00
withchao
66b6d5fc2f group db 2023-02-07 18:36:47 +08:00
withchao
cfa5420d9d group func name 2023-02-07 17:16:04 +08:00
skiffer-git
d59c4367fb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:51:57 +08:00
skiffer-git
22c63ecdbd Error code standardization 2023-02-03 16:51:35 +08:00
Gordon
99504eec2e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
2023-02-03 16:23:47 +08:00
skiffer-git
1aa3ac9399 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/controller/friend.go
#	pkg/common/db/relation/friend_model_k.go
#	pkg/common/db/relation/friend_request_model.go
2023-02-03 16:11:29 +08:00
skiffer-git
3320f81c8f Error code standardization 2023-02-03 16:10:33 +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
83eba5a9ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 19:41:11 +08:00
wangchuxiao
47b725ac69 errcode 2023-02-02 19:40:54 +08:00
skiffer-git
5402d33519 Error code standardization 2023-02-02 16:39:29 +08:00
wangchuxiao
f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
wangchuxiao
803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
skiffer-git
2e19e3109e Error code standardization 2023-02-01 17:39:08 +08:00
skiffer-git
1d42c220af Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:21:30 +08:00
skiffer-git
cbe68507f3 Error code standardization 2023-02-01 17:20:55 +08:00
withchao
d67515f53f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:12:00 +08:00
withchao
0f3691893e 1 2023-02-01 17:07:56 +08:00
skiffer-git
fb436e7713 Error code standardization 2023-02-01 16:44:50 +08:00
Gordon
80bde864c1 friend update 2023-02-01 16:19:44 +08:00