810 Commits

Author SHA1 Message Date
wangchuxiao
6205c67b70 log 2023-01-12 15:55:44 +08:00
wangchuxiao
e466faa20d db 2023-01-11 19:03:26 +08:00
wangchuxiao
88d6fc663a db 2023-01-11 17:40:20 +08:00
wangchuxiao
dff32dd7ef db 2023-01-11 17:32:49 +08:00
wangchuxiao
d3c9ef6992 fix Pb2String 2023-01-11 16:46:09 +08:00
wangchuxiao
c96ccfc7f5 fix Pb2String 2023-01-11 16:23:16 +08:00
wangchuxiao
07a6439082 fix Pb2String 2023-01-11 11:15:46 +08:00
withchao
9341a5f57f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/group.go
2023-01-10 10:17:28 +08:00
wangchuxiao
5cbfe7c73f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
2023-01-09 16:49:14 +08:00
wangchuxiao
69787064e9 group rpc 2023-01-09 16:37:33 +08:00
withchao
aa2b43293d group 2023-01-09 14:51:31 +08:00
withchao
36be1f4be8 group 2023-01-09 14:29:53 +08:00
withchao
4a098a4a0e group 2023-01-09 14:29:43 +08:00
wangchuxiao
ac74d01d35 groupCallback 2023-01-09 14:27:08 +08:00
withchao
90fddd34d2 CreateGroup 2023-01-06 16:21:43 +08:00
wangchuxiao
463f08546e groupCallback 2023-01-06 14:36:39 +08:00
wangchuxiao
297f3c16a8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-05 15:30:33 +08:00
skiffer-git
4147c68f6d Error code standardization 2023-01-05 11:33:17 +08:00
skiffer-git
847860a0c7 Error code standardization 2023-01-05 10:07:38 +08:00
withchao
c092c0e72d group member db 2023-01-04 21:56:42 +08:00
wangchuxiao
633aefad56 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:49:47 +08:00
wangchuxiao
6bd9b3d82f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:38:07 +08:00
wangchuxiao
7743801795 errCode 2023-01-04 19:35:07 +08:00
skiffer-git
bedba8d8f5 Error code standardization 2023-01-04 19:32:44 +08:00
skiffer-git
4aad2c86ec Error code standardization 2023-01-04 19:26:57 +08:00
skiffer-git
b041cb6cbf Error code standardization 2023-01-04 19:09:53 +08:00
withchao
99de72d723 1 2023-01-04 18:43:49 +08:00
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
c076f16793 Error code standardization 2023-01-04 11:54:49 +08:00
skiffer-git
89a4fe96b5 Error code standardization 2023-01-04 10:12:20 +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
wangchuxiao
e80afa610d getui 2022-12-21 16:46:16 +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
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