Commit Graph

164 Commits

Author SHA1 Message Date
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 dea9a4c8fa Error code standardization 2023-02-14 19:34:19 +08:00
skiffer-git 05d00a8174 Error code standardization 2023-02-14 11:33:10 +08:00
skiffer-git b27aa040f7 Error code standardization 2023-02-13 21:36:08 +08:00
skiffer-git cba70e3196 Error code standardization 2023-02-10 21:04:22 +08:00
skiffer-git f985689a39 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 16:19:35 +08:00
skiffer-git 7e1b69cc3c Error code standardization 2023-02-10 16:18:26 +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
skiffer-git aff1c1f35e Error code standardization 2023-02-10 12:53:46 +08:00
wangchuxiao 79c30fdc69 errcode 2023-02-10 11:03:03 +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
skiffer-git d46970f519 Error code standardization 2023-02-09 13:43:50 +08:00
skiffer-git 099bbbb5d3 Error code standardization 2023-02-09 13:36:37 +08:00
skiffer-git ddb4e1e6ea Error code standardization 2023-02-09 12:21:58 +08:00
skiffer-git ac284b696a Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	pkg/common/db/controller/user.go
2023-02-09 10:59:32 +08:00
skiffer-git 9a7ed2d24d Error code standardization 2023-02-09 10:58:30 +08:00
wangchuxiao db51bc87e2 errcode 2023-02-08 18:29:11 +08:00
skiffer-git dad31652ad Error code standardization 2023-02-07 20:39:12 +08:00
skiffer-git 0565474732 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	go.sum
2023-02-07 20:30:55 +08:00
skiffer-git 0a2e55311c Error code standardization 2023-02-07 20:28:34 +08:00
wangchuxiao 4a32e98e62 errcode 2023-02-07 20:24:20 +08:00
wangchuxiao b637a29348 errcode 2023-02-03 12:16:48 +08:00
skiffer-git 6658566144 Error code standardization 2023-02-01 17:54:16 +08:00
skiffer-git cbe68507f3 Error code standardization 2023-02-01 17:20:55 +08:00
skiffer-git b3e141a3ce Error code standardization 2023-01-31 20:33:33 +08:00
skiffer-git 954e01c951 Error code standardization 2023-01-31 16:49:35 +08:00
skiffer-git 4e580cb848 Error code standardization 2023-01-31 15:45:24 +08:00
wangchuxiao 67c082ab7b errcode 2023-01-30 15:28:46 +08:00
skiffer-git 2a76dc3ac8 Error code standardization 2023-01-30 10:40:27 +08:00
skiffer-git d2d8b9c41c Error code standardization 2023-01-29 17:54:01 +08:00
skiffer-git 1d25a5e53f Error code standardization 2023-01-29 17:46:11 +08:00
skiffer-git b162909147 Error code standardization 2023-01-29 16:30:33 +08:00
skiffer-git a218bc1daa Error code standardization 2023-01-29 15:03:39 +08:00
skiffer-git 39fc655b1a Error code standardization 2023-01-29 14:47:21 +08:00
skiffer-git 46c3b5a6ea Error code standardization 2023-01-11 11:24:38 +08:00
skiffer-git 86bf207e02 Error code standardization 2023-01-04 17:22:55 +08:00
skiffer-git 5d4600a080 Separate the notification 2022-12-07 10:00:53 +08:00
Gordon 9fddf6819b user notification 2022-11-20 17:45:49 +08:00
wangchuxiao 2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
wangchuxiao 78ce5c3f69 prometheus 2022-09-15 16:39:49 +08:00
wangchuxiao 02fa9142fe prometheus 2022-09-15 16:27:36 +08:00
wangchuxiao 144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao a1f79f4508 prome 2022-09-15 01:22:20 +08:00
wangchuxiao 4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao 5233e4c097 fix bug 2022-09-06 16:08:28 +08:00
wangchuxiao bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00