310 Commits

Author SHA1 Message Date
wangchuxiao
51529eece3 del files 2023-01-13 18:00:18 +08:00
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
wangchuxiao
0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
wangchuxiao
4d56dfdfa2 modify 2022-12-09 12:13:14 +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
f8ca38b7e3 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:07:14 +08:00
wangchuxiao
bfeb434920 conf script 2022-11-14 18:03:44 +08:00
skiffer-git
7101ba472d config 2022-11-14 16:02:00 +08:00
wangchuxiao
b21cc930af Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-14 15:37:51 +08:00
wangchuxiao
ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao
7364dc1989 fix config 2022-11-12 17:12:06 +08:00
wangchuxiao
5b816b095d fix conf 2022-11-11 19:01:23 +08:00
wangchuxiao
d6e14eafef k8s version update 2022-11-11 15:18:04 +08:00
wangchuxiao
cb9db10052 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
2022-11-11 10:56:47 +08:00
skiffer-git
66960b147a nginx config 2022-11-10 22:09:05 +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
skiffer-git
6ced618c1c nginx config 2022-11-10 14:56:29 +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
e52be45659 slack 2022-11-10 14:26:39 +08:00
skiffer-git
e7e08a94a9 slack 2022-11-10 14:24:30 +08:00
skiffer-git
d22c3867c1 slack 2022-11-10 09:23:28 +08:00
skiffer-git
e52f65f690 slack 2022-11-10 09:23:19 +08:00
skiffer-git
dfcfa643f0 nginx config 2022-11-09 21:05:14 +08:00
wangchuxiao
a986068cbb Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 19:40:16 +08:00
skiffer-git
af6915b1b0 install_im_server 2022-11-09 18:24:45 +08:00
wangchuxiao
af46999a16 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 18:18:35 +08:00
skiffer-git
decef23751 config 2022-11-09 12:36:55 +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
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
skiffer-git
93cb01e7e6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-16 16:52:15 +08:00
skiffer-git
139285c46a Support mongodb cluster 2022-09-16 16:52:03 +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
06117c98b1 Support mongodb cluster 2022-09-16 16:17:21 +08:00
skiffer-git
3bdafc2a11 Support mongodb cluster 2022-09-16 15:11:13 +08:00
skiffer-git
3c4227696c Support mongodb cluster 2022-09-16 15:08:48 +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
wangchuxiao
ef66b10501 prome 2022-09-12 19:32:24 +08:00
wangchuxiao
aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao
95910f5c17 prome 2022-09-08 01:27:05 +08:00