112 Commits

Author SHA1 Message Date
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
a92dd54354 errcode 2023-02-10 18:13:58 +08:00
wangchuxiao
2e3bb941b0 errcode 2023-02-10 17:02:20 +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
wangchuxiao
79c30fdc69 errcode 2023-02-10 11:03:03 +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
withchao
ab30c77836 group db 2023-02-09 16:33:40 +08:00
wangchuxiao
ccc7e6b3c8 errcode 2023-02-09 16:11:18 +08:00
wangchuxiao
1075754458 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
2023-02-09 14:49:17 +08:00
wangchuxiao
414915eb3b errcode 2023-02-09 14:40:49 +08:00
skiffer-git
22f4d8f66d Error code standardization 2023-02-09 13:05:12 +08:00
skiffer-git
96ef753c77 Error code standardization 2023-02-09 13:02:10 +08:00
skiffer-git
ca6b704377 Error code standardization 2023-02-09 12:52:47 +08:00
skiffer-git
ac284b696a Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	pkg/common/db/controller/user.go
2023-02-09 10:59:32 +08:00
skiffer-git
9a7ed2d24d Error code standardization 2023-02-09 10:58:30 +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
withchao
41d62937ff group rpc 2023-02-09 10:27:55 +08:00
withchao
f20e9e71b7 group complete 2023-02-08 20:08:22 +08:00
withchao
324a0ae0ae super group rpc 2023-02-08 18:30:45 +08:00
wangchuxiao
db51bc87e2 errcode 2023-02-08 18:29:11 +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
withchao
77edbe1edd group controller 2023-02-08 14:41:09 +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
withchao
1716de808f realization group rpc 2023-02-07 16:31:12 +08:00
withchao
26794503c3 realization group rpc 2023-02-07 15:48:18 +08:00
withchao
4645eec8b6 realization group rpc 2023-02-07 15:11:31 +08:00
withchao
4f96cc9b1b group rpc 2023-02-06 18:33:33 +08:00
withchao
210d04d488 rpc GroupApplicationResponse 2023-02-06 15:32:20 +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