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
7412327c
Commit
7412327c
authored
Jan 28, 2022
by
lixiaozhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
聊天的action,需要透传自定义内容。支持。
parent
f3f8e44a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
15 deletions
+38
-15
core/src/main/java/com/wecloud/dispatch/general/impl/GeneralMethodArgumentResolver.java
+0
-9
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+1
-1
core/src/main/java/com/wecloud/im/param/ChatContentVo.java
+36
-4
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
+1
-1
No files found.
core/src/main/java/com/wecloud/dispatch/general/impl/GeneralMethodArgumentResolver.java
View file @
7412327c
package
com
.
wecloud
.
dispatch
.
general
.
impl
;
import
cn.hutool.core.bean.copier.BeanCopier
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wecloud.dispatch.ActionContext
;
import
com.wecloud.dispatch.extend.ActionRequest
;
import
com.wecloud.dispatch.extend.ArgumentBox
;
import
com.wecloud.dispatch.extend.MethodArgumentResolver
;
import
com.wecloud.utils.JsonUtils
;
import
org.springframework.core.MethodParameter
;
import
org.springframework.core.convert.support.DefaultConversionService
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.lang.reflect.Array
;
import
java.lang.reflect.Modifier
;
import
java.lang.reflect.ParameterizedType
;
import
java.lang.reflect.Type
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.HashMap
;
...
...
@@ -29,8 +23,6 @@ import java.util.Set;
*/
public
class
GeneralMethodArgumentResolver
implements
MethodArgumentResolver
{
protected
final
DefaultConversionService
conversionService
=
new
DefaultConversionService
();
Map
<
Class
<?>,
Boolean
>
canNotInstanceMap
=
new
HashMap
<>();
@Override
...
...
@@ -51,7 +43,6 @@ public class GeneralMethodArgumentResolver implements MethodArgumentResolver {
// 获取属定义的名称
String
name
=
null
==
define
?
parameter
.
getParameterName
()
:
define
.
value
();
Type
t
=
parameter
.
getGenericParameterType
();
Class
<?>
clazz
=
parameter
.
getParameterType
();
Object
value
=
request
.
getData
().
get
(
name
);
...
...
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
View file @
7412327c
...
...
@@ -186,7 +186,7 @@ public class NormalChatAction {
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
imMessageOnlineSend
.
setMsgId
(
imMessage
.
getId
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
Map
<
String
,
Object
>
content
=
JsonUtils
.
bean
ToMap
(
data
);
Map
<
String
,
Object
>
content
=
JsonUtils
.
bean
CopyDeep
(
data
,
Map
.
class
);
//action的属性无需要返回
content
.
remove
(
BaseRequest
.
ACTION
);
imMessageOnlineSend
.
setContent
(
content
);
...
...
core/src/main/java/com/wecloud/im/param/ChatContentVo.java
View file @
7412327c
package
com
.
wecloud
.
im
.
param
;
import
com.wecloud.dispatch.common.BaseRequest
;
import
com.wecloud.im.ws.model.request.PushVO
;
import
lombok.Data
;
import
com.wecloud.utils.JsonUtils
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
/**
* @Description TODO
* @Author lixiaozhong
* @Date 2022/1/26 6:11 下午
*/
@Data
public
class
ChatContentVo
implements
Serializable
{
public
class
ChatContentVo
extends
BaseRequest
{
PushVO
push
;
@NotNull
Long
toConversation
;
@NotNull
Integer
type
;
String
text
;
public
PushVO
getPush
()
{
return
JsonUtils
.
beanCopyDeep
(
this
.
get
(
"push"
),
PushVO
.
class
);
}
public
void
setPush
(
PushVO
push
)
{
this
.
push
=
push
;
}
public
Long
getToConversation
()
{
return
Long
.
valueOf
(
this
.
get
(
"toConversation"
)
+
""
);
}
public
void
setToConversation
(
Long
toConversation
)
{
this
.
toConversation
=
toConversation
;
}
public
Integer
getType
()
{
return
Integer
.
valueOf
(
this
.
get
(
"type"
)
+
""
);
}
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
public
String
getText
()
{
return
this
.
get
(
"type"
)
+
""
;
}
public
void
setText
(
String
text
)
{
this
.
text
=
text
;
}
}
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
View file @
7412327c
...
...
@@ -165,7 +165,7 @@ public class ThousandChatAction {
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
imMessageOnlineSend
.
setMsgId
(
imMessage
.
getId
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
Map
<
String
,
Object
>
content
=
JsonUtils
.
bean
ToMap
(
data
);
Map
<
String
,
Object
>
content
=
JsonUtils
.
bean
CopyDeep
(
data
,
Map
.
class
);
//action的属性无需要返回
content
.
remove
(
BaseRequest
.
ACTION
);
imMessageOnlineSend
.
setContent
(
content
);
...
...
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