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;