1824 Commits

Author SHA1 Message Date
wangchuxiao
f2cade3251 errCode 2023-01-04 18:36:04 +08:00
wangchuxiao
9d433fb248 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 18:20:31 +08:00
wangchuxiao
94d087b1bc errCode 2023-01-04 18:19:18 +08:00
skiffer-git
64b4e5570c Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/friend/friend.go
#	pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
2023-01-04 17:23:27 +08:00
skiffer-git
86bf207e02 Error code standardization 2023-01-04 17:22:55 +08:00
wangchuxiao
b13ab0f0ba Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 17:21:46 +08:00
wangchuxiao
2d8a538798 errCode 2023-01-04 17:21:33 +08:00
withchao
e9446d0360 1 2023-01-04 17:16:06 +08:00
skiffer-git
5a2a57c706 Error code standardization 2023-01-04 15:51:02 +08:00
skiffer-git
c076f16793 Error code standardization 2023-01-04 11:54:49 +08:00
wangchuxiao
58bb3fe3f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 11:32:30 +08:00
wangchuxiao
cbe7dcebea errCode 2023-01-04 11:28:52 +08:00
skiffer-git
4acde81cc4 Error code standardization 2023-01-04 11:26:35 +08:00
skiffer-git
1d5e4a0f8a Error code standardization 2023-01-04 11:06:28 +08:00
skiffer-git
89a4fe96b5 Error code standardization 2023-01-04 10:12:20 +08:00
skiffer-git
efd5da9e87 Error code standardization 2023-01-03 16:37:04 +08:00
skiffer-git
5e5d238e82 Error code standardization 2023-01-03 14:19:23 +08:00
skiffer-git
c77868bfae Error code standardization 2023-01-03 14:09:51 +08:00
skiffer-git
bf747e538b Error code standardization 2023-01-03 14:08:29 +08:00
skiffer-git
a2cd47f79f Error code standardization 2022-12-30 19:46:26 +08:00
skiffer-git
32d7846139 Error code standardization 2022-12-30 18:46:02 +08:00
wangchuxiao
e588091bf6 mongodb 2022-12-27 11:01:21 +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
Gordon
86fc0e4101 reaction message update 2022-12-22 17:23:14 +08:00
wangchuxiao
e80afa610d getui 2022-12-21 16:46:16 +08:00
Gordon
20a2cb3d3c reaction message update 2022-12-19 11:18:23 +08:00
wangchuxiao
920a7cfdac set groupMemberInfo callback 2022-12-16 16:54:18 +08:00
skiffer-git
a78e43bfe3 Simplify logs 2022-12-14 15:22:06 +08:00
skiffer-git
7b57b924ee Simplify logs 2022-12-14 14:52:39 +08:00
skiffer-git
46ee4e41a1 simplify init logging 2022-12-14 14:15:53 +08:00
Gordon
915118140f reaction message add expiration 2022-12-12 20:41:40 +08:00
wangchuxiao
112ce9b450 Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
#	pkg/proto/msg/msg.pb.go
2022-12-12 19:24:53 +08:00
wangchuxiao
0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
Gordon
25871aea49 reaction message add expiration 2022-12-12 19:15:31 +08:00
Gordon
b3f5c2f185 reaction message add expiration 2022-12-12 12:12:53 +08:00
Gordon
ac55951c74 message reaction 2022-12-11 13:16:24 +08:00
Gordon
6f20cdd905 reaction message 2022-12-09 20:53:13 +08:00
wangchuxiao
6d45f0730c mongo operation 2022-12-09 19:54:49 +08:00
wangchuxiao
24288aa597 modify msg 2022-12-09 18:03:40 +08:00
Gordon
9cb30e0ec6 reaction message 2022-12-09 14:28:24 +08:00
wangchuxiao
a4e2e23fbe modify 2022-12-08 19:50:28 +08:00
wangchuxiao
0e726a20ba modify 2022-12-08 12:54:39 +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
skiffer-git
01b1116017 log 2022-12-06 13:06:20 +08:00
skiffer-git
d3af2e6547 log 2022-12-06 12:51:39 +08:00
skiffer-git
b5a031be9f log 2022-12-06 12:06:37 +08:00
wangchuxiao
d5e7d3298a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-05 18:30:13 +08:00
wangchuxiao
837efc90b6 ws connID 2022-12-05 18:29:58 +08:00
skiffer-git
9394d340a2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-05 17:10:15 +08:00