Skip to content

W
wecloud_im_server
Commit bfeaf214 by Shadow
Options

im-common项目迁移，引入新依赖

parent ddb7c473
Showing with 201 additions and 235 deletions
im-biz-client/pom.xml
...@@ -32,6 +32,12 @@ ...@@ -32,6 +32,12 @@
<version>2.11.3</version> <version>2.11.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
......
im-biz/pom.xml
...@@ -22,75 +22,41 @@ ...@@ -22,75 +22,41 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>com.wecloud</groupId>
<artifactId>im-common-core</artifactId> <artifactId>can-common-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>com.wecloud</groupId>
<artifactId>im-common-log</artifactId> <artifactId>can-common-log</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>com.wecloud</groupId>
<artifactId>im-common-security</artifactId> <artifactId>can-common-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>com.wecloud</groupId>
<artifactId>im-server</artifactId> <artifactId>can-common-swagger</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>com.wecloud</groupId>
<artifactId>im-common-web</artifactId> <artifactId>can-common-datasource</artifactId>
</dependency>
<dependency>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-admin</artifactId>
<version>6.4.0</version>
</dependency> </dependency>
<!-- netty-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.25.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.25.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.25.Final</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.25.Final</version>
</dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>com.wecloud</groupId>
<artifactId>netty-handler</artifactId> <artifactId>im-server</artifactId>
<version>4.1.25.Final</version> <version>2.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-udt</artifactId>
<version>4.1.25.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>com.google.firebase</groupId>
<artifactId>netty-transport-sctp</artifactId> <artifactId>firebase-admin</artifactId>
<version>4.1.25.Final</version> <version>6.4.0</version>
</dependency> </dependency>
<!-- netty-->
<!-- fastbootWeixin的核心依赖 --> <!-- fastbootWeixin的核心依赖 -->
<dependency> <dependency>
...@@ -166,18 +132,14 @@ ...@@ -166,18 +132,14 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId> <groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId> <artifactId>nacos-api</artifactId>
<version>1.4.1</version> <version>1.4.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wecloud</groupId> <groupId>cn.hutool</groupId>
<artifactId>im-common-swagger</artifactId> <artifactId>hutool-crypto</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
......
im-biz/src/main/java/com/wecloud/SpringBootPlusApplication.java
...@@ -13,8 +13,8 @@ import org.springframework.scheduling.annotation.EnableAsync; ...@@ -13,8 +13,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import com.wecloud.can.core.util.PrintApplicationInfo;
import com.wecloud.im.biz.core.rocketmq.annotation.EnableRocketMq; import com.wecloud.im.biz.core.rocketmq.annotation.EnableRocketMq;
import com.wecloud.im.core.util.PrintApplicationInfo;
/** /**
* 项目启动入口 * 项目启动入口
......
im-biz/src/main/java/com/wecloud/im/biz/action/BlacklistAction.java
...@@ -9,13 +9,13 @@ import java.util.Map; ...@@ -9,13 +9,13 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam; import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo; import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo;
import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate; import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate;
import com.wecloud.im.biz.module.message.service.ImClientBlacklistService; import com.wecloud.im.biz.module.message.service.ImClientBlacklistService;
import com.wecloud.im.core.log.annotation.OperationLog;
import com.wecloud.im.core.log.enums.OperationLogType;
import com.wecloud.im.core.pagination.Paging;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/action/ConversationAction.java
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.im.biz.module.message.controller.param.ChatRoomMemberPageParam; import com.wecloud.im.biz.module.message.controller.param.ChatRoomMemberPageParam;
import com.wecloud.im.biz.module.message.controller.param.DisbandConversationParam; import com.wecloud.im.biz.module.message.controller.param.DisbandConversationParam;
import com.wecloud.im.biz.module.message.controller.param.ExitChatRoomParam; import com.wecloud.im.biz.module.message.controller.param.ExitChatRoomParam;
...@@ -36,7 +37,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ChatRoomMemberVo; ...@@ -36,7 +37,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ChatRoomMemberVo;
import com.wecloud.im.biz.module.message.controller.vo.ConversationVo; import com.wecloud.im.biz.module.message.controller.vo.ConversationVo;
import com.wecloud.im.biz.module.message.controller.vo.ImConversationCreateVo; import com.wecloud.im.biz.module.message.controller.vo.ImConversationCreateVo;
import com.wecloud.im.biz.module.message.service.ImConversationService; import com.wecloud.im.biz.module.message.service.ImConversationService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/action/InboxAction.java
...@@ -13,11 +13,11 @@ import org.springframework.stereotype.Component; ...@@ -13,11 +13,11 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.im.biz.module.message.controller.param.ImMsgReceivedStatusUpdate; import com.wecloud.im.biz.module.message.controller.param.ImMsgReceivedStatusUpdate;
import com.wecloud.im.biz.module.message.controller.param.MsgReadStatusUpdateParam; import com.wecloud.im.biz.module.message.controller.param.MsgReadStatusUpdateParam;
import com.wecloud.im.biz.module.message.controller.param.UpdateMsgReadStatusByConversationParam; import com.wecloud.im.biz.module.message.controller.param.UpdateMsgReadStatusByConversationParam;
import com.wecloud.im.biz.module.message.service.ImInboxService; import com.wecloud.im.biz.module.message.service.ImInboxService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/action/MessageAction.java
...@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.im.biz.module.message.controller.param.GetReadersParam; import com.wecloud.im.biz.module.message.controller.param.GetReadersParam;
import com.wecloud.im.biz.module.message.controller.param.ImHistoryMessagePageParam; import com.wecloud.im.biz.module.message.controller.param.ImHistoryMessagePageParam;
import com.wecloud.im.biz.module.message.controller.param.MsgDeleteParam; import com.wecloud.im.biz.module.message.controller.param.MsgDeleteParam;
...@@ -19,7 +20,6 @@ import com.wecloud.im.biz.module.message.controller.param.add.ImMsgUpdate; ...@@ -19,7 +20,6 @@ import com.wecloud.im.biz.module.message.controller.param.add.ImMsgUpdate;
import com.wecloud.im.biz.module.message.controller.vo.OfflineMsgDto; import com.wecloud.im.biz.module.message.controller.vo.OfflineMsgDto;
import com.wecloud.im.biz.module.message.controller.vo.ReaderList; import com.wecloud.im.biz.module.message.controller.vo.ReaderList;
import com.wecloud.im.biz.module.message.service.ImMessageService; import com.wecloud.im.biz.module.message.service.ImMessageService;
import com.wecloud.im.core.pagination.Paging;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/action/MultiMeetAction.java
...@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component; ...@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.im.biz.module.message.controller.param.AgreeToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.AgreeToMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.HeartbeatMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.HeartbeatMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.InviteToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.InviteToMultiMeetParam;
...@@ -19,7 +20,6 @@ import com.wecloud.im.biz.module.message.controller.param.LeaveFromMultiMeetPara ...@@ -19,7 +20,6 @@ import com.wecloud.im.biz.module.message.controller.param.LeaveFromMultiMeetPara
import com.wecloud.im.biz.module.message.controller.param.NotAnsweredMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.NotAnsweredMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.RejectToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.RejectToMultiMeetParam;
import com.wecloud.im.biz.module.multimeet.service.MultiMeetService; import com.wecloud.im.biz.module.multimeet.service.MultiMeetService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/action/NormalChatAction.java
...@@ -24,6 +24,10 @@ import com.alibaba.fastjson.JSONObject; ...@@ -24,6 +24,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.util.JsonUtils;
import com.wecloud.can.core.util.SnowflakeUtil;
import com.wecloud.im.biz.core.rocketmq.component.MqSender; import com.wecloud.im.biz.core.rocketmq.component.MqSender;
import com.wecloud.im.biz.enums.ChatTypeEnum; import com.wecloud.im.biz.enums.ChatTypeEnum;
import com.wecloud.im.biz.enums.FriendStateEnum; import com.wecloud.im.biz.enums.FriendStateEnum;
...@@ -48,10 +52,6 @@ import com.wecloud.im.biz.module.message.service.ImConversationService; ...@@ -48,10 +52,6 @@ import com.wecloud.im.biz.module.message.service.ImConversationService;
import com.wecloud.im.biz.module.message.service.ImFriendService; import com.wecloud.im.biz.module.message.service.ImFriendService;
import com.wecloud.im.biz.module.message.service.ImInboxService; import com.wecloud.im.biz.module.message.service.ImInboxService;
import com.wecloud.im.biz.module.message.service.ImMessageService; import com.wecloud.im.biz.module.message.service.ImMessageService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.util.JsonUtils;
import com.wecloud.im.core.util.SnowflakeUtil;
import com.wecloud.im.server.enums.MsgTypeEnum; import com.wecloud.im.server.enums.MsgTypeEnum;
import com.wecloud.im.server.enums.WsResponseCmdEnum; import com.wecloud.im.server.enums.WsResponseCmdEnum;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
...@@ -389,7 +389,7 @@ public class NormalChatAction { ...@@ -389,7 +389,7 @@ public class NormalChatAction {
// 没有配置 认为不是vip // 没有配置 认为不是vip
} }
} }
int sendCount = long sendCount =
imMessageService.count(Wrappers.<ImMessage>lambdaQuery().eq(ImMessage::getFkConversationId, imMessageService.count(Wrappers.<ImMessage>lambdaQuery().eq(ImMessage::getFkConversationId,
conversationId).eq(ImMessage::getSender, imClientSender.getId()).between(ImMessage::getCreateTime, getStartTime(), getEndTime())); conversationId).eq(ImMessage::getSender, imClientSender.getId()).between(ImMessage::getCreateTime, getStartTime(), getEndTime()));
if (!isVip) { if (!isVip) {
......
im-biz/src/main/java/com/wecloud/im/biz/action/RtcAction.java
...@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.enums.BaseEnum;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.im.biz.enums.CallTypeEnum; import com.wecloud.im.biz.enums.CallTypeEnum;
import com.wecloud.im.biz.module.message.controller.param.rtc.CandidateForwardParam; import com.wecloud.im.biz.module.message.controller.param.rtc.CandidateForwardParam;
import com.wecloud.im.biz.module.message.controller.param.rtc.CreateRtcChannelParam; import com.wecloud.im.biz.module.message.controller.param.rtc.CreateRtcChannelParam;
...@@ -19,8 +21,6 @@ import com.wecloud.im.biz.module.message.controller.param.rtc.LeaveRtcChannelPar ...@@ -19,8 +21,6 @@ import com.wecloud.im.biz.module.message.controller.param.rtc.LeaveRtcChannelPar
import com.wecloud.im.biz.module.message.controller.param.rtc.RejectRtcChannelParam; import com.wecloud.im.biz.module.message.controller.param.rtc.RejectRtcChannelParam;
import com.wecloud.im.biz.module.message.controller.param.rtc.SdpForwardParam; import com.wecloud.im.biz.module.message.controller.param.rtc.SdpForwardParam;
import com.wecloud.im.biz.module.rtc.service.RtcService; import com.wecloud.im.biz.module.rtc.service.RtcService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.enums.BaseEnum;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.netty.dispatch.annotation.ActionMapping; import com.wecloud.netty.dispatch.annotation.ActionMapping;
......
im-biz/src/main/java/com/wecloud/im/biz/core/aop/LogAop.java
...@@ -10,9 +10,9 @@ import org.aspectj.lang.annotation.Aspect; ...@@ -10,9 +10,9 @@ import org.aspectj.lang.annotation.Aspect;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.wecloud.im.log.aop.BaseLogAop; import com.wecloud.can.log.aop.BaseLogAop;
import com.wecloud.im.log.bean.OperationLogInfo; import com.wecloud.can.log.bean.OperationLogInfo;
import com.wecloud.im.log.bean.RequestInfo; import com.wecloud.can.log.bean.RequestInfo;
/** /**
* <p> * <p>
......
im-biz/src/main/java/com/wecloud/im/biz/core/post/Couriers.java
...@@ -6,11 +6,11 @@ import java.util.Date; ...@@ -6,11 +6,11 @@ import java.util.Date;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.entity.ImClient; import com.wecloud.im.biz.module.message.entity.ImClient;
import com.wecloud.im.biz.module.message.entity.ImMessage; import com.wecloud.im.biz.module.message.entity.ImMessage;
import com.wecloud.im.biz.module.message.entity.ImMessageOnlineSend; import com.wecloud.im.biz.module.message.entity.ImMessageOnlineSend;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.server.enums.WsResponseCmdEnum; import com.wecloud.im.server.enums.WsResponseCmdEnum;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.im.server.sender.ChannelSender; import com.wecloud.im.server.sender.ChannelSender;
......
im-biz/src/main/java/com/wecloud/im/biz/core/post/MessageBuilder.java
...@@ -2,11 +2,11 @@ package com.wecloud.im.biz.core.post; ...@@ -2,11 +2,11 @@ package com.wecloud.im.biz.core.post;
import java.util.Date; import java.util.Date;
import com.wecloud.can.core.util.SnowflakeUtil;
import com.wecloud.im.biz.module.message.entity.ImApplication; import com.wecloud.im.biz.module.message.entity.ImApplication;
import com.wecloud.im.biz.module.message.entity.ImClient; import com.wecloud.im.biz.module.message.entity.ImClient;
import com.wecloud.im.biz.module.message.entity.ImConversation; import com.wecloud.im.biz.module.message.entity.ImConversation;
import com.wecloud.im.biz.module.message.entity.ImMessage; import com.wecloud.im.biz.module.message.entity.ImMessage;
import com.wecloud.im.core.util.SnowflakeUtil;
import com.wecloud.im.server.enums.MsgTypeEnum; import com.wecloud.im.server.enums.MsgTypeEnum;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/core/web/GlobalExceptionHandler.java
...@@ -23,15 +23,13 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -23,15 +23,13 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTDecodeException;
import com.wecloud.im.core.bean.RequestDetail; import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.im.core.common.api.ApiCode; import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.im.core.common.api.ApiResult; import com.wecloud.can.core.exception.DaoException;
import com.wecloud.im.core.common.exception.BusinessException; import com.wecloud.can.core.exception.SpringBootPlusException;
import com.wecloud.im.core.common.exception.DaoException; import com.wecloud.can.core.exception.SysLoginException;
import com.wecloud.im.core.common.exception.SpringBootPlusException; import com.wecloud.can.core.exception.VerificationCodeException;
import com.wecloud.im.core.exception.SysLoginException; import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.core.exception.VerificationCodeException;
import com.wecloud.im.core.util.RequestDetailThreadLocal;
/** /**
* 全局异常处理器, 封装错误response * 全局异常处理器, 封装错误response
...@@ -227,10 +225,10 @@ public class GlobalExceptionHandler { ...@@ -227,10 +225,10 @@ public class GlobalExceptionHandler {
* 打印请求详情 * 打印请求详情
*/ */
private void printRequestDetail() { private void printRequestDetail() {
RequestDetail requestDetail = RequestDetailThreadLocal.getRequestDetail(); // RequestDetail requestDetail = RequestDetailThreadLocal.getRequestDetail();
if (requestDetail != null) { // if (requestDetail != null) {
log.error("异常来源：ip: {}, path: {}", requestDetail.getIp(), requestDetail.getPath()); // log.error("异常来源：ip: {}, path: {}", requestDetail.getIp(), requestDetail.getPath());
} // }
} }
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/enums/CallTypeEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/ChatTypeEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Description 会话类型 * @Description 会话类型
......
im-biz/src/main/java/com/wecloud/im/biz/enums/DeviceTypeEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/EventResponseSubCmdEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Description 服务器下发事件的枚举 * @Description 服务器下发事件的枚举
......
im-biz/src/main/java/com/wecloud/im/biz/enums/FriendStateEnum.java
...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums; ...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* 好友关系 1：待确定，2：已确认，3：已拒绝，4：已删除 * 好友关系 1：待确定，2：已确认，3：已拒绝，4：已删除
......
im-biz/src/main/java/com/wecloud/im/biz/enums/GroupRoleEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/MenuLevelEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* 层级枚举 * 层级枚举
......
im-biz/src/main/java/com/wecloud/im/biz/enums/MultiRtcMemberStateEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/MultiRtcRoomStateEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/MutedEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/ReadMsgStatusEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/RelationEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/RtcStateEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author Future * @Author Future
......
im-biz/src/main/java/com/wecloud/im/biz/enums/SexEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/enums/SingleRtcOperateTypeEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author Future * @Author Future
......
im-biz/src/main/java/com/wecloud/im/biz/enums/StateAuditStatusEnum.java
...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums; ...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* 审核状态,0审核中,1审核通过,2审核未通过 * 审核状态,0审核中,1审核通过,2审核未通过
......
im-biz/src/main/java/com/wecloud/im/biz/enums/StateEnum.java
...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums; ...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* 启用禁用状态枚举 * 启用禁用状态枚举
......
im-biz/src/main/java/com/wecloud/im/biz/enums/StatePaymentStatusEnum.java
...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums; ...@@ -3,7 +3,7 @@ package com.wecloud.im.biz.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* 付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款 * 付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款
......
im-biz/src/main/java/com/wecloud/im/biz/enums/VerifySceneEnum.java
package com.wecloud.im.biz.enums; package com.wecloud.im.biz.enums;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/controller/FriendController.java
...@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.externalaccess.param.FriendDto; import com.wecloud.im.biz.externalaccess.param.FriendDto;
import com.wecloud.im.biz.externalaccess.service.FriendService; import com.wecloud.im.biz.externalaccess.service.FriendService;
import com.wecloud.im.biz.module.message.entity.ImClient; import com.wecloud.im.biz.module.message.entity.ImClient;
import com.wecloud.im.biz.module.message.param.ImFriendBaseParam; import com.wecloud.im.biz.module.message.param.ImFriendBaseParam;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/controller/MultiMeetController.java
...@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.externalaccess.param.MultiMeetSignGetParam; import com.wecloud.im.biz.externalaccess.param.MultiMeetSignGetParam;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/controller/UserController.java
...@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.externalaccess.param.ChangePhoneParam; import com.wecloud.im.biz.externalaccess.param.ChangePhoneParam;
import com.wecloud.im.biz.externalaccess.param.CheckPhoneParam; import com.wecloud.im.biz.externalaccess.param.CheckPhoneParam;
import com.wecloud.im.biz.externalaccess.param.FindUserParam; import com.wecloud.im.biz.externalaccess.param.FindUserParam;
...@@ -28,9 +31,6 @@ import com.wecloud.im.biz.externalaccess.param.UserBaseDto; ...@@ -28,9 +31,6 @@ import com.wecloud.im.biz.externalaccess.param.UserBaseDto;
import com.wecloud.im.biz.externalaccess.param.UserLoginParam; import com.wecloud.im.biz.externalaccess.param.UserLoginParam;
import com.wecloud.im.biz.externalaccess.param.UserRegisterParam; import com.wecloud.im.biz.externalaccess.param.UserRegisterParam;
import com.wecloud.im.biz.externalaccess.service.UserService; import com.wecloud.im.biz.externalaccess.service.UserService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/controller/VerifyCodeController.java
...@@ -18,6 +18,12 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,6 +18,12 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.base.enums.BaseEnum;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.util.RandomUtil;
import com.wecloud.im.biz.constant.RedisKeyPrefixConstant; import com.wecloud.im.biz.constant.RedisKeyPrefixConstant;
import com.wecloud.im.biz.enums.VerifySceneEnum; import com.wecloud.im.biz.enums.VerifySceneEnum;
import com.wecloud.im.biz.externalaccess.entity.User; import com.wecloud.im.biz.externalaccess.entity.User;
...@@ -25,12 +31,6 @@ import com.wecloud.im.biz.externalaccess.param.SendVerifyCodeParam; ...@@ -25,12 +31,6 @@ import com.wecloud.im.biz.externalaccess.param.SendVerifyCodeParam;
import com.wecloud.im.biz.externalaccess.service.UserService; import com.wecloud.im.biz.externalaccess.service.UserService;
import com.wecloud.im.biz.externalaccess.sms.constant.SmsConstants; import com.wecloud.im.biz.externalaccess.sms.constant.SmsConstants;
import com.wecloud.im.biz.externalaccess.sms.sender.HwSmsSender; import com.wecloud.im.biz.externalaccess.sms.sender.HwSmsSender;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.common.enums.BaseEnum;
import com.wecloud.im.core.common.exception.BusinessException;
import com.wecloud.im.core.util.RandomUtil;
import com.wecloud.im.server.utils.RedisUtils; import com.wecloud.im.server.utils.RedisUtils;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/entity/User.java
...@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; ...@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/service/FriendService.java
...@@ -12,6 +12,9 @@ import org.springframework.stereotype.Service; ...@@ -12,6 +12,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.datasource.mybatisplus.service.impl.BaseServiceImpl;
import com.wecloud.im.biz.externalaccess.entity.User; import com.wecloud.im.biz.externalaccess.entity.User;
import com.wecloud.im.biz.externalaccess.mapper.UserMapper; import com.wecloud.im.biz.externalaccess.mapper.UserMapper;
import com.wecloud.im.biz.externalaccess.param.FriendDto; import com.wecloud.im.biz.externalaccess.param.FriendDto;
...@@ -22,9 +25,6 @@ import com.wecloud.im.biz.module.message.param.ImFriendBaseParam; ...@@ -22,9 +25,6 @@ import com.wecloud.im.biz.module.message.param.ImFriendBaseParam;
import com.wecloud.im.biz.module.message.param.ImFriendPageParam; import com.wecloud.im.biz.module.message.param.ImFriendPageParam;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.biz.module.message.service.ImFriendService; import com.wecloud.im.biz.module.message.service.ImFriendService;
import com.wecloud.im.core.common.exception.BusinessException;
import com.wecloud.im.core.common.service.impl.BaseServiceImpl;
import com.wecloud.im.core.pagination.Paging;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/externalaccess/service/UserService.java
...@@ -9,6 +9,11 @@ import org.springframework.stereotype.Service; ...@@ -9,6 +9,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.core.util.AesUtil;
import com.wecloud.can.core.util.RandomUtil;
import com.wecloud.can.core.util.SnowflakeUtil;
import com.wecloud.can.datasource.mybatisplus.service.impl.BaseServiceImpl;
import com.wecloud.im.biz.constant.NumberConstant; import com.wecloud.im.biz.constant.NumberConstant;
import com.wecloud.im.biz.constant.RedisKeyPrefixConstant; import com.wecloud.im.biz.constant.RedisKeyPrefixConstant;
import com.wecloud.im.biz.enums.FriendStateEnum; import com.wecloud.im.biz.enums.FriendStateEnum;
...@@ -41,11 +46,6 @@ import com.wecloud.im.biz.module.message.service.ImClientBlacklistService; ...@@ -41,11 +46,6 @@ import com.wecloud.im.biz.module.message.service.ImClientBlacklistService;
import com.wecloud.im.biz.module.message.service.ImClientDeviceService; import com.wecloud.im.biz.module.message.service.ImClientDeviceService;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.biz.module.message.service.ImFriendService; import com.wecloud.im.biz.module.message.service.ImFriendService;
import com.wecloud.im.core.common.exception.BusinessException;
import com.wecloud.im.core.common.service.impl.BaseServiceImpl;
import com.wecloud.im.core.util.AesUtil;
import com.wecloud.im.core.util.RandomUtil;
import com.wecloud.im.core.util.SnowflakeUtil;
import com.wecloud.im.server.utils.RedisUtils; import com.wecloud.im.server.utils.RedisUtils;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/module/chatroom/action/ChatRoomAction.java
...@@ -13,6 +13,10 @@ import java.util.Map; ...@@ -13,6 +13,10 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.util.JsonUtils;
import com.wecloud.can.core.util.SnowflakeUtil;
import com.wecloud.im.biz.module.chatroom.cache.ChatRoomCacheManager; import com.wecloud.im.biz.module.chatroom.cache.ChatRoomCacheManager;
import com.wecloud.im.biz.module.message.controller.param.ChatContentVo; import com.wecloud.im.biz.module.message.controller.param.ChatContentVo;
import com.wecloud.im.biz.module.message.controller.param.ImConversationQueryVo; import com.wecloud.im.biz.module.message.controller.param.ImConversationQueryVo;
...@@ -23,10 +27,6 @@ import com.wecloud.im.biz.module.message.entity.ImMessageOnlineSend; ...@@ -23,10 +27,6 @@ import com.wecloud.im.biz.module.message.entity.ImMessageOnlineSend;
import com.wecloud.im.biz.module.message.service.ImApplicationService; import com.wecloud.im.biz.module.message.service.ImApplicationService;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.biz.module.message.service.ImConversationService; import com.wecloud.im.biz.module.message.service.ImConversationService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.util.JsonUtils;
import com.wecloud.im.core.util.SnowflakeUtil;
import com.wecloud.im.server.enums.WsResponseCmdEnum; import com.wecloud.im.server.enums.WsResponseCmdEnum;
import com.wecloud.im.server.model.WsResponse; import com.wecloud.im.server.model.WsResponse;
import com.wecloud.im.server.sender.ChannelSender; import com.wecloud.im.server.sender.ChannelSender;
......
im-biz/src/main/java/com/wecloud/im/biz/module/chatroom/cache/ChatRoomCacheManager.java
...@@ -12,7 +12,7 @@ import javax.annotation.Resource; ...@@ -12,7 +12,7 @@ import javax.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.wecloud.im.core.util.GetIpUtils; import com.wecloud.can.core.util.GetIpUtils;
import com.wecloud.im.server.utils.RedisUtils; import com.wecloud.im.server.utils.RedisUtils;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/AppHelloWorldController.java
//package com.wecloud.im.controller; //package com.wecloud.im.controller;
// //
//import com.wecloud.im.core.common.api.ApiResult; //import com.wecloud.can.core.util.ApiResult;
//import com.wecloud.im.core.log.annotation.OperationLog; //import com.wecloud.can.log.annotation.OperationLog;
//import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImApplicationController.java
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
//import com.wecloud.im.param.add.ImApplicationAdd; //import com.wecloud.im.param.add.ImApplicationAdd;
//import com.wecloud.im.service.ImApplicationService; //import com.wecloud.im.service.ImApplicationService;
//import com.wecloud.im.server.utils.RSAGenerator; //import com.wecloud.im.server.utils.RSAGenerator;
//import com.wecloud.im.core.common.api.ApiResult; //import com.wecloud.can.core.util.ApiResult;
//import com.wecloud.im.core.common.controller.BaseController; //import com.wecloud.can.core.base.controller.BaseController;
//import com.wecloud.im.core.core.pagination.Paging; //import com.wecloud.can.core.core.pagination.Paging;
//import com.wecloud.im.core.core.validator.groups.Add; //import com.wecloud.can.core.core.validator.groups.Add;
//import com.wecloud.im.core.core.validator.groups.Update; //import com.wecloud.can.core.core.validator.groups.Update;
//import com.wecloud.im.core.log.annotation.OperationLog; //import com.wecloud.can.log.annotation.OperationLog;
//import com.wecloud.im.core.log.enums.OperationLogType; //import com.wecloud.can.log.enums.OperationLogType;
//import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImClientBlacklistController.java
...@@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.validator.groups.Add;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam; import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo; import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo;
import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate; import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate;
import com.wecloud.im.biz.module.message.service.ImClientBlacklistService; import com.wecloud.im.biz.module.message.service.ImClientBlacklistService;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.log.annotation.OperationLog;
import com.wecloud.im.core.log.enums.OperationLogType;
import com.wecloud.im.core.pagination.Paging;
import com.wecloud.im.core.validator.groups.Add;
/** /**
* 黑名单 控制器 * 黑名单 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImClientController.java
...@@ -17,6 +17,12 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -17,6 +17,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.validator.groups.Add;
import com.wecloud.can.security.jwt.JwtToken;
import com.wecloud.can.security.util.JwtUtil;
import com.wecloud.im.biz.module.message.controller.param.ClientInfoParam; import com.wecloud.im.biz.module.message.controller.param.ClientInfoParam;
import com.wecloud.im.biz.module.message.controller.param.ClientRelationVo; import com.wecloud.im.biz.module.message.controller.param.ClientRelationVo;
import com.wecloud.im.biz.module.message.controller.param.GetClientInfoParam; import com.wecloud.im.biz.module.message.controller.param.GetClientInfoParam;
...@@ -38,12 +44,6 @@ import com.wecloud.im.biz.module.message.entity.ImApplication; ...@@ -38,12 +44,6 @@ import com.wecloud.im.biz.module.message.entity.ImApplication;
import com.wecloud.im.biz.module.message.entity.ImClient; import com.wecloud.im.biz.module.message.entity.ImClient;
import com.wecloud.im.biz.module.message.service.ImApplicationService; import com.wecloud.im.biz.module.message.service.ImApplicationService;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.validator.groups.Add;
import com.wecloud.im.security.jwt.JwtToken;
import com.wecloud.im.security.util.JwtUtil;
import com.wecloud.im.server.cache.UserStateCacheManager; import com.wecloud.im.server.cache.UserStateCacheManager;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImConversationController.java
...@@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.ChatRoomMemberPageParam; import com.wecloud.im.biz.module.message.controller.param.ChatRoomMemberPageParam;
import com.wecloud.im.biz.module.message.controller.param.DisbandConversationParam; import com.wecloud.im.biz.module.message.controller.param.DisbandConversationParam;
import com.wecloud.im.biz.module.message.controller.param.ExitChatRoomParam; import com.wecloud.im.biz.module.message.controller.param.ExitChatRoomParam;
...@@ -38,9 +41,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ConversationVo; ...@@ -38,9 +41,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ConversationVo;
import com.wecloud.im.biz.module.message.controller.vo.ImConversationCreateVo; import com.wecloud.im.biz.module.message.controller.vo.ImConversationCreateVo;
import com.wecloud.im.biz.module.message.entity.ImConversation; import com.wecloud.im.biz.module.message.entity.ImConversation;
import com.wecloud.im.biz.module.message.service.ImConversationService; import com.wecloud.im.biz.module.message.service.ImConversationService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* 会话表 控制器 * 会话表 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImConversationMembersController.java
...@@ -14,6 +14,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -14,6 +14,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.ChatSettingParam; import com.wecloud.im.biz.module.message.controller.param.ChatSettingParam;
import com.wecloud.im.biz.module.message.controller.param.ImConvMemeClientRemarkNameParam; import com.wecloud.im.biz.module.message.controller.param.ImConvMemeClientRemarkNameParam;
import com.wecloud.im.biz.module.message.controller.param.ListConversationMembersParam; import com.wecloud.im.biz.module.message.controller.param.ListConversationMembersParam;
...@@ -21,10 +25,6 @@ import com.wecloud.im.biz.module.message.controller.param.add.ImConversationMemA ...@@ -21,10 +25,6 @@ import com.wecloud.im.biz.module.message.controller.param.add.ImConversationMemA
import com.wecloud.im.biz.module.message.controller.vo.ConversationMemberVo; import com.wecloud.im.biz.module.message.controller.vo.ConversationMemberVo;
import com.wecloud.im.biz.module.message.param.ImFriendApplyParam; import com.wecloud.im.biz.module.message.param.ImFriendApplyParam;
import com.wecloud.im.biz.module.message.service.ImConversationMembersService; import com.wecloud.im.biz.module.message.service.ImConversationMembersService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.common.exception.BusinessException;
/** /**
* 会话成员表 控制器 * 会话成员表 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImFriendController.java
...@@ -17,6 +17,15 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -17,6 +17,15 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.base.enums.BaseEnum;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.can.security.util.SecurityUtils;
import com.wecloud.im.biz.enums.FriendStateEnum; import com.wecloud.im.biz.enums.FriendStateEnum;
import com.wecloud.im.biz.module.message.entity.ImClient; import com.wecloud.im.biz.module.message.entity.ImClient;
import com.wecloud.im.biz.module.message.param.FriendRemarkParam; import com.wecloud.im.biz.module.message.param.FriendRemarkParam;
...@@ -33,15 +42,6 @@ import com.wecloud.im.biz.module.message.param.ImFriendRecommendDto; ...@@ -33,15 +42,6 @@ import com.wecloud.im.biz.module.message.param.ImFriendRecommendDto;
import com.wecloud.im.biz.module.message.param.UnfriendParam; import com.wecloud.im.biz.module.message.param.UnfriendParam;
import com.wecloud.im.biz.module.message.service.ImClientService; import com.wecloud.im.biz.module.message.service.ImClientService;
import com.wecloud.im.biz.module.message.service.ImFriendService; import com.wecloud.im.biz.module.message.service.ImFriendService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.common.enums.BaseEnum;
import com.wecloud.im.core.common.exception.BusinessException;
import com.wecloud.im.core.log.annotation.OperationLog;
import com.wecloud.im.core.log.enums.OperationLogType;
import com.wecloud.im.core.pagination.Paging;
import com.wecloud.im.security.util.SecurityUtils;
/** /**
* @author lixiaozhong * @author lixiaozhong
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImGroupController.java
...@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.GroupOwnerTransferParam; import com.wecloud.im.biz.module.message.controller.param.GroupOwnerTransferParam;
import com.wecloud.im.biz.module.message.controller.param.ModifyGroupAdminParam; import com.wecloud.im.biz.module.message.controller.param.ModifyGroupAdminParam;
import com.wecloud.im.biz.module.message.controller.param.group.CreateGroupParam; import com.wecloud.im.biz.module.message.controller.param.group.CreateGroupParam;
...@@ -25,7 +26,6 @@ import com.wecloud.im.biz.module.message.controller.param.group.LeaveGroupParam; ...@@ -25,7 +26,6 @@ import com.wecloud.im.biz.module.message.controller.param.group.LeaveGroupParam;
import com.wecloud.im.biz.module.message.controller.param.group.ListGroupMembersParam; import com.wecloud.im.biz.module.message.controller.param.group.ListGroupMembersParam;
import com.wecloud.im.biz.module.message.controller.param.group.MutedMembersParam; import com.wecloud.im.biz.module.message.controller.param.group.MutedMembersParam;
import com.wecloud.im.biz.module.message.service.ImGroupService; import com.wecloud.im.biz.module.message.service.ImGroupService;
import com.wecloud.im.core.common.api.ApiResult;
/** /**
* 群聊接口 * 群聊接口
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImInboxController.java
...@@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.ImMsgReceivedStatusUpdate; import com.wecloud.im.biz.module.message.controller.param.ImMsgReceivedStatusUpdate;
import com.wecloud.im.biz.module.message.controller.param.MsgReadStatusUpdateParam; import com.wecloud.im.biz.module.message.controller.param.MsgReadStatusUpdateParam;
import com.wecloud.im.biz.module.message.controller.param.UpdateMsgReadStatusByConversationParam; import com.wecloud.im.biz.module.message.controller.param.UpdateMsgReadStatusByConversationParam;
import com.wecloud.im.biz.module.message.service.ImInboxService; import com.wecloud.im.biz.module.message.service.ImInboxService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* 消息收件箱表 控制器 * 消息收件箱表 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImIosApnsController.java
//package com.wecloud.im.controller; //package com.wecloud.im.controller;
// //
//import com.wecloud.im.service.ImIosApnsService; //import com.wecloud.im.service.ImIosApnsService;
//import com.wecloud.im.core.common.controller.BaseController; //import com.wecloud.can.core.base.controller.BaseController;
//import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
//import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImMessageController.java
...@@ -14,6 +14,12 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -14,6 +14,12 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.GetReadersParam; import com.wecloud.im.biz.module.message.controller.param.GetReadersParam;
import com.wecloud.im.biz.module.message.controller.param.GroupChatMessageParam; import com.wecloud.im.biz.module.message.controller.param.GroupChatMessageParam;
import com.wecloud.im.biz.module.message.controller.param.GroupChatStatusMessageParam; import com.wecloud.im.biz.module.message.controller.param.GroupChatStatusMessageParam;
...@@ -28,12 +34,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ImMessageOfflineListVo; ...@@ -28,12 +34,6 @@ import com.wecloud.im.biz.module.message.controller.vo.ImMessageOfflineListVo;
import com.wecloud.im.biz.module.message.controller.vo.OfflineMsgDto; import com.wecloud.im.biz.module.message.controller.vo.OfflineMsgDto;
import com.wecloud.im.biz.module.message.controller.vo.ReaderList; import com.wecloud.im.biz.module.message.controller.vo.ReaderList;
import com.wecloud.im.biz.module.message.service.ImMessageService; import com.wecloud.im.biz.module.message.service.ImMessageService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.log.annotation.OperationLog;
import com.wecloud.im.core.log.enums.OperationLogType;
import com.wecloud.im.core.pagination.Paging;
/** /**
* 消息存储表 控制器 * 消息存储表 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImMultiMeetController.java
...@@ -13,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -13,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.AgreeToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.AgreeToMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.HeartbeatMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.HeartbeatMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.InviteToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.InviteToMultiMeetParam;
...@@ -20,9 +23,6 @@ import com.wecloud.im.biz.module.message.controller.param.LeaveFromMultiMeetPara ...@@ -20,9 +23,6 @@ import com.wecloud.im.biz.module.message.controller.param.LeaveFromMultiMeetPara
import com.wecloud.im.biz.module.message.controller.param.NotAnsweredMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.NotAnsweredMultiMeetParam;
import com.wecloud.im.biz.module.message.controller.param.RejectToMultiMeetParam; import com.wecloud.im.biz.module.message.controller.param.RejectToMultiMeetParam;
import com.wecloud.im.biz.module.multimeet.service.MultiMeetService; import com.wecloud.im.biz.module.multimeet.service.MultiMeetService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImRtcController.java
...@@ -10,6 +10,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -10,6 +10,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.base.enums.BaseEnum;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.enums.CallTypeEnum; import com.wecloud.im.biz.enums.CallTypeEnum;
import com.wecloud.im.biz.module.message.controller.param.rtc.CandidateForwardParam; import com.wecloud.im.biz.module.message.controller.param.rtc.CandidateForwardParam;
import com.wecloud.im.biz.module.message.controller.param.rtc.CreateRtcChannelParam; import com.wecloud.im.biz.module.message.controller.param.rtc.CreateRtcChannelParam;
...@@ -19,10 +23,6 @@ import com.wecloud.im.biz.module.message.controller.param.rtc.LeaveRtcChannelPar ...@@ -19,10 +23,6 @@ import com.wecloud.im.biz.module.message.controller.param.rtc.LeaveRtcChannelPar
import com.wecloud.im.biz.module.message.controller.param.rtc.RejectRtcChannelParam; import com.wecloud.im.biz.module.message.controller.param.rtc.RejectRtcChannelParam;
import com.wecloud.im.biz.module.message.controller.param.rtc.SdpForwardParam; import com.wecloud.im.biz.module.message.controller.param.rtc.SdpForwardParam;
import com.wecloud.im.biz.module.rtc.service.RtcService; import com.wecloud.im.biz.module.rtc.service.RtcService;
import com.wecloud.im.core.common.api.ApiCode;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
import com.wecloud.im.core.common.enums.BaseEnum;
/** /**
* 音视频通话 控制器 * 音视频通话 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/ImRtcRecordController.java
...@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.rtc.SingleRtcRecordParam; import com.wecloud.im.biz.module.message.controller.param.rtc.SingleRtcRecordParam;
import com.wecloud.im.biz.module.message.entity.ImRtcRecord; import com.wecloud.im.biz.module.message.entity.ImRtcRecord;
import com.wecloud.im.biz.module.message.service.ImRtcRecordService; import com.wecloud.im.biz.module.message.service.ImRtcRecordService;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* @author nanqianhao * @author nanqianhao
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/SignController.java
...@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.im.biz.module.message.controller.param.GetSignParam; import com.wecloud.im.biz.module.message.controller.param.GetSignParam;
import com.wecloud.im.biz.module.message.service.ImClientLoginService; import com.wecloud.im.biz.module.message.service.ImClientLoginService;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* sign 控制器 * sign 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/TokenController.java
...@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.im.biz.module.message.controller.param.ClientLoginParam; import com.wecloud.im.biz.module.message.controller.param.ClientLoginParam;
import com.wecloud.im.biz.module.message.controller.param.ImTokenVerify; import com.wecloud.im.biz.module.message.controller.param.ImTokenVerify;
import com.wecloud.im.biz.module.message.controller.vo.TokenVo; import com.wecloud.im.biz.module.message.controller.vo.TokenVo;
import com.wecloud.im.biz.module.message.service.ImClientLoginService; import com.wecloud.im.biz.module.message.service.ImClientLoginService;
import com.wecloud.im.core.common.api.ApiResult;
import com.wecloud.im.core.common.controller.BaseController;
/** /**
* token 控制器 * token 控制器
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ChatContentVo.java
...@@ -2,7 +2,7 @@ package com.wecloud.im.biz.module.message.controller.param; ...@@ -2,7 +2,7 @@ package com.wecloud.im.biz.module.message.controller.param;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.util.JsonUtils; import com.wecloud.can.core.util.JsonUtils;
import com.wecloud.im.server.model.request.PushVO; import com.wecloud.im.server.model.request.PushVO;
import com.wecloud.netty.dispatch.common.BaseRequest; import com.wecloud.netty.dispatch.common.BaseRequest;
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ChatSettingTypeEnum.java
...@@ -2,7 +2,7 @@ package com.wecloud.im.biz.module.message.controller.param; ...@@ -2,7 +2,7 @@ package com.wecloud.im.biz.module.message.controller.param;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import com.wecloud.im.core.common.enums.BaseEnum; import com.wecloud.can.core.base.enums.BaseEnum;
/** /**
* *
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/DisbandConversationParam.java
...@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel; ...@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ExitChatRoomParam.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/GetReadersParam.java
...@@ -7,7 +7,7 @@ import lombok.Setter; ...@@ -7,7 +7,7 @@ import lombok.Setter;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImApplicationPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImClientBlacklistPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImClientPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImClientSimpleDto.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 终端表 * 终端表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImConversationMembersPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImConversationPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImHistoryMessagePageParam.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImInboxPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImIosApnsPageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImMessagePageParam.java
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.pagination.BasePageOrderParam; import com.wecloud.can.datasource.mybatisplus.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ImMsgReceivedStatusUpdate.java
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,7 @@ import java.util.List;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* ImMsgReadUpdate * ImMsgReadUpdate
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/IntoChatRoomParam.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/ListConversationParam.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/LogoutParam.java
...@@ -6,8 +6,8 @@ import lombok.Data; ...@@ -6,8 +6,8 @@ import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.biz.enums.DeviceTypeEnum; import com.wecloud.im.biz.enums.DeviceTypeEnum;
import com.wecloud.im.core.common.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/MsgDeleteParam.java
...@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; ...@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
import java.util.List; import java.util.List;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/MsgReadStatusUpdateParam.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* ImMsgReadUpdate * ImMsgReadUpdate
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/MutedGroupMemberParam.java
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/MutedGroupParam.java
...@@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode; ...@@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.biz.enums.MutedEnum; import com.wecloud.im.biz.enums.MutedEnum;
import com.wecloud.im.core.common.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/SetAdminsParam.java
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/TransferOwnerParam.java
...@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/UpdateMsgReadStatusByConversationParam.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ClientDeviceUpdateParam.java
...@@ -6,8 +6,8 @@ import lombok.Data; ...@@ -6,8 +6,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.biz.enums.DeviceTypeEnum; import com.wecloud.im.biz.enums.DeviceTypeEnum;
import com.wecloud.im.core.common.entity.BaseEntity;
/** /**
* 添加或修改推送设备信息 * 添加或修改推送设备信息
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImApplicationAdd.java
...@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; ...@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 第三方应用表 * 第三方应用表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientBlacklistUpdate.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 黑名单 * 黑名单
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientHeadPortraitAdd.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 添加或修改推送设备信息 * 添加或修改推送设备信息
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientHeadPortraitAndNicknameUpdate.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 添加或修改推送设备信息 * 添加或修改推送设备信息
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientLeaveConversation.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @author wei * @author wei
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientNicknameAdd.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 添加或修改推送设备信息 * 添加或修改推送设备信息
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientNicknameUpdate.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* @Author wenzhida * @Author wenzhida
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImClientToConversation.java
...@@ -8,8 +8,8 @@ import lombok.experimental.Accessors; ...@@ -8,8 +8,8 @@ import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.biz.enums.JoinConversationTypeEnum; import com.wecloud.im.biz.enums.JoinConversationTypeEnum;
import com.wecloud.im.core.common.entity.BaseEntity;
/** /**
* @author wei * @author wei
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImConversationAttrUpdate.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 会话表 * 会话表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImConversationCreate.java
...@@ -11,8 +11,8 @@ import java.util.Map; ...@@ -11,8 +11,8 @@ import java.util.Map;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.biz.enums.ChatTypeEnum; import com.wecloud.im.biz.enums.ChatTypeEnum;
import com.wecloud.im.core.common.entity.BaseEntity;
/** /**
* 会话表 * 会话表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImConversationDisplayUpdate.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 修改是否单向隐藏会话 * 修改是否单向隐藏会话
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImConversationMemAttrUpdate.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import java.util.HashMap; import java.util.HashMap;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 会话表 * 会话表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImConversationNameUpdate.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 会话表 * 会话表
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImMsgRecall.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
import com.wecloud.im.server.model.request.PushVO; import com.wecloud.im.server.model.request.PushVO;
/** /**
......
im-biz/src/main/java/com/wecloud/im/biz/module/message/controller/param/add/ImMsgSendToOnlineClient.java
...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors; ...@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
import java.util.HashMap; import java.util.HashMap;
import com.wecloud.im.core.common.entity.BaseEntity; import com.wecloud.can.core.base.entity.BaseEntity;
/** /**
* 自定义透传内容 * 自定义透传内容
......
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