2232 Commits

Author SHA1 Message Date
withchao
4c5613084c error 2023-03-07 12:19:30 +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
wangchuxiao97@outlook.com
120477c092 pb generate 2023-03-06 11:56:17 +08:00
wangchuxiao
7342d2ebd0 modify dictory 2023-03-06 11:55:13 +08:00
wangchuxiao
15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
withchao
db89a13f65 solve error 2023-03-03 19:51:03 +08:00
wangchuxiao
2ca3f4673b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-03 19:44:49 +08:00
wangchuxiao
de6fbf82e2 proto modify 2023-03-03 19:44:34 +08:00
withchao
b2ea5036db solve error 2023-03-03 19:05:57 +08:00
withchao
a743a2cfd2 solve error 2023-03-03 19:02:09 +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
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
withchao
6150419842 api 2023-03-02 14:41:59 +08:00
wangchuxiao97@outlook.com
7050b64b19 pb 2023-03-02 12:12:54 +08:00
wangchuxiao
9c59b4d21d proto modify 2023-03-02 12:10:52 +08:00
wangchuxiao
90fc925360 proto modify 2023-03-02 12:10:30 +08:00
wangchuxiao
bff7d0923a proto modify 2023-03-02 12:07:32 +08:00
wangchuxiao
d991947d4c proto modify 2023-03-02 12:00:31 +08:00
wangchuxiao
fc009c7c6c proto modify 2023-03-01 15:36:04 +08:00
wangchuxiao
8d0148c4ba proto modify 2023-03-01 15:32:26 +08:00
root
9ecd43af73 proto modify 2023-02-28 17:17:21 +08:00
wangchuxiao
82c3f871f4 proto 2023-02-28 17:14:44 +08:00
wangchuxiao
84904b7eca proto 2023-02-28 17:13:56 +08:00
wangchuxiao
acfdb90b6e pb 2023-02-28 16:05:33 +08:00
wangchuxiao
0c417d3471 pb 2023-02-28 15:53:38 +08:00
wangchuxiao
c2cfb32c45 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:48:42 +08:00
wangchuxiao
ab6fa41438 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:47:42 +08:00
wangchuxiao
2edb3cfd8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:28:04 +08:00
wangchuxiao
4ac9943565 conf 2023-02-28 15:20:57 +08:00
withchao
e30e391756 gen group pb json no omitempty 2023-02-27 18:47:11 +08:00
withchao
0411a5045b api to rpc 2023-02-27 14:44:14 +08:00