Skip to content

W
wecloud_im_server
Commit 12cd68f3 by Shadow
Options

若干微不足道的修改

parent a9447f03
Showing with 27 additions and 16 deletions
core/src/main/java/com/wecloud/im/friend/controller/ImFriendController.java
...@@ -183,9 +183,9 @@ public class ImFriendController extends BaseController { ...@@ -183,9 +183,9 @@ public class ImFriendController extends BaseController {
* @param * @param
* @Return * @Return
*/ */
@GetMapping("/sdk/getFriends") @PostMapping("/sdk/getFriends")
@ApiOperation(value = "全量获取好友列表") @ApiOperation(value = "全量获取好友列表")
public ApiResult<List<ImFriendBaseDto>> getFriendsSdk(@RequestParam("clientId") String clientId) { public ApiResult<List<ImFriendBaseDto>> getFriendsSdk(@RequestParam("userId") String clientId) {
Long appId = SecurityUtils.getCurrentAppId(); Long appId = SecurityUtils.getCurrentAppId();
ImClient imClient = imClientService.getCacheImClient(appId, clientId); ImClient imClient = imClientService.getCacheImClient(appId, clientId);
return ApiResult.ok(imFriendService.getFriends(imClient)); return ApiResult.ok(imFriendService.getFriends(imClient));
......
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImContactsOperation.java
...@@ -87,7 +87,7 @@ public class WecloudImContactsOperation extends WecloudImOperation { ...@@ -87,7 +87,7 @@ public class WecloudImContactsOperation extends WecloudImOperation {
param.put("clientId", userId + ""); param.put("clientId", userId + "");
// 发送请求 // 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(GET_FRIENDS) RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(GET_FRIENDS)
.setMethod(HttpMethod.GET).setParameters(param) .setMethod(HttpMethod.POST).setParameters(param)
.setOriginalRequest(getFriendsRequest).build(); .setOriginalRequest(getFriendsRequest).build();
Object result = doOperation(request); Object result = doOperation(request);
......
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImUserOperation.java
...@@ -195,7 +195,7 @@ public class WecloudImUserOperation extends WecloudImOperation { ...@@ -195,7 +195,7 @@ public class WecloudImUserOperation extends WecloudImOperation {
assertParameterNotBlank(userId, "userId"); assertParameterNotBlank(userId, "userId");
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("clientId", userId); param.put("userId", userId);
param.put("minute", minute.toString()); param.put("minute", minute.toString());
// 发送请求 // 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(BANNED_USER_REQUEST) RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(BANNED_USER_REQUEST)
......
im-sdk/src/main/java/com/wecloud/im/sdk/model/Conversation.java
...@@ -5,7 +5,6 @@ import lombok.experimental.Accessors; ...@@ -5,7 +5,6 @@ import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
/** /**
* <pre> * <pre>
...@@ -49,7 +48,7 @@ public class Conversation implements Serializable { ...@@ -49,7 +48,7 @@ public class Conversation implements Serializable {
/** /**
* "可选 自定义属性，供开发者扩展使用。" * "可选 自定义属性，供开发者扩展使用。"
*/ */
private HashMap attributes; private String attributes;
/** /**
* "可选 对话类型标志，是否是系统对话，后面会说明。" * "可选 对话类型标志，是否是系统对话，后面会说明。"
......
im-sdk/src/main/java/com/wecloud/im/sdk/model/message/VoiceMessage.java → im-sdk/src/main/java/com/wecloud/im/sdk/model/message/AudioMessage.java
...@@ -8,8 +8,8 @@ import com.wecloud.im.sdk.enums.MessageTypeEnum; ...@@ -8,8 +8,8 @@ import com.wecloud.im.sdk.enums.MessageTypeEnum;
* @Date 2022年05月07日 13:59 * @Date 2022年05月07日 13:59
* @Version 1.0 * @Version 1.0
*/ */
public class VoiceMessage extends WecloudImBaseMessage { public class AudioMessage extends WecloudImBaseMessage {
public VoiceMessage() { public AudioMessage() {
super(MessageTypeEnum.AUDIO); super(MessageTypeEnum.AUDIO);
} }
......
im-sdk/src/main/java/com/wecloud/im/sdk/model/message/PositionMessage.java → im-sdk/src/main/java/com/wecloud/im/sdk/model/message/LocationMessage.java
...@@ -6,13 +6,13 @@ import lombok.Setter; ...@@ -6,13 +6,13 @@ import lombok.Setter;
import com.wecloud.im.sdk.enums.MessageTypeEnum; import com.wecloud.im.sdk.enums.MessageTypeEnum;
/** /**
* 图片类型消息 * 位置类型消息
* @Author luozh * @Author luozh
* @Date 2022年05月07日 13:59 * @Date 2022年05月07日 13:59
* @Version 1.0 * @Version 1.0
*/ */
public class PositionMessage extends WecloudImBaseMessage { public class LocationMessage extends WecloudImBaseMessage {
public PositionMessage() { public LocationMessage() {
super(MessageTypeEnum.POSITION); super(MessageTypeEnum.POSITION);
} }
......
im-sdk/src/main/java/com/wecloud/im/sdk/sample/PublishPrivateChatMessageSample.java
...@@ -3,7 +3,9 @@ package com.wecloud.im.sdk.sample; ...@@ -3,7 +3,9 @@ package com.wecloud.im.sdk.sample;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.wecloud.im.sdk.WecloudIm; import com.wecloud.im.sdk.WecloudIm;
import com.wecloud.im.sdk.WecloudImClientBuilder; import com.wecloud.im.sdk.WecloudImClientBuilder;
import com.wecloud.im.sdk.model.PrivateChatStatusMessage; import com.wecloud.im.sdk.model.ConversationExt;
import com.wecloud.im.sdk.model.SingleUserNotification;
import com.wecloud.im.sdk.model.message.WecloudImBaseMessage;
/** /**
* 发布单聊消息 * 发布单聊消息
...@@ -21,13 +23,23 @@ public class PublishPrivateChatMessageSample { ...@@ -21,13 +23,23 @@ public class PublishPrivateChatMessageSample {
"QizKVHcILRWp6Td2", "QizKVHcILRWp6Td2",
"287d04828099fb7de871e9dda845fa8b6b2302faf2ab3737"); "287d04828099fb7de871e9dda845fa8b6b2302faf2ab3737");
String s = "{\"content\":{\"attrs\":{\"transfer\":\"{\\\"amount\\\":1.000,\\\"drawStatus\\\":2," + String s = "{\"fromUserId\":1526928068558675968,\"userName\":\"温枝达\",\"headPortrait\":\"https://xiaohudou.obs.cn-south-1.myhuaweicloud.com/test/62907630993254d611b016f5.min.jpg\",\"type\":\"501\",\"attrs\":{\"fromUserId\":1526928068558675968,\"userName\":\"温枝达\",\"headPortrait\":\"https://xiaohudou.obs.cn-south-1.myhuaweicloud.com/test/62907630993254d611b016f5.min.jpg\",\"type\":\"501\"}}";
"\\\"id\\\":1529790517452394496,\\\"liveStatus\\\":1,\\\"payStatus\\\":2,\\\"payTime\\\":1653565456000,\\\"receiverAccountCode\\\":\\\"1529729370233688064\\\",\\\"sponsorAccountCode\\\":\\\"1529733172080857088\\\"}\",\"msgId\":\"1529790517716623360\",\"type\":\"301\"}},\"fromUserId\":\"1529729370233688064\",\"includeBlacklist\":false,\"includeSender\":true,\"messageType\":\"301\",\"toUserIds\":\"1529729370233688064,1529733172080857088\"}";
PrivateChatStatusMessage message = JSONObject.parseObject(s, PrivateChatStatusMessage.class); WecloudImBaseMessage message = JSONObject.parseObject(s, WecloudImBaseMessage.class);
ConversationExt conversationExt = new ConversationExt();
conversationExt.setName("小虎通知");
SingleUserNotification singleUserNotification =
SingleUserNotification.builder()
.fromUserId("888888").toUserIds("1527241923595841536")
.content(JSONObject.toJSONString(message))
.messageType("502")
.conversationExt(conversationExt)
.persisted(true)
.pushContent(null)
.build();
im.publishPrivateStatusMessage(message); im.singleUserNotification(singleUserNotification);
} }
......
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