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
4,875 Commits 35 Branches 142 Tags
2edb3cfd8ca49de38ae789b76e9ea06004b88ab5
Commit Graph

127 Commits

Author SHA1 Message Date
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 0411a5045b api to rpc 2023-02-27 14:44:14 +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
withchao 2af2716c2c msg database 2023-02-23 18:17:17 +08:00
wangchuxiao e1a27e6aea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	cmd/api/main.go
	go.mod
	internal/push/fcm/push.go
	internal/push/getui/push.go
	internal/push/logic/init.go
	internal/push/logic/push_to_client.go
	internal/push/push_rpc_server.go
	internal/rpc/conversation/conversaion.go
	pkg/common/db/controller/group.go
	pkg/proto/push/push.pb.go
 2023-02-22 19:52:53 +08:00
wangchuxiao 94d50a6c71 push 2023-02-22 19:51:14 +08:00
withchao e94bf6216c utils 2023-02-22 11:20:09 +08:00
withchao f9e09d67bb utils 2023-02-21 19:20:09 +08:00
withchao a1e66e9da0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-21 19:16:57 +08:00
skiffer-git 5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
withchao edc09af93f utils 2023-02-21 16:22:22 +08:00
wangchuxiao 29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
wangchuxiao 1b3eaed0e5 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	cmd/rpc/auth/main.go
	cmd/rpc/friend/main.go
	cmd/rpc/group/main.go
	cmd/rpc/msg/main.go
	cmd/rpc/user/main.go
	internal/rpc/auth/auth.go
	internal/rpc/conversation/conversaion.go
	internal/rpc/friend/friend.go
	internal/rpc/group/callback.go
	internal/rpc/group/group.go
	internal/rpc/msg/pull_message.go
	internal/rpc/msg/query_msg.go
	internal/rpc/msg/rpc_chat.go
	internal/rpc/msg/send_msg.go
	internal/rpc/user/user.go
	pkg/common/db/cache/redis.go
	pkg/common/db/controller/msg.go
	pkg/common/http/http_client.go
 2023-02-15 16:03:31 +08:00
wangchuxiao 6619183a48 errcode 2023-02-15 15:52:32 +08:00
withchao 1ae1f77a14 msg cb 2023-02-14 15:02:45 +08:00
withchao 09c6fbdfe4 group 2023-02-10 19:17:33 +08:00
withchao 1e1c6de56e group nickname 2023-02-10 15:36:25 +08:00
wangchuxiao 759432794f errcode 2023-02-09 20:36:34 +08:00
wangchuxiao 1075754458 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
 2023-02-09 14:49:17 +08:00
wangchuxiao 414915eb3b errcode 2023-02-09 14:40:49 +08:00
withchao b422b49c06 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 14:33:45 +08:00
withchao 00d64119fa api to rpc use generic paradigm 2023-02-09 14:33:35 +08:00
skiffer-git 9a7ed2d24d Error code standardization 2023-02-09 10:58:30 +08:00
withchao ec43f2847e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-08 18:30:49 +08:00
withchao 324a0ae0ae super group rpc 2023-02-08 18:30:45 +08:00
wangchuxiao 6d700765d2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-08 17:56:21 +08:00
wangchuxiao 2193d380ca errcode 2023-02-08 17:56:04 +08:00
withchao 77edbe1edd group controller 2023-02-08 14:41:09 +08:00
withchao 66b6d5fc2f group db 2023-02-07 18:36:47 +08:00
withchao 210d04d488 rpc GroupApplicationResponse 2023-02-06 15:32:20 +08:00
withchao 8c30bde86e 1 2023-02-06 11:55:10 +08:00
withchao 32d99595fb 1 2023-02-06 11:53:19 +08:00
withchao 516285952d 1 2023-02-03 18:10:49 +08:00
withchao bec4a89f7b 1 2023-02-03 17:27:56 +08:00
withchao 64dee9f989 1 2023-02-03 16:10:07 +08:00
withchao f98d894a4b 1 2023-02-03 14:36:38 +08:00
withchao d5a9647902 1 2023-02-03 11:50:23 +08:00
withchao dec0c8cc47 1 2023-02-02 18:45:43 +08:00
withchao e8a24ab59e 1 2023-02-02 17:54:02 +08:00
withchao 4649ce5354 1 2023-02-02 10:47:19 +08:00
wangchuxiao e0d05e1fa8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-31 18:56:23 +08:00
wangchuxiao 4c931fba5c errcode 2023-01-31 18:55:22 +08:00
skiffer-git 026649f875 Error code standardization 2023-01-31 10:48:02 +08:00
skiffer-git fa45eb1fa8 Error code standardization 2023-01-30 21:57:39 +08:00
wangchuxiao c1d6f5809b errcode 2023-01-30 16:55:44 +08:00
wangchuxiao 1b4f6054ae errcode 2023-01-30 16:47:58 +08:00
wangchuxiao 1ba5cde076 errcode 2023-01-30 16:45:40 +08:00
wangchuxiao 67c082ab7b errcode 2023-01-30 15:28:46 +08:00