5904 Commits

Author SHA1 Message Date
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
ebe689324b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-03 18:44:27 +08:00
wangchuxiao
3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
withchao
ebd1de919d Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/api/auth.go
2023-03-03 18:43:54 +08:00
withchao
4deedb6856 api to rpc 2023-03-03 18:42:33 +08:00
withchao
5e845c8fb6 api to rpc 2023-03-03 18:14:48 +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
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
886818e54c api pack move 2023-02-28 14:20:26 +08:00
withchao
1538917089 api 2023-02-28 11:38:05 +08:00
withchao
e30e391756 gen group pb json no omitempty 2023-02-27 18:47:11 +08:00
withchao
cae6c53b01 api resp 2023-02-27 18:21:41 +08:00
withchao
4cf29ad565 group api 2023-02-27 18:11:00 +08:00
withchao
586a113994 apitorpc group 2023-02-27 15:13:39 +08:00
withchao
0411a5045b api to rpc 2023-02-27 14:44:14 +08:00
withchao
03ccd0131a api2rpc 2023-02-27 10:27:35 +08:00
withchao
e513a09e45 api2rpc 2023-02-27 10:14:19 +08:00
withchao
08fdac83fc api2rpc 2023-02-27 09:53:17 +08:00
withchao
0547f25ecb Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/config/config.go
2023-02-24 19:17:06 +08:00
withchao
c019dd5f1e api2rpc 2023-02-24 19:16:26 +08:00
wangchuxiao
4c426c7c7c config modify 2023-02-24 17:42:01 +08:00
withchao
d7640ca864 api2rpc 2023-02-24 15:41:50 +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
cfe6aff3ac config path 2023-02-24 11:51:07 +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