62 Commits

Author SHA1 Message Date
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
74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00
wangchuxiao
5447f27c80 script 2023-03-09 15:47:00 +08:00
wangchuxiao
9ce50095b5 cobra 2023-03-08 17:29:03 +08:00
wangchuxiao
ca1cdbdeb7 cobra 2023-03-08 16:35:18 +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
a6562e5a0e modify dictory 2023-03-06 12:06:50 +08:00
wangchuxiao
77b2d4aad0 modify dictory 2023-03-06 12:04:44 +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
7930c230e4 config path 2023-02-23 19:51:58 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
skiffer-git
5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
skiffer-git
ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git
6201e5c206 Error code standardization 2023-02-21 13:14:19 +08:00
skiffer-git
be1bf240ad Error code standardization 2023-02-21 12:59:44 +08:00
withchao
762c49625c group db tx 2023-02-20 17:43:09 +08:00
withchao
98769fefae grammar 2023-02-16 17:25:28 +08:00
withchao
20ba4e33e8 db 2023-02-16 17:08:24 +08:00
wangchuxiao
29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
wangchuxiao
6619183a48 errcode 2023-02-15 15:52:32 +08:00
wangchuxiao
85ebf24325 errcode 2023-02-10 19:45:24 +08:00
wangchuxiao
a92dd54354 errcode 2023-02-10 18:13:58 +08:00
wangchuxiao
2e3bb941b0 errcode 2023-02-10 17:02:20 +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
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
ab30c77836 group db 2023-02-09 16:33:40 +08:00
wangchuxiao
414915eb3b errcode 2023-02-09 14:40:49 +08:00
withchao
41d62937ff group rpc 2023-02-09 10:27:55 +08:00
withchao
f20e9e71b7 group complete 2023-02-08 20:08:22 +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
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
8fc54a7379 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/cache/conversation.go
2023-02-07 18:45:54 +08:00
wangchuxiao
f4baf847ca errcode 2023-02-07 18:43:43 +08:00
withchao
bec4a89f7b 1 2023-02-03 17:27:56 +08:00
withchao
4d4a451926 1 2023-02-03 14:26:54 +08:00
withchao
adfcfac711 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/relation.go
2023-02-03 14:24:57 +08:00
withchao
8e49d7e567 1 2023-02-03 14:23:29 +08:00
wangchuxiao
b637a29348 errcode 2023-02-03 12:16:48 +08:00