Skip to content

W
wecloud_im_server
Commit 97981223 by lixiaozhong
Options

数据库升级后，字段报错问题

parent 7f0c91e6
Showing with 21 additions and 16 deletions
bootstrap/src/test/java/io/geekidea/springbootplus/test/ImConversationMembersTest.java
...@@ -42,7 +42,7 @@ public class ImConversationMembersTest { ...@@ -42,7 +42,7 @@ public class ImConversationMembersTest {
imConversation.setCreator(creator); imConversation.setCreator(creator);
imConversation.setName(""); imConversation.setName("");
imConversation.setAttributes(""); imConversation.setAttributes("");
imConversation.setSystem(false); imConversation.setSystemFlag(false);
imConversationService.save(imConversation); imConversationService.save(imConversation);
// 将自己添加到会话 // 将自己添加到会话
......
core/src/main/java/com/wecloud/im/entity/ImConversation.java
...@@ -54,6 +54,6 @@ public class ImConversation extends BaseEntity { ...@@ -54,6 +54,6 @@ public class ImConversation extends BaseEntity {
private String attributes; private String attributes;
@ApiModelProperty("可选 对话类型标志，是否是系统对话，后面会说明。") @ApiModelProperty("可选 对话类型标志，是否是系统对话，后面会说明。")
private Boolean system; private Boolean systemFlag;
} }
core/src/main/java/com/wecloud/im/entity/ImMessage.java
...@@ -56,7 +56,7 @@ public class ImMessage extends BaseEntity { ...@@ -56,7 +56,7 @@ public class ImMessage extends BaseEntity {
private Boolean event; private Boolean event;
@ApiModelProperty("0非系统通知; 1为系统通知") @ApiModelProperty("0非系统通知; 1为系统通知")
private Boolean system; private Boolean systemFlag;
@ApiModelProperty("at他人,传入客户端id数组") @ApiModelProperty("at他人,传入客户端id数组")
private String at; private String at;
......
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
...@@ -185,7 +185,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -185,7 +185,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversation.setFkAppid(createClient.getFkAppid()); imConversation.setFkAppid(createClient.getFkAppid());
imConversation.setCreator(creator); imConversation.setCreator(creator);
imConversation.setName(imConversationCreate.getName()); imConversation.setName(imConversationCreate.getName());
imConversation.setSystem(false); imConversation.setSystemFlag(false);
JsonMapper jsonMapper = new JsonMapper(); JsonMapper jsonMapper = new JsonMapper();
// 拓展数据 // 拓展数据
String writeValueAsString = jsonMapper.writeValueAsString(imConversationCreate.getAttributes()); String writeValueAsString = jsonMapper.writeValueAsString(imConversationCreate.getAttributes());
...@@ -300,7 +300,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -300,7 +300,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage.setSender(imClientSender.getId()); imMessage.setSender(imClientSender.getId());
imMessage.setWithdraw(false); imMessage.setWithdraw(false);
imMessage.setEvent(true); imMessage.setEvent(true);
imMessage.setSystem(false); imMessage.setSystemFlag(false);
imMessage.setSendStatus(2); imMessage.setSendStatus(2);
imMessage.setFkConversationId(imClientToConversation.getConversationId()); imMessage.setFkConversationId(imClientToConversation.getConversationId());
boolean save = imMessageService.save(imMessage); boolean save = imMessageService.save(imMessage);
...@@ -417,7 +417,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -417,7 +417,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage.setSender(imClientSender.getId()); imMessage.setSender(imClientSender.getId());
imMessage.setWithdraw(false); imMessage.setWithdraw(false);
imMessage.setEvent(true); imMessage.setEvent(true);
imMessage.setSystem(false); imMessage.setSystemFlag(false);
imMessage.setSendStatus(2); imMessage.setSendStatus(2);
imMessage.setFkConversationId(imClientToConversation.getConversationId()); imMessage.setFkConversationId(imClientToConversation.getConversationId());
boolean save = imMessageService.save(imMessage); boolean save = imMessageService.save(imMessage);
...@@ -526,7 +526,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -526,7 +526,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage.setSender(imClientSender.getId()); imMessage.setSender(imClientSender.getId());
imMessage.setWithdraw(false); imMessage.setWithdraw(false);
imMessage.setEvent(true); imMessage.setEvent(true);
imMessage.setSystem(false); imMessage.setSystemFlag(false);
imMessage.setSendStatus(2); imMessage.setSendStatus(2);
imMessage.setFkConversationId(imClientToConversation.getConversationId()); imMessage.setFkConversationId(imClientToConversation.getConversationId());
boolean save = imMessageService.save(imMessage); boolean save = imMessageService.save(imMessage);
......
core/src/main/java/com/wecloud/im/service/impl/ImInboxServiceImpl.java
...@@ -187,7 +187,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox> ...@@ -187,7 +187,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
imMessage.setSender(curentClient.getId()); imMessage.setSender(curentClient.getId());
imMessage.setWithdraw(false); imMessage.setWithdraw(false);
imMessage.setEvent(true); imMessage.setEvent(true);
imMessage.setSystem(false); imMessage.setSystemFlag(false);
imMessage.setSendStatus(2); imMessage.setSendStatus(2);
imMessage.setFkConversationId(conversationMember.getFkConversationId()); imMessage.setFkConversationId(conversationMember.getFkConversationId());
......
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
...@@ -152,7 +152,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -152,7 +152,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessage.setContent(content); imMessage.setContent(content);
imMessage.setWithdraw(false); imMessage.setWithdraw(false);
imMessage.setEvent(false); imMessage.setEvent(false);
imMessage.setSystem(false); imMessage.setSystemFlag(false);
imMessage.setSendStatus(2); imMessage.setSendStatus(2);
imMessage.setFkConversationId(toConversationId); imMessage.setFkConversationId(toConversationId);
this.save(imMessage); this.save(imMessage);
......
core/src/main/resources/mapper/ImConversationMapper.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id 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> </sql>
<select id="getImConversationById" resultType="com.wecloud.im.param.ImConversationQueryVo"> <select id="getImConversationById" resultType="com.wecloud.im.param.ImConversationQueryVo">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
imConversation.create_time, imConversation.create_time,
imConversation.`name`, imConversation.`name`,
imConversation.attributes as attribute, imConversation.attributes as attribute,
imConversation.system, imConversation.system_flag,
im_client.client_id AS creator, im_client.client_id AS creator,
(SELECT COUNT(im_inbox.id) (SELECT COUNT(im_inbox.id)
FROM im_inbox FROM im_inbox
......
core/src/main/resources/mapper/ImMessageMapper.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id 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> </sql>
<select id="getImMessageById" resultType="com.wecloud.im.param.ImMessageQueryVo"> <select id="getImMessageById" resultType="com.wecloud.im.param.ImMessageQueryVo">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
im_message.content, im_message.content,
im_message.withdraw, im_message.withdraw,
im_message.`event`, im_message.`event`,
im_message.system, im_message.system_flag,
im_message.`at`, im_message.`at`,
im_message.send_status, im_message.send_status,
im_message.fk_conversation_id, im_message.fk_conversation_id,
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
im_message.content, im_message.content,
im_message.withdraw, im_message.withdraw,
im_message.`event`, im_message.`event`,
im_message.system, im_message.system_flag,
im_message.`at`, im_message.`at`,
im_message.send_status, im_message.send_status,
im_message.fk_conversation_id, im_message.fk_conversation_id,
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
im_message.content, im_message.content,
im_message.withdraw, im_message.withdraw,
im_message.`event`, im_message.`event`,
im_message.system, im_message.system_flag,
im_message.`at`, im_message.`at`,
im_message.send_status, im_message.send_status,
im_message.fk_conversation_id im_message.fk_conversation_id
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
im_message.content, im_message.content,
im_message.withdraw, im_message.withdraw,
im_message.`event`, im_message.`event`,
im_message.system, im_message.system_flag,
im_message.`at`, im_message.`at`,
im_message.send_status, im_message.send_status,
im_message.fk_conversation_id im_message.fk_conversation_id
......
docs/db/wecloud_im.sql
...@@ -212,3 +212,8 @@ CREATE TABLE `im_rtc_log` ...@@ -212,3 +212,8 @@ CREATE TABLE `im_rtc_log`
SET SET
FOREIGN_KEY_CHECKS = 1; 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`;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment