Commit Graph

5387 Commits

Author SHA1 Message Date
withchao 05ae254d3d Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/apiresp/gin.go
#	pkg/apiresp/resp.go
2023-03-24 17:35:22 +08:00
withchao 429d5da1d2 ctx 2023-03-24 17:34:00 +08:00
Gordon 4c18e47e96 ws update 2023-03-24 16:57:50 +08:00
Gordon 1199a45784 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-24 16:56:39 +08:00
Gordon c8ba439a2c ws update 2023-03-24 16:56:02 +08:00
wangchuxiao d9afe8a562 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 16:41:17 +08:00
wangchuxiao 6fb9992957 conversation 2023-03-24 16:41:11 +08:00
Gordon 7e7d5fc41b Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-24 16:40:13 +08:00
Gordon 1291420db0 ws update 2023-03-24 16:39:33 +08:00
wangchuxiao ad7fa572b5 fix cache 2023-03-24 16:06:37 +08:00
wangchuxiao 07309b872b del user field 2023-03-24 15:44:45 +08:00
withchao 5017c61e28 ctx 2023-03-24 14:50:35 +08:00
withchao d2a4ea5c4e Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-03-24 14:48:17 +08:00
withchao 3ccdc96229 ctx 2023-03-24 14:47:57 +08:00
wangchuxiao dce1769bcc Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 11:29:47 +08:00
wangchuxiao 59fe9f0ca9 add redis pipeline 2023-03-24 11:29:39 +08:00
Gordon 98e22cc699 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 20:06:23 +08:00
Gordon 735c35bd0f ws update 2023-03-23 20:05:49 +08:00
wangchuxiao 39c35e840d cache 2023-03-23 19:06:35 +08:00
wangchuxiao 2baf208c02 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-23 19:05:20 +08:00
wangchuxiao 132e1b987c cache 2023-03-23 19:02:20 +08:00
Gordon a0d61769b2 ws update 2023-03-23 17:51:38 +08:00
Gordon 52f49140b2 ws update 2023-03-23 17:06:21 +08:00
Gordon f109ead705 ws update 2023-03-23 16:53:25 +08:00
Gordon 393dfa5902 ws update 2023-03-23 15:56:47 +08:00
Gordon a5380a971b ws update 2023-03-23 15:42:31 +08:00
Gordon 2ba38d30f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 15:15:35 +08:00
Gordon e08a127213 ws update 2023-03-23 15:14:50 +08:00
withchao 53ed7728f5 ctx 2023-03-23 14:54:40 +08:00
Gordon 6382528360 ws update 2023-03-23 14:22:02 +08:00
Gordon 889e6b0d84 ws update 2023-03-23 14:18:33 +08:00
Gordon be3c866dc0 ws update 2023-03-23 14:05:49 +08:00
Gordon ac8a53b1b3 ws update 2023-03-23 13:17:06 +08:00
Gordon c96d6b48d1 ws update 2023-03-23 13:04:35 +08:00
Gordon e794769eea ws update 2023-03-23 12:49:18 +08:00
Gordon 87ae907df1 ws update 2023-03-23 12:33:25 +08:00
Gordon d88c45c415 ws update 2023-03-23 12:05:25 +08:00
Gordon 985fa74b34 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 10:46:16 +08:00
withchao 2564c2f06e ctx 2023-03-23 10:39:03 +08:00
Gordon 0a90986d14 ws update 2023-03-23 10:34:53 +08:00
withchao 3ea2128b93 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 09:48:48 +08:00
withchao 1e683fcf95 api error 2023-03-23 09:48:11 +08:00
Gordon 646cf767f9 log 2023-03-22 20:33:37 +08:00
Gordon 56cd2b0a46 log 2023-03-22 20:24:13 +08:00
Gordon 77a9fad102 log 2023-03-22 19:39:20 +08:00
Gordon 1f80758ebb log 2023-03-22 19:38:35 +08:00
Gordon d2d3ee4979 log 2023-03-22 19:31:43 +08:00
Gordon 19b8bd0ff6 msg update 2023-03-22 19:24:38 +08:00
Gordon 2b0e0eb9e5 msg update 2023-03-22 19:11:44 +08:00
Gordon 254313d11f msg update 2023-03-22 18:47:29 +08:00