90 Commits

Author SHA1 Message Date
Gordon
c036d27b36 msg update 2023-03-21 12:28:21 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao
5a3cea56fa zap 2023-03-14 18:50:49 +08:00
wangchuxiao
104b5748b8 zap 2023-03-14 18:47:40 +08:00
Gordon
e6c02fcb8f conversation update 2023-03-14 17:58:51 +08:00
withchao
6d03169f12 special error 2023-03-14 14:25:02 +08:00
wangchuxiao
4547e809bf connID to md5 2023-03-13 18:23:43 +08:00
wangchuxiao
bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
withchao
aca2843224 pb path 2023-03-09 16:18:01 +08:00
wangchuxiao
3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
wangchuxiao
96d9b25b57 proto modify 2023-03-03 17:42:26 +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
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
bb94a7947c config path 2023-02-24 11:01:33 +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
withchao
c8004279a4 msg database 2023-02-23 18:48:14 +08:00
withchao
2f1c064413 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	internal/push/init.go
#	pkg/common/db/cache/redis.go
#	pkg/common/db/controller/msg.go
2023-02-23 18:42:56 +08:00
wangchuxiao
9c76722c90 push 2023-02-23 18:20:45 +08:00
withchao
2af2716c2c msg database 2023-02-23 18:17:17 +08:00
wangchuxiao
4fc00109ef push 2023-02-23 17:28:57 +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
3bae8edb39 conversation 2023-02-22 14:31:30 +08:00
withchao
5bb42593ba Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:44:28 +08:00
withchao
762c49625c group db tx 2023-02-20 17:43:09 +08:00
skiffer-git
7338b633c8 Error code standardization 2023-02-20 17:13:15 +08:00
withchao
6ef8228064 group build pass 2023-02-20 10:49:39 +08:00
withchao
da9f4bb78e rpc 2023-02-20 10:10:02 +08:00
withchao
5e6f9448bc gorm db 2023-02-16 17:20:08 +08:00
wangchuxiao
29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
wangchuxiao
0d0a90a14b errcode 2023-02-15 17:00:43 +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
skiffer-git
64caafd6b6 Error code standardization 2023-02-14 20:01:44 +08:00
withchao
bba819854c group 2023-02-14 16:33:18 +08:00
withchao
048d4b83e1 rpc start 2023-02-13 17:44:22 +08:00
Gordon
0f5cfbb2dc Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 20:58:54 +08:00
Gordon
a3593379f6 conversation update 2023-02-10 20:57:45 +08:00
withchao
dbf41bf21f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/callback.go
2023-02-10 19:18:29 +08:00
withchao
09c6fbdfe4 group 2023-02-10 19:17:33 +08:00
wangchuxiao
4aaac8595a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-02-10 15:47:02 +08:00
wangchuxiao
0e97285e0a errcode 2023-02-10 15:46:29 +08:00
withchao
1e1c6de56e group nickname 2023-02-10 15:36:25 +08:00
withchao
5d7809624c group cache 2023-02-10 10:48:49 +08:00
wangchuxiao
6eb231aae4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go
	pkg/proto/group/group.proto
2023-02-09 20:39:12 +08:00
wangchuxiao
759432794f errcode 2023-02-09 20:36:34 +08:00