blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,218 Commits 40 Branches 130 Tags
Commit Graph

191 Commits

Author SHA1 Message Date
withchao
1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
 2023-03-16 10:51:00 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao
ea8de45a6c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 15:29:58 +08:00
withchao
e9865539de s3 2023-03-15 11:24:59 +08:00
withchao
6a95025e41 s3 2023-03-14 19:33:44 +08:00
Gordon
78a30a7663 user bug fix 2023-03-13 12:15:25 +08:00
wangchuxiao
9709271ae3 log 2023-03-13 10:21:50 +08:00
wangchuxiao
acadfd2c35 script 2023-03-09 15:17:46 +08:00
wangchuxiao
0c98231fcd script 2023-03-09 13:26:58 +08:00
wangchuxiao
8904ebccbc script 2023-03-09 12:46:56 +08:00
wangchuxiao
889f3031bf script 2023-03-09 11:35:52 +08:00
wangchuxiao
2bc2b4cf24 script 2023-03-09 11:10:12 +08:00
wangchuxiao
e10b0743dc script 2023-03-09 10:28:48 +08:00
wangchuxiao
040fd345e0 script 2023-03-08 20:02:34 +08:00
wangchuxiao
4c5210af59 script 2023-03-08 19:59:22 +08:00
wangchuxiao
107f4c950b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-08 11:46:03 +08:00
wangchuxiao
e55167d0bf test cobra 2023-03-08 11:45:54 +08:00
withchao
5df6847f7d version 2023-03-08 11:42:15 +08:00
wangchuxiao
ea614167a6 test cobra 2023-03-07 17:59:34 +08:00
wangchuxiao
6ad93962aa test cobra 2023-03-06 18:52:49 +08:00
wangchuxiao
757fd4bf0b test cobra 2023-03-06 18:41:59 +08:00
wangchuxiao
6ca1d403b2 test cobra 2023-03-06 18:26:23 +08:00
wangchuxiao
15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
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