IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,218 Commits 35 Branches 142 Tags
1680b96b651b2209d494ea55834a41dd4e92db2f
Commit Graph

618 Commits

Author SHA1 Message Date
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 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
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
wangchuxiao 0c417d3471 pb 2023-02-28 15:53:38 +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 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 08fdac83fc api2rpc 2023-02-27 09:53:17 +08:00