Commit Graph

115 Commits

Author SHA1 Message Date
wangchuxiao d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
skiffer-git 85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +08:00
wangchuxiao 2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao 3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
skiffer-git 073b6d200a Set the token activity time to five minutes ago 2022-08-15 15:40:36 +08:00
欧阳氏 39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
wangchuxiao c4084cbcec callback kickoff 2022-08-11 15:55:33 +08:00
wangchuxiao 062c4b53b6 Merge pull request #258 from ouyangshi/main
增加 AWS S3 存储
2022-08-11 14:32:45 +08:00
Smile 547ad7a2c7 kafka topic优化及解释,删除废弃topic的冗余代码 (#255) 2022-08-11 10:24:37 +08:00
wangchuxiao a74168d1e1 fix delete 2022-08-10 12:02:50 +08:00
wangchuxiao d1ffa9b330 callback fix 2022-08-05 15:54:00 +08:00
Gordon 22a39ed4d3 config file update 2022-08-01 16:56:06 +08:00
Gordon c17ca47e7d config file update 2022-08-01 16:42:07 +08:00
Gordon 6734c714d7 config file update 2022-08-01 16:23:52 +08:00
Gordon 526aa15ff6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-01 16:09:42 +08:00
Gordon bc0e9eb74e config file update 2022-08-01 16:09:03 +08:00
Gordon a425c62156 config file update 2022-08-01 16:01:10 +08:00
wangchuxiao 9136838b63 fix bug 2022-08-01 14:33:01 +08:00
欧阳氏 cfa9f2d13f 增加 AWS S3 存储 2022-07-31 01:14:26 +08:00
wangchuxiao 8f12fa52b4 mongodb superGroup to cache 2022-07-29 14:36:07 +08:00
Gordon e61434347e Merge branch 'superGroup' into v2.3.0release
# Conflicts:
#	go.sum
#	pkg/common/db/RedisModel.go
#	pkg/common/db/model.go
2022-07-25 17:22:47 +08:00
欧阳氏 84c068783d 新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送

新增 api接口  /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器

* mongodb授权缺少授权数据库

windows下面的编译+启动
2022-07-25 17:07:47 +08:00
wangchuxiao eb1aeefc8c Merge branch 'dtm' into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
2022-07-21 10:41:48 +08:00
skiffer-git 7c15a53a62 rename 2022-07-20 20:59:52 +08:00
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
2022-07-14 14:06:30 +08:00
wangchuxiao 9e0e2fe124 fix bug 2022-07-08 19:26:44 +08:00
Gordon f89c1edadf add redis username 2022-07-08 15:17:46 +08:00
skiffer-git d7ce455f2f Super code can be disabled 2022-07-02 09:50:25 +08:00
Gordon d8717bd0b4 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-24 19:04:39 +08:00
Gordon cfcc5c1095 test 2022-06-24 19:04:06 +08:00
wangchuxiao 99062805ec add swagger demo 2022-06-24 17:45:33 +08:00
Gordon b242aac7cd jpush add config for ios env mode 2022-06-21 11:27:39 +08:00
wangchuxiao c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
Gordon 92cb2e7eab config file update 2022-06-17 10:59:50 +08:00
Gordon fd256a6c28 config file update 2022-06-17 10:50:15 +08:00
Gordon 903c39206f msg transfer handle change 2022-06-16 20:35:27 +08:00
wangchuxiao b3dcff2d76 redis interface 2022-06-16 14:45:39 +08:00
Gordon 5e51eebe8a msg handle 2022-06-16 12:21:49 +08:00
wangchuxiao 6525d63459 fix bug 2022-06-09 12:39:28 +08:00
wangchuxiao 276328e0fd fix bug 2022-06-08 15:05:57 +08:00
wangchuxiao 1fffd36054 singal offline push 2022-06-02 20:06:14 +08:00
wangchuxiao 16d33b1c1f singal offline push 2022-06-02 18:17:11 +08:00
wangchuxiao 1eeb7f8303 callback 2022-05-26 19:53:13 +08:00
wangchuxiao b4da35a0ab ingress 2022-05-26 18:02:00 +08:00
wangchuxiao c32b53b3c0 msg cache 2022-05-24 17:22:17 +08:00
wangchuxiao 8c64538207 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-23 14:32:37 +08:00
Gordon ee0a71de1b concurrent consumption of messages 2022-05-19 12:25:46 +08:00
wangchuxiao 23b03919e6 office tag async send 2022-05-19 10:44:39 +08:00
wangchuxiao 6b5fb81e01 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-12 19:06:25 +08:00
wangchuxiao bb5991b111 organization 2022-05-12 19:00:48 +08:00