1824 Commits

Author SHA1 Message Date
wangchuxiao
6eb13df2e2 test cobra 2023-03-07 18:06:57 +08:00
wangchuxiao
32af58e861 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	cmd/cmdutils/main.go
2023-03-07 18:01:36 +08:00
wangchuxiao
ea614167a6 test cobra 2023-03-07 17:59:34 +08:00
withchao
d80cf34f26 rpc mw 2023-03-07 17:21:48 +08:00
withchao
102ab98276 rpc mw 2023-03-07 16:57:49 +08:00
withchao
555fc52acc Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-07 12:19:38 +08:00
withchao
4c5613084c error 2023-03-07 12:19:30 +08:00
wangchuxiao
d6704aed80 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-07 12:12:34 +08:00
wangchuxiao
52d8ec6aee test cobra 2023-03-07 12:12:16 +08:00
withchao
3fe9ee22fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-07 11:12:53 +08:00
withchao
1513933922 error 2023-03-07 11:12:39 +08:00
wangchuxiao
6ad93962aa test cobra 2023-03-06 18:52:49 +08:00
wangchuxiao
373b317b1a test cobra 2023-03-06 18:47:48 +08:00
wangchuxiao
757fd4bf0b test cobra 2023-03-06 18:41:59 +08:00
wangchuxiao
5604ec9902 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-06 18:26:36 +08:00
wangchuxiao
6ca1d403b2 test cobra 2023-03-06 18:26:23 +08:00
withchao
5ca36ebc10 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-06 17:43:48 +08:00
withchao
3ea0d1f765 s3 complete 2023-03-06 16:40:57 +08:00
wangchuxiao
9575ba74e8 makefile 2023-03-06 16:25:00 +08:00
wangchuxiao
23c24308f7 makefile 2023-03-06 16:23:16 +08:00
wangchuxiao
8ae9c2a278 test name 2023-03-06 14:25:49 +08:00
wangchuxiao
612fe2173e modify dictory 2023-03-06 12:07:25 +08:00
wangchuxiao
a6562e5a0e modify dictory 2023-03-06 12:06:50 +08:00
wangchuxiao
77b2d4aad0 modify dictory 2023-03-06 12:04:44 +08:00
wangchuxiao
15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
withchao
b2ea5036db solve error 2023-03-03 19:05:57 +08:00
withchao
cdb8197156 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-03 18:59:43 +08:00
withchao
b74e6b52f3 solve error 2023-03-03 18:59:28 +08:00
wangchuxiao
3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
wangchuxiao
f177715ada Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/auth.go
	internal/api/route.go
	internal/api/user.go
	internal/rpc/third/third.go
2023-03-03 17:45:15 +08:00
wangchuxiao
96d9b25b57 proto modify 2023-03-03 17:42:26 +08:00
withchao
e93425c574 api rpc third 2023-03-03 17:20:36 +08:00
wangchuxiao
d991947d4c proto modify 2023-03-02 12:00:31 +08:00
wangchuxiao
8d0148c4ba proto modify 2023-03-01 15:32:26 +08:00
wangchuxiao
4ac9943565 conf 2023-02-28 15:20:57 +08:00
wangchuxiao
4c426c7c7c config modify 2023-02-24 17:42:01 +08:00
withchao
ae8478dc5e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/delete.go
#	internal/rpc/msg/send_pull.go
#	pkg/common/db/cache/msg.go
#	pkg/common/db/cache/redis.go
#	pkg/common/db/cache/redis_test.go
2023-02-24 13:55:53 +08:00
wangchuxiao
ffaf0bd021 config path 2023-02-24 11:37:40 +08:00
wangchuxiao
2a0ad5c7af config path 2023-02-24 11:15:40 +08:00
wangchuxiao
92764b3727 config path 2023-02-24 11:13:16 +08:00
wangchuxiao
66aaa9b152 config path 2023-02-24 11:06:49 +08:00
wangchuxiao
bb94a7947c config path 2023-02-24 11:01:33 +08:00
wangchuxiao
dd7a7d9cda config path 2023-02-24 10:47:36 +08:00
wangchuxiao
7930c230e4 config path 2023-02-23 19:51:58 +08:00
wangchuxiao
a26ca657fe config path 2023-02-23 19:41:44 +08:00
wangchuxiao
8bdf86172f push 2023-02-23 19:20:58 +08:00
wangchuxiao
76565cded1 push 2023-02-23 19:19:01 +08:00
wangchuxiao
be11da75ae Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/delete.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/table/unrelation/extend_msg_set.go
2023-02-23 19:17:23 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
withchao
c8004279a4 msg database 2023-02-23 18:48:14 +08:00