调整group url名称

其他调整

调整group url名称
其他调整
0322f3d0 · Shadow · ac3dfd20 · 0322f3d0 · 0322f3d0 · 0322f3d0
Commit 0322f3d0 authored May 27, 2022 by Shadow
5 changed files
--- a/core/src/main/java/com/wecloud/im/controller/ImGroupController.java
+++ b/core/src/main/java/com/wecloud/im/controller/ImGroupController.java
@@ -49,7 +49,7 @@ public class ImGroupController {
     * @Date 2022年05月10日 02:16:19
     * @Return
     */
-    @PostMapping("/createGroup")
+    @PostMapping("/create")
    public ApiResult<Long> createGroup(@RequestBody CreateGroupParam param) {
        log.info("创建群组请求 参数: {}", JSON.toJSONString(param));
        List<String> memberClientIds = Arrays.asList(param.getMemberIds().split(","));
@@ -63,7 +63,7 @@ public class ImGroupController {
     * @Date 2022年05月10日 02:16:19
     * @Return
     */
-    @PostMapping("/dismissGroup")
+    @PostMapping("/dismiss")
    public ApiResult<Boolean> dismissGroup(@RequestBody DismissGroupParam param) {
        log.info("解散群组请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.dismissGroup(param.getUserId(), param.getGroupId()));
@@ -75,7 +75,7 @@ public class ImGroupController {
     * @Date 2022年05月10日 02:16:19
     * @Return
     */
-    @PostMapping("/joinGroup")
+    @PostMapping("/join")
    public ApiResult<Integer> joinGroup(@Validated @RequestBody JoinGroupParam param) {
        log.info("加入群组请求 参数: {}", JSON.toJSONString(param));
        List<String> memberIds = Arrays.asList(param.getUserIds().split(","));
@@ -88,7 +88,7 @@ public class ImGroupController {
     * @Date 2022年05月10日 02:16:19
     * @Return
     */
-    @PostMapping("/leaveGroup")
+    @PostMapping("/leave")
    public ApiResult<Integer> leaveGroup(@RequestBody LeaveGroupParam param) {
        log.info("离开群组请求 参数: {}", JSON.toJSONString(param));
        List<String> memberIds = Arrays.asList(param.getUserIds().split(","));
@@ -102,7 +102,7 @@ public class ImGroupController {
     * @Return
     * @return
     */
-    @PostMapping("/listGroupMembers")
+    @PostMapping("/member/list")
    public ApiResult<List<String>> listGroupMembers(@RequestBody ListGroupMembersParam param) {
        log.info("获取群组成员请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.listGroupMembers(param.getGroupId()));
@@ -115,7 +115,7 @@ public class ImGroupController {
     * @Return
     * @return
     */
-    @PostMapping("/mutedMembers")
+    @PostMapping("/member/muted")
    public ApiResult<Boolean> mutedMembers(@RequestBody MutedMembersParam param) {
        log.info("禁言群成员请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.mutedMembers(param));
@@ -128,7 +128,7 @@ public class ImGroupController {
     * @param param
     * @Return
     */
-    @PostMapping("/groupOwnerTransfer")
+    @PostMapping("/ownerTransfer")
    public ApiResult<Boolean> groupOwnerTransfer(@RequestBody GroupOwnerTransferParam param) {
        log.info("群主转移请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.groupOwnerTransfer(param.getGroupId(), param.getNewGroupOwnerUserId()));
@@ -141,7 +141,7 @@ public class ImGroupController {
     * @param param
     * @Return
     */
-    @PostMapping("/addGroupAdmin")
+    @PostMapping("/addAdmin")
    public ApiResult<Boolean> addGroupAdmin(@Validated @RequestBody ModifyGroupAdminParam param) {
        log.info("添加群管理员请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.addGroupAdmin(param.getGroupId(), param.getAdminUserIds()));
@@ -154,7 +154,7 @@ public class ImGroupController {
     * @param param
     * @Return
     */
-    @PostMapping("/removeGroupAdmin")
+    @PostMapping("/removeAdmin")
    public ApiResult<Boolean> removeGroupAdmin(@Validated @RequestBody ModifyGroupAdminParam param) {
        log.info("移除群管理员请求 参数: {}", JSON.toJSONString(param));
        return ApiResult.ok(groupService.removeGroupAdmin(param.getGroupId(), param.getAdminUserIds()));

--- a/core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
@@ -927,6 +927,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                                             ConversationExtParam conversationExt,
                                             Map<Long, ImConversation> conversationMapGroupById,
                                             Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId) {
        Long appId = application.getId();
        // 获取收件人信息
        List<ImClient> receiverList = imClientService.list(Wrappers.<ImClient>lambdaQuery().eq(ImClient::getFkAppid,

--- a/im-sdk/src/main/java/com/wecloud/im/sdk/ResourcePathConstants.java
+++ b/im-sdk/src/main/java/com/wecloud/im/sdk/ResourcePathConstants.java
@@ -99,27 +99,27 @@ public class ResourcePathConstants {
    /**
     * 创建群
     */
-    public static final String CREATE_GROUP_REQUEST = "/api/group/createGroup";
+    public static final String CREATE_GROUP_REQUEST = "/api/group/create";
    /**
     * 解散群
     */
-    public static final String DISMISS_GROUP_REQUEST = "/api/group/dismissGroup";
+    public static final String DISMISS_GROUP_REQUEST = "/api/group/dismiss";
    /**
     * 加入群
     */
-    public static final String JOIN_GROUP_REQUEST = "/api/group/joinGroup";
+    public static final String JOIN_GROUP_REQUEST = "/api/group/join";
    /**
     * 离开群
     */
-    public static final String LEAVE_GROUP_REQUEST = "/api/group/leaveGroup";
+    public static final String LEAVE_GROUP_REQUEST = "/api/group/leave";
    /**
     * 获取群成员列表
     */
-    public static final String LIST_GROUP_MEMBERS_REQUEST = "/api/group/listGroupMembers";
+    public static final String LIST_GROUP_MEMBERS_REQUEST = "/api/group/member/list";
    /**
     * 群设置请求
@@ -149,22 +149,22 @@ public class ResourcePathConstants {
    /**
     * 禁言群成员
     */
-    public static final String MUTED_GROUP_MEMBER_REQUEST = "/api/group/mutedMembers";
+    public static final String MUTED_GROUP_MEMBER_REQUEST = "/api/group/member/muted";
    /**
     * 更换群主 请求
     */
-    public static final String GROUP_OWNER_TRANSFER_REQUEST = "/api/group/groupOwnerTransfer";
+    public static final String GROUP_OWNER_TRANSFER_REQUEST = "/api/group/ownerTransfer";
    /**
     * 添加群管理员 请求
     */
-    public static final String ADD_GROUP_ADMIN_REQUEST = "/api/group/addGroupAdmin";
+    public static final String ADD_GROUP_ADMIN_REQUEST = "/api/group/addAdmin";
    /**
     * 移除群管理员 请求
     */
-    public static final String REMOVE_GROUP_ADMIN_REQUEST = "/api/group/removeGroupAdmin";
+    public static final String REMOVE_GROUP_ADMIN_REQUEST = "/api/group/removeAdmin";
    /**
     * 获取通话记录请求

--- a/im-sdk/src/main/java/com/wecloud/im/sdk/model/message/WecloudImBaseMessage.java
+++ b/im-sdk/src/main/java/com/wecloud/im/sdk/model/message/WecloudImBaseMessage.java
@@ -10,6 +10,11 @@ import com.wecloud.im.sdk.enums.MessageTypeEnum;
 */
 public class WecloudImBaseMessage extends WecloudImMessage {
+    public WecloudImBaseMessage() {
+        super();
+    }
    public WecloudImBaseMessage(MessageTypeEnum type) {
        this.setType(type);
    }

--- a/im-sdk/src/main/java/com/wecloud/im/sdk/sample/PublishPrivateChatMessageSample.java
+++ b/im-sdk/src/main/java/com/wecloud/im/sdk/sample/PublishPrivateChatMessageSample.java
 package com.wecloud.im.sdk.sample;
-import java.util.Date;
+import com.alibaba.fastjson.JSONObject;
-import cn.hutool.core.date.DateUtil;
 import com.wecloud.im.sdk.WecloudIm;
 import com.wecloud.im.sdk.WecloudImClientBuilder;
-import com.wecloud.im.sdk.model.PrivateChatMessage;
+import com.wecloud.im.sdk.model.PrivateChatStatusMessage;
-import com.wecloud.im.sdk.model.message.TextMessage;
 /**
 * 发布单聊消息
@@ -25,24 +21,14 @@ public class PublishPrivateChatMessageSample {
                "QizKVHcILRWp6Td2",
                "287d04828099fb7de871e9dda845fa8b6b2302faf2ab3737");
-        String senderId = "1526788710924972032";
+        String s = "{\"content\":{\"attrs\":{\"transfer\":\"{\\\"amount\\\":1.000,\\\"drawStatus\\\":2," +
-        String toUserId = "1529434627821957120";
+                "\\\"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\"}";
-        String messageType = "-1";
+        PrivateChatStatusMessage message = JSONObject.parseObject(s, PrivateChatStatusMessage.class);
-        TextMessage textMessage = new TextMessage();
-        textMessage.setText("这是text消息测试: " + DateUtil.formatDateTime(new Date()));
+        im.publishPrivateStatusMessage(message);
-        boolean silent = true;
-        PrivateChatMessage privateChatMessage = new PrivateChatMessage();
-        privateChatMessage.setFromUserId(senderId);
-        privateChatMessage.setToUserIds(toUserId);
-        privateChatMessage.setMessageType(messageType);
-        privateChatMessage.setContent(textMessage);
-        privateChatMessage.setPushContent("");
-        privateChatMessage.setIncludeSender(false);
-        privateChatMessage.setPersisted(true);
-        privateChatMessage.setSilent(silent);
-        Boolean result = im.publishPrivateMessage(privateChatMessage);
    }