Commit Graph

1172 Commits

Author SHA1 Message Date
withchao 4f2d9c548e 1 2023-01-11 19:26:17 +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
skiffer-git 8d42184ff0 Error code standardization 2023-01-06 13:41:50 +08:00
withchao 08bffa60f4 CreateGroup rpc 2023-01-06 11:49:11 +08:00
wangchuxiao fb1b3687f4 groupCallback 2023-01-05 20:15:51 +08:00
wangchuxiao 2d67f95413 groupCallback 2023-01-05 20:04:11 +08:00
wangchuxiao 4aa7abf94b groupCallback 2023-01-05 18:37:01 +08:00
wangchuxiao 99fc84aaea groupCallback 2023-01-05 18:32:30 +08:00
wangchuxiao cf82d3495e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/constant/error.go
2023-01-05 15:33:28 +08:00
wangchuxiao 297f3c16a8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-05 15:30:33 +08:00
skiffer-git b81513e9bb Error code standardization 2023-01-05 13:36:49 +08:00
skiffer-git 4147c68f6d Error code standardization 2023-01-05 11:33:17 +08:00
skiffer-git 847860a0c7 Error code standardization 2023-01-05 10:07:38 +08:00
withchao c092c0e72d group member db 2023-01-04 21:56:42 +08:00
wangchuxiao 633aefad56 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:49:47 +08:00
wangchuxiao b9a11e4ca1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:46:43 +08:00
wangchuxiao bd8536b9eb Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:45:56 +08:00
wangchuxiao 6bd9b3d82f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:38:07 +08:00
wangchuxiao 7743801795 errCode 2023-01-04 19:35:07 +08:00
skiffer-git bedba8d8f5 Error code standardization 2023-01-04 19:32:44 +08:00
skiffer-git 4aad2c86ec Error code standardization 2023-01-04 19:26:57 +08:00
skiffer-git b041cb6cbf Error code standardization 2023-01-04 19:09:53 +08:00
withchao 99de72d723 1 2023-01-04 18:43:49 +08:00
wangchuxiao f2cade3251 errCode 2023-01-04 18:36:04 +08:00
wangchuxiao 9d433fb248 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 18:20:31 +08:00