Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wecloud_im_server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
wecloud_im_server
Commits
97981223
Commit
97981223
authored
Dec 22, 2021
by
lixiaozhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据库升级后,字段报错问题
parent
7f0c91e6
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
16 deletions
+21
-16
bootstrap/src/test/java/io/geekidea/springbootplus/test/ImConversationMembersTest.java
+1
-1
core/src/main/java/com/wecloud/im/entity/ImConversation.java
+1
-1
core/src/main/java/com/wecloud/im/entity/ImMessage.java
+1
-1
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+4
-4
core/src/main/java/com/wecloud/im/service/impl/ImInboxServiceImpl.java
+1
-1
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+1
-1
core/src/main/resources/mapper/ImConversationMapper.xml
+2
-2
core/src/main/resources/mapper/ImMessageMapper.xml
+5
-5
docs/db/wecloud_im.sql
+5
-0
No files found.
bootstrap/src/test/java/io/geekidea/springbootplus/test/ImConversationMembersTest.java
View file @
97981223
...
...
@@ -42,7 +42,7 @@ public class ImConversationMembersTest {
imConversation
.
setCreator
(
creator
);
imConversation
.
setName
(
""
);
imConversation
.
setAttributes
(
""
);
imConversation
.
setSystem
(
false
);
imConversation
.
setSystem
Flag
(
false
);
imConversationService
.
save
(
imConversation
);
// 将自己添加到会话
...
...
core/src/main/java/com/wecloud/im/entity/ImConversation.java
View file @
97981223
...
...
@@ -54,6 +54,6 @@ public class ImConversation extends BaseEntity {
private
String
attributes
;
@ApiModelProperty
(
"可选 对话类型标志,是否是系统对话,后面会说明。"
)
private
Boolean
system
;
private
Boolean
system
Flag
;
}
core/src/main/java/com/wecloud/im/entity/ImMessage.java
View file @
97981223
...
...
@@ -56,7 +56,7 @@ public class ImMessage extends BaseEntity {
private
Boolean
event
;
@ApiModelProperty
(
"0非系统通知; 1为系统通知"
)
private
Boolean
system
;
private
Boolean
system
Flag
;
@ApiModelProperty
(
"at他人,传入客户端id数组"
)
private
String
at
;
...
...
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
View file @
97981223
...
...
@@ -185,7 +185,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversation
.
setFkAppid
(
createClient
.
getFkAppid
());
imConversation
.
setCreator
(
creator
);
imConversation
.
setName
(
imConversationCreate
.
getName
());
imConversation
.
setSystem
(
false
);
imConversation
.
setSystem
Flag
(
false
);
JsonMapper
jsonMapper
=
new
JsonMapper
();
// 拓展数据
String
writeValueAsString
=
jsonMapper
.
writeValueAsString
(
imConversationCreate
.
getAttributes
());
...
...
@@ -300,7 +300,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setWithdraw
(
false
);
imMessage
.
setEvent
(
true
);
imMessage
.
setSystem
(
false
);
imMessage
.
setSystem
Flag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setFkConversationId
(
imClientToConversation
.
getConversationId
());
boolean
save
=
imMessageService
.
save
(
imMessage
);
...
...
@@ -417,7 +417,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setWithdraw
(
false
);
imMessage
.
setEvent
(
true
);
imMessage
.
setSystem
(
false
);
imMessage
.
setSystem
Flag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setFkConversationId
(
imClientToConversation
.
getConversationId
());
boolean
save
=
imMessageService
.
save
(
imMessage
);
...
...
@@ -526,7 +526,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setWithdraw
(
false
);
imMessage
.
setEvent
(
true
);
imMessage
.
setSystem
(
false
);
imMessage
.
setSystem
Flag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setFkConversationId
(
imClientToConversation
.
getConversationId
());
boolean
save
=
imMessageService
.
save
(
imMessage
);
...
...
core/src/main/java/com/wecloud/im/service/impl/ImInboxServiceImpl.java
View file @
97981223
...
...
@@ -187,7 +187,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
imMessage
.
setSender
(
curentClient
.
getId
());
imMessage
.
setWithdraw
(
false
);
imMessage
.
setEvent
(
true
);
imMessage
.
setSystem
(
false
);
imMessage
.
setSystem
Flag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setFkConversationId
(
conversationMember
.
getFkConversationId
());
...
...
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
View file @
97981223
...
...
@@ -152,7 +152,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessage
.
setContent
(
content
);
imMessage
.
setWithdraw
(
false
);
imMessage
.
setEvent
(
false
);
imMessage
.
setSystem
(
false
);
imMessage
.
setSystem
Flag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setFkConversationId
(
toConversationId
);
this
.
save
(
imMessage
);
...
...
core/src/main/resources/mapper/ImConversationMapper.xml
View file @
97981223
...
...
@@ -5,7 +5,7 @@
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id
, create_time, update_time, last_message, fk_appid, creator, name, attributes, system
, create_time, update_time, last_message, fk_appid, creator, name, attributes, system
_flag
</sql>
<select
id=
"getImConversationById"
resultType=
"com.wecloud.im.param.ImConversationQueryVo"
>
...
...
@@ -25,7 +25,7 @@
imConversation.create_time,
imConversation.`name`,
imConversation.attributes as attribute,
imConversation.system,
imConversation.system
_flag
,
im_client.client_id AS creator,
(SELECT COUNT(im_inbox.id)
FROM im_inbox
...
...
core/src/main/resources/mapper/ImMessageMapper.xml
View file @
97981223
...
...
@@ -5,7 +5,7 @@
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id
, create_time, withdraw_time, update_date, fk_appid, sender, content, withdraw, event, system, at, send_status, fk_conversation_id
, create_time, withdraw_time, update_date, fk_appid, sender, content, withdraw, event, system
_flag
, at, send_status, fk_conversation_id
</sql>
<select
id=
"getImMessageById"
resultType=
"com.wecloud.im.param.ImMessageQueryVo"
>
...
...
@@ -29,7 +29,7 @@
im_message.content,
im_message.withdraw,
im_message.`event`,
im_message.system,
im_message.system
_flag
,
im_message.`at`,
im_message.send_status,
im_message.fk_conversation_id,
...
...
@@ -55,7 +55,7 @@
im_message.content,
im_message.withdraw,
im_message.`event`,
im_message.system,
im_message.system
_flag
,
im_message.`at`,
im_message.send_status,
im_message.fk_conversation_id,
...
...
@@ -79,7 +79,7 @@
im_message.content,
im_message.withdraw,
im_message.`event`,
im_message.system,
im_message.system
_flag
,
im_message.`at`,
im_message.send_status,
im_message.fk_conversation_id
...
...
@@ -99,7 +99,7 @@
im_message.content,
im_message.withdraw,
im_message.`event`,
im_message.system,
im_message.system
_flag
,
im_message.`at`,
im_message.send_status,
im_message.fk_conversation_id
...
...
docs/db/wecloud_im.sql
View file @
97981223
...
...
@@ -212,3 +212,8 @@ CREATE TABLE `im_rtc_log`
SET
FOREIGN_KEY_CHECKS
=
1
;
-- 在feature-cluster 2021年12月22日之后,需要执行的的sql增量脚本
ALTER
TABLE
`im_conversation`
CHANGE
COLUMN
`system`
`system_flag`
tinyint
(
1
)
NULL
DEFAULT
NULL
COMMENT
'可选 对话类型标志,是否是系统对话,后面会说明。'
AFTER
`attributes`
;
ALTER
TABLE
`im_message`
CHANGE
COLUMN
`system`
`system_flag`
tinyint
(
1
)
NULL
DEFAULT
0
COMMENT
'0非系统通知; 1为系统通知'
AFTER
`event`
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment