mallchat项目重构

mallchat-chat-server/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mallchat-common</artifactId>
+    <artifactId>mallchat-chat-server</artifactId>
 
     <dependencies>
         <dependency>
@@ -20,6 +20,11 @@
             <groupId>com.abin.mallchat</groupId>
             <artifactId>mallchat-transaction</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.knuddels</groupId>
+            <artifactId>jtokkit</artifactId>
+            <version>0.6.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -28,6 +33,10 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
         </plugins>
 
     </build>

mallchat-chat-server/src/main/java/com/abin/mallchat/common/MallchatCustomApplication.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom;
+package com.abin.mallchat.common;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/consumer/MsgSendConsumer.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.consumer;
+package com.abin.mallchat.common.chat.consumer;
 
 import com.abin.mallchat.common.chat.dao.ContactDao;
 import com.abin.mallchat.common.chat.dao.MessageDao;
@@ -9,18 +9,18 @@ import com.abin.mallchat.common.chat.domain.entity.Room;
 import com.abin.mallchat.common.chat.domain.entity.RoomFriend;
 import com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum;
 import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp;
+import com.abin.mallchat.common.chat.service.ChatService;
+import com.abin.mallchat.common.chat.service.WeChatMsgOperationService;
 import com.abin.mallchat.common.chat.service.cache.GroupMemberCache;
 import com.abin.mallchat.common.chat.service.cache.HotRoomCache;
 import com.abin.mallchat.common.chat.service.cache.RoomCache;
+import com.abin.mallchat.common.chatai.service.IChatAIService;
 import com.abin.mallchat.common.common.constant.MQConstant;
 import com.abin.mallchat.common.common.domain.dto.MsgSendMessageDTO;
+import com.abin.mallchat.common.user.service.WebSocketService;
+import com.abin.mallchat.common.user.service.adapter.WSAdapter;
 import com.abin.mallchat.common.user.service.cache.UserCache;
 import com.abin.mallchat.common.user.service.impl.PushService;
-import com.abin.mallchat.custom.chat.service.ChatService;
-import com.abin.mallchat.custom.chat.service.WeChatMsgOperationService;
-import com.abin.mallchat.custom.chatai.service.IChatAIService;
-import com.abin.mallchat.custom.user.service.WebSocketService;
-import com.abin.mallchat.custom.user.service.adapter.WSAdapter;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ChatController.java

@@ -1,8 +1,13 @@
-package com.abin.mallchat.custom.chat.controller;
+package com.abin.mallchat.common.chat.controller;
 
 
 import com.abin.mallchat.common.chat.domain.dto.MsgReadInfoDTO;
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberStatisticResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageReadResp;
 import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp;
+import com.abin.mallchat.common.chat.service.ChatService;
 import com.abin.mallchat.common.common.annotation.FrequencyControl;
 import com.abin.mallchat.common.common.domain.vo.response.ApiResult;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
@@ -10,11 +15,6 @@ import com.abin.mallchat.common.common.utils.RequestHolder;
 import com.abin.mallchat.common.user.domain.enums.BlackTypeEnum;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
 import com.abin.mallchat.common.user.service.cache.UserCache;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageReadResp;
-import com.abin.mallchat.custom.chat.service.ChatService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ContactController.java

@@ -1,14 +1,14 @@
-package com.abin.mallchat.custom.chat.controller;
+package com.abin.mallchat.common.chat.controller;
 
 
+import com.abin.mallchat.common.chat.domain.vo.response.ChatRoomResp;
+import com.abin.mallchat.common.chat.service.ChatService;
+import com.abin.mallchat.common.chat.service.RoomAppService;
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import com.abin.mallchat.common.common.domain.vo.request.IdReqVO;
 import com.abin.mallchat.common.common.domain.vo.response.ApiResult;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
 import com.abin.mallchat.common.common.utils.RequestHolder;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp;
-import com.abin.mallchat.custom.chat.service.ChatService;
-import com.abin.mallchat.custom.chat.service.RoomAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java

@@ -1,16 +1,16 @@
-package com.abin.mallchat.custom.chat.controller;
+package com.abin.mallchat.common.chat.controller;
 
 
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.MemberResp;
+import com.abin.mallchat.common.chat.service.RoomAppService;
 import com.abin.mallchat.common.common.domain.vo.request.IdReqVO;
 import com.abin.mallchat.common.common.domain.vo.response.ApiResult;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
 import com.abin.mallchat.common.common.domain.vo.response.IdRespVO;
 import com.abin.mallchat.common.common.utils.RequestHolder;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.MemberResp;
-import com.abin.mallchat.custom.chat.service.RoomAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleAPPEnum.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.enums;
+package com.abin.mallchat.common.chat.domain.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageBaseReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMarkReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMemberReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessagePageReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import io.swagger.annotations.ApiModelProperty;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadInfoReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import io.swagger.annotations.ApiModelProperty;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/GroupAddReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberAddReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberDelReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request;
+package com.abin.mallchat.common.chat.domain.vo.request;
 
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import io.swagger.annotations.ApiModelProperty;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/msg/TextMsgReq.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.request.msg;
+package com.abin.mallchat.common.chat.domain.vo.request.msg;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberListResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberStatisticResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadInfoResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatRoomResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/MemberResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response;
+package com.abin.mallchat.common.chat.domain.vo.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -25,7 +25,7 @@ public class MemberResp {
     @ApiModelProperty("在线人数")
     private Long onlineNum;//在线人数
     /**
-     * @see com.abin.mallchat.custom.chat.domain.vo.enums.GroupRoleAPPEnum
+     * @see com.abin.mallchat.common.chat.domain.enums.GroupRoleAPPEnum
      */
     @ApiModelProperty("成员角色 1群主 2管理员 3普通成员 4踢出群聊")
     private Integer role;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/msg/TextMsgResp.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.domain.vo.response.msg;
+package com.abin.mallchat.common.chat.domain.vo.response.msg;
 
 import com.abin.mallchat.common.common.utils.discover.domain.UrlInfo;
 import io.swagger.annotations.ApiModelProperty;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/ChatService.java

@@ -1,15 +1,15 @@
-package com.abin.mallchat.custom.chat.service;
+package com.abin.mallchat.common.chat.service;
 
 import com.abin.mallchat.common.chat.domain.dto.MsgReadInfoDTO;
 import com.abin.mallchat.common.chat.domain.entity.Message;
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberStatisticResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageReadResp;
 import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp;
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageReadResp;
 
 import javax.annotation.Nullable;
 import java.util.Collection;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/RoomAppService.java

@@ -1,12 +1,12 @@
-package com.abin.mallchat.custom.chat.service;
+package com.abin.mallchat.common.chat.service;
 
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatRoomResp;
+import com.abin.mallchat.common.chat.domain.vo.response.MemberResp;
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.MemberResp;
 
 import java.util.List;
 

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/WeChatMsgOperationService.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service;
+package com.abin.mallchat.common.chat.service;
 
 import java.util.List;
 

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MemberAdapter.java

@@ -1,7 +1,8 @@
-package com.abin.mallchat.custom.chat.service.adapter;
+package com.abin.mallchat.common.chat.service.adapter;
 
 import com.abin.mallchat.common.chat.domain.entity.GroupMember;
 import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
 import com.abin.mallchat.common.user.domain.entity.User;
 import com.abin.mallchat.common.user.domain.entity.UserFriend;
 import com.abin.mallchat.common.user.domain.enums.WSBaseResp;
@@ -9,7 +10,6 @@ import com.abin.mallchat.common.user.domain.enums.WSRespTypeEnum;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
 import com.abin.mallchat.common.user.domain.vo.response.ws.WSMemberChange;
 import com.abin.mallchat.common.user.service.cache.UserCache;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MessageAdapter.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.adapter;
+package com.abin.mallchat.common.chat.service.adapter;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.abin.mallchat.common.chat.domain.entity.Message;
@@ -6,12 +6,12 @@ import com.abin.mallchat.common.chat.domain.entity.MessageMark;
 import com.abin.mallchat.common.chat.domain.enums.MessageMarkTypeEnum;
 import com.abin.mallchat.common.chat.domain.enums.MessageStatusEnum;
 import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum;
+import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq;
+import com.abin.mallchat.common.chat.domain.vo.request.msg.TextMsgReq;
 import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp;
+import com.abin.mallchat.common.chat.service.strategy.msg.AbstractMsgHandler;
+import com.abin.mallchat.common.chat.service.strategy.msg.MsgHandlerFactory;
 import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum;
-import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq;
-import com.abin.mallchat.custom.chat.domain.vo.request.msg.TextMsgReq;
-import com.abin.mallchat.custom.chat.service.strategy.msg.AbstractMsgHandler;
-import com.abin.mallchat.custom.chat.service.strategy.msg.MsgHandlerFactory;
 
 import java.util.*;
 import java.util.stream.Collectors;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/RoomAdapter.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.adapter;
+package com.abin.mallchat.common.chat.service.adapter;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.abin.mallchat.common.chat.domain.entity.Contact;
@@ -7,10 +7,10 @@ import com.abin.mallchat.common.chat.domain.entity.Room;
 import com.abin.mallchat.common.chat.domain.entity.RoomGroup;
 import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum;
 import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum;
+import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageReadResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatRoomResp;
 import com.abin.mallchat.common.user.domain.entity.User;
-import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageReadResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp;
 
 import java.util.List;
 import java.util.Map;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/helper/ChatMemberHelper.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.helper;
+package com.abin.mallchat.common.chat.service.helper;
 
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.StrUtil;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.impl;
+package com.abin.mallchat.common.chat.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -10,10 +10,24 @@ import com.abin.mallchat.common.chat.domain.dto.MsgReadInfoDTO;
 import com.abin.mallchat.common.chat.domain.entity.*;
 import com.abin.mallchat.common.chat.domain.enums.MessageMarkActTypeEnum;
 import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum;
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberStatisticResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageReadResp;
 import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp;
+import com.abin.mallchat.common.chat.service.ChatService;
 import com.abin.mallchat.common.chat.service.ContactService;
+import com.abin.mallchat.common.chat.service.adapter.MemberAdapter;
+import com.abin.mallchat.common.chat.service.adapter.MessageAdapter;
+import com.abin.mallchat.common.chat.service.adapter.RoomAdapter;
 import com.abin.mallchat.common.chat.service.cache.RoomCache;
 import com.abin.mallchat.common.chat.service.cache.RoomGroupCache;
+import com.abin.mallchat.common.chat.service.helper.ChatMemberHelper;
+import com.abin.mallchat.common.chat.service.strategy.mark.AbstractMsgMarkStrategy;
+import com.abin.mallchat.common.chat.service.strategy.mark.MsgMarkFactory;
+import com.abin.mallchat.common.chat.service.strategy.msg.AbstractMsgHandler;
+import com.abin.mallchat.common.chat.service.strategy.msg.MsgHandlerFactory;
+import com.abin.mallchat.common.chat.service.strategy.msg.RecallMsgHandler;
 import com.abin.mallchat.common.common.annotation.RedissonLock;
 import com.abin.mallchat.common.common.domain.enums.NormalOrNoEnum;
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
@@ -27,20 +41,6 @@ import com.abin.mallchat.common.user.domain.enums.RoleEnum;
 import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp;
 import com.abin.mallchat.common.user.service.IRoleService;
 import com.abin.mallchat.common.user.service.cache.UserCache;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageReadResp;
-import com.abin.mallchat.custom.chat.service.ChatService;
-import com.abin.mallchat.custom.chat.service.adapter.MemberAdapter;
-import com.abin.mallchat.custom.chat.service.adapter.MessageAdapter;
-import com.abin.mallchat.custom.chat.service.adapter.RoomAdapter;
-import com.abin.mallchat.custom.chat.service.helper.ChatMemberHelper;
-import com.abin.mallchat.custom.chat.service.strategy.mark.AbstractMsgMarkStrategy;
-import com.abin.mallchat.custom.chat.service.strategy.mark.MsgMarkFactory;
-import com.abin.mallchat.custom.chat.service.strategy.msg.AbstractMsgHandler;
-import com.abin.mallchat.custom.chat.service.strategy.msg.MsgHandlerFactory;
-import com.abin.mallchat.custom.chat.service.strategy.msg.RecallMsgHandler;
 import com.abin.mallchat.transaction.service.MQProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.impl;
+package com.abin.mallchat.common.chat.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Pair;
@@ -7,12 +7,23 @@ import com.abin.mallchat.common.chat.dao.GroupMemberDao;
 import com.abin.mallchat.common.chat.dao.MessageDao;
 import com.abin.mallchat.common.chat.domain.dto.RoomBaseInfo;
 import com.abin.mallchat.common.chat.domain.entity.*;
+import com.abin.mallchat.common.chat.domain.enums.GroupRoleAPPEnum;
 import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum;
 import com.abin.mallchat.common.chat.domain.enums.HotFlagEnum;
 import com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum;
+import com.abin.mallchat.common.chat.domain.vo.request.*;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberListResp;
+import com.abin.mallchat.common.chat.domain.vo.response.ChatRoomResp;
+import com.abin.mallchat.common.chat.domain.vo.response.MemberResp;
+import com.abin.mallchat.common.chat.service.ChatService;
+import com.abin.mallchat.common.chat.service.RoomAppService;
 import com.abin.mallchat.common.chat.service.RoomService;
 import com.abin.mallchat.common.chat.service.adapter.ChatAdapter;
+import com.abin.mallchat.common.chat.service.adapter.MemberAdapter;
+import com.abin.mallchat.common.chat.service.adapter.RoomAdapter;
 import com.abin.mallchat.common.chat.service.cache.*;
+import com.abin.mallchat.common.chat.service.strategy.msg.AbstractMsgHandler;
+import com.abin.mallchat.common.chat.service.strategy.msg.MsgHandlerFactory;
 import com.abin.mallchat.common.common.annotation.RedissonLock;
 import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq;
 import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
@@ -28,17 +39,6 @@ import com.abin.mallchat.common.user.service.IRoleService;
 import com.abin.mallchat.common.user.service.cache.UserCache;
 import com.abin.mallchat.common.user.service.cache.UserInfoCache;
 import com.abin.mallchat.common.user.service.impl.PushService;
-import com.abin.mallchat.custom.chat.domain.vo.enums.GroupRoleAPPEnum;
-import com.abin.mallchat.custom.chat.domain.vo.request.*;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberListResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp;
-import com.abin.mallchat.custom.chat.domain.vo.response.MemberResp;
-import com.abin.mallchat.custom.chat.service.ChatService;
-import com.abin.mallchat.custom.chat.service.RoomAppService;
-import com.abin.mallchat.custom.chat.service.adapter.MemberAdapter;
-import com.abin.mallchat.custom.chat.service.adapter.RoomAdapter;
-import com.abin.mallchat.custom.chat.service.strategy.msg.AbstractMsgHandler;
-import com.abin.mallchat.custom.chat.service.strategy.msg.MsgHandlerFactory;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/WeChatMsgOperationServiceImpl.java

@@ -1,13 +1,13 @@
-package com.abin.mallchat.custom.chat.service.impl;
+package com.abin.mallchat.common.chat.service.impl;
 
 import cn.hutool.core.thread.NamedThreadFactory;
+import com.abin.mallchat.common.chat.service.WeChatMsgOperationService;
 import com.abin.mallchat.common.common.domain.dto.FrequencyControlDTO;
 import com.abin.mallchat.common.common.exception.FrequencyControlException;
 import com.abin.mallchat.common.common.handler.GlobalUncaughtExceptionHandler;
 import com.abin.mallchat.common.common.service.frequencycontrol.FrequencyControlUtil;
 import com.abin.mallchat.common.user.domain.entity.User;
 import com.abin.mallchat.common.user.service.cache.UserCache;
-import com.abin.mallchat.custom.chat.service.WeChatMsgOperationService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/AbstractMsgMarkStrategy.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.strategy.mark;
+package com.abin.mallchat.common.chat.service.strategy.mark;
 
 import com.abin.mallchat.common.chat.dao.MessageMarkDao;
 import com.abin.mallchat.common.chat.domain.dto.ChatMessageMarkDTO;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/DisLikeStrategy.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.strategy.mark;
+package com.abin.mallchat.common.chat.service.strategy.mark;
 
 import com.abin.mallchat.common.chat.domain.enums.MessageMarkTypeEnum;
 import org.springframework.stereotype.Component;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/LikeStrategy.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.strategy.mark;
+package com.abin.mallchat.common.chat.service.strategy.mark;
 
 import com.abin.mallchat.common.chat.domain.enums.MessageMarkTypeEnum;
 import org.springframework.stereotype.Component;

mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/MsgMarkFactory.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.custom.chat.service.strategy.mark;
+package com.abin.mallchat.common.chat.service.strategy.mark;
 
 import com.abin.mallchat.common.common.exception.CommonErrorEnum;
 import com.abin.mallchat.common.common.utils.AssertUtil;