1294 Commits

Author SHA1 Message Date
withchao
835cd6d14a pkg 2023-03-17 11:14:14 +08:00
wangchuxiao
ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
wangchuxiao
12d25e91bf db 2023-03-16 16:10:08 +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
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
withchao
e9865539de s3 2023-03-15 11:24:59 +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
104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao
6afb47ba06 zap 2023-03-14 15:35:58 +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
Gordon
cf29bd6227 zk add client options 2023-03-13 13:59:39 +08:00
Gordon
bc2ae99ba7 test 2023-03-13 11:40:16 +08:00
Gordon
cddf35fb2b test 2023-03-13 11:32:32 +08:00
withchao
aca2843224 pb path 2023-03-09 16:18:01 +08:00
wangchuxiao
d3b711e91b script 2023-03-08 19:25:27 +08:00
wangchuxiao
ca1cdbdeb7 cobra 2023-03-08 16:35:18 +08:00
withchao
4c5613084c error 2023-03-07 12:19:30 +08:00
withchao
1513933922 error 2023-03-07 11:12:39 +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
5b175377ee makefile 2023-03-06 16:26:40 +08:00
wangchuxiao
23c24308f7 makefile 2023-03-06 16:23:16 +08:00
wangchuxiao
a2674bfe9f modify dictory 2023-03-06 12:09:42 +08:00
wangchuxiao
612fe2173e modify dictory 2023-03-06 12:07:25 +08:00
wangchuxiao
77b2d4aad0 modify dictory 2023-03-06 12:04:44 +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
3a93f60555 proto modify 2023-03-03 18:55:51 +08:00
wangchuxiao
3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
wangchuxiao
d06235d28e proto modify 2023-03-03 18:08:26 +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
0c417d3471 pb 2023-02-28 15:53:38 +08:00
wangchuxiao
92764b3727 config path 2023-02-24 11:13:16 +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
8bdf86172f push 2023-02-23 19:20:58 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00