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
00b2281a
Commit
00b2281a
authored
May 09, 2022
by
罗长华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bugs
parent
ba03e9d5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
core/src/main/java/com/wecloud/im/entity/ImConversationMembers.java
+1
-2
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+5
-5
No files found.
core/src/main/java/com/wecloud/im/entity/ImConversationMembers.java
View file @
00b2281a
...
...
@@ -14,7 +14,6 @@ import javax.validation.constraints.NotNull;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.wecloud.im.sdk.enums.JoinConversationTypeEnum
;
/**
* 会话成员表
...
...
@@ -91,7 +90,7 @@ public class ImConversationMembers extends BaseEntity {
private
Boolean
top
;
@ApiModelProperty
(
"加入会话方式编码"
)
private
JoinConversationTypeEnum
joinTypeCode
;
private
String
joinTypeCode
;
@ApiModelProperty
(
"加入会话方式信息"
)
private
String
joinTypeMsg
;
...
...
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
View file @
00b2281a
...
...
@@ -250,7 +250,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers
.
setClientId
(
createClient
.
getClientId
());
imConversationMembers
.
setRole
(
GroupRoleEnum
.
OWNER
.
getCode
());
// 会话拥有者加入会话方式固定
imConversationMembers
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
OWNER
);
imConversationMembers
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
OWNER
.
getCode
()
);
String
joinTypeMsg
=
""
;
if
(
ChatTypeEnum
.
SINGLE
.
getCode
().
equals
(
imConversationCreate
.
getChatType
()))
{
joinTypeMsg
=
DateUtil
.
format
(
now
,
CHINESE_DATE_PATTERN
)
+
" <@>"
+
createClient
.
getClientId
()
...
...
@@ -282,7 +282,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers2
.
setClientId
(
client2
.
getClientId
());
imConversationMembers2
.
setRole
(
GroupRoleEnum
.
NORMAL
.
getCode
());
// 加入会话方式固定为 邀请
imConversationMembers
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
);
imConversationMembers
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
.
getCode
()
);
String
memberJoinTypeMsg
=
""
;
if
(
ChatTypeEnum
.
SINGLE
.
getCode
().
equals
(
imConversationCreate
.
getChatType
()))
{
memberJoinTypeMsg
=
"由 <@>"
+
createClient
.
getClientId
()
...
...
@@ -415,7 +415,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
conversationCreator
.
setFkClientId
(
creatorImClientId
);
conversationCreator
.
setClientId
(
creator
.
getClientId
());
conversationCreator
.
setRole
(
GroupRoleEnum
.
OWNER
.
getCode
());
conversationCreator
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
OWNER
);
conversationCreator
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
OWNER
.
getCode
()
);
String
joinTypeMsg
=
""
;
if
(
ChatTypeEnum
.
SINGLE
.
getCode
().
equals
(
imConversationCreate
.
getChatType
()))
{
joinTypeMsg
=
DateUtil
.
format
(
now
,
CHINESE_DATE_PATTERN
)
+
" <@>"
+
creatorImClientId
...
...
@@ -436,7 +436,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMember
.
setRole
(
GroupRoleEnum
.
NORMAL
.
getCode
());
// 加入会话方式固定为 邀请
imConversationMember
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
);
imConversationMember
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
.
getCode
()
);
String
memberJoinTypeMsg
=
""
;
if
(
ChatTypeEnum
.
SINGLE
.
getCode
().
equals
(
imConversationCreate
.
getChatType
()))
{
memberJoinTypeMsg
=
"由 <@>"
+
creatorImClientId
...
...
@@ -535,7 +535,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembers2
.
setRole
(
GroupRoleEnum
.
NORMAL
.
getCode
());
// 加入会话方式
// 加入会话方式固定为 邀请
imConversationMembers2
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
);
imConversationMembers2
.
setJoinTypeCode
(
JoinConversationTypeEnum
.
BE_INVITED
.
getCode
()
);
String
memberJoinTypeMsg
=
""
;
if
(
ChatTypeEnum
.
SINGLE
.
getCode
().
equals
(
imConversation
.
getChatType
()))
{
memberJoinTypeMsg
=
"由 <@>"
+
createClient
.
getClientId
()
...
...
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