1195 Commits

Author SHA1 Message Date
withchao
be39542832 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 16:06:46 +08:00
withchao
69e94c25f4 1 2023-01-12 16:04:12 +08:00
wangchuxiao
ff524b0ee7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 16:01:20 +08:00
wangchuxiao
1a32b49662 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 15:58:26 +08:00
wangchuxiao
6205c67b70 log 2023-01-12 15:55:44 +08:00
withchao
3b82fbe4ca 1 2023-01-12 14:23:00 +08:00
wangchuxiao
47766a2c2c db 2023-01-12 11:23:07 +08:00
wangchuxiao
6ee06ded3f db 2023-01-12 11:19:25 +08:00
wangchuxiao
9bc659e8f0 db 2023-01-12 11:14:37 +08:00
wangchuxiao
db51b597da db 2023-01-12 11:09:08 +08:00
wangchuxiao
6fd6c29ea4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 10:55:31 +08:00
wangchuxiao
6808d734b4 db 2023-01-12 10:55:07 +08:00
withchao
5e020bb514 1 2023-01-12 10:52:41 +08:00
withchao
7bc32e67bc Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 10:50:48 +08:00
withchao
dfb91b3fc0 1 2023-01-12 10:50:35 +08:00
wangchuxiao
4649eb11e6 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 10:48:17 +08:00
wangchuxiao
cb713db9d2 db 2023-01-12 10:48:02 +08:00
withchao
59c477424c 1 2023-01-12 10:42:27 +08:00
withchao
2841109f31 1 2023-01-12 10:07:08 +08:00
withchao
35c0e8303c 1 2023-01-11 19:33:25 +08:00
withchao
6dafbf2165 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-11 19:28:12 +08:00
withchao
4f2d9c548e 1 2023-01-11 19:26:17 +08:00
wangchuxiao
31a264f411 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-11 19:03:40 +08:00
wangchuxiao
e466faa20d db 2023-01-11 19:03:26 +08:00
withchao
6c0175540b 1 2023-01-11 18:39:42 +08:00
wangchuxiao
9b962a0368 db 2023-01-11 18:08:26 +08:00
wangchuxiao
88d6fc663a db 2023-01-11 17:40:20 +08:00
wangchuxiao
dff32dd7ef db 2023-01-11 17:32:49 +08:00
withchao
53c278234d friend 2023-01-11 16:55:25 +08:00
wangchuxiao
d3c9ef6992 fix Pb2String 2023-01-11 16:46:09 +08:00
wangchuxiao
edced72be9 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api_to_rpc/api.go
	internal/rpc/group/group.go
2023-01-11 16:27:20 +08:00
wangchuxiao
c96ccfc7f5 fix Pb2String 2023-01-11 16:23:16 +08:00
withchao
920fcc14f1 api to rpc 2023-01-11 16:16:44 +08:00
withchao
e8de74f76d group rpc 2023-01-11 15:33:32 +08:00
withchao
1fc7c4434c group 2023-01-11 14:29:37 +08:00
wangchuxiao
07a6439082 fix Pb2String 2023-01-11 11:15:46 +08:00
withchao
9341a5f57f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/group.go
2023-01-10 10:17:28 +08:00
wangchuxiao
6e8a2232a9 group rpc 2023-01-09 17:04:43 +08:00
wangchuxiao
5cbfe7c73f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
2023-01-09 16:49:14 +08:00
wangchuxiao
69787064e9 group rpc 2023-01-09 16:37:33 +08:00
withchao
aa2b43293d group 2023-01-09 14:51:31 +08:00
withchao
36be1f4be8 group 2023-01-09 14:29:53 +08:00
withchao
4a098a4a0e group 2023-01-09 14:29:43 +08:00
wangchuxiao
ac74d01d35 groupCallback 2023-01-09 14:27:08 +08:00
withchao
90fddd34d2 CreateGroup 2023-01-06 16:21:43 +08:00
wangchuxiao
463f08546e groupCallback 2023-01-06 14:36:39 +08:00
skiffer-git
6518473436 Error code standardization 2023-01-06 14:23:43 +08:00
skiffer-git
31cb75b024 Error code standardization 2023-01-06 13:52:25 +08:00
withchao
18c4212aa0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-06 13:47:00 +08:00
withchao
028c2ac364 CheckAccess 2023-01-06 13:46:35 +08:00