Skip to content

W
wecloud_im_server
Commit 00b2281a by 罗长华
Options

fixed bugs

parent ba03e9d5
Showing with 6 additions and 7 deletions
core/src/main/java/com/wecloud/im/entity/ImConversationMembers.java
...@@ -14,7 +14,6 @@ import javax.validation.constraints.NotNull; ...@@ -14,7 +14,6 @@ import javax.validation.constraints.NotNull;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.wecloud.im.sdk.enums.JoinConversationTypeEnum;
/** /**
* 会话成员表 * 会话成员表
...@@ -91,7 +90,7 @@ public class ImConversationMembers extends BaseEntity { ...@@ -91,7 +90,7 @@ public class ImConversationMembers extends BaseEntity {
private Boolean top; private Boolean top;
@ApiModelProperty("加入会话方式编码") @ApiModelProperty("加入会话方式编码")
private JoinConversationTypeEnum joinTypeCode; private String joinTypeCode;
@ApiModelProperty("加入会话方式信息") @ApiModelProperty("加入会话方式信息")
private String joinTypeMsg; private String joinTypeMsg;
......
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
...@@ -250,7 +250,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -250,7 +250,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers.setClientId(createClient.getClientId()); imConversationMembers.setClientId(createClient.getClientId());
imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode()); imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode());
// 会话拥有者加入会话方式固定 // 会话拥有者加入会话方式固定
imConversationMembers.setJoinTypeCode(JoinConversationTypeEnum.OWNER); imConversationMembers.setJoinTypeCode(JoinConversationTypeEnum.OWNER.getCode());
String joinTypeMsg = ""; String joinTypeMsg = "";
if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) {
joinTypeMsg = DateUtil.format(now, CHINESE_DATE_PATTERN) + " <@>" + createClient.getClientId() joinTypeMsg = DateUtil.format(now, CHINESE_DATE_PATTERN) + " <@>" + createClient.getClientId()
...@@ -282,7 +282,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -282,7 +282,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers2.setClientId(client2.getClientId()); imConversationMembers2.setClientId(client2.getClientId());
imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode()); imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
// 加入会话方式固定为 邀请 // 加入会话方式固定为 邀请
imConversationMembers.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED); imConversationMembers.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED.getCode());
String memberJoinTypeMsg = ""; String memberJoinTypeMsg = "";
if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) {
memberJoinTypeMsg = "由 <@>" + createClient.getClientId() memberJoinTypeMsg = "由 <@>" + createClient.getClientId()
...@@ -415,7 +415,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -415,7 +415,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
conversationCreator.setFkClientId(creatorImClientId); conversationCreator.setFkClientId(creatorImClientId);
conversationCreator.setClientId(creator.getClientId()); conversationCreator.setClientId(creator.getClientId());
conversationCreator.setRole(GroupRoleEnum.OWNER.getCode()); conversationCreator.setRole(GroupRoleEnum.OWNER.getCode());
conversationCreator.setJoinTypeCode(JoinConversationTypeEnum.OWNER); conversationCreator.setJoinTypeCode(JoinConversationTypeEnum.OWNER.getCode());
String joinTypeMsg = ""; String joinTypeMsg = "";
if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) {
joinTypeMsg = DateUtil.format(now, CHINESE_DATE_PATTERN) + " <@>" + creatorImClientId joinTypeMsg = DateUtil.format(now, CHINESE_DATE_PATTERN) + " <@>" + creatorImClientId
...@@ -436,7 +436,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -436,7 +436,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMember.setRole(GroupRoleEnum.NORMAL.getCode()); imConversationMember.setRole(GroupRoleEnum.NORMAL.getCode());
// 加入会话方式固定为 邀请 // 加入会话方式固定为 邀请
imConversationMember.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED); imConversationMember.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED.getCode());
String memberJoinTypeMsg = ""; String memberJoinTypeMsg = "";
if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(imConversationCreate.getChatType())) {
memberJoinTypeMsg = "由 <@>" + creatorImClientId memberJoinTypeMsg = "由 <@>" + creatorImClientId
...@@ -535,7 +535,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -535,7 +535,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode()); imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
// 加入会话方式 // 加入会话方式
// 加入会话方式固定为 邀请 // 加入会话方式固定为 邀请
imConversationMembers2.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED); imConversationMembers2.setJoinTypeCode(JoinConversationTypeEnum.BE_INVITED.getCode());
String memberJoinTypeMsg = ""; String memberJoinTypeMsg = "";
if (ChatTypeEnum.SINGLE.getCode().equals(imConversation.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(imConversation.getChatType())) {
memberJoinTypeMsg = "由 <@>" + createClient.getClientId() memberJoinTypeMsg = "由 <@>" + createClient.getClientId()
......
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