blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 10:22:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,271 Commits 40 Branches 130 Tags
Commit Graph

629 Commits

Author SHA1 Message Date
wangchuxiao
7445f96e66 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 11:42:57 +08:00
wangchuxiao
cf968c0b4c friend 2023-03-17 11:41:20 +08:00
withchao
2ce1bc84f2 pkg 2023-03-17 11:27:34 +08:00
withchao
835cd6d14a pkg 2023-03-17 11:14:14 +08:00
wangchuxiao
ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
withchao
c331d6f200 code error 2023-03-16 18:54:01 +08:00
Gordon
92d941b747 user update 2023-03-16 17:49:36 +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
withchao
a529ba4f5b packet name pb 2023-03-16 10:52:50 +08:00
withchao
1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
 2023-03-16 10:51:00 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao
a0f3307fe3 db 2023-03-16 10:45:56 +08:00
wangchuxiao
51d8c0ba51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 17:59:38 +08:00
Gordon
b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
Gordon
5b4cc786ed log update 2023-03-15 14:50:23 +08:00
withchao
eba9b8ad44 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:25:18 +08:00
Gordon
a74c60927f Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:09:31 +08:00
Gordon
49f855e1d1 log update 2023-03-15 11:09:01 +08:00
wangchuxiao
fcbcfbb17c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-14 20:09:26 +08:00
wangchuxiao
2a49abc74a zap 2023-03-14 20:05:48 +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
845f858e7a zap 2023-03-14 16:09:20 +08:00
Gordon
abc303d1b3 add log 2023-03-10 19:34:24 +08:00
wangchuxiao
4f0813889c log 2023-03-10 11:59:50 +08:00
wangchuxiao
c0afe5d24a log 2023-03-10 11:47:53 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00
wangchuxiao
cfefc757af log 2023-03-09 20:12:58 +08:00
wangchuxiao
549a0aceb0 log 2023-03-09 20:05:18 +08:00
wangchuxiao
0c98231fcd script 2023-03-09 13:26:58 +08:00
wangchuxiao
8904ebccbc script 2023-03-09 12:46:56 +08:00
wangchuxiao
9ce50095b5 cobra 2023-03-08 17:29:03 +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
4c5613084c error 2023-03-07 12:19:30 +08:00
withchao
56306f33d7 validator 2023-03-06 10:39:02 +08:00
wangchuxiao
e07c9077ca proto modify 2023-03-06 10:17:55 +08:00
withchao
db89a13f65 solve error 2023-03-03 19:51:03 +08:00
wangchuxiao
080dfa5563 proto modify 2023-03-03 19:45:15 +08:00
wangchuxiao
de6fbf82e2 proto modify 2023-03-03 19:44:34 +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
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