IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,907 Commits 35 Branches 142 Tags
080dfa5563b2298a97f91e6c009485d5b3bf2e40
Commit Graph

168 Commits

Author SHA1 Message Date
wangchuxiao f177715ada Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	internal/api/auth.go
	internal/api/route.go
	internal/api/user.go
	internal/rpc/third/third.go
 2023-03-03 17:45:15 +08:00
wangchuxiao 96d9b25b57 proto modify 2023-03-03 17:42:26 +08:00
withchao e93425c574 api rpc third 2023-03-03 17:20:36 +08:00
wangchuxiao 4ac9943565 conf 2023-02-28 15:20:57 +08:00
wangchuxiao 4c426c7c7c config modify 2023-02-24 17:42:01 +08:00
wangchuxiao 7930c230e4 config path 2023-02-23 19:51:58 +08:00
wangchuxiao a26ca657fe config path 2023-02-23 19:41:44 +08:00
wangchuxiao f586ab1ac2 push 2023-02-23 19:15:30 +08:00
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
 2023-02-22 19:52:53 +08:00
wangchuxiao 94d50a6c71 push 2023-02-22 19:51:14 +08:00
skiffer-git 5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
wangchuxiao 6619183a48 errcode 2023-02-15 15:52:32 +08:00
wangchuxiao a92dd54354 errcode 2023-02-10 18:13:58 +08:00
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
 2023-02-09 20:39:12 +08:00
wangchuxiao 759432794f errcode 2023-02-09 20:36:34 +08:00
skiffer-git d26daa23f1 Error code standardization 2023-02-09 17:55:59 +08:00
wangchuxiao 2193d380ca errcode 2023-02-08 17:56:04 +08:00
wangchuxiao 40438f529a del files 2023-01-13 19:05:43 +08:00
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
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