Commit Graph

14 Commits

Author SHA1 Message Date
wangchuxiao 690a2195da Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/friend.go
2023-03-16 11:03:57 +08:00
withchao 1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
2023-03-16 10:51:00 +08:00
withchao 17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao a0f3307fe3 db 2023-03-16 10:45:56 +08:00
wangchuxiao e888910f3c db 2023-03-15 18:41:22 +08:00
wangchuxiao 74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao 5a3cea56fa zap 2023-03-14 18:50:49 +08:00
wangchuxiao 104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao f586ab1ac2 push 2023-02-23 19:15:30 +08:00
skiffer-git ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git be1bf240ad Error code standardization 2023-02-21 12:59:44 +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
wangchuxiao d9becad8e9 errCode 2023-01-28 13:19:36 +08:00