149 Commits

Author SHA1 Message Date
Gordon
1026a6b2b6 Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-12-23 16:16:28 +08:00
wangchuxiao
920a7cfdac set groupMemberInfo callback 2022-12-16 16:54:18 +08:00
skiffer-git
46ee4e41a1 simplify init logging 2022-12-14 14:15:53 +08:00
wangchuxiao
0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
wangchuxiao
be01c4da0c dek jinzhu 2022-12-07 21:12:48 +08:00
skiffer-git
5d4600a080 Separate the notification 2022-12-07 10:00:53 +08:00
wangchuxiao
819ebf0ede add callback and fix cache 2022-11-22 11:07:20 +08:00
wangchuxiao
405a60c4f8 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:35:53 +08:00
wangchuxiao
ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao
08a4b92f3a mute member cant send msg 2022-11-11 18:06:15 +08:00
wangchuxiao
d6e14eafef k8s version update 2022-11-11 15:18:04 +08:00
wangchuxiao
08f3a79e6e add usualConfig 2022-11-10 18:23:11 +08:00
wangchuxiao
9a9d6ac524 config 2022-11-10 15:32:01 +08:00
wangchuxiao
bb1babad11 config 2022-11-10 14:51:35 +08:00
wangchuxiao
1a93592253 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-10 14:30:00 +08:00
skiffer-git
1f0040ceb6 Specify the relative path for the configuration file 2022-11-08 11:08:27 +08:00
wangchuxiao
16b3ea8b7e callback update 2022-10-21 15:44:55 +08:00
wangchuxiao
162478563c add friend callback 2022-10-19 21:06:48 +08:00
wangchuxiao
9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +08:00
wangchuxiao
b18813689d workmoment 2022-09-27 15:45:47 +08:00
wangchuxiao
764b34d947 workmoment 2022-09-27 15:35:36 +08:00
liu ming
e000dc18aa
添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
2022-09-23 17:40:48 +08:00
wangchuxiao
af2baba1e3 merge shichuang 2022-09-16 17:23:28 +08:00
wangchuxiao
dc401c784a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-16 16:51:25 +08:00
wangchuxiao
bb0f5e97a2 kafka 2022-09-16 16:51:12 +08:00
skiffer-git
5d78fa9519 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-16 15:07:13 +08:00
skiffer-git
eb2a9d540e Support mongodb cluster 2022-09-16 15:06:49 +08:00
wangchuxiao
665e2e3e83 add mysql 2022-09-16 11:57:01 +08:00
wangchuxiao
d534f026b0 promethues 2022-09-14 17:45:38 +08:00
skiffer-git
60f0c80c36 log 2022-09-14 12:31:24 +08:00
wangchuxiao
f41cebe776 prometheus 2022-09-09 01:39:00 +08:00
wangchuxiao
aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao
6754fdb580 getui 2022-09-07 18:20:41 +08:00
wangchuxiao
c3d3f0986e join groups 2022-08-29 14:34:07 +08:00
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