diff --git a/im-center-server/src/main/java/cn/axzo/im/channel/netease/NimChannelService.java b/im-center-server/src/main/java/cn/axzo/im/channel/netease/NimChannelService.java index 03aa06d..5719192 100644 --- a/im-center-server/src/main/java/cn/axzo/im/channel/netease/NimChannelService.java +++ b/im-center-server/src/main/java/cn/axzo/im/channel/netease/NimChannelService.java @@ -1,10 +1,27 @@ package cn.axzo.im.channel.netease; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; + +import javax.annotation.Resource; +import javax.validation.Valid; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import com.alibaba.fastjson.JSON; +import com.google.common.collect.Maps; + import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.basics.common.util.AssertUtil; import cn.axzo.im.center.api.vo.req.chatgroup.GroupHistoryMsgQueryReq; import cn.axzo.im.center.api.vo.req.chatgroup.PrivateHistoryMsgQueryReq; import cn.axzo.im.channel.IMChannelProvider; +import cn.axzo.im.channel.netease.client.NimClient; import cn.axzo.im.channel.netease.dto.ChangeOwnerRequest; import cn.axzo.im.channel.netease.dto.ChangeOwnerResponse; import cn.axzo.im.channel.netease.dto.ChatGroupCreateRequest; @@ -34,21 +51,8 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.google.common.collect.Maps; import io.github.resilience4j.ratelimiter.annotation.RateLimiter; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; /** * 网易云信IM服务 @@ -61,55 +65,55 @@ import java.util.UUID; @Slf4j public class NimChannelService implements IMChannelProvider { - private static final String NIM_ACCOUNT_CREATE_URL = "https://api.netease.im/nimserver/user/create.action"; + private static final String NIM_ACCOUNT_CREATE_URL = NimClient.URL + "/user/create.action"; - private static final String NIM_ACCOUNT_UPDATE_URL = "https://api.netease.im/nimserver/user/updateUinfo.action"; + private static final String NIM_ACCOUNT_UPDATE_URL = NimClient.URL + "/user/updateUinfo.action"; - private static final String NIM_ACCOUNT_QUERY_URL = "https://api.netease.im/nimserver/user/getUinfos.action"; + private static final String NIM_ACCOUNT_QUERY_URL = NimClient.URL + "/user/getUinfos.action"; - private static final String NIM_MESSAGE_DISPATCH_URL = "https://api.netease.im/nimserver/msg/sendMsg.action"; + private static final String NIM_MESSAGE_DISPATCH_URL = NimClient.URL + "/msg/sendMsg.action"; - private static final String NIM_MESSAGE_BATCH_DISPATCH_URL = "https://api.netease.im/nimserver/msg/sendBatchMsg.action"; + private static final String NIM_MESSAGE_BATCH_DISPATCH_URL = NimClient.URL + "/msg/sendBatchMsg.action"; - private static final String NIM_MESSAGE_ATTACH_URL = "https://api.netease.im/nimserver/msg/sendAttachMsg.action"; + private static final String NIM_MESSAGE_ATTACH_URL = NimClient.URL + "/msg/sendAttachMsg.action"; /** * 创建群聊 */ - private static final String CHAT_GROUP_CREATE = "https://api.netease.im/nimserver/team/create.action"; + private static final String CHAT_GROUP_CREATE = NimClient.URL + "/team/create.action"; /** * 用户加入群聊 */ - private static final String USER_ADD_CHAT_GROUP = "https://api.netease.im/nimserver/team/add.action"; + private static final String USER_ADD_CHAT_GROUP = NimClient.URL + "/team/add.action"; /** * 踢人出群 */ - private static final String KICK_CHAT_GROUP = "https://api.netease.im/nimserver/team/kick.action"; + private static final String KICK_CHAT_GROUP = NimClient.URL + "/team/kick.action"; /** * 获取群聊 */ - private static final String CHAT_GROUP_QUERY = "https://api.netease.im/nimserver/team/query.action"; + private static final String CHAT_GROUP_QUERY = NimClient.URL + "/team/query.action"; /** * 转让群主 */ - private static final String CHANGE_OWNER = "https://api.netease.im/nimserver/team/changeOwner.action"; + private static final String CHANGE_OWNER = NimClient.URL + "/team/changeOwner.action"; /** * 获取用户已加入的群组信息 */ - private static final String JOIN_TEAM = "https://api.netease.im/nimserver/team/joinTeams.action"; + private static final String JOIN_TEAM = NimClient.URL + "/team/joinTeams.action"; /** * 私聊-历史消息查询 */ - private static final String PRIVATE_HISTORY_MSG_QUERY = "https://api.netease.im/nimserver/history/querySessionMsg.action"; + private static final String PRIVATE_HISTORY_MSG_QUERY = NimClient.URL + "/history/querySessionMsg.action"; /** * 群聊-历史消息查询 */ - private static final String GROUP_HISTORY_MSG_QUERY = "https://api.netease.im/nimserver/history/queryTeamMsg.action"; + private static final String GROUP_HISTORY_MSG_QUERY = NimClient.URL + "/history/queryTeamMsg.action"; public static final int SUCCESS_CODE = 200; diff --git a/im-center-server/src/main/java/cn/axzo/im/channel/netease/client/NimClient.java b/im-center-server/src/main/java/cn/axzo/im/channel/netease/client/NimClient.java index f98e73b..710d8d4 100644 --- a/im-center-server/src/main/java/cn/axzo/im/channel/netease/client/NimClient.java +++ b/im-center-server/src/main/java/cn/axzo/im/channel/netease/client/NimClient.java @@ -42,7 +42,7 @@ import static cn.axzo.im.channel.netease.client.NimClient.URL; @FeignClient(name = "NimClient", url = URL) public interface NimClient { - String URL = "https://api.netease.im/nimserver"; + String URL = "https://api.yunxinapi.com/nimserver"; @PostMapping(value = "/msg/delMsgOneWay.action") NimCodeResponse revoke(NimRevokeMessageRequest request);