将 content-service 中 im 模块的名字修改为 chat

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/ChatDialogController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatDialogController.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.tnb.content.app.im.model.dto.chat.*;
-import cn.reghao.tnb.content.app.im.service.ChatDialogService;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.*;
+import cn.reghao.tnb.content.app.chat.service.ChatDialogService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/ChatMessageController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatMessageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordDelete;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordRevoke;
-import cn.reghao.tnb.content.app.im.model.dto.message.*;
-import cn.reghao.tnb.content.app.im.service.ChatMessageService;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordDelete;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordRevoke;
+import cn.reghao.tnb.content.app.chat.model.dto.message.*;
+import cn.reghao.tnb.content.app.chat.service.ChatMessageService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/ChatMsgController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatMsgController.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.tnb.content.app.im.model.dto.message.*;
-import cn.reghao.tnb.content.app.im.service.ChatMessageService;
+import cn.reghao.tnb.content.app.chat.model.dto.message.*;
+import cn.reghao.tnb.content.app.chat.service.ChatMessageService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/ChatRecordController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatRecordController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGet;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRetList;
-import cn.reghao.tnb.content.app.im.service.ChatRecordService;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGet;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRetList;
+import cn.reghao.tnb.content.app.chat.service.ChatRecordService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/EmoticonController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/EmoticonController.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.tnb.content.app.im.model.dto.emoticon.EmoticonInfo;
-import cn.reghao.tnb.content.app.im.model.dto.emoticon.EmoticonList;
+import cn.reghao.tnb.content.app.chat.model.dto.emoticon.EmoticonInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.emoticon.EmoticonList;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/controller/GroupController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/GroupController.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.content.app.im.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.content.app.im.model.dto.contact.ContactInfo;
-import cn.reghao.tnb.content.app.im.model.dto.group.*;
-import cn.reghao.tnb.content.app.im.service.GroupInfoService;
-import cn.reghao.tnb.content.app.im.service.GroupMemberService;
-import cn.reghao.tnb.content.app.im.service.GroupNoticeService;
+import cn.reghao.tnb.content.app.chat.model.dto.contact.ContactInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.group.*;
+import cn.reghao.tnb.content.app.chat.service.GroupInfoService;
+import cn.reghao.tnb.content.app.chat.service.GroupMemberService;
+import cn.reghao.tnb.content.app.chat.service.GroupNoticeService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/ChatDialogMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/ChatDialogMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/ChatRecordMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/ChatRecordMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatRecord;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/CodeBlockMessageMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/CodeBlockMessageMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.po.message.CodeBlockMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.CodeBlockMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/FileMessageMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/FileMessageMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.po.message.FileMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.FileMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/GroupInfoMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/GroupInfoMapper.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatUserInfo;
-import cn.reghao.tnb.content.app.im.model.dto.group.GroupDetailRet;
-import cn.reghao.tnb.content.app.im.model.dto.group.GroupInfoRet;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatUserInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.group.GroupDetailRet;
+import cn.reghao.tnb.content.app.chat.model.dto.group.GroupInfoRet;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/GroupMemberMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/GroupMemberMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.dto.group.GroupMemberRet;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupMember;
+import cn.reghao.tnb.content.app.chat.model.dto.group.GroupMemberRet;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupMember;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/GroupNoticeMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/GroupNoticeMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.dto.group.NoticeRet;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupNotice;
+import cn.reghao.tnb.content.app.chat.model.dto.group.NoticeRet;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupNotice;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/SettingMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/SettingMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.po.Setting;
+import cn.reghao.tnb.content.app.chat.model.po.Setting;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/db/mapper/TextMessageMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/TextMessageMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.im.model.po.message.TextMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.TextMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/constant/ApplyStatus.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/ApplyStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/constant/ChatType.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/ChatType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/constant/FileMsgType.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/FileMsgType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/constant/FriendStatus.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/FriendStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/constant/MsgType.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/MsgType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/Paginate.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/Paginate.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto;
+package cn.reghao.tnb.content.app.chat.model.dto;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/UnreadNum.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/UnreadNum.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto;
+package cn.reghao.tnb.content.app.chat.model.dto;
 
 import lombok.AllArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/auth/LoginDto.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/auth/LoginDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.auth;
+package cn.reghao.tnb.content.app.chat.model.dto.auth;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/auth/LoginRetDto.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/auth/LoginRetDto.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.im.model.dto.auth;
+package cn.reghao.tnb.content.app.chat.model.dto.auth;
 
-import cn.reghao.tnb.content.app.im.model.dto.user.UserInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.user.UserInfo;
 import lombok.Data;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatDelete.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatDelete.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatDisturb.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatDisturb.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatInitial.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatInitial.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatInitialRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatInitialRet.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog;
 import lombok.Data;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatRecordDelete.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatRecordDelete.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatRecordGet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatRecordGet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatRecordGetRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatRecordGetRet.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.im.model.dto.message.CodeBlockResult;
