将 user-service 中 chat 相关的代码迁移到 content-service/chat 模块

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.user.app.model.dto.ContactInfo;
-import cn.reghao.tnb.user.app.model.dto.group.*;
-import cn.reghao.tnb.user.app.service.GroupInfoService;
-import cn.reghao.tnb.user.app.service.GroupMemberService;
-import cn.reghao.tnb.user.app.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.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.user.app.model.dto.ChatUserInfo;
-import cn.reghao.tnb.user.app.model.dto.group.GroupDetailRet;
-import cn.reghao.tnb.user.app.model.dto.group.GroupInfoRet;
-import cn.reghao.tnb.user.app.model.po.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.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.GroupInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.user.app.model.dto.group.GroupMemberRet;
-import cn.reghao.tnb.user.app.model.po.GroupMember;
+import cn.reghao.tnb.content.app.chat.model.dto.group.GroupMemberRet;
+import cn.reghao.tnb.content.app.chat.model.po.GroupMember;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.user.app.model.dto.group.NoticeRet;
-import cn.reghao.tnb.user.app.model.po.GroupNotice;
+import cn.reghao.tnb.content.app.chat.model.dto.group.NoticeRet;
+import cn.reghao.tnb.content.app.chat.model.po.GroupNotice;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

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

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Data;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.AllArgsConstructor;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 import lombok.Setter;

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.model.dto.group;
+package cn.reghao.tnb.content.app.chat.model.dto.group;
 
 import lombok.Getter;
 

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

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

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

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

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

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

user/user-service/src/main/java/cn/reghao/tnb/user/app/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.user.app.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.user.app.db.mapper.GroupInfoMapper;
-import cn.reghao.tnb.user.app.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.user.app.db.mapper.GroupNoticeMapper;
-import cn.reghao.tnb.user.app.model.dto.group.*;
-import cn.reghao.tnb.user.app.model.po.GroupInfo;
-import cn.reghao.tnb.user.app.model.po.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.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.po.GroupMember;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import org.springframework.stereotype.Service;
 

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

@@ -1,16 +1,16 @@
-package cn.reghao.tnb.user.app.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.user.app.db.mapper.GroupInfoMapper;
-import cn.reghao.tnb.user.app.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.user.app.model.dto.ContactInfo;
-import cn.reghao.tnb.user.app.model.dto.group.*;
-import cn.reghao.tnb.user.app.model.po.GroupInfo;
-import cn.reghao.tnb.user.app.model.po.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.model.dto.contact.ContactInfo;
+import cn.reghao.tnb.content.app.chat.model.dto.group.*;
+import cn.reghao.tnb.content.app.chat.model.po.GroupInfo;
+import cn.reghao.tnb.content.app.chat.model.po.GroupMember;
+import cn.reghao.tnb.content.app.chat.model.po.contact.UserContact;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import cn.reghao.tnb.user.api.iface.UserContactService;
-import cn.reghao.tnb.user.app.model.po.UserContact;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

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

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.user.app.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.user.app.db.mapper.GroupMemberMapper;
-import cn.reghao.tnb.user.app.db.mapper.GroupNoticeMapper;
-import cn.reghao.tnb.user.app.model.dto.group.EditGroupNotice;
-import cn.reghao.tnb.user.app.model.dto.group.NoticeListRet;
-import cn.reghao.tnb.user.app.model.dto.group.NoticeRet;
-import cn.reghao.tnb.user.app.model.po.GroupMember;
-import cn.reghao.tnb.user.app.model.po.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.GroupMember;
+import cn.reghao.tnb.content.app.chat.model.po.GroupNotice;
 import cn.reghao.tnb.user.api.dto.ContactDetail;
 import org.springframework.stereotype.Service;
 

user/user-service/src/main/resources/mapper/GroupInfoMapper.xml → content/content-service/src/main/resources/mapper/chat/GroupInfoMapper.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.user.app.db.mapper.GroupInfoMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.GroupInfoMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into chat_group_info
         (`id`,`deleted`,`create_time`,`update_time`,`group_id`,`name`,`avatar`,`profile`,`owner_id`)
@@ -14,23 +14,23 @@
         where group_id=#{groupId}
     </update>
 
-    <select id="findByGroupId" resultType="cn.reghao.tnb.user.app.model.po.GroupInfo">
+    <select id="findByGroupId" resultType="cn.reghao.tnb.content.app.chat.model.po.GroupInfo">
         select * from chat_group_info where id=#{groupId}
     </select>
