IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,250 Commits 35 Branches 142 Tags
5c38ffa15e48b1c54bcfeb37ecb411271b256dca
Commit Graph

2680 Commits

Author SHA1 Message Date
Gordon 92d941b747 user update 2023-03-16 17:49:36 +08:00
withchao 0fd1e785fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 16:33:33 +08:00
withchao 1f935531f6 code error 2023-03-16 16:32:42 +08:00
wangchuxiao 962c39f3c2 db 2023-03-16 16:11:34 +08:00
wangchuxiao 62920d3dd0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 16:10:29 +08:00
wangchuxiao 12d25e91bf db 2023-03-16 16:10:08 +08:00
Gordon 9539f93640 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 15:11:35 +08:00
wangchuxiao 23c704e93b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 15:10:37 +08:00
Gordon ce87ef0a04 conversation update 2023-03-16 15:10:23 +08:00
wangchuxiao 31833d06ba db 2023-03-16 15:10:21 +08:00
Gordon 38d3c5d94d user update 2023-03-16 13:01:42 +08:00
Gordon baae7875aa Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 12:07:57 +08:00
Gordon e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao a8dd306196 db 2023-03-16 12:00:14 +08:00
wangchuxiao be847d5d5e db 2023-03-16 11:41:38 +08:00
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
wangchuxiao 63f5169dbe db 2023-03-16 11:03:14 +08:00
withchao a529ba4f5b packet name pb 2023-03-16 10:52:50 +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 69f147a70c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 10:46:04 +08:00
wangchuxiao a0f3307fe3 db 2023-03-16 10:45:56 +08:00
Gordon 574399669c log remove 2023-03-16 10:20:40 +08:00
wangchuxiao 2a60974ebd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 17:59:56 +08:00
wangchuxiao 51d8c0ba51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 17:59:38 +08:00
Gordon f2d33991e1 parse token 2023-03-15 17:11:23 +08:00
Gordon b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
Gordon 5b4cc786ed log update 2023-03-15 14:50:23 +08:00
Gordon a40ad5df68 log update 2023-03-15 14:38:11 +08:00
Gordon a03bdb35ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:40:54 +08:00
Gordon 41fb79d995 remove statistic 2023-03-15 11:40:22 +08:00
withchao eba9b8ad44 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:25:18 +08:00
withchao e9865539de s3 2023-03-15 11:24:59 +08:00
Gordon a74c60927f Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:09:31 +08:00
Gordon 49f855e1d1 log update 2023-03-15 11:09:01 +08:00
wangchuxiao fcbcfbb17c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-14 20:09:26 +08:00
wangchuxiao 2a49abc74a zap 2023-03-14 20:05:48 +08:00
withchao 188dc6d322 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/controller/storage.go
 2023-03-14 19:39:34 +08:00
withchao 6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao fdf20f31c3 zap 2023-03-14 18:55:32 +08:00
wangchuxiao 104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao c33dab0e30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 16:14:19 +08:00
withchao 9bb30406ee api error 2023-03-14 16:13:00 +08:00
wangchuxiao 845f858e7a zap 2023-03-14 16:09:20 +08:00
wangchuxiao 6afb47ba06 zap 2023-03-14 15:35:58 +08:00
wangchuxiao 4547e809bf connID to md5 2023-03-13 18:23:43 +08:00
wangchuxiao 27a1197a97 connID to md5 2023-03-13 18:08:24 +08:00
wangchuxiao bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
wangchuxiao 217765be6e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 15:39:54 +08:00
wangchuxiao eb946ad181 log 2023-03-13 15:39:47 +08:00