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

203 Commits

Author SHA1 Message Date
wangchuxiao
ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
Gordon
f3937499fa user update 2023-03-16 17:00:10 +08:00
Gordon
e99753f188 user update 2023-03-16 12:07:21 +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
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
cc93335d7f db 2023-03-15 18:36:00 +08:00
wangchuxiao
74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao
d75d1f57e4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:45:17 +08:00
wangchuxiao
8dea2cacf4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:29:04 +08:00
withchao
e9865539de s3 2023-03-15 11:24:59 +08:00
withchao
acb7a8be2d s3 2023-03-14 19:40:35 +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
6b98f27656 zap 2023-03-14 19:27:43 +08:00
wangchuxiao
5a3cea56fa zap 2023-03-14 18:50:49 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao
eb946ad181 log 2023-03-13 15:39:47 +08:00
wangchuxiao
d545a7f753 fix cron 2023-03-10 16:47:22 +08:00
wangchuxiao
49e7f15130 log 2023-03-10 11:44:26 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00
wangchuxiao
6d4cee96c8 script 2023-03-08 19:34:36 +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
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
77b2d4aad0 modify dictory 2023-03-06 12:04:44 +08:00
withchao
b74e6b52f3 solve error 2023-03-03 18:59:28 +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
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
wangchuxiao
66aaa9b152 config path 2023-02-24 11:06:49 +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
76565cded1 push 2023-02-23 19:19:01 +08:00
wangchuxiao
be11da75ae Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	internal/rpc/msg/delete.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/table/unrelation/extend_msg_set.go
 2023-02-23 19:17:23 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00