-    <select id="findDetailByGroupId" resultType="cn.reghao.tnb.user.app.model.dto.group.GroupDetailRet">
+    <select id="findDetailByGroupId" resultType="cn.reghao.tnb.content.app.chat.model.dto.group.GroupDetailRet">
         select groupInfo.id as groupId,groupInfo.name as groupName,groupInfo.avatar,groupInfo.profile,
         groupInfo.owner_id as ownerId,date_format(groupInfo.create_time,'%Y-%m-%d %H:%i:%s') as createdAt
         from chat_group_info groupInfo
         where groupInfo.id=#{groupId}
     </select>
-    <select id="findGroupsByUserId" resultType="cn.reghao.tnb.user.app.model.dto.group.GroupInfoRet">
+    <select id="findGroupsByUserId" resultType="cn.reghao.tnb.content.app.chat.model.dto.group.GroupInfoRet">
         select groupInfo.id,groupInfo.name as groupName,groupInfo.profile as groupProfile,groupInfo.avatar,
         groupMember.owner,groupMember.disturb
         from chat_group_info groupInfo
         inner join group_member groupMember
         on groupInfo.id=groupMember.group_id and groupMember.user_id=#{userId}
     </select>
-    <select id="findDialogGroupInfo" resultType="cn.reghao.tnb.user.app.model.dto.ChatUserInfo">
+    <select id="findDialogGroupInfo" resultType="cn.reghao.tnb.content.app.chat.model.dto.ChatUserInfo">
         select group_id as receiverId,`name`,avatar
         from chat_group_info
         where group_id=#{groupId}

user/user-service/src/main/resources/mapper/GroupMemberMapper.xml → content/content-service/src/main/resources/mapper/chat/GroupMemberMapper.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.user.app.db.mapper.GroupMemberMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.GroupMemberMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into chat_group_member
         (`id`,`deleted`,`create_time`,`update_time`,`group_id`,`user_id`,`nickname`,`owner`,`disturb`)
@@ -33,10 +33,10 @@
     <select id="findUserIdsByGroupId" resultType="java.lang.Long">
         select user_id from chat_group_member where group_id=#{groupId}
     </select>
-    <select id="findByGroupAndUserId" resultType="cn.reghao.tnb.user.app.model.po.GroupMember">
+    <select id="findByGroupAndUserId" resultType="cn.reghao.tnb.content.app.chat.model.po.GroupMember">
         select * from chat_group_member where group_id=#{groupId} and user_id=#{userId}
     </select>
-    <select id="findByGroupId" resultType="cn.reghao.tnb.user.app.model.dto.group.GroupMemberRet">
+    <select id="findByGroupId" resultType="cn.reghao.tnb.content.app.chat.model.dto.group.GroupMemberRet">
         select groupMember.id,groupMember.nickname as userCard,groupMember.owner
         from chat_group_member groupMember
         where groupMember.group_id=#{groupId}

user/user-service/src/main/resources/mapper/GroupNoticeMapper.xml → content/content-service/src/main/resources/mapper/chat/GroupNoticeMapper.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.user.app.db.mapper.GroupNoticeMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.GroupNoticeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into chat_group_notice
         (`id`,`deleted`,`create_time`,`update_time`,`notice_id`,`group_id`,`title`,`content`,`top`,`confirmed`,`create_by`)
@@ -14,17 +14,17 @@
         where id=#{noticeId}
     </update>
 
-    <select id="findByNoticeId" resultType="cn.reghao.tnb.user.app.model.po.GroupNotice">
+    <select id="findByNoticeId" resultType="cn.reghao.tnb.content.app.chat.model.po.GroupNotice">
         select * from chat_group_notice where id=#{noticeId}
     </select>
-    <select id="findByGroupId" resultType="cn.reghao.tnb.user.app.model.dto.group.NoticeRet">
+    <select id="findByGroupId" resultType="cn.reghao.tnb.content.app.chat.model.dto.group.NoticeRet">
         select groupNotice.id,groupNotice.title,groupNotice.content,groupNotice.confirmed as isConfirm,groupNotice.top as isTop,
         date_format(groupNotice.create_time,'%Y-%m-%d %H:%i:%s') as createdAt,
         date_format(groupNotice.update_time,'%Y-%m-%d %H:%i:%s') as updatedAt
         from chat_group_notice groupNotice
         where groupNotice.group_id=#{groupId}
     </select>
-    <select id="findByLatest" resultType="cn.reghao.tnb.user.app.model.dto.group.NoticeRet">
+    <select id="findByLatest" resultType="cn.reghao.tnb.content.app.chat.model.dto.group.NoticeRet">
         select groupNotice.id,groupNotice.title,groupNotice.content,groupNotice.confirmed as isConfirm,groupNotice.top as isTop,
         date_format(groupNotice.create_time,'%Y-%m-%d %H:%i:%s') as createdAt,
         date_format(groupNotice.update_time,'%Y-%m-%d %H:%i:%s') as updatedAt