Commit Graph

4204 Commits

Author SHA1 Message Date
wangchuxiao 2db5a8b618 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-05 18:32:55 +08:00
wangchuxiao 99fc84aaea groupCallback 2023-01-05 18:32:30 +08:00
skiffer-git 7827ce1aee Error code standardization 2023-01-05 17:20:12 +08:00
skiffer-git d28d470435 Error code standardization 2023-01-05 17:14:28 +08:00
skiffer-git b76751ec79 Error code standardization 2023-01-05 17:09:35 +08:00
wangchuxiao 635c703535 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-05 15:59:34 +08:00
wangchuxiao 1fc0f0cb01 getcd 2023-01-05 15:58:00 +08:00
skiffer-git 0f7b183e7c Error code standardization 2023-01-05 15:52:48 +08:00
skiffer-git 45aa8293e5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 15:45:46 +08:00
skiffer-git f3a3477811 Error code standardization 2023-01-05 15:45:21 +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 9d791c186b Error code standardization 2023-01-05 15:04:48 +08:00
skiffer-git b81513e9bb Error code standardization 2023-01-05 13:36:49 +08:00
skiffer-git e03a34cae4 Error code standardization 2023-01-05 11:40:48 +08:00
skiffer-git 89f0741cea Error code standardization 2023-01-05 11:38:20 +08:00
skiffer-git 8028ee790f Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 11:33:32 +08:00
skiffer-git 4147c68f6d Error code standardization 2023-01-05 11:33:17 +08:00
withchao f5b598fde8 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 10:48:51 +08:00
withchao 0138b7fc12 get func name 2023-01-05 10:47:41 +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
wangchuxiao 94d087b1bc errCode 2023-01-04 18:19:18 +08:00
skiffer-git 64b4e5570c Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/friend/friend.go
#	pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
2023-01-04 17:23:27 +08:00
skiffer-git 86bf207e02 Error code standardization 2023-01-04 17:22:55 +08:00
wangchuxiao b13ab0f0ba Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 17:21:46 +08:00
wangchuxiao 2d8a538798 errCode 2023-01-04 17:21:33 +08:00
withchao e9446d0360 1 2023-01-04 17:16:06 +08:00
skiffer-git 5a2a57c706 Error code standardization 2023-01-04 15:51:02 +08:00
skiffer-git c076f16793 Error code standardization 2023-01-04 11:54:49 +08:00
wangchuxiao 58bb3fe3f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 11:32:30 +08:00
wangchuxiao 491501c618 errCode 2023-01-04 11:31:52 +08:00
wangchuxiao cbe7dcebea errCode 2023-01-04 11:28:52 +08:00
skiffer-git 4acde81cc4 Error code standardization 2023-01-04 11:26:35 +08:00
skiffer-git 108685e8d0 Error code standardization 2023-01-04 11:24:11 +08:00
skiffer-git 1d5e4a0f8a Error code standardization 2023-01-04 11:06:28 +08:00
skiffer-git 89a4fe96b5 Error code standardization 2023-01-04 10:12:20 +08:00
withchao b2ce96eb67 operationID 2023-01-03 16:47:11 +08:00
skiffer-git 84df63e249 Error code standardization 2023-01-03 16:42:48 +08:00