Compare commits

...

71 Commits
main ... v3.2.1

Author SHA1 Message Date
Gordon
e49e3475b2 fix: pull message set isRead only message come from single.
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-21 12:05:54 +08:00
Gordon
4f69dd496c Merge remote-tracking branch 'upstream/main' 2023-08-18 22:32:47 +08:00
Gordon
a1bdb01cd2 fix: check component
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-18 22:15:48 +08:00
Gordon
a77c47ebf6 Merge remote-tracking branch 'origin/main' 2023-08-18 22:00:27 +08:00
Gordon
e2c90d7d12 Merge remote-tracking branch 'upstream/main' 2023-08-18 22:00:03 +08:00
FGadvancer
ac29fd654e cicd: robot automated Change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-18 13:44:55 +00:00
Gordon
1c751db156 Merge remote-tracking branch 'upstream/main' 2023-08-18 21:41:44 +08:00
Gordon
ac7e909463 fix: start don't kill old process
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 21:19:04 +08:00
Gordon
dc419794e7 Merge remote-tracking branch 'upstream/main' 2023-08-17 20:24:27 +08:00
Gordon
729b18d2a2 Merge branch 'main' into main 2023-08-17 19:30:24 +08:00
Gordon
1d7ec29358 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 19:23:37 +08:00
Gordon
fc243d321c fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 19:20:11 +08:00
Gordon
e6fd55555d Merge remote-tracking branch 'upstream/main' 2023-08-17 19:16:37 +08:00
Gordon
8361e3554e fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:51:21 +08:00
Gordon
9e65261763 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:49:53 +08:00
Gordon
60383415d7 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:46:30 +08:00
Gordon
6021080e7b fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:45:52 +08:00
Gordon
8c05b2771a fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:45:03 +08:00
Gordon
975b9ef62b fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:43:58 +08:00
Gordon
d88e77868d fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:42:30 +08:00
Gordon
32a2614039 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:41:13 +08:00
Gordon
a63fa37ad1 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:36:48 +08:00
Gordon
05388598c1 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:28:38 +08:00
Gordon
0721fb75f8 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:26:58 +08:00
Gordon
74484735f8 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:22:44 +08:00
Gordon
5b5d6c3318 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:07:10 +08:00
Gordon
a5c412ceaa fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:06:02 +08:00
Gordon
63c1778ae7 fix: script update
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 17:01:18 +08:00
Gordon
014c3b7824 fix: check msg-transfer script
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 16:40:53 +08:00
Gordon
cd87175697 Merge remote-tracking branch 'origin/main' 2023-08-17 15:18:52 +08:00
Gordon
f4b0c79f70 fix: pull message add isRead field
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 15:15:52 +08:00
FGadvancer
56bcb57b53 cicd: robot automated Change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-17 06:27:07 +00:00
Gordon
407dff20f1 feat: sync upstream
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 14:24:25 +08:00
Gordon
233c1e3fef feat: remove go work sum
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 14:22:05 +08:00
Gordon
0cc5125ef6 Merge remote-tracking branch 'origin/main' 2023-08-17 12:42:22 +08:00
Gordon
2639ecb7ce feat: add api of get server time
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-17 12:41:52 +08:00
FGadvancer
c7bbe6acc4 cicd: robot automated Change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-17 04:31:14 +00:00
Gordon
33f9e28865 Merge remote-tracking branch 'origin/main' 2023-08-17 12:28:26 +08:00
Gordon
edc2f79740 Merge remote-tracking branch 'upstream/main' 2023-08-17 12:28:08 +08:00
FGadvancer
bd118ba824 cicd: robot automated Change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-15 11:19:59 +00:00
Gordon
8744accfa1 Merge remote-tracking branch 'upstream/main' 2023-08-15 19:17:08 +08:00
FGadvancer
0af496417c cicd: robot automated Change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-14 02:52:31 +00:00
Gordon
89c0dc43a2 Merge remote-tracking branch 'origin/main' 2023-08-14 10:49:47 +08:00
Gordon
cdbd4d5240 feat: fetch origin
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-14 10:48:14 +08:00
Xinwei Xiong
bbb9f85a50 Merge branch 'main' into main 2023-08-10 21:47:28 +08:00
Gordon
3ffbb90d77 chore: network mode change
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-10 20:47:40 +08:00
Gordon
3b74ad3d9a refactor: log change
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-09 20:14:00 +08:00
Gordon
82d7255058 refactor: log change
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-08-07 19:58:55 +08:00
Gordon
a6fd0f95bf Merge remote-tracking branch 'upstream/main' 2023-07-31 12:01:13 +08:00
Gordon
a99e54de6b fix: msggateway add online status call
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-07-28 22:27:52 +08:00
Gordon
7eeb3d6792 fix: get all userID
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-07-28 18:18:47 +08:00
Gordon
ba6013d352 fix: get all userID
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-07-28 18:10:47 +08:00
Gordon
0c1bbd0de5 fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-27 20:03:49 +08:00
Gordon
bc70c5bb15 fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-27 16:09:17 +08:00
Gordon
177a163d90 fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:58:41 +08:00
Gordon
445c34d9ed fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:57:54 +08:00
Gordon
82e53195c1 fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:56:09 +08:00
Gordon
d4d88d56ad fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:54:45 +08:00
Gordon
49220ccfbf fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:51:55 +08:00
withchao
ac14dd0249 chore: package path changes
Signed-off-by: withchao <993506633@qq.com>
2023-07-26 17:23:35 +08:00
withchao
f4c31ea09a Merge remote-tracking branch 'origin/main' 2023-07-26 17:17:59 +08:00
withchao
0ed80222fe chore: package path changes
Signed-off-by: withchao <993506633@qq.com>
2023-07-26 17:17:40 +08:00
Gordon
ce81f6b096 fix: token update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:17:25 +08:00
withchao
4fc70a7815 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	go.mod
#	go.sum
2023-07-26 17:09:40 +08:00
Gordon
6b1e2015c2 fix: go mod update
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 17:06:35 +08:00
withchao
be0abddcc4 Merge remote-tracking branch 'origin/main' 2023-07-26 16:57:19 +08:00
withchao
eaeb342b0e chore: package path changes
Signed-off-by: withchao <993506633@qq.com>
2023-07-26 16:56:25 +08:00
Gordon
f0227efa30 fix: msg gateway start output err info
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-26 16:42:18 +08:00
Gordon
78daeec424 Merge remote-tracking branch 'upstream/main' 2023-07-26 15:21:33 +08:00
Gordon
5cc7483a4f fix: msg gateway start output err info
Signed-off-by: Gordon <1432970085@qq.com>
2023-07-20 20:55:30 +08:00
Gordon
a99b6a1700 fix: to start im or chat, ZooKeeper must be started first. 2023-07-20 10:50:58 +08:00

View File

@@ -15,6 +15,7 @@
package convert
import (
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/protocol/sdkws"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
@@ -78,7 +79,9 @@ func MsgDB2Pb(msgModel *unrelation.MsgDataModel) *sdkws.MsgData {
msg.SendTime = msgModel.SendTime
msg.CreateTime = msgModel.CreateTime
msg.Status = msgModel.Status
msg.IsRead = msgModel.IsRead
if msgModel.SessionType == constant.SingleChatType {
msg.IsRead = msgModel.IsRead
}
msg.Options = msgModel.Options
if msgModel.OfflinePush != nil {
msg.OfflinePushInfo = &sdkws.OfflinePushInfo{