Commit dd272cb54a1c86060b9578d8558310291c301864

Authored by YunaiV
1 parent 267477c9

【功能修复】IM:解决报错问题

yudao-module-im/yudao-module-im-biz/pom.xml
@@ -24,12 +24,6 @@ @@ -24,12 +24,6 @@
24 <version>${revision}</version> 24 <version>${revision}</version>
25 </dependency> 25 </dependency>
26 26
27 - <!-- 业务组件 -->  
28 - <dependency>  
29 - <groupId>cn.iocoder.boot</groupId>  
30 - <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>  
31 - </dependency>  
32 -  
33 <!-- Web 相关 --> 27 <!-- Web 相关 -->
34 <dependency> 28 <dependency>
35 <groupId>cn.iocoder.boot</groupId> 29 <groupId>cn.iocoder.boot</groupId>
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/controller/admin/groupmember/ImGroupMemberController.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 7 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
8 -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;  
9 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberPageReqVO; 8 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberPageReqVO;
10 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberRespVO; 9 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberRespVO;
11 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberSaveReqVO; 10 import cn.iocoder.yudao.module.im.controller.admin.groupmember.vo.ImGroupMemberSaveReqVO;
@@ -25,7 +24,6 @@ import java.io.IOException; @@ -25,7 +24,6 @@ import java.io.IOException;
25 import java.util.List; 24 import java.util.List;
26 25
27 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 26 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
28 -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;  
29 27
30 // TODO @芋艿:得看看 create、update、delete、get、page 这几个接口,要保留哪些 28 // TODO @芋艿:得看看 create、update、delete、get、page 这几个接口,要保留哪些
31 @Tag(name = "管理后台 - 群成员") 29 @Tag(name = "管理后台 - 群成员")
@@ -81,7 +79,6 @@ public class ImGroupMemberController { @@ -81,7 +79,6 @@ public class ImGroupMemberController {
81 @GetMapping("/export-excel") 79 @GetMapping("/export-excel")
82 @Operation(summary = "导出群成员 Excel") 80 @Operation(summary = "导出群成员 Excel")
83 @PreAuthorize("@ss.hasPermission('im:group-member:export')") 81 @PreAuthorize("@ss.hasPermission('im:group-member:export')")
84 - @OperateLog(type = EXPORT)  
85 public void exportGroupMemberExcel(@Valid ImGroupMemberPageReqVO pageReqVO, 82 public void exportGroupMemberExcel(@Valid ImGroupMemberPageReqVO pageReqVO,
86 HttpServletResponse response) throws IOException { 83 HttpServletResponse response) throws IOException {
87 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); 84 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/inbox/ImInboxServiceImpl.java
1 package cn.iocoder.yudao.module.im.service.inbox; 1 package cn.iocoder.yudao.module.im.service.inbox;
2 2
  3 +import cn.hutool.core.date.DateUnit;
3 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 4 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
4 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 5 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
5 import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageRespVO; 6 import cn.iocoder.yudao.module.im.controller.admin.message.vo.ImMessageRespVO;
@@ -13,7 +14,6 @@ import cn.iocoder.yudao.module.im.enums.conversation.ImConversationTypeEnum; @@ -13,7 +14,6 @@ import cn.iocoder.yudao.module.im.enums.conversation.ImConversationTypeEnum;
13 import cn.iocoder.yudao.module.im.service.groupmember.ImGroupMemberService; 14 import cn.iocoder.yudao.module.im.service.groupmember.ImGroupMemberService;
14 import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; 15 import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
15 import jakarta.annotation.Resource; 16 import jakarta.annotation.Resource;
16 -import org.dromara.hutool.core.date.DateUnit;  
17 import org.springframework.scheduling.annotation.Async; 17 import org.springframework.scheduling.annotation.Async;
18 import org.springframework.stereotype.Service; 18 import org.springframework.stereotype.Service;
19 import org.springframework.validation.annotation.Validated; 19 import org.springframework.validation.annotation.Validated;
yudao-module-im/yudao-module-im-biz/src/main/java/cn/iocoder/yudao/module/im/service/message/ImMessageServiceImpl.java
@@ -16,10 +16,10 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi; @@ -16,10 +16,10 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
16 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; 16 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
17 import jakarta.annotation.Resource; 17 import jakarta.annotation.Resource;
18 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
19 -import org.dromara.hutool.core.date.TimeUtil;  
20 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
21 import org.springframework.validation.annotation.Validated; 20 import org.springframework.validation.annotation.Validated;
22 21
  22 +import java.time.LocalDateTime;
23 import java.util.Collections; 23 import java.util.Collections;
24 import java.util.List; 24 import java.util.List;
25 25
@@ -87,7 +87,7 @@ public class ImMessageServiceImpl implements ImMessageService { @@ -87,7 +87,7 @@ public class ImMessageServiceImpl implements ImMessageService {
87 .setConversationNo(ImConversationTypeEnum.generateConversationNo(fromUserId, message.getReceiverId(), message.getConversationType())) 87 .setConversationNo(ImConversationTypeEnum.generateConversationNo(fromUserId, message.getReceiverId(), message.getConversationType()))
88 .setSendFrom(ImMessageSourceEnum.USER_SEND.getSource()) 88 .setSendFrom(ImMessageSourceEnum.USER_SEND.getSource())
89 .setMessageStatus(ImMessageStatusEnum.SENDING.getStatus()) 89 .setMessageStatus(ImMessageStatusEnum.SENDING.getStatus())
90 - .setSendTime(TimeUtil.now()); 90 + .setSendTime(LocalDateTime.now());
91 imMessageMapper.insert(imMessageDO); 91 imMessageMapper.insert(imMessageDO);
92 return imMessageDO; 92 return imMessageDO;
93 } 93 }
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserRespDTO.java
@@ -45,10 +45,4 @@ public class AdminUserRespDTO { @@ -45,10 +45,4 @@ public class AdminUserRespDTO {
45 */ 45 */
46 private String avatar; 46 private String avatar;
47 47
48 - // TODO @hao:这种字段的添加,最好和 do 保持一致的顺序哈;  
49 - /**  
50 - * 用户头像  
51 - */  
52 - private String avatar;  
53 -  
54 } 48 }