-import cn.reghao.tnb.content.app.im.model.dto.message.FileMsgResult;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatRecord;
+import cn.reghao.tnb.content.app.chat.model.dto.message.CodeBlockResult;
+import cn.reghao.tnb.content.app.chat.model.dto.message.FileMsgResult;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatRecord;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatRecordGetRetList.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatRecordGetRetList.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatRecordRevoke.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatRecordRevoke.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatTop.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatTop.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatUnreadClear.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatUnreadClear.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/chat/ChatUserInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/chat/ChatUserInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.chat;
+package cn.reghao.tnb.content.app.chat.model.dto.chat;
 
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactAdd.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactAdd.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactAddRespond.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactAddRespond.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactApplyInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactApplyInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactApplyList.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactApplyList.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
-import cn.reghao.tnb.content.app.im.model.dto.Paginate;
+import cn.reghao.tnb.content.app.chat.model.dto.Paginate;
 import lombok.Data;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/ContactInfoResult.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/ContactInfoResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/contact/SearchContactResult.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/contact/SearchContactResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.contact;
+package cn.reghao.tnb.content.app.chat.model.dto.contact;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/emoticon/EmoticonInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/emoticon/EmoticonInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.emoticon;
+package cn.reghao.tnb.content.app.chat.model.dto.emoticon;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/emoticon/EmoticonList.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/emoticon/EmoticonList.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.emoticon;
+package cn.reghao.tnb.content.app.chat.model.dto.emoticon;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/CreateGroup.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/CreateGroup.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/CreateGroupRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/CreateGroupRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/EditGroupNotice.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/EditGroupNotice.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupDetailRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupDetailRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupInfoRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupInfoRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupInfoRetList.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupInfoRetList.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupInvite.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupInvite.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupMemberRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupMemberRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/GroupSetting.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/GroupSetting.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/MemberRemark.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/MemberRemark.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/NoticeListRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/NoticeListRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/NoticeRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/NoticeRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/RemoveMember.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/RemoveMember.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/group/SecedeGroup.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/group/SecedeGroup.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/ChatMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ChatMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/ChatRecordMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ChatRecordMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import java.io.Serializable;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/CodeBlockMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/CodeBlockMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/CodeBlockResult.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/CodeBlockResult.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.im.model.po.message.CodeBlockMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.CodeBlockMessage;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/DateDto.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/DateDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/EmoticonMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/EmoticonMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/FileMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/FileMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/FileMsgResult.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/FileMsgResult.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
-import cn.reghao.tnb.content.app.im.model.po.message.FileMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.FileMessage;
 import lombok.Getter;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/ForwardMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ForwardMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/ImageMessage.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/ImageMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/LoginRecord.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/LoginRecord.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/Record.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/Record.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/RecordsRet.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/RecordsRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import java.util.List;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/TextMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/TextMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/VoteMsg.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/VoteMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/message/VoteMsgResult.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/VoteMsgResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.message;
+package cn.reghao.tnb.content.app.chat.model.dto.message;
 
 import java.util.List;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/user/SmsCode.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/user/SmsCode.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.user;
+package cn.reghao.tnb.content.app.chat.model.dto.user;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/user/UserInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/user/UserInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.user;
+package cn.reghao.tnb.content.app.chat.model.dto.user;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/user/UserRegisterDto.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/user/UserRegisterDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.dto.user;
+package cn.reghao.tnb.content.app.chat.model.dto.user;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/dto/user/UserSetting.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/user/UserSetting.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.im.model.dto.user;
+package cn.reghao.tnb.content.app.chat.model.dto.user;
 
-import cn.reghao.tnb.content.app.im.model.po.Setting;
+import cn.reghao.tnb.content.app.chat.model.po.Setting;
 import lombok.Data;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/Setting.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/Setting.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po;
+package cn.reghao.tnb.content.app.chat.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/chat/ChatDialog.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/chat/ChatDialog.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.chat;
+package cn.reghao.tnb.content.app.chat.model.po.chat;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/chat/ChatRecord.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/chat/ChatRecord.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.chat;
+package cn.reghao.tnb.content.app.chat.model.po.chat;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/contact/UserContact.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/contact/UserContact.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.contact;
+package cn.reghao.tnb.content.app.chat.model.po.contact;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/emoticon/Emoticon.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/emoticon/Emoticon.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.emoticon;
+package cn.reghao.tnb.content.app.chat.model.po.emoticon;
 
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/group/GroupInfo.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/group/GroupInfo.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.model.po.group;
+package cn.reghao.tnb.content.app.chat.model.po.group;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.content.app.im.model.dto.group.CreateGroup;
+import cn.reghao.tnb.content.app.chat.model.dto.group.CreateGroup;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/group/GroupMember.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/group/GroupMember.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.group;
+package cn.reghao.tnb.content.app.chat.model.po.group;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/group/GroupNotice.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/group/GroupNotice.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.im.model.po.group;
+package cn.reghao.tnb.content.app.chat.model.po.group;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.content.app.im.model.dto.group.EditGroupNotice;
+import cn.reghao.tnb.content.app.chat.model.dto.group.EditGroupNotice;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/message/CodeBlockMessage.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/message/CodeBlockMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.message;
+package cn.reghao.tnb.content.app.chat.model.po.message;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/message/FileMessage.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/message/FileMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.message;
+package cn.reghao.tnb.content.app.chat.model.po.message;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/model/po/message/TextMessage.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/message/TextMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.im.model.po.message;
+package cn.reghao.tnb.content.app.chat.model.po.message;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/ChatDialogService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatDialogService.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.jutil.tool.id.SnowFlake;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.*;
-import cn.reghao.tnb.content.app.im.model.constant.ChatType;
-import cn.reghao.tnb.content.app.im.model.dto.chat.*;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog;
+import cn.reghao.tnb.content.app.chat.db.mapper.*;
+import cn.reghao.tnb.content.app.chat.model.constant.ChatType;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.*;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import cn.reghao.tnb.user.api.iface.UserContactService;
 import org.apache.dubbo.config.annotation.DubboReference;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/ChatMessageService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatMessageService.java

@@ -1,19 +1,19 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.tool.id.SnowFlake;
 import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.*;
-import cn.reghao.tnb.content.app.im.model.constant.MsgType;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet;
-import cn.reghao.tnb.content.app.im.model.dto.message.*;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog;
-import cn.reghao.tnb.content.app.im.model.po.chat.ChatRecord;
-import cn.reghao.tnb.content.app.im.model.po.message.CodeBlockMessage;
-import cn.reghao.tnb.content.app.im.model.po.message.FileMessage;
-import cn.reghao.tnb.content.app.im.model.po.message.TextMessage;
+import cn.reghao.tnb.content.app.chat.db.mapper.*;
+import cn.reghao.tnb.content.app.chat.model.constant.MsgType;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet;
+import cn.reghao.tnb.content.app.chat.model.dto.message.*;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog;
+import cn.reghao.tnb.content.app.chat.model.po.chat.ChatRecord;
+import cn.reghao.tnb.content.app.chat.model.po.message.CodeBlockMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.FileMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.TextMessage;
 import cn.reghao.tnb.message.api.model.resp.EvtTalkRevokeResp;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import cn.reghao.tnb.user.api.iface.UserContactService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/ChatRecordService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatRecordService.java

@@ -1,16 +1,16 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.*;
-import cn.reghao.tnb.content.app.im.model.constant.MsgType;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet;
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRetList;
-import cn.reghao.tnb.content.app.im.model.dto.message.CodeBlockResult;
-import cn.reghao.tnb.content.app.im.model.dto.message.FileMsgResult;
-import cn.reghao.tnb.content.app.im.model.po.message.CodeBlockMessage;
-import cn.reghao.tnb.content.app.im.model.po.message.FileMessage;
-import cn.reghao.tnb.content.app.im.model.po.message.TextMessage;
+import cn.reghao.tnb.content.app.chat.db.mapper.*;
+import cn.reghao.tnb.content.app.chat.model.constant.MsgType;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRetList;
+import cn.reghao.tnb.content.app.chat.model.dto.message.CodeBlockResult;
+import cn.reghao.tnb.content.app.chat.model.dto.message.FileMsgResult;
+import cn.reghao.tnb.content.app.chat.model.po.message.CodeBlockMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.FileMessage;
+import cn.reghao.tnb.content.app.chat.model.po.message.TextMessage;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import cn.reghao.tnb.user.api.iface.UserContactService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/EventService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/EventService.java

@@ -1,13 +1,12 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
-import cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet;
+import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet;
 import cn.reghao.tnb.message.api.model.EventType;
 import cn.reghao.tnb.message.api.model.resp.EventMessageResp;
 import cn.reghao.tnb.message.api.model.resp.EvtTalkResp;
 import cn.reghao.tnb.message.api.model.resp.EvtTalkRevokeResp;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/GroupInfoService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/GroupInfoService.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupInfoMapper;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupNoticeMapper;
-import cn.reghao.tnb.content.app.im.model.dto.group.*;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupInfo;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupMember;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupInfoMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupMemberMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupNoticeMapper;
+import cn.reghao.tnb.content.app.chat.model.dto.group.*;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupMember;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/GroupMemberService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/GroupMemberService.java

@@ -1,14 +1,14 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.ChatDialogMapper;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupInfoMapper;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.content.app.im.model.dto.contact.ContactInfo;
-import cn.reghao.tnb.content.app.im.model.dto.group.*;
-import cn.reghao.tnb.content.app.im.model.po.contact.UserContact;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupInfo;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupMember;
+import cn.reghao.tnb.content.app.chat.db.mapper.ChatDialogMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupInfoMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupMemberMapper;
+import cn.reghao.tnb.content.app.chat.model.dto.contact.ContactInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.group.*;
+import cn.reghao.tnb.content.app.chat.model.po.contact.UserContact;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupMember;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import cn.reghao.tnb.user.api.iface.UserContactService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/im/service/GroupNoticeService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/GroupNoticeService.java

@@ -1,16 +1,14 @@
-package cn.reghao.tnb.content.app.im.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.content.app.im.db.mapper.GroupNoticeMapper;
-import cn.reghao.tnb.content.app.im.model.dto.group.EditGroupNotice;
-import cn.reghao.tnb.content.app.im.model.dto.group.NoticeListRet;
-import cn.reghao.tnb.content.app.im.model.dto.group.NoticeRet;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupMember;
-import cn.reghao.tnb.content.app.im.model.po.group.GroupNotice;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupMemberMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.GroupNoticeMapper;
+import cn.reghao.tnb.content.app.chat.model.dto.group.EditGroupNotice;
+import cn.reghao.tnb.content.app.chat.model.dto.group.NoticeListRet;
+import cn.reghao.tnb.content.app.chat.model.dto.group.NoticeRet;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupMember;
+import cn.reghao.tnb.content.app.chat.model.po.group.GroupNotice;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
-import cn.reghao.tnb.user.api.iface.UserContactService;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

content/content-service/src/main/resources/mapper/im/ChatDialogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.im.db.mapper.ChatDialogMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.ChatDialogMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into chat_chat_dialog
         (`chat_id`,`chat_type`,`receiver_id`,`disturb`,`robot`,`top`,`display`,`user_id`,`unread_num`)
@@ -46,14 +46,14 @@
         </foreach>
     </delete>
 
-    <select id="findByReceiverAndUserId" resultType="cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog">
+    <select id="findByReceiverAndUserId" resultType="cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog">
         select * from chat_chat_dialog where receiver_id=#{receiverId} and user_id=#{userId}
     </select>
-    <select id="findChatDialog" resultType="cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog">
+    <select id="findChatDialog" resultType="cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog">
         select * from chat_chat_dialog
         where chat_type=#{chatType} and receiver_id=#{receiverId} and user_id=#{userId}
     </select>
-    <select id="findChatDialogsByUserId" resultType="cn.reghao.tnb.content.app.im.model.po.chat.ChatDialog">
+    <select id="findChatDialogsByUserId" resultType="cn.reghao.tnb.content.app.chat.model.po.chat.ChatDialog">
         select *
         from chat_chat_dialog
         where display is true and user_id=#{userId}

content/content-service/src/main/resources/mapper/im/ChatRecordMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.im.db.mapper.ChatRecordMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.ChatRecordMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
         insert into chat_chat_record
         (`record_id`,`chat_id`,`chat_type`,`sender_id`,`receiver_id`,`msg_type`,`read`,`revoke`)
@@ -15,7 +15,7 @@
         where id=#{recordId}
     </update>
 
-    <select id="findChatRecordGetRet" resultType="cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet">
+    <select id="findChatRecordGetRet" resultType="cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet">
         select chatRecord.record_id, chatRecord.chat_type as talkType,chatRecord.receiver_id,chatRecord.read as isRead,chatRecord.revoke as isRevoke,
         chatRecord.msg_type,date_format(chatRecord.create_time,'%Y-%m-%d %H:%i:%s') as createdAt,
         chatRecord.sender_id as user_id
@@ -25,7 +25,7 @@
         order by chatRecord.create_time desc
         limit #{limit}
     </select>
-    <select id="findChatRecordGetRetByMsgType" resultType="cn.reghao.tnb.content.app.im.model.dto.chat.ChatRecordGetRet">
+    <select id="findChatRecordGetRetByMsgType" resultType="cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRet">
         select chatRecord.record_id, chatRecord.chat_type as talkType,chatRecord.receiver_id,chatRecord.read as isRead,chatRecord.revoke as isRevoke,
         chatRecord.msg_type,date_format(chatRecord.create_time,'%Y-%m-%d %H:%i:%s') as createdAt,
         chatRecord.sender_id as user_id
@@ -36,7 +36,7 @@
         order by chatRecord.create_time desc
         limit #{limit}
     </select>
-    <select id="findByRecordId" resultType="cn.reghao.tnb.content.app.im.model.po.chat.ChatRecord">
+    <select id="findByRecordId" resultType="cn.reghao.tnb.content.app.chat.model.po.chat.ChatRecord">
         select * from chat_chat_record where record_id=#{recordId}
     </select>
 </mapper>