wangchuxiao
|
b705ac24fa
|
fix code
|
2 years ago |
|
wangchuxiao
|
4ec255917d
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
|
2 years ago |
|
wangchuxiao
|
9b86a18752
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/ip_model.go
|
2 years ago |
skiffer-git
|
630fef29a2
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
05d45c94d5
|
ip limit
|
2 years ago |
Gordon
|
1f8a965b7a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
8b491f4c94
|
retry function
|
2 years ago |
|
skiffer-git
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
skiffer-git
|
5e3a3c61f3
|
Set the token activity time to five minutes ago
|
2 years ago |
|
skiffer-git
|
073b6d200a
|
Set the token activity time to five minutes ago
|
2 years ago |
|
Gordon
|
652d560a21
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
be69ee8b1d
|
fcm update
|
2 years ago |
|
wangchuxiao
|
d5239365be
|
hide jwt not active yet
|
2 years ago |
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
wangchuxiao
|
9b130ae56c
|
fix log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
2 years ago |
|
wangchuxiao
|
e4bbd57c41
|
fix log
|
2 years ago |
|
wangchuxiao
|
69008e08be
|
cms api rpc
|
2 years ago |
|
wangchuxiao
|
60029fc618
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f3e71fec91
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
cc3f53d572
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
a2ddf3567c
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
aa7ba6d659
|
callback kickoff
|
2 years ago |
|
skiffer-git
|
c53bcd990d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
78c807a514
|
add Invitation Code
|
2 years ago |
|
wangchuxiao
|
c4084cbcec
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
062c4b53b6
|
Merge pull request #258 from ouyangshi/main
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
06729c4e84
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
5c5f80691a
|
fix delete
|
2 years ago |
|
skiffer-git
|
5a0340e927
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
eb7e6a566b
|
Multiple gateways
|
2 years ago |
|
wangchuxiao
|
429bee7e6c
|
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
|
2 years ago |
Smile
|
547ad7a2c7
|
kafka topic优化及解释，删除废弃topic的冗余代码 (#255)
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
skiffer-git
|
281f4b38d2
|
add log
|
2 years ago |
|
skiffer-git
|
7b590e4bd6
|
add log
|
2 years ago |
|
skiffer-git
|
923a035e6e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a2a56980d9
|
add log
|
2 years ago |
|
wangchuxiao
|
a74168d1e1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
6c0922a6d8
|
fix delete
|
2 years ago |
|
wangchuxiao
|
706f6c6747
|
getui debug
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
欧阳氏
|
9358aa1bd8
|
用户表增加注册IP 登陆IP
1、用户表增加注册IP 登陆IP
2、新增ip_limit表、user_ip_limit表
3、用户创建需要增加createIp参数同步
用户登录需要增加loginIp参数同步
login_limit 限制说明
0:读取ip_limits表 限制用户注册+用户登陆IP
1:读取user_ip_limits表 限制用户在指定IP登陆
2:读取black_lists表 限制用户在限制时间不能登陆
|
2 years ago |
|
Gordon
|
e33af2a316
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
ffc4da1589
|
callback add seq
|
2 years ago |
|
wangchuxiao
|
4cfa8d880f
|
getui debug
|
2 years ago |
|
skiffer-git
|
bba5e7db0c
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb960f2606
|
fix bug
|
2 years ago |
|
skiffer-git
|
92a68108a6
|
fix bug
|
2 years ago |
|
skiffer-git
|
ae8acc6eba
|
GetGroupAbstractInfoResp
|
2 years ago |
|
wangchuxiao
|
12cbb1f6f9
|
group hash
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
wangchuxiao
|
faae01cb8a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
00bddd5e57
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
skiffer-git
|
68eed69221
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/base_info/group_api_struct.go
|
2 years ago |
|
skiffer-git
|
5db5bf17cb
|
add GetGroupAbstractInfo api
|
2 years ago |
|
Gordon
|
319631b5c4
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
0489c35417
|
unread bug fix
|
2 years ago |
|
Gordon
|
10c0f3075a
|
unread bug fix
|
2 years ago |
|
wangchuxiao
|
576348b1f2
|
callback fix
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
0f655e9292
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
2 years ago |
|
Gordon
|
0117e96d5b
|
callback msg content
|
2 years ago |
|
Gordon
|
ca7bba33e6
|
docker-compose file update
|
2 years ago |
|
wangchuxiao
|
b294a8138c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
a99dbf634b
|
callback fix
|
2 years ago |
|
skiffer-git
|
cda0fb6a10
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a1392a7677
|
GetGroupAllMemberListBySplit
|
2 years ago |
|
Gordon
|
7057d7fffb
|
pb add fields
|
2 years ago |
|
wangchuxiao
|
b32463df53
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f202d5f54a
|
fix bug
|
2 years ago |
|
Gordon
|
22a39ed4d3
|
config file update
|
2 years ago |
|
Gordon
|
4003befc2a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c17ca47e7d
|
config file update
|
2 years ago |
|
wangchuxiao
|
e2e5ab656f
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
b4d82579b7
|
fix bug
|
2 years ago |
|
Gordon
|
6734c714d7
|
config file update
|
2 years ago |
|
Gordon
|
526aa15ff6
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bc0e9eb74e
|
config file update
|
2 years ago |
|
Gordon
|
a425c62156
|
config file update
|
2 years ago |
|
wangchuxiao
|
9136838b63
|
fix bug
|
2 years ago |
|
欧阳氏
|
cfa9f2d13f
|
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
0a8a248349
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b29f93dcd2
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
1c85424488
|
mongodb superGroup
|
2 years ago |
|
Gordon
|
b753536437
|
add test file
|
2 years ago |
|
Gordon
|
2b54f0a7ae
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
6def5bd3cf
|
add test file
|
2 years ago |
|
wenxu12345
|
efe727ec71
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
d278dfb996
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
6a19c8130c
|
Adjust error code
|
2 years ago |
|
Gordon
|
c43290338d
|
add test file
|
2 years ago |
|
Gordon
|
783a982ca8
|
remove _:
|
2 years ago |
|
wangchuxiao
|
6e826cf369
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
8f12fa52b4
|
mongodb superGroup to cache
|
2 years ago |
|
Gordon
|
6d15e5b5a1
|
msg
|
2 years ago |
|
Gordon
|
51679b47a6
|
delete super group message
|
2 years ago |
|
Gordon
|
787cef54f5
|
manger send msg modify
|
2 years ago |
|
Gordon
|
4b6332dbfa
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bbc62ef907
|
remove cache message from redis
|
2 years ago |
|
wenxu12345
|
90401d4d12
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
5a626e9dab
|
add update conversation unread count
|
2 years ago |
|
wenxu12345
|
0ddf5eadb6
|
Push message to client through message queue
|
2 years ago |
|
wenxu12345
|
b1377218b1
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
80d74f6f38
|
Push message to client through message queue
|
2 years ago |
|
wangchuxiao
|
192c764c8c
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
a3530be7b4
|
firebase update
|
2 years ago |
|
Gordon
|
e61434347e
|
Merge branch 'superGroup' into v2.3.0release
# Conflicts:
# go.sum
# pkg/common/db/RedisModel.go
# pkg/common/db/model.go
|
2 years ago |
|
欧阳氏
|
84c068783d
|
新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送
新增 api接口 /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器
* mongodb授权缺少授权数据库
windows下面的编译+启动
|
2 years ago |
|
wangchuxiao
|
a3f62e2246
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a5ef78fd1e
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a937a94e43
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a6cf407a8f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
eec8eb4766
|
dtm
|
2 years ago |
|
wangchuxiao
|
52c71e3843
|
dtm
|
2 years ago |
|
wangchuxiao
|
960e3d34eb
|
dtm
|
2 years ago |
|
wangchuxiao
|
cbb127ff38
|
Merge branch 'dtm' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
db1a043261
|
dtm
|
2 years ago |
|
wangchuxiao
|
f9eee19cbe
|
dtm
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
53eebb0638
|
rename
|
2 years ago |
|
skiffer-git
|
4546e77d5b
|
rename
|
2 years ago |
|
skiffer-git
|
7d2eb31f05
|
rename
|
2 years ago |
|
skiffer-git
|
7c15a53a62
|
rename
|
2 years ago |
|
wangchuxiao
|
1531db0a35
|
departmentcache
|
2 years ago |
|
wangchuxiao
|
6d91f766e7
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
bf5bce9e64
|
rocks cache
|
2 years ago |
|
wangchuxiao
|
5afa3380a6
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
85f5c59781
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
656241c23f
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
wangchuxiao
|
abe06b8753
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1b4b2b9bb1
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
ad1d759840
|
Application for joining the group: JoinSource && InviterUserID
|
2 years ago |
|
wangchuxiao
|
1e6a93b4b6
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
# internal/rpc/user/user.go
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
8ad22f8148
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b064244907
|
rocks cache
|
2 years ago |
|
skiffer-git
|
a01156feb6
|
fix bug
|
2 years ago |
|
skiffer-git
|
af1d8fa834
|
fix bug
|
2 years ago |
