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
|
2 years ago |
|
wangchuxiao
|
94d50a6c71
|
push
|
2 years ago |
withchao
|
f3e37650c6
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3bae8edb39
|
conversation
|
2 years ago |
skiffer-git
|
28fb738410
|
Error code standardization
|
2 years ago |
|
withchao
|
cd00d91eee
|
group db
|
2 years ago |
|
skiffer-git
|
62a2cf2976
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
5751062605
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
ae40c8c8c0
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
9e4b59034d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6201e5c206
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
be1bf240ad
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
e27d66cd2e
|
Error code standardization
|
2 years ago |
|
withchao
|
f5fbe1d852
|
gorm conn
|
2 years ago |
|
withchao
|
5bb42593ba
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
762c49625c
|
group db tx
|
2 years ago |
|
skiffer-git
|
9b0682705e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
7338b633c8
|
Error code standardization
|
2 years ago |
Gordon
|
141cfef1b6
|
conversation update
|
2 years ago |
|
wangchuxiao
|
2b38381296
|
fix mongoDB bug
|
2 years ago |
|
withchao
|
6ef8228064
|
group build pass
|
2 years ago |
|
withchao
|
da9f4bb78e
|
rpc
|
2 years ago |
|
withchao
|
98769fefae
|
grammar
|
2 years ago |
|
withchao
|
5e6f9448bc
|
gorm db
|
2 years ago |
|
withchao
|
20ba4e33e8
|
db
|
2 years ago |
|
wangchuxiao
|
29a1f5b4f7
|
errcode
|
2 years ago |
|
wangchuxiao
|
0d0a90a14b
|
errcode
|
2 years ago |
|
wangchuxiao
|
52a0a8aca4
|
errcode
|
2 years ago |
|
wangchuxiao
|
b2cdf4279d
|
errcode
|
2 years ago |
|
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
|
2 years ago |
|
wangchuxiao
|
6619183a48
|
errcode
|
2 years ago |
|
skiffer-git
|
64caafd6b6
|
Error code standardization
|
2 years ago |
|
withchao
|
0f776fb2f3
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
e147dc5b1b
|
callback start
|
2 years ago |
|
skiffer-git
|
c63b543a4a
|
Error code standardization
|
2 years ago |
|
withchao
|
bba819854c
|
group
|
2 years ago |
|
withchao
|
d7ea41fa1a
|
msg rpc
|
2 years ago |
|
withchao
|
048d4b83e1
|
rpc start
|
2 years ago |
|
withchao
|
884d28b9a8
|
msg send pull
|
2 years ago |
|
withchao
|
991a4d1d95
|
msg del
|
2 years ago |
|
withchao
|
52e393dc45
|
msg status
|
2 years ago |
|
skiffer-git
|
452d9840bf
|
Error code standardization
|
2 years ago |
|
Gordon
|
0f5cfbb2dc
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
a3593379f6
|
conversation update
|
2 years ago |
|
wangchuxiao
|
85ebf24325
|
errcode
|
2 years ago |
|
withchao
|
dbf41bf21f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/group/callback.go
|
2 years ago |
|
withchao
|
09c6fbdfe4
|
group
|
2 years ago |
|
wangchuxiao
|
a92dd54354
|
errcode
|
2 years ago |
|
wangchuxiao
|
2e3bb941b0
|
errcode
|
2 years ago |
|
wangchuxiao
|
4aaac8595a
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
0e97285e0a
|
errcode
|
2 years ago |
|
withchao
|
1e1c6de56e
|
group nickname
|
2 years ago |
|
wangchuxiao
|
79c30fdc69
|
errcode
|
2 years ago |
|
withchao
|
5d7809624c
|
group cache
|
2 years ago |
|
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
|
2 years ago |
|
wangchuxiao
|
759432794f
|
errcode
|
2 years ago |
|
withchao
|
a15051bfde
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
d6d6afb788
|
group update batch
|
2 years ago |
|
skiffer-git
|
bfc202f31f
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d26daa23f1
|
`Error code standardization`
|
2 years ago |
|
withchao
|
5da1195274
|
group cache
|
2 years ago |
|
withchao
|
ab30c77836
|
group db
|
2 years ago |
|
wangchuxiao
|
8a1702fcf7
|
errcode
|
2 years ago |
|
wangchuxiao
|
ccc7e6b3c8
|
errcode
|
2 years ago |
|
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
|
2 years ago |
|
wangchuxiao
|
414915eb3b
|
errcode
|
2 years ago |
|
skiffer-git
|
772a46e041
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
22f4d8f66d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
96ef753c77
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
ca6b704377
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
8c6c7ee21f
|
errcode
|
2 years ago |
|
skiffer-git
|
ac284b696a
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# pkg/common/db/controller/user.go
|
2 years ago |
|
skiffer-git
|
9a7ed2d24d
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
62f0d1043d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/cache/conversation.go
pkg/common/db/cache/group.go
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
4826810c2a
|
errcode
|
2 years ago |
|
withchao
|
41d62937ff
|
group rpc
|
2 years ago |
|
withchao
|
f20e9e71b7
|
group complete
|
2 years ago |
|
withchao
|
b3ae69ce94
|
conversation.go
|
2 years ago |
|
withchao
|
ec43f2847e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
324a0ae0ae
|
super group rpc
|
2 years ago |
|
wangchuxiao
|
db51bc87e2
|
errcode
|
2 years ago |
|
wangchuxiao
|
6d700765d2
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
2193d380ca
|
errcode
|
2 years ago |
|
withchao
|
f5adb7a17e
|
group database
|
2 years ago |
|
withchao
|
3423b224fd
|
group db
|
2 years ago |
|
withchao
|
77edbe1edd
|
group controller
|
2 years ago |
|
skiffer-git
|
0565474732
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# go.sum
|
2 years ago |
|
skiffer-git
|
0a2e55311c
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
84c59cecfb
|
errcode
|
2 years ago |
|
wangchuxiao
|
8fc54a7379
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/cache/conversation.go
|
2 years ago |
|
wangchuxiao
|
f4baf847ca
|
errcode
|
2 years ago |
|
withchao
|
66b6d5fc2f
|
group db
|
2 years ago |
|
withchao
|
cfa5420d9d
|
group func name
|
2 years ago |
|
withchao
|
1716de808f
|
realization group rpc
|
2 years ago |
|
withchao
|
26794503c3
|
realization group rpc
|
2 years ago |
|
withchao
|
4645eec8b6
|
realization group rpc
|
2 years ago |
|
withchao
|
4f96cc9b1b
|
group rpc
|
2 years ago |
|
withchao
|
210d04d488
|
rpc GroupApplicationResponse
|
2 years ago |
|
withchao
|
d91039c99d
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
bec4a89f7b
|
1
|
2 years ago |
|
skiffer-git
|
d59c4367fb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
22c63ecdbd
|
Error code standardization
|
2 years ago |
|
Gordon
|
99504eec2e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
|
2 years ago |
|
skiffer-git
|
795a90a194
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1aa3ac9399
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/friend.go
# pkg/common/db/relation/friend_model_k.go
# pkg/common/db/relation/friend_request_model.go
|
2 years ago |
|
withchao
|
a2c4bccdb6
|
1
|
2 years ago |
|
skiffer-git
|
3320f81c8f
|
Error code standardization
|
2 years ago |
|
Gordon
|
3b4c227519
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
withchao
|
4d4a451926
|
1
|
2 years ago |
|
withchao
|
adfcfac711
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/relation.go
|
2 years ago |
|
withchao
|
8e49d7e567
|
1
|
2 years ago |
|
wangchuxiao
|
b637a29348
|
errcode
|
2 years ago |
|
Gordon
|
e167d80469
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
Gordon
|
730be9db47
|
conversation update
|
2 years ago |
|
wangchuxiao
|
01f7262d3a
|
errcode
|
2 years ago |
|
wangchuxiao
|
83eba5a9ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
47b725ac69
|
errcode
|
2 years ago |
|
skiffer-git
|
5402d33519
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
174c3e5fae
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
f6cc91d7db
|
errcode
|
2 years ago |
|
withchao
|
c55785783d
|
1
|
2 years ago |
|
wangchuxiao
|
803ecd3f92
|
errcode
|
2 years ago |
|
wangchuxiao
|
5bb731f884
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/black.go
|
2 years ago |
|
skiffer-git
|
6658566144
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
2e19e3109e
|
Error code standardization
|
2 years ago |
|
withchao
|
2b1868f558
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3651274d68
|
1
|
2 years ago |
|
skiffer-git
|
1d42c220af
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
skiffer-git
|
cbe68507f3
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
c2fbcd1f22
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
withchao
|
d67515f53f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
wangchuxiao
|
d4952ebc16
|
errcode
|
2 years ago |
|
withchao
|
0f3691893e
|
1
|
2 years ago |
|
skiffer-git
|
fb436e7713
|
Error code standardization
|
2 years ago |
|
Gordon
|
aafe17a0f3
|
friend update
|
2 years ago |
|
Gordon
|
80bde864c1
|
friend update
|
2 years ago |
|
Gordon
|
7c92de7899
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
e550c9a874
|
friend update
|
2 years ago |
|
withchao
|
4bea4252ff
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
26e130122c
|
1
|
2 years ago |
|
wangchuxiao
|
4ad6b74d75
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
wangchuxiao
|
40470bc320
|
errcode
|
2 years ago |
|
skiffer-git
|
d44c286ff3
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
bac9ba000e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
00bd22041b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b3e141a3ce
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
e0d05e1fa8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
4c931fba5c
|
errcode
|
2 years ago |
|
skiffer-git
|
954e01c951
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
4e580cb848
|
Error code standardization
|
2 years ago |
