Commit Graph

277 Commits

Author SHA1 Message Date
wangchuxiao 7f861fa5c3 log 2023-03-09 16:36:47 +08:00
wangchuxiao 12a0ab8ae8 script 2023-03-09 10:57:55 +08:00
withchao 4c5613084c error 2023-03-07 12:19:30 +08:00
wangchuxiao b26f115e67 makefile 2023-03-06 16:28:42 +08:00
wangchuxiao 0ed07dfa2a proto modify 2023-03-03 19:59:10 +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
wangchuxiao 92764b3727 config path 2023-02-24 11:13:16 +08:00
wangchuxiao bb94a7947c config path 2023-02-24 11:01:33 +08:00
wangchuxiao 3106f671af config path 2023-02-24 10:41:34 +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 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
withchao 2af2716c2c msg database 2023-02-23 18:17:17 +08:00
wangchuxiao 4fc00109ef push 2023-02-23 17:28:57 +08:00
wangchuxiao 432627353c push 2023-02-23 10:47:50 +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
wangchuxiao 5be441f4fd errcode 2023-02-20 10:13:29 +08:00
wenxu12345 dc33071478 Error code standardization 2023-02-16 15:41:37 +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 ed466387e4 callback 2023-02-15 15:50:52 +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
withchao d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
wangchuxiao 414915eb3b errcode 2023-02-09 14:40:49 +08:00
wangchuxiao 4a32e98e62 errcode 2023-02-07 20:24:20 +08:00
wangchuxiao 67c082ab7b errcode 2023-01-30 15:28:46 +08:00
wangchuxiao 40438f529a del files 2023-01-13 19:05:43 +08:00
wangchuxiao 51529eece3 del files 2023-01-13 18:00:18 +08:00
skiffer-git 46c3b5a6ea Error code standardization 2023-01-11 11:24:38 +08:00
wangchuxiao 07a6439082 fix Pb2String 2023-01-11 11:15:46 +08:00
wangchuxiao eb49b27e16 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-26 10:25:53 +08:00
wangchuxiao 4fd31e4367 getui 2022-12-26 10:25:42 +08:00
Gordon 1026a6b2b6 Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-12-23 16:16:28 +08:00
wangchuxiao e8dc5ce085 push 2022-12-22 17:35:09 +08:00
wangchuxiao fb72f4b1ae push 2022-12-22 17:17:28 +08:00
wangchuxiao 6bf0a3a804 push 2022-12-22 16:28:36 +08:00
wangchuxiao 4bcaa5eaca push 2022-12-22 15:42:16 +08:00
wangchuxiao 8ca6584299 push 2022-12-22 15:23:46 +08:00
wangchuxiao e86e8820f3 push 2022-12-22 11:30:19 +08:00
wangchuxiao 07c300f35f push 2022-12-22 11:10:19 +08:00
wangchuxiao b08936c27e push 2022-12-21 19:56:25 +08:00
wangchuxiao 0b4b408552 push 2022-12-21 18:58:36 +08:00
wangchuxiao 36e37052e0 push 2022-12-21 18:37:58 +08:00
wangchuxiao 9a3373a43d push 2022-12-21 18:29:31 +08:00
wangchuxiao 428e5a7a4e push 2022-12-21 18:15:25 +08:00
wangchuxiao 7445b84756 push 2022-12-21 18:03:39 +08:00