From a2f3a51a41ac5eac159fecbdeec8c52d690274f9 Mon Sep 17 00:00:00 2001 From: zhongzb <972627721@qq.com> Date: Mon, 21 Aug 2023 22:14:07 +0800 Subject: [PATCH] =?UTF-8?q?mallchat=E9=A1=B9=E7=9B=AE=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 11 +++- .../common}/MallchatCustomApplication.java | 2 +- .../chat/consumer/MsgSendConsumer.java | 12 ++-- .../chat/controller/ChatController.java | 12 ++-- .../chat/controller/ContactController.java | 8 +-- .../chat/controller/RoomController.java | 10 +-- .../mallchat/common/chat/dao/ContactDao.java | 0 .../common/chat/dao/GroupMemberDao.java | 0 .../mallchat/common/chat/dao/MessageDao.java | 0 .../common/chat/dao/MessageMarkDao.java | 0 .../mallchat/common/chat/dao/RoomDao.java | 0 .../common/chat/dao/RoomFriendDao.java | 0 .../common/chat/dao/RoomGroupDao.java | 0 .../mallchat/common/chat/dao/WxMsgDao.java | 0 .../chat/domain/dto/ChatMessageMarkDTO.java | 0 .../chat/domain/dto/ChatMsgRecallDTO.java | 0 .../chat/domain/dto/MsgReadInfoDTO.java | 0 .../common/chat/domain/dto/RoomBaseInfo.java | 0 .../common/chat/domain/entity/Contact.java | 0 .../chat/domain/entity/GroupMember.java | 0 .../common/chat/domain/entity/Message.java | 0 .../chat/domain/entity/MessageMark.java | 0 .../common/chat/domain/entity/Room.java | 0 .../common/chat/domain/entity/RoomFriend.java | 0 .../common/chat/domain/entity/RoomGroup.java | 0 .../common/chat/domain/entity/WxMsg.java | 0 .../chat/domain/entity/msg/EmojisMsgDTO.java | 0 .../chat/domain/entity/msg/FileMsgDTO.java | 0 .../chat/domain/entity/msg/ImgMsgDTO.java | 0 .../chat/domain/entity/msg/MessageExtra.java | 0 .../chat/domain/entity/msg/MsgRecall.java | 0 .../chat/domain/entity/msg/SoundMsgDTO.java | 0 .../chat/domain/entity/msg/VideoMsgDTO.java | 0 .../chat/domain}/enums/GroupRoleAPPEnum.java | 2 +- .../chat/domain/enums/GroupRoleEnum.java | 0 .../common/chat/domain/enums/HotFlagEnum.java | 0 .../domain/enums/MessageMarkActTypeEnum.java | 0 .../domain/enums/MessageMarkTypeEnum.java | 0 .../chat/domain/enums/MessageStatusEnum.java | 0 .../chat/domain/enums/MessageTypeEnum.java | 0 .../chat/domain/enums/RoomTypeEnum.java | 0 .../domain/vo/request/ChatMessageBaseReq.java | 2 +- .../domain/vo/request/ChatMessageMarkReq.java | 2 +- .../vo/request/ChatMessageMemberReq.java | 2 +- .../domain/vo/request/ChatMessagePageReq.java | 2 +- .../vo/request/ChatMessageReadInfoReq.java | 2 +- .../domain/vo/request/ChatMessageReadReq.java | 2 +- .../domain/vo/request/ChatMessageReq.java | 2 +- .../chat/domain/vo/request/GroupAddReq.java | 2 +- .../chat/domain/vo/request/MemberAddReq.java | 2 +- .../chat/domain/vo/request/MemberDelReq.java | 2 +- .../chat/domain/vo/request/MemberReq.java | 2 +- .../domain/vo/request/msg/TextMsgReq.java | 2 +- .../vo/response/ChatMemberListResp.java | 2 +- .../vo/response/ChatMemberStatisticResp.java | 2 +- .../vo/response/ChatMessageReadInfoResp.java | 2 +- .../vo/response/ChatMessageReadResp.java | 2 +- .../domain/vo/response/ChatMessageResp.java | 0 .../chat/domain/vo/response/ChatRoomResp.java | 2 +- .../chat/domain/vo/response/MemberResp.java | 4 +- .../domain/vo/response/msg/TextMsgResp.java | 2 +- .../common/chat/mapper/ContactMapper.java | 0 .../common/chat/mapper/GroupMemberMapper.java | 0 .../common/chat/mapper/MessageMapper.java | 0 .../common/chat/mapper/MessageMarkMapper.java | 0 .../common/chat/mapper/RoomFriendMapper.java | 0 .../common/chat/mapper/RoomGroupMapper.java | 0 .../common/chat/mapper/RoomMapper.java | 0 .../common/chat/mapper/WxMsgMapper.java | 0 .../chat/mapper/xml/RoomFriendMapper.xml | 0 .../chat/mapper/xml/RoomGroupMapper.xml | 0 .../common/chat/mapper/xml/RoomMapper.xml | 0 .../common}/chat/service/ChatService.java | 10 +-- .../common/chat/service/ContactService.java | 0 .../chat/service/IGroupMemberService.java | 0 .../chat/service/IMessageMarkService.java | 0 .../common/chat/service/IMessageService.java | 0 .../common}/chat/service/RoomAppService.java | 10 +-- .../common/chat/service/RoomService.java | 0 .../service/WeChatMsgOperationService.java | 2 +- .../chat/service/adapter/ChatAdapter.java | 0 .../chat/service/adapter/MemberAdapter.java | 4 +- .../chat/service/adapter/MessageAdapter.java | 10 +-- .../chat/service/adapter/RoomAdapter.java | 8 +-- .../chat/service/cache/GroupMemberCache.java | 0 .../chat/service/cache/HotRoomCache.java | 0 .../common/chat/service/cache/MsgCache.java | 0 .../common/chat/service/cache/RoomCache.java | 0 .../chat/service/cache/RoomFriendCache.java | 0 .../chat/service/cache/RoomGroupCache.java | 0 .../chat/service/helper/ChatMemberHelper.java | 2 +- .../chat/service/impl/ChatServiceImpl.java | 30 ++++----- .../chat/service/impl/ContactServiceImpl.java | 0 .../chat/service/impl/RoomAppServiceImpl.java | 24 +++---- .../chat/service/impl/RoomServiceImpl.java | 0 .../impl/WeChatMsgOperationServiceImpl.java | 4 +- .../mark/AbstractMsgMarkStrategy.java | 2 +- .../strategy/mark/DisLikeStrategy.java | 2 +- .../service/strategy/mark/LikeStrategy.java | 2 +- .../service/strategy/mark/MsgMarkFactory.java | 2 +- .../strategy/msg/AbstractMsgHandler.java | 4 +- .../strategy/msg/EmojisMsgHandler.java | 4 +- .../service/strategy/msg/FileMsgHandler.java | 4 +- .../service/strategy/msg/ImgMsgHandler.java | 4 +- .../chat/service/strategy/msg/MsgHandler.java | 2 +- .../strategy/msg/MsgHandlerFactory.java | 2 +- .../strategy/msg/RecallMsgHandler.java | 4 +- .../service/strategy/msg/SoundMsgHandler.java | 4 +- .../strategy/msg/SystemMsgHandler.java | 4 +- .../service/strategy/msg/TextMsgHandler.java | 10 +-- .../service/strategy/msg/VideoMsgHandler.java | 4 +- .../common}/chatai/domain/ChatGPTContext.java | 2 +- .../common}/chatai/domain/ChatGPTMsg.java | 2 +- .../domain/builder/ChatGPTContextBuilder.java | 4 +- .../domain/builder/ChatGPTMsgBuilder.java | 6 +- .../common}/chatai/dto/GPTRequestDTO.java | 2 +- .../chatai/enums/ChatGPTModelEnum.java | 2 +- .../common}/chatai/enums/ChatGPTRoleEnum.java | 2 +- .../chatai/handler/AbstractChatAIHandler.java | 12 ++-- .../chatai/handler/ChatAIHandlerFactory.java | 2 +- .../chatai/handler/ChatGLM2Handler.java | 10 +-- .../chatai/handler/GPTChatAIHandler.java | 16 ++--- .../chatai/properties/ChatGLM2Properties.java | 2 +- .../chatai/properties/ChatGPTProperties.java | 2 +- .../chatai/service/IChatAIService.java | 2 +- .../service/impl/ChatAIServiceImpl.java | 8 +-- .../common}/chatai/utils/ChatGLM2Utils.java | 2 +- .../common}/chatai/utils/ChatGPTUtils.java | 4 +- .../common/common/algorithm/ac/ACTrie.java | 5 +- .../common/algorithm/ac/ACTrieNode.java | 0 .../common/algorithm/ac/MatchResult.java | 4 +- .../common/common/algorithm/package-info.java | 0 .../common/annotation/FrequencyControl.java | 0 .../annotation/FrequencyControlContainer.java | 0 .../common/annotation/RedissonLock.java | 0 .../common/aspect/FrequencyControlAspect.java | 0 .../common/aspect/RedissonLockAspect.java | 0 .../common/common/config/CacheConfig.java | 0 .../common/config/InterceptorConfig.java | 8 +-- .../common/config/MinIOConfiguration.java | 0 .../common/config/MybatisPlusConfig.java | 0 .../common/common/config/RedisConfig.java | 0 .../common/common/config/RedissonConfig.java | 0 .../common/config/SensitiveWordConfig.java | 0 .../common}/common/config/SwaggerConfig.java | 2 +- .../common/config/ThreadPoolConfig.java | 0 .../common/config/WxMpConfiguration.java | 10 +-- .../common}/common/config/WxMpProperties.java | 2 +- .../common/common/constant/MDCKey.java | 0 .../common/common/constant/MQConstant.java | 0 .../common/common/constant/RedisKey.java | 0 .../domain/dto/FrequencyControlDTO.java | 0 .../common/domain/dto/LoginMessageDTO.java | 0 .../common/domain/dto/MsgSendMessageDTO.java | 0 .../common/domain/dto/PushMessageDTO.java | 0 .../common/common/domain/dto/RequestInfo.java | 0 .../domain/dto/ScanSuccessMessageDTO.java | 0 .../common/domain/enums/IdempotentEnum.java | 0 .../common/domain/enums/NormalOrNoEnum.java | 0 .../common/domain/enums/YesOrNoEnum.java | 0 .../domain/vo/request/CursorPageBaseReq.java | 0 .../common/domain/vo/request/IdReqVO.java | 0 .../common/domain/vo/request/PageBaseReq.java | 0 .../common/domain/vo/response/ApiResult.java | 0 .../vo/response/CursorPageBaseResp.java | 0 .../common/domain/vo/response/IdRespVO.java | 0 .../domain/vo/response/PageBaseResp.java | 0 .../common/event/GroupMemberAddEvent.java | 0 .../common/common/event/ItemReceiveEvent.java | 0 .../common/common/event/MessageMarkEvent.java | 0 .../common/event/MessageRecallEvent.java | 0 .../common/common/event/MessageSendEvent.java | 0 .../common/common/event/UserApplyEvent.java | 0 .../common/common/event/UserBlackEvent.java | 0 .../common/common/event/UserOfflineEvent.java | 0 .../common/common/event/UserOnlineEvent.java | 0 .../common/event/UserRegisterEvent.java | 0 .../listener/GroupMemberAddListener.java | 12 ++-- .../event/listener/ItemReceiveListener.java | 2 +- .../event/listener/MessageMarkListener.java | 6 +- .../event/listener/MessageRecallListener.java | 8 +-- .../event/listener/MessageSendListener.java | 10 +-- .../event/listener/UserApplyListener.java | 6 +- .../event/listener/UserBlackListener.java | 4 +- .../event/listener/UserOfflineListener.java | 6 +- .../event/listener/UserOnlineListener.java | 6 +- .../event/listener/UserRegisterListener.java | 2 +- .../common/exception/BusinessErrorEnum.java | 0 .../common/exception/BusinessException.java | 0 .../common/exception/CommonErrorEnum.java | 0 .../common/common/exception/ErrorEnum.java | 0 .../exception/FrequencyControlException.java | 0 .../exception/GlobalExceptionHandler.java | 0 .../common/exception/HttpErrorEnum.java | 0 .../common/factory/MyThreadFactory.java | 6 +- .../GlobalUncaughtExceptionHandler.java | 4 +- .../common/intecepter/BlackInterceptor.java | 2 +- .../intecepter/CollectorInterceptor.java | 2 +- .../common/intecepter/HttpTraceIdFilter.java | 2 +- .../common/intecepter/TokenInterceptor.java | 4 +- .../common/intecepter/WebLogAspect.java | 2 +- .../common/common/service/LockService.java | 0 .../service/cache/AbstractLocalCache.java | 0 .../cache/AbstractRedisStringCache.java | 0 .../common/service/cache/BatchCache.java | 0 .../AbstractFrequencyControlService.java | 0 .../FrequencyControlStrategyFactory.java | 0 .../FrequencyControlUtil.java | 0 ...CountWithInFixTimeFrequencyController.java | 0 .../common/common/utils/AssertUtil.java | 11 ++-- .../common/common/utils/CursorUtils.java | 0 .../common/common/utils/DateUtils.java | 0 .../common/common/utils/FutureUtils.java | 0 .../common/common/utils/JwtUtils.java | 0 .../common/common/utils/LambdaUtils.java | 0 .../common/common/utils/RedisUtils.java | 12 ++-- .../common/common/utils/RequestHolder.java | 0 .../common/common/utils/SpElUtils.java | 0 .../utils/discover/AbstractUrlDiscover.java | 1 - .../utils/discover/CommonUrlDiscover.java | 7 -- .../discover/PrioritizedUrlDiscover.java | 2 +- .../common/utils/discover/UrlDiscover.java | 3 +- .../common/utils/discover/WxUrlDiscover.java | 2 +- .../common/utils/discover/domain/UrlInfo.java | 6 +- .../common/utils/oss/MinIOTemplate.java | 0 .../common/common/utils/oss/OssFile.java | 0 .../common/utils/oss/OssProperties.java | 0 .../common/common/utils/oss/OssType.java | 0 .../common/utils/oss/domain/OssReq.java | 0 .../common/utils/oss/domain/OssResp.java | 0 .../common/utils/sensitiveWord/ACFilter.java | 2 +- .../common/utils/sensitiveWord/DFAFilter.java | 1 + .../common/utils/sensitiveWord/IWordDeny.java | 1 + .../utils/sensitiveWord/SensitiveWordBs.java | 7 +- .../sensitiveWord/SensitiveWordFilter.java | 0 .../mallchat/common/sensitive/MyWordDeny.java | 0 .../sensitive/dao/SensitiveWordDao.java | 0 .../sensitive/domain/SensitiveWord.java | 0 .../sensitive/mapper/SensitiveWordMapper.java | 0 .../user/consumer/MsgLoginConsumer.java | 4 +- .../common}/user/consumer/PushConsumer.java | 4 +- .../user/consumer/ScanSuccessConsumer.java | 4 +- .../user/controller/FriendController.java | 18 ++--- .../user/controller/OssController.java | 6 +- .../user/controller/UserController.java | 10 +-- .../user/controller/UserEmojiController.java | 8 +-- .../user/controller/WxPortalController.java | 4 +- .../mallchat/common/user/dao/BlackDao.java | 0 .../common/user/dao/ItemConfigDao.java | 0 .../mallchat/common/user/dao/RoleDao.java | 0 .../common/user/dao/UserApplyDao.java | 0 .../common/user/dao/UserBackpackDao.java | 0 .../mallchat/common/user/dao/UserDao.java | 0 .../common/user/dao/UserEmojiDao.java | 0 .../common/user/dao/UserFriendDao.java | 0 .../mallchat/common/user/dao/UserRoleDao.java | 0 .../common/user/domain/dto/IpResult.java | 0 .../common/user/domain/dto/ItemInfoDTO.java | 0 .../user/domain/dto/SummeryInfoDTO.java | 0 .../user/domain/dto}/WSChannelExtraDTO.java | 2 +- .../common/user/domain/entity/Black.java | 0 .../common/user/domain/entity/IpDetail.java | 0 .../common/user/domain/entity/IpInfo.java | 0 .../common/user/domain/entity/ItemConfig.java | 0 .../common/user/domain/entity/Role.java | 0 .../common/user/domain/entity/User.java | 0 .../common/user/domain/entity/UserApply.java | 0 .../user/domain/entity/UserBackpack.java | 0 .../common/user/domain/entity/UserEmoji.java | 0 .../common/user/domain/entity/UserFriend.java | 0 .../common/user/domain/entity/UserRole.java | 0 .../domain/enums/ApplyReadStatusEnum.java | 0 .../user/domain/enums/ApplyStatusEnum.java | 0 .../user/domain/enums/ApplyTypeEnum.java | 0 .../user/domain/enums/BlackTypeEnum.java | 0 .../domain/enums/ChatActiveStatusEnum.java | 0 .../common/user/domain/enums/ItemEnum.java | 0 .../user/domain/enums/ItemTypeEnum.java | 0 .../user/domain/enums/OssSceneEnum.java | 0 .../common/user/domain/enums/RoleEnum.java | 0 .../common/user/domain/enums/WSBaseResp.java | 0 .../user/domain/enums/WSPushTypeEnum.java | 0 .../user/domain/enums/WSReqTypeEnum.java | 0 .../user/domain/enums/WSRespTypeEnum.java | 0 .../vo/request/friend/FriendApplyReq.java | 2 +- .../vo/request/friend/FriendApproveReq.java | 2 +- .../vo/request/friend/FriendCheckReq.java | 2 +- .../vo/request/friend/FriendDeleteReq.java | 2 +- .../domain/vo/request/oss/UploadUrlReq.java | 2 +- .../user/domain/vo/request/user/BlackReq.java | 2 +- .../domain/vo/request/user/EmojisPageReq.java | 2 +- .../domain/vo/request/user/ItemInfoReq.java | 2 +- .../domain/vo/request/user/ModifyNameReq.java | 2 +- .../vo/request/user/SummeryInfoReq.java | 2 +- .../domain/vo/request/user/UserEmojiReq.java | 2 +- .../vo/request/user/WearingBadgeReq.java | 2 +- .../domain/vo/request/ws/WSAuthorize.java | 0 .../user/domain/vo/request/ws/WSBaseReq.java | 0 .../vo/response/friend/FriendApplyResp.java | 2 +- .../vo/response/friend/FriendCheckResp.java | 2 +- .../domain/vo/response/friend/FriendResp.java | 2 +- .../vo/response/friend/FriendUnreadResp.java | 2 +- .../domain/vo/response/user/BadgeResp.java | 2 +- .../vo/response/user/UserEmojiResp.java | 2 +- .../domain/vo/response/user/UserInfoResp.java | 2 +- .../domain/vo/response/ws/ChatMemberResp.java | 0 .../user/domain/vo/response/ws/WSBlack.java | 0 .../domain/vo/response/ws/WSFriendApply.java | 0 .../domain/vo/response/ws/WSLoginSuccess.java | 0 .../domain/vo/response/ws/WSLoginUrl.java | 0 .../domain/vo/response/ws/WSMemberChange.java | 0 .../user/domain/vo/response/ws/WSMessage.java | 0 .../domain/vo/response/ws/WSMessageRead.java | 0 .../user/domain/vo/response/ws/WSMsgMark.java | 0 .../domain/vo/response/ws/WSMsgRecall.java | 0 .../vo/response/ws/WSOnlineOfflineNotify.java | 0 .../common/user/mapper/BlackMapper.java | 0 .../common/user/mapper/ItemConfigMapper.java | 0 .../common/user/mapper/RoleMapper.java | 0 .../common/user/mapper/UserApplyMapper.java | 0 .../user/mapper/UserBackpackMapper.java | 0 .../common/user/mapper/UserEmojiMapper.java | 0 .../common/user/mapper/UserEmojisMapper.java | 0 .../common/user/mapper/UserFriendMapper.java | 0 .../common/user/mapper/UserMapper.java | 0 .../common/user/mapper/UserRoleMapper.java | 0 .../common}/user/service/FriendService.java | 14 ++-- .../common/user/service/IRoleService.java | 0 .../user/service/IUserBackpackService.java | 0 .../common/user/service/IpService.java | 0 .../common}/user/service/LoginService.java | 2 +- .../common}/user/service/OssService.java | 4 +- .../user/service/UserEmojiService.java | 6 +- .../common}/user/service/UserService.java | 8 +-- .../user/service/WebSocketService.java | 2 +- .../common}/user/service/WxMsgService.java | 6 +- .../user/service/adapter/AbstractBuilder.java | 2 +- .../user/service/adapter/FriendAdapter.java | 6 +- .../user/service/adapter/ImageBuilder.java | 2 +- .../user/service/adapter/TextBuilder.java | 5 +- .../user/service/adapter/UserAdapter.java | 6 +- .../user/service/adapter/WSAdapter.java | 6 +- .../common/user/service/cache/ItemCache.java | 0 .../common/user/service/cache/UserCache.java | 0 .../user/service/cache/UserInfoCache.java | 0 .../user/service/cache/UserSummaryCache.java | 0 .../user/service/handler/AbstractHandler.java | 2 +- .../user/service/handler/LogHandler.java | 2 +- .../user/service/handler/MsgHandler.java | 4 +- .../user/service/handler/ScanHandler.java | 4 +- .../service/handler/SubscribeHandler.java | 6 +- .../user/service/impl/FriendServiceImpl.java | 24 +++---- .../user/service/impl/IpServiceImpl.java | 0 .../user/service/impl/LoginServiceImpl.java | 4 +- .../user/service/impl/OssServiceImpl.java | 6 +- .../common/user/service/impl/PushService.java | 0 .../user/service/impl/RoleServiceImpl.java | 0 .../service/impl/UserBackpackServiceImpl.java | 0 .../service/impl/UserEmojiServiceImpl.java | 8 +-- .../user/service/impl/UserServiceImpl.java | 12 ++-- .../service/impl/WebSocketServiceImpl.java | 14 ++-- .../common}/websocket/HttpHeadersHandler.java | 2 +- .../mallchat/common}/websocket/NettyUtil.java | 2 +- .../websocket/NettyWebSocketServer.java | 2 +- .../NettyWebSocketServerHandler.java | 4 +- .../main/resources/application-pro.properties | 0 .../resources/application-test.properties | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 4 +- .../resources/mapper/chat/ContactMapper.xml | 0 .../mapper/chat/GroupMemberMapper.xml | 0 .../resources/mapper/chat/MessageMapper.xml | 0 .../mapper/chat/MessageMarkMapper.xml | 0 .../main/resources/mapper/chat/RoomMapper.xml | 0 .../resources/mapper/chat/WxMsgMapper.xml | 0 .../resources/mapper/user/BlackMapper.xml | 0 .../mapper/user/ItemConfigMapper.xml | 0 .../main/resources/mapper/user/RoleMapper.xml | 0 .../resources/mapper/user/UserApplyMapper.xml | 0 .../mapper/user/UserBackpackMapper.xml | 0 .../resources/mapper/user/UserEmojiMapper.xml | 0 .../mapper/user/UserFriendMapper.xml | 0 .../main/resources/mapper/user/UserMapper.xml | 0 .../resources/mapper/user/UserRoleMapper.xml | 0 .../user/controller/UserApplyController.java | 20 ------ .../user/controller/UserFriendController.java | 20 ------ .../common/user/service/IBlackService.java | 16 ----- .../user/service/IItemConfigService.java | 16 ----- .../user/service/IUserApplyService.java | 16 ----- .../user/service/IUserFriendService.java | 16 ----- .../common/user/service/IUserRoleService.java | 16 ----- mallchat-custom-server/pom.xml | 48 -------------- .../abin/mallchat/custom/ac/ACTrieTest.java | 65 ------------------- .../mallchat/custom/ac/CreateTokenTest.java | 34 ---------- .../mallchat/custom/spring/WXTemplate.java | 36 ---------- pom.xml | 3 +- 396 files changed, 393 insertions(+), 685 deletions(-) rename {mallchat-common => mallchat-chat-server}/pom.xml (73%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/MallchatCustomApplication.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/consumer/MsgSendConsumer.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/controller/ChatController.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/controller/ContactController.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/controller/RoomController.java (90%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/RoomFriendDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/RoomGroupDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMsgRecallDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/dto/MsgReadInfoDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/dto/RoomBaseInfo.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/Contact.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomFriend.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomGroup.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MsgRecall.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo => mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain}/enums/GroupRoleAPPEnum.java (93%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/HotFlagEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkActTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageStatusEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/enums/RoomTypeEnum.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageBaseReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageMarkReq.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageMemberReq.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessagePageReq.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageReadInfoReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageReadReq.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/ChatMessageReq.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/GroupAddReq.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/MemberAddReq.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/MemberDelReq.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/MemberReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/request/msg/TextMsgReq.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/ChatMemberListResp.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/ChatMemberStatisticResp.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/ChatMessageReadInfoResp.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/ChatMessageReadResp.java (88%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageResp.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/ChatRoomResp.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/MemberResp.java (84%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/domain/vo/response/msg/TextMsgResp.java (96%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/GroupMemberMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMarkMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/RoomFriendMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/RoomGroupMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/RoomMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/WxMsgMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomFriendMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomGroupMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomMapper.xml (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/ChatService.java (88%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/IGroupMemberService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/IMessageMarkService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/IMessageService.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/RoomAppService.java (77%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/RoomService.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/WeChatMsgOperationService.java (87%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/adapter/ChatAdapter.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/adapter/MemberAdapter.java (97%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/adapter/MessageAdapter.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/adapter/RoomAdapter.java (91%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/GroupMemberCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/HotRoomCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/MsgCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomGroupCache.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/helper/ChatMemberHelper.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/impl/ChatServiceImpl.java (93%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/impl/RoomAppServiceImpl.java (95%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomServiceImpl.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/impl/WeChatMsgOperationServiceImpl.java (97%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/mark/AbstractMsgMarkStrategy.java (98%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/mark/DisLikeStrategy.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/mark/LikeStrategy.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/mark/MsgMarkFactory.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/AbstractMsgHandler.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/EmojisMsgHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/FileMsgHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/ImgMsgHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/MsgHandler.java (74%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/MsgHandlerFactory.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/RecallMsgHandler.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/SoundMsgHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/SystemMsgHandler.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/TextMsgHandler.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chat/service/strategy/msg/VideoMsgHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/domain/ChatGPTContext.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/domain/ChatGPTMsg.java (83%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/domain/builder/ChatGPTContextBuilder.java (75%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/domain/builder/ChatGPTMsgBuilder.java (85%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/dto/GPTRequestDTO.java (87%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/enums/ChatGPTModelEnum.java (98%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/enums/ChatGPTRoleEnum.java (84%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/handler/AbstractChatAIHandler.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/handler/ChatAIHandlerFactory.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/handler/ChatGLM2Handler.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/handler/GPTChatAIHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/properties/ChatGLM2Properties.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/properties/ChatGPTProperties.java (94%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/service/IChatAIService.java (72%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/service/impl/ChatAIServiceImpl.java (75%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/utils/ChatGLM2Utils.java (98%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/chatai/utils/ChatGPTUtils.java (98%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrieNode.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java (84%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/algorithm/package-info.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControl.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/CacheConfig.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/config/InterceptorConfig.java (81%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/MybatisPlusConfig.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/RedissonConfig.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/SensitiveWordConfig.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/config/SwaggerConfig.java (98%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/config/ThreadPoolConfig.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/config/WxMpConfiguration.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/config/WxMpProperties.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/constant/MDCKey.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/constant/MQConstant.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/FrequencyControlDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/LoginMessageDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/MsgSendMessageDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/PushMessageDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/RequestInfo.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/dto/ScanSuccessMessageDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/enums/IdempotentEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/enums/NormalOrNoEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/request/IdReqVO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/response/ApiResult.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/response/IdRespVO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/domain/vo/response/PageBaseResp.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/GroupMemberAddEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/MessageMarkEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/MessageRecallEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/UserApplyEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/UserBlackEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/UserOfflineEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/event/UserRegisterEvent.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/GroupMemberAddListener.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/ItemReceiveListener.java (96%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/MessageMarkListener.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/MessageRecallListener.java (85%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/MessageSendListener.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/UserApplyListener.java (87%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/UserBlackListener.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/UserOfflineListener.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/UserOnlineListener.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/event/listener/UserRegisterListener.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/BusinessErrorEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/BusinessException.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/ErrorEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/FrequencyControlException.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java (75%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java (66%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/intecepter/BlackInterceptor.java (97%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/intecepter/CollectorInterceptor.java (96%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/intecepter/HttpTraceIdFilter.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/intecepter/TokenInterceptor.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/common/intecepter/WebLogAspect.java (98%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/LockService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractLocalCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractRedisStringCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/cache/BatchCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/AbstractFrequencyControlService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlStrategyFactory.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlUtil.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/TotalCountWithInFixTimeFrequencyController.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java (94%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/DateUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/LambdaUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java (99%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/RequestHolder.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java (99%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java (88%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java (95%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java (93%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java (95%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java (89%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java (99%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java (99%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java (99%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordFilter.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/sensitive/MyWordDeny.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/sensitive/dao/SensitiveWordDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/sensitive/domain/SensitiveWord.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/sensitive/mapper/SensitiveWordMapper.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/consumer/MsgLoginConsumer.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/consumer/PushConsumer.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/consumer/ScanSuccessConsumer.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/controller/FriendController.java (84%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/controller/OssController.java (86%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/controller/UserController.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/controller/UserEmojiController.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/controller/WxPortalController.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserEmojiDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/dto/IpResult.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/dto/ItemInfoDTO.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/dto/SummeryInfoDTO.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws => mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto}/WSChannelExtraDTO.java (89%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/UserApply.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/UserEmoji.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyReadStatusEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyStatusEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ChatActiveStatusEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/OssSceneEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/WSBaseResp.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/WSPushTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/WSReqTypeEnum.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/enums/WSRespTypeEnum.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/friend/FriendApplyReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/friend/FriendApproveReq.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/friend/FriendCheckReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/friend/FriendDeleteReq.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/oss/UploadUrlReq.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/BlackReq.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/EmojisPageReq.java (80%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/ItemInfoReq.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/ModifyNameReq.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/SummeryInfoReq.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/UserEmojiReq.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/request/user/WearingBadgeReq.java (88%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSAuthorize.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSBaseReq.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/friend/FriendApplyResp.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/friend/FriendCheckResp.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/friend/FriendResp.java (87%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/friend/FriendUnreadResp.java (87%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/user/BadgeResp.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/user/UserEmojiResp.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/domain/vo/response/user/UserInfoResp.java (91%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/ChatMemberResp.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSBlack.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSFriendApply.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginSuccess.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginUrl.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMemberChange.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessage.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessageRead.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgMark.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgRecall.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSOnlineOfflineNotify.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/BlackMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/ItemConfigMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserBackpackMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojiMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserFriendMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserMapper.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/FriendService.java (80%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/IpService.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/LoginService.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/OssService.java (75%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/UserEmojiService.java (83%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/UserService.java (83%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/WebSocketService.java (96%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/WxMsgService.java (96%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/AbstractBuilder.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/FriendAdapter.java (89%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/ImageBuilder.java (92%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/TextBuilder.java (84%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/UserAdapter.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/adapter/WSAdapter.java (97%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/cache/UserInfoCache.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/cache/UserSummaryCache.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/handler/AbstractHandler.java (85%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/handler/LogHandler.java (93%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/handler/MsgHandler.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/handler/ScanHandler.java (88%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/handler/SubscribeHandler.java (90%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/FriendServiceImpl.java (91%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/LoginServiceImpl.java (96%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/OssServiceImpl.java (86%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/impl/PushService.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java (100%) rename {mallchat-common => mallchat-chat-server}/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java (100%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/UserEmojiServiceImpl.java (91%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/UserServiceImpl.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/user/service/impl/WebSocketServiceImpl.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/websocket/HttpHeadersHandler.java (97%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/websocket/NettyUtil.java (95%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/websocket/NettyWebSocketServer.java (98%) rename {mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user => mallchat-chat-server/src/main/java/com/abin/mallchat/common}/websocket/NettyWebSocketServerHandler.java (96%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/application-pro.properties (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/application-test.properties (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/application.yml (100%) rename {mallchat-custom-server => mallchat-chat-server}/src/main/resources/logback.xml (94%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/ContactMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/GroupMemberMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/MessageMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/MessageMarkMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/RoomMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/chat/WxMsgMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/BlackMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/ItemConfigMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/RoleMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserApplyMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserBackpackMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserEmojiMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserFriendMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserMapper.xml (100%) rename {mallchat-common => mallchat-chat-server}/src/main/resources/mapper/user/UserRoleMapper.xml (100%) delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserApplyController.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IBlackService.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IItemConfigService.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserApplyService.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserFriendService.java delete mode 100644 mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserRoleService.java delete mode 100644 mallchat-custom-server/pom.xml delete mode 100644 mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/ACTrieTest.java delete mode 100644 mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java delete mode 100644 mallchat-custom-server/src/test/java/com/abin/mallchat/custom/spring/WXTemplate.java diff --git a/mallchat-common/pom.xml b/mallchat-chat-server/pom.xml similarity index 73% rename from mallchat-common/pom.xml rename to mallchat-chat-server/pom.xml index ba3a524..1134ffc 100644 --- a/mallchat-common/pom.xml +++ b/mallchat-chat-server/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - mallchat-common + mallchat-chat-server @@ -20,6 +20,11 @@ com.abin.mallchat mallchat-transaction + + com.knuddels + jtokkit + 0.6.1 + @@ -28,6 +33,10 @@ maven-resources-plugin 2.4.3 + + org.springframework.boot + spring-boot-maven-plugin + diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/MallchatCustomApplication.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/MallchatCustomApplication.java index 40f94ee..77e4584 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/consumer/MsgSendConsumer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/consumer/MsgSendConsumer.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/consumer/MsgSendConsumer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/consumer/MsgSendConsumer.java index d1e0805..133b590 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/consumer/MsgSendConsumer.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ChatController.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ChatController.java index 1737471..48a8d9d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ContactController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ContactController.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ContactController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/ContactController.java index b627161..421e451 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ContactController.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/RoomController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/RoomController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/controller/RoomController.java index fe280e5..0595d50 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/RoomController.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/ContactDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/GroupMemberDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomFriendDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomFriendDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomFriendDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomFriendDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomGroupDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomGroupDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomGroupDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/RoomGroupDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMsgRecallDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMsgRecallDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMsgRecallDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMsgRecallDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/MsgReadInfoDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/MsgReadInfoDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/MsgReadInfoDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/MsgReadInfoDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/RoomBaseInfo.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/RoomBaseInfo.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/RoomBaseInfo.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/dto/RoomBaseInfo.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Contact.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Contact.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Contact.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Contact.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/GroupMember.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomFriend.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomFriend.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomFriend.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomFriend.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomGroup.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomGroup.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomGroup.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/RoomGroup.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/EmojisMsgDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/ImgMsgDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MessageExtra.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MsgRecall.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MsgRecall.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MsgRecall.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/MsgRecall.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/enums/GroupRoleAPPEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleAPPEnum.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/enums/GroupRoleAPPEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleAPPEnum.java index 810af3c..175f9e8 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/enums/GroupRoleAPPEnum.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/GroupRoleEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/HotFlagEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/HotFlagEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/HotFlagEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/HotFlagEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkActTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkActTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkActTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkActTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageStatusEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageStatusEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageStatusEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageStatusEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/RoomTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/RoomTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/RoomTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/enums/RoomTypeEnum.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageBaseReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageBaseReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageBaseReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageBaseReq.java index 2a08032..635f1c4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageBaseReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMarkReq.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMarkReq.java index d1e2be4..c9ababe 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMemberReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMemberReq.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMemberReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageMemberReq.java index 4354cb0..4eda4eb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMemberReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessagePageReq.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessagePageReq.java index 13863bd..a307941 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadInfoReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadInfoReq.java index 2b1c585..2c33de3 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadInfoReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadReq.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReadReq.java index 686318a..4ae5f7f 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReadReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReq.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/ChatMessageReq.java index 4300f94..6314e58 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/GroupAddReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/GroupAddReq.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/GroupAddReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/GroupAddReq.java index a5ade0b..1fec2c0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/GroupAddReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberAddReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberAddReq.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberAddReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberAddReq.java index 3c0ce8e..b7e9bec 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberAddReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberDelReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberDelReq.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberDelReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberDelReq.java index 7951023..34de494 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberDelReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/MemberReq.java index 75f78b1..76f8ac7 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/MemberReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/msg/TextMsgReq.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/request/msg/TextMsgReq.java index 4ccfee4..8f762cb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberListResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberListResp.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberListResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberListResp.java index 9ba50a4..c060e44 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberListResp.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberStatisticResp.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMemberStatisticResp.java index 5f26878..b37d373 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadInfoResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadInfoResp.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadInfoResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadInfoResp.java index dd6cb71..86fcc77 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadInfoResp.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadResp.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageReadResp.java index 4b187c8..96ce356 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageReadResp.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatMessageResp.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatRoomResp.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/ChatRoomResp.java index 2faec3f..2d826ba 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/MemberResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/MemberResp.java similarity index 84% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/MemberResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/MemberResp.java index 2c39a5a..2652b98 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/MemberResp.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/msg/TextMsgResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/msg/TextMsgResp.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/msg/TextMsgResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/vo/response/msg/TextMsgResp.java index 17a7b48..c810965 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/msg/TextMsgResp.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/ContactMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/GroupMemberMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/GroupMemberMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/GroupMemberMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/GroupMemberMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMarkMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMarkMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMarkMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/MessageMarkMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomFriendMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomFriendMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomFriendMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomFriendMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomGroupMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomGroupMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomGroupMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomGroupMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/RoomMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/RoomMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/WxMsgMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/WxMsgMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/WxMsgMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/WxMsgMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomFriendMapper.xml b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomFriendMapper.xml similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomFriendMapper.xml rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomFriendMapper.xml diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomGroupMapper.xml b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomGroupMapper.xml similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomGroupMapper.xml rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomGroupMapper.xml diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomMapper.xml b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomMapper.xml similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomMapper.xml rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/mapper/xml/RoomMapper.xml diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/ChatService.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/ChatService.java index 5f9e973..62e6d4a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/ContactService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IGroupMemberService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IGroupMemberService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IGroupMemberService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IGroupMemberService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IMessageMarkService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IMessageMarkService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IMessageMarkService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IMessageMarkService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IMessageService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IMessageService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/IMessageService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/IMessageService.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/RoomAppService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/RoomAppService.java similarity index 77% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/RoomAppService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/RoomAppService.java index 8b5685d..ce23ec0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/RoomAppService.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/RoomService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/RoomService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/RoomService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/RoomService.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/WeChatMsgOperationService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/WeChatMsgOperationService.java similarity index 87% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/WeChatMsgOperationService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/WeChatMsgOperationService.java index 1e08b4a..339d571 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/WeChatMsgOperationService.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/adapter/ChatAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/ChatAdapter.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/adapter/ChatAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/ChatAdapter.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MemberAdapter.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MemberAdapter.java index 88c4dbd..70dace7 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MessageAdapter.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/MessageAdapter.java index a368954..c7cea2d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/RoomAdapter.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/adapter/RoomAdapter.java index 9d28841..88b5d87 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/GroupMemberCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/GroupMemberCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/GroupMemberCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/GroupMemberCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/HotRoomCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/HotRoomCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/HotRoomCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/HotRoomCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/MsgCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/MsgCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/MsgCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/MsgCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomGroupCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomGroupCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomGroupCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomGroupCache.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/helper/ChatMemberHelper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/helper/ChatMemberHelper.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/helper/ChatMemberHelper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/helper/ChatMemberHelper.java index b809282..44a1dfd 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/helper/ChatMemberHelper.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java index f091726..e78b0ab 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ContactServiceImpl.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/RoomAppServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/RoomAppServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java index b1201eb..3127100 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/RoomAppServiceImpl.java +++ b/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; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomServiceImpl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomServiceImpl.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/WeChatMsgOperationServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/WeChatMsgOperationServiceImpl.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/WeChatMsgOperationServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/WeChatMsgOperationServiceImpl.java index 0866b41..f5e615e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/WeChatMsgOperationServiceImpl.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/AbstractMsgMarkStrategy.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/AbstractMsgMarkStrategy.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/AbstractMsgMarkStrategy.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/AbstractMsgMarkStrategy.java index 847eccb..a4899c3 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/AbstractMsgMarkStrategy.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/DisLikeStrategy.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/DisLikeStrategy.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/DisLikeStrategy.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/DisLikeStrategy.java index b848e1b..e838cbb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/DisLikeStrategy.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/LikeStrategy.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/LikeStrategy.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/LikeStrategy.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/LikeStrategy.java index 3b92528..233dc75 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/LikeStrategy.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/MsgMarkFactory.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/MsgMarkFactory.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/MsgMarkFactory.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/mark/MsgMarkFactory.java index 4b6acc4..1d5797f 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/mark/MsgMarkFactory.java +++ b/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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/AbstractMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/AbstractMsgHandler.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/AbstractMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/AbstractMsgHandler.java index 76a82f1..6fca490 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/AbstractMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/AbstractMsgHandler.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import javax.annotation.PostConstruct; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/EmojisMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/EmojisMsgHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/EmojisMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/EmojisMsgHandler.java index 3c219aa..7c1854e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/EmojisMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/EmojisMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -6,8 +6,8 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.EmojisMsgDTO; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/FileMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/FileMsgHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/FileMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/FileMsgHandler.java index 9fec9bc..485894c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/FileMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/FileMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -6,8 +6,8 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.FileMsgDTO; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/ImgMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/ImgMsgHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/ImgMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/ImgMsgHandler.java index ac52bce..12434e0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/ImgMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/ImgMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -6,8 +6,8 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.ImgMsgDTO; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandler.java similarity index 74% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandler.java index 589589f..15be726 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import com.abin.mallchat.common.chat.domain.entity.Message; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandlerFactory.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandlerFactory.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandlerFactory.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandlerFactory.java index 22563cf..4b096b2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/MsgHandlerFactory.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/MsgHandlerFactory.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import com.abin.mallchat.common.common.exception.CommonErrorEnum; import com.abin.mallchat.common.common.utils.AssertUtil; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/RecallMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/RecallMsgHandler.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/RecallMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/RecallMsgHandler.java index 6d5cc1e..7984b5d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/RecallMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/RecallMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.domain.dto.ChatMsgRecallDTO; @@ -6,11 +6,11 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.entity.msg.MsgRecall; 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.service.cache.MsgCache; import com.abin.mallchat.common.common.event.MessageRecallEvent; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.service.cache.UserCache; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SoundMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SoundMsgHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SoundMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SoundMsgHandler.java index 1321ab3..1f4e009 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SoundMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SoundMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -6,8 +6,8 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.entity.msg.SoundMsgDTO; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SystemMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SystemMsgHandler.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SystemMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SystemMsgHandler.java index 5dfbedb..98c757c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/SystemMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/SystemMsgHandler.java @@ -1,9 +1,9 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java index def0a19..8ee9279 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; @@ -7,6 +7,10 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; 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.msg.TextMsgResp; +import com.abin.mallchat.common.chat.service.adapter.MessageAdapter; import com.abin.mallchat.common.chat.service.cache.MsgCache; import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; import com.abin.mallchat.common.common.utils.AssertUtil; @@ -18,10 +22,6 @@ import com.abin.mallchat.common.user.domain.enums.RoleEnum; 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.custom.chat.domain.vo.request.ChatMessageReq; -import com.abin.mallchat.custom.chat.domain.vo.request.msg.TextMsgReq; -import com.abin.mallchat.custom.chat.domain.vo.response.msg.TextMsgResp; -import com.abin.mallchat.custom.chat.service.adapter.MessageAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/VideoMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/VideoMsgHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/VideoMsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/VideoMsgHandler.java index e9707a4..39cc61d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/VideoMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/VideoMsgHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chat.service.strategy.msg; +package com.abin.mallchat.common.chat.service.strategy.msg; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -6,8 +6,8 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.chat.domain.entity.msg.VideoMsgDTO; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTContext.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTContext.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTContext.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTContext.java index 814be04..7f2bc5d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTContext.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTContext.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.domain; +package com.abin.mallchat.common.chatai.domain; import lombok.Getter; import lombok.Setter; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTMsg.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTMsg.java similarity index 83% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTMsg.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTMsg.java index 2d913f9..0bc2390 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/ChatGPTMsg.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/ChatGPTMsg.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.domain; +package com.abin.mallchat.common.chatai.domain; import lombok.Getter; import lombok.Setter; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTContextBuilder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTContextBuilder.java similarity index 75% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTContextBuilder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTContextBuilder.java index 0348646..4b13500 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTContextBuilder.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTContextBuilder.java @@ -1,6 +1,6 @@ -package com.abin.mallchat.custom.chatai.domain.builder; +package com.abin.mallchat.common.chatai.domain.builder; -import com.abin.mallchat.custom.chatai.domain.ChatGPTContext; +import com.abin.mallchat.common.chatai.domain.ChatGPTContext; public class ChatGPTContextBuilder { diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTMsgBuilder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTMsgBuilder.java similarity index 85% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTMsgBuilder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTMsgBuilder.java index 05be619..8781459 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/domain/builder/ChatGPTMsgBuilder.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/domain/builder/ChatGPTMsgBuilder.java @@ -1,7 +1,7 @@ -package com.abin.mallchat.custom.chatai.domain.builder; +package com.abin.mallchat.common.chatai.domain.builder; -import com.abin.mallchat.custom.chatai.domain.ChatGPTMsg; -import com.abin.mallchat.custom.chatai.enums.ChatGPTRoleEnum; +import com.abin.mallchat.common.chatai.domain.ChatGPTMsg; +import com.abin.mallchat.common.chatai.enums.ChatGPTRoleEnum; public class ChatGPTMsgBuilder { public static ChatGPTMsg SYSTEM_PROMPT; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/dto/GPTRequestDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/dto/GPTRequestDTO.java similarity index 87% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/dto/GPTRequestDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/dto/GPTRequestDTO.java index cb72432..e33d44b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/dto/GPTRequestDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/dto/GPTRequestDTO.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.dto; +package com.abin.mallchat.common.chatai.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTModelEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTModelEnum.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTModelEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTModelEnum.java index 6b73b0f..74ab336 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTModelEnum.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTModelEnum.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.enums; +package com.abin.mallchat.common.chatai.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTRoleEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTRoleEnum.java similarity index 84% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTRoleEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTRoleEnum.java index 4fe5957..cd1dfb9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/enums/ChatGPTRoleEnum.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/enums/ChatGPTRoleEnum.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.enums; +package com.abin.mallchat.common.chatai.enums; public enum ChatGPTRoleEnum { SYSTEM("system"), diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/AbstractChatAIHandler.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/AbstractChatAIHandler.java index 598e621..367c6f0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/AbstractChatAIHandler.java @@ -1,13 +1,13 @@ -package com.abin.mallchat.custom.chatai.handler; +package com.abin.mallchat.common.chatai.handler; import com.abin.mallchat.common.chat.domain.entity.Message; 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.service.ChatService; import com.abin.mallchat.common.common.config.ThreadPoolConfig; -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.ChatService; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; -import com.abin.mallchat.custom.user.service.UserService; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.service.UserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatAIHandlerFactory.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatAIHandlerFactory.java index a719ecb..39eca8d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatAIHandlerFactory.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.handler; +package com.abin.mallchat.common.chatai.handler; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatGLM2Handler.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatGLM2Handler.java index 83f665a..7bfe0b8 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/ChatGLM2Handler.java @@ -1,17 +1,17 @@ -package com.abin.mallchat.custom.chatai.handler; +package com.abin.mallchat.common.chatai.handler; import cn.hutool.http.HttpResponse; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; +import com.abin.mallchat.common.chatai.dto.GPTRequestDTO; +import com.abin.mallchat.common.chatai.properties.ChatGLM2Properties; +import com.abin.mallchat.common.chatai.utils.ChatGLM2Utils; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.domain.dto.FrequencyControlDTO; import com.abin.mallchat.common.common.exception.FrequencyControlException; import com.abin.mallchat.common.common.service.frequencycontrol.FrequencyControlUtil; import com.abin.mallchat.common.common.utils.RedisUtils; -import com.abin.mallchat.custom.chatai.dto.GPTRequestDTO; -import com.abin.mallchat.custom.chatai.properties.ChatGLM2Properties; -import com.abin.mallchat.custom.chatai.utils.ChatGLM2Utils; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/GPTChatAIHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/GPTChatAIHandler.java index c812dcc..2e02030 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/handler/GPTChatAIHandler.java @@ -1,20 +1,20 @@ -package com.abin.mallchat.custom.chatai.handler; +package com.abin.mallchat.common.chatai.handler; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; +import com.abin.mallchat.common.chatai.domain.ChatGPTContext; +import com.abin.mallchat.common.chatai.domain.ChatGPTMsg; +import com.abin.mallchat.common.chatai.domain.builder.ChatGPTContextBuilder; +import com.abin.mallchat.common.chatai.domain.builder.ChatGPTMsgBuilder; +import com.abin.mallchat.common.chatai.properties.ChatGPTProperties; +import com.abin.mallchat.common.chatai.utils.ChatGPTUtils; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.domain.dto.FrequencyControlDTO; import com.abin.mallchat.common.common.exception.FrequencyControlException; import com.abin.mallchat.common.common.service.frequencycontrol.FrequencyControlUtil; import com.abin.mallchat.common.common.utils.DateUtils; import com.abin.mallchat.common.common.utils.RedisUtils; -import com.abin.mallchat.custom.chatai.domain.ChatGPTContext; -import com.abin.mallchat.custom.chatai.domain.ChatGPTMsg; -import com.abin.mallchat.custom.chatai.domain.builder.ChatGPTContextBuilder; -import com.abin.mallchat.custom.chatai.domain.builder.ChatGPTMsgBuilder; -import com.abin.mallchat.custom.chatai.properties.ChatGPTProperties; -import com.abin.mallchat.custom.chatai.utils.ChatGPTUtils; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; import org.apache.commons.lang3.StringUtils; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGLM2Properties.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGLM2Properties.java index f231643..ebcc8e6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGLM2Properties.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.properties; +package com.abin.mallchat.common.chatai.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGPTProperties.java similarity index 94% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGPTProperties.java index f2855fa..189ed87 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/properties/ChatGPTProperties.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.properties; +package com.abin.mallchat.common.chatai.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/IChatAIService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/IChatAIService.java similarity index 72% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/IChatAIService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/IChatAIService.java index 8cded22..5a842d0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/IChatAIService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/IChatAIService.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.service; +package com.abin.mallchat.common.chatai.service; import com.abin.mallchat.common.chat.domain.entity.Message; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/impl/ChatAIServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/impl/ChatAIServiceImpl.java similarity index 75% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/impl/ChatAIServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/impl/ChatAIServiceImpl.java index 885c227..ef8ca35 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/service/impl/ChatAIServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/service/impl/ChatAIServiceImpl.java @@ -1,10 +1,10 @@ -package com.abin.mallchat.custom.chatai.service.impl; +package com.abin.mallchat.common.chatai.service.impl; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; -import com.abin.mallchat.custom.chatai.handler.AbstractChatAIHandler; -import com.abin.mallchat.custom.chatai.handler.ChatAIHandlerFactory; -import com.abin.mallchat.custom.chatai.service.IChatAIService; +import com.abin.mallchat.common.chatai.handler.AbstractChatAIHandler; +import com.abin.mallchat.common.chatai.handler.ChatAIHandlerFactory; +import com.abin.mallchat.common.chatai.service.IChatAIService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGLM2Utils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGLM2Utils.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGLM2Utils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGLM2Utils.java index 7ac9e1a..d78f3cd 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGLM2Utils.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGLM2Utils.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.chatai.utils; +package com.abin.mallchat.common.chatai.utils; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGPTUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGPTUtils.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGPTUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGPTUtils.java index 4a4a1b8..2e8229b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/utils/ChatGPTUtils.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chatai/utils/ChatGPTUtils.java @@ -1,7 +1,7 @@ -package com.abin.mallchat.custom.chatai.utils; +package com.abin.mallchat.common.chatai.utils; +import com.abin.mallchat.common.chatai.domain.ChatGPTMsg; import com.abin.mallchat.common.common.exception.BusinessException; -import com.abin.mallchat.custom.chatai.domain.ChatGPTMsg; import com.abin.mallchat.utils.JsonUtils; import com.fasterxml.jackson.databind.JsonNode; import com.knuddels.jtokkit.Encodings; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java similarity index 97% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java index 523e4b2..cdace14 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrie.java @@ -3,7 +3,10 @@ package com.abin.mallchat.common.common.algorithm.ac; import com.google.common.collect.Lists; import javax.annotation.concurrent.NotThreadSafe; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; import java.util.stream.Collectors; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrieNode.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrieNode.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrieNode.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/ACTrieNode.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java similarity index 84% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java index 36087e4..f3b7da4 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/ac/MatchResult.java @@ -1,6 +1,8 @@ package com.abin.mallchat.common.common.algorithm.ac; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; /** * Created by berg on 2023/6/18. diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/package-info.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/package-info.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/algorithm/package-info.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/algorithm/package-info.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControl.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/CacheConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/CacheConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/CacheConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/CacheConfig.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/InterceptorConfig.java similarity index 81% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/InterceptorConfig.java index 6fc0e65..60206a7 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/InterceptorConfig.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.common.config; +package com.abin.mallchat.common.common.config; -import com.abin.mallchat.custom.common.intecepter.BlackInterceptor; -import com.abin.mallchat.custom.common.intecepter.CollectorInterceptor; -import com.abin.mallchat.custom.common.intecepter.TokenInterceptor; +import com.abin.mallchat.common.common.intecepter.BlackInterceptor; +import com.abin.mallchat.common.common.intecepter.CollectorInterceptor; +import com.abin.mallchat.common.common.intecepter.TokenInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MinIOConfiguration.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/MybatisPlusConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MybatisPlusConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/MybatisPlusConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/MybatisPlusConfig.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedissonConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/RedissonConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedissonConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/RedissonConfig.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/SensitiveWordConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/SensitiveWordConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/SensitiveWordConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/SensitiveWordConfig.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/SwaggerConfig.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/SwaggerConfig.java index 5682959..41f2b6e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.config; +package com.abin.mallchat.common.common.config; import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/ThreadPoolConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/ThreadPoolConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/config/ThreadPoolConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/ThreadPoolConfig.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpConfiguration.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpConfiguration.java index 088802b..c23c322 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpConfiguration.java @@ -1,9 +1,9 @@ -package com.abin.mallchat.custom.common.config; +package com.abin.mallchat.common.common.config; -import com.abin.mallchat.custom.user.service.handler.LogHandler; -import com.abin.mallchat.custom.user.service.handler.MsgHandler; -import com.abin.mallchat.custom.user.service.handler.ScanHandler; -import com.abin.mallchat.custom.user.service.handler.SubscribeHandler; +import com.abin.mallchat.common.user.service.handler.LogHandler; +import com.abin.mallchat.common.user.service.handler.MsgHandler; +import com.abin.mallchat.common.user.service.handler.ScanHandler; +import com.abin.mallchat.common.user.service.handler.SubscribeHandler; import lombok.AllArgsConstructor; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpProperties.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpProperties.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpProperties.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpProperties.java index a7a53e9..36b69bb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpProperties.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/config/WxMpProperties.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.config; +package com.abin.mallchat.common.common.config; import cn.hutool.json.JSONUtil; import lombok.Data; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/MDCKey.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/MDCKey.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/MDCKey.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/MDCKey.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/MQConstant.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/MQConstant.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/MQConstant.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/MQConstant.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/FrequencyControlDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/FrequencyControlDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/FrequencyControlDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/FrequencyControlDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/LoginMessageDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/LoginMessageDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/LoginMessageDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/LoginMessageDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/MsgSendMessageDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/MsgSendMessageDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/MsgSendMessageDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/MsgSendMessageDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/PushMessageDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/PushMessageDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/PushMessageDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/PushMessageDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/RequestInfo.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/RequestInfo.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/RequestInfo.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/RequestInfo.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/ScanSuccessMessageDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/ScanSuccessMessageDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/dto/ScanSuccessMessageDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/dto/ScanSuccessMessageDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/IdempotentEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/IdempotentEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/IdempotentEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/IdempotentEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/NormalOrNoEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/NormalOrNoEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/NormalOrNoEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/NormalOrNoEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/IdReqVO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/IdReqVO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/IdReqVO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/IdReqVO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/ApiResult.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/ApiResult.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/ApiResult.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/ApiResult.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/IdRespVO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/IdRespVO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/IdRespVO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/IdRespVO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/PageBaseResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/PageBaseResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/PageBaseResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/domain/vo/response/PageBaseResp.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/GroupMemberAddEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/GroupMemberAddEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/GroupMemberAddEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/GroupMemberAddEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageMarkEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageMarkEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageMarkEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageMarkEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageRecallEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageRecallEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageRecallEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageRecallEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserApplyEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserApplyEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserApplyEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserApplyEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserBlackEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserBlackEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserBlackEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserBlackEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOfflineEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserOfflineEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOfflineEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserOfflineEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserRegisterEvent.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserRegisterEvent.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserRegisterEvent.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/UserRegisterEvent.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/GroupMemberAddListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/GroupMemberAddListener.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/GroupMemberAddListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/GroupMemberAddListener.java index fbecf33..93e2183 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/GroupMemberAddListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/GroupMemberAddListener.java @@ -1,8 +1,12 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.chat.dao.GroupMemberDao; import com.abin.mallchat.common.chat.domain.entity.GroupMember; import com.abin.mallchat.common.chat.domain.entity.RoomGroup; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageReq; +import com.abin.mallchat.common.chat.service.ChatService; +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.GroupMemberCache; import com.abin.mallchat.common.chat.service.cache.MsgCache; import com.abin.mallchat.common.common.event.GroupMemberAddEvent; @@ -10,13 +14,9 @@ import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.enums.WSBaseResp; import com.abin.mallchat.common.user.domain.vo.response.ws.WSMemberChange; +import com.abin.mallchat.common.user.service.WebSocketService; 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.request.ChatMessageReq; -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.RoomAdapter; -import com.abin.mallchat.custom.user.service.WebSocketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/ItemReceiveListener.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/ItemReceiveListener.java index 11aa871..b0c2f3d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/ItemReceiveListener.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.common.event.ItemReceiveEvent; import com.abin.mallchat.common.user.dao.UserDao; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageMarkListener.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageMarkListener.java index 485dc61..8e9e8db 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageMarkListener.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.dao.MessageMarkDao; @@ -10,8 +10,8 @@ import com.abin.mallchat.common.common.domain.enums.IdempotentEnum; import com.abin.mallchat.common.common.event.MessageMarkEvent; import com.abin.mallchat.common.user.domain.enums.ItemEnum; import com.abin.mallchat.common.user.service.IUserBackpackService; -import com.abin.mallchat.custom.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; +import com.abin.mallchat.common.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageRecallListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageRecallListener.java similarity index 85% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageRecallListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageRecallListener.java index 29525a5..dfe611a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageRecallListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageRecallListener.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.chat.domain.dto.ChatMsgRecallDTO; +import com.abin.mallchat.common.chat.service.ChatService; import com.abin.mallchat.common.chat.service.cache.MsgCache; import com.abin.mallchat.common.common.event.MessageRecallEvent; +import com.abin.mallchat.common.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.adapter.WSAdapter; import com.abin.mallchat.common.user.service.impl.PushService; -import com.abin.mallchat.custom.chat.service.ChatService; -import com.abin.mallchat.custom.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageSendListener.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageSendListener.java index 882f25a..a25cd37 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/MessageSendListener.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.chat.dao.ContactDao; import com.abin.mallchat.common.chat.dao.MessageDao; @@ -7,17 +7,17 @@ import com.abin.mallchat.common.chat.dao.RoomFriendDao; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.entity.Room; import com.abin.mallchat.common.chat.domain.enums.HotFlagEnum; +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.common.event.MessageSendEvent; +import com.abin.mallchat.common.user.service.WebSocketService; import com.abin.mallchat.common.user.service.cache.UserCache; -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.transaction.service.MQProducer; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserApplyListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserApplyListener.java similarity index 87% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserApplyListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserApplyListener.java index 9809e5d..8bc50e0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserApplyListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserApplyListener.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.common.event.UserApplyEvent; import com.abin.mallchat.common.user.dao.UserApplyDao; import com.abin.mallchat.common.user.domain.entity.UserApply; import com.abin.mallchat.common.user.domain.vo.response.ws.WSFriendApply; +import com.abin.mallchat.common.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.adapter.WSAdapter; import com.abin.mallchat.common.user.service.impl.PushService; -import com.abin.mallchat.custom.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserBlackListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserBlackListener.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserBlackListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserBlackListener.java index 9d05f12..e414700 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserBlackListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserBlackListener.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.common.event.UserBlackEvent; import com.abin.mallchat.common.user.domain.enums.WSBaseResp; import com.abin.mallchat.common.user.domain.enums.WSRespTypeEnum; import com.abin.mallchat.common.user.domain.vo.response.ws.WSBlack; +import com.abin.mallchat.common.user.service.WebSocketService; import com.abin.mallchat.common.user.service.cache.UserCache; -import com.abin.mallchat.custom.user.service.WebSocketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOfflineListener.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOfflineListener.java index eb27a74..827a0e6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOfflineListener.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.common.event.UserOfflineEvent; import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.enums.ChatActiveStatusEnum; +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.custom.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOnlineListener.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOnlineListener.java index 5e3a57f..ed1a862 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserOnlineListener.java @@ -1,14 +1,14 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.common.event.UserOnlineEvent; import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.enums.ChatActiveStatusEnum; import com.abin.mallchat.common.user.service.IpService; +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.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserRegisterListener.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserRegisterListener.java index d6d2775..8a1c0d6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/event/listener/UserRegisterListener.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.event.listener; +package com.abin.mallchat.common.common.event.listener; import com.abin.mallchat.common.common.domain.enums.IdempotentEnum; import com.abin.mallchat.common.common.event.UserRegisterEvent; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/BusinessErrorEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/BusinessErrorEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/BusinessErrorEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/BusinessErrorEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/BusinessException.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/BusinessException.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/BusinessException.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/BusinessException.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/CommonErrorEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/ErrorEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/ErrorEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/ErrorEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/ErrorEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/FrequencyControlException.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/FrequencyControlException.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/FrequencyControlException.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/FrequencyControlException.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java similarity index 75% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java index 29a44eb..b0cd55b 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/factory/MyThreadFactory.java @@ -8,13 +8,13 @@ import java.util.concurrent.ThreadFactory; @Slf4j @AllArgsConstructor -public class MyThreadFactory implements ThreadFactory { +public class MyThreadFactory implements ThreadFactory { - private final ThreadFactory factory; + private final ThreadFactory factory; @Override public Thread newThread(Runnable r) { - Thread thread =factory.newThread(r); + Thread thread = factory.newThread(r); thread.setUncaughtExceptionHandler(GlobalUncaughtExceptionHandler.getInstance()); return thread; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java similarity index 66% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java index 6a65030..33f27c8 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/handler/GlobalUncaughtExceptionHandler.java @@ -3,9 +3,9 @@ package com.abin.mallchat.common.common.handler; import lombok.extern.slf4j.Slf4j; @Slf4j -public class GlobalUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler { +public class GlobalUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler { - private static final GlobalUncaughtExceptionHandler instance = new GlobalUncaughtExceptionHandler(); + private static final GlobalUncaughtExceptionHandler instance = new GlobalUncaughtExceptionHandler(); private GlobalUncaughtExceptionHandler() { } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/BlackInterceptor.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/BlackInterceptor.java index 9336b30..68881ac 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/BlackInterceptor.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.intecepter; +package com.abin.mallchat.common.common.intecepter; import cn.hutool.core.collection.CollectionUtil; import com.abin.mallchat.common.common.domain.dto.RequestInfo; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/CollectorInterceptor.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/CollectorInterceptor.java index afd440a..58cb499 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/CollectorInterceptor.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.intecepter; +package com.abin.mallchat.common.common.intecepter; import cn.hutool.extra.servlet.ServletUtil; import com.abin.mallchat.common.common.domain.dto.RequestInfo; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/HttpTraceIdFilter.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/HttpTraceIdFilter.java index a8d1c7b..3ddbc49 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/HttpTraceIdFilter.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.intecepter; +package com.abin.mallchat.common.common.intecepter; import com.abin.mallchat.common.common.constant.MDCKey; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/TokenInterceptor.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/TokenInterceptor.java index 814297b..750f87e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/TokenInterceptor.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.common.intecepter; +package com.abin.mallchat.common.common.intecepter; import com.abin.mallchat.common.common.constant.MDCKey; import com.abin.mallchat.common.common.exception.HttpErrorEnum; -import com.abin.mallchat.custom.user.service.LoginService; +import com.abin.mallchat.common.user.service.LoginService; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/WebLogAspect.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/WebLogAspect.java index 0009183..d51cc70 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/intecepter/WebLogAspect.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.common.intecepter; +package com.abin.mallchat.common.common.intecepter; import cn.hutool.core.date.StopWatch; import cn.hutool.json.JSONUtil; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/LockService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/LockService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractLocalCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractLocalCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractLocalCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractLocalCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractRedisStringCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractRedisStringCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractRedisStringCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/AbstractRedisStringCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/BatchCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/BatchCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/cache/BatchCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/cache/BatchCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/AbstractFrequencyControlService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/AbstractFrequencyControlService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/AbstractFrequencyControlService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/AbstractFrequencyControlService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlStrategyFactory.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlStrategyFactory.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlStrategyFactory.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlStrategyFactory.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlUtil.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlUtil.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlUtil.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/FrequencyControlUtil.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/TotalCountWithInFixTimeFrequencyController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/TotalCountWithInFixTimeFrequencyController.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/TotalCountWithInFixTimeFrequencyController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/service/frequencycontrol/TotalCountWithInFixTimeFrequencyController.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java similarity index 94% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java index 0301132..45aa48e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java @@ -33,17 +33,19 @@ public class AssertUtil { /** * 注解验证参数(校验到失败就结束) + * * @param obj */ public static void fastFailValidate(T obj) { Set> constraintViolations = failFastValidator.validate(obj); if (constraintViolations.size() > 0) { - throwException(CommonErrorEnum.PARAM_VALID,constraintViolations.iterator().next().getMessage()); + throwException(CommonErrorEnum.PARAM_VALID, constraintViolations.iterator().next().getMessage()); } } /** * 注解验证参数(全部校验,抛出异常) + * * @param obj */ public static void allCheckValidateThrow(T obj) { @@ -64,16 +66,17 @@ public class AssertUtil { /** * 注解验证参数(全部校验,返回异常信息集合) + * * @param obj */ - public static Map allCheckValidate(T obj) { + public static Map allCheckValidate(T obj) { Set> constraintViolations = validator.validate(obj); if (constraintViolations.size() > 0) { - Map errorMessages= new HashMap<>(); + Map errorMessages = new HashMap<>(); Iterator> iterator = constraintViolations.iterator(); while (iterator.hasNext()) { ConstraintViolation violation = iterator.next(); - errorMessages.put(violation.getPropertyPath().toString(),violation.getMessage()); + errorMessages.put(violation.getPropertyPath().toString(), violation.getMessage()); } return errorMessages; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/DateUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/DateUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/DateUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/DateUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/LambdaUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/LambdaUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/LambdaUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/LambdaUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java similarity index 99% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java index d6f29e7..8a6b5cb 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java @@ -5,7 +5,10 @@ import com.abin.mallchat.utils.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.Cursor; +import org.springframework.data.redis.core.RedisConnectionUtils; +import org.springframework.data.redis.core.ScanOptions; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ZSetOperations.TypedTuple; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; @@ -47,14 +50,15 @@ public class RedisUtils { public static Integer integerInc(String key, int time, TimeUnit unit) { RedisScript redisScript = new DefaultRedisScript<>(LUA_INCR_EXPIRE, Long.class); Long result = stringRedisTemplate.execute(redisScript, Collections.singletonList(key), String.valueOf(unit.toSeconds(time))); - try{ + try { return Integer.parseInt(result.toString()); - }catch (Exception e) { + } catch (Exception e) { RedisUtils.del(key); throw e; } } - /** + + /** * 指定缓存失效时间 * * @param key 键 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RequestHolder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/RequestHolder.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RequestHolder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/RequestHolder.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java similarity index 99% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java index 32cfaef..d800d1c 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlDiscover.java @@ -11,7 +11,6 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.springframework.data.util.Pair; -import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.HashMap; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java similarity index 88% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java index dd55618..4da747b 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlDiscover.java @@ -1,15 +1,8 @@ package com.abin.mallchat.common.common.utils.discover; import cn.hutool.core.util.StrUtil; -import io.jsonwebtoken.lang.Objects; -import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.jsoup.nodes.Document; -import org.jsoup.select.Elements; - -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; /** * @author zhaoqichao diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java similarity index 95% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java index eef3c11..6ce3d88 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlDiscover.java @@ -50,7 +50,7 @@ public class PrioritizedUrlDiscover extends AbstractUrlDiscover { @Override public String getImage(String url, Document document) { for (UrlDiscover urlDiscover : urlDiscovers) { - String urlImage = urlDiscover.getImage(url,document); + String urlImage = urlDiscover.getImage(url, document); if (StrUtil.isNotBlank(urlImage)) { return urlImage; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java similarity index 93% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java index 3515c28..84cdfbb 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlDiscover.java @@ -1,7 +1,6 @@ package com.abin.mallchat.common.common.utils.discover; import cn.hutool.core.date.StopWatch; -import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.common.utils.discover.domain.UrlInfo; import org.jsoup.nodes.Document; @@ -16,7 +15,7 @@ public interface UrlDiscover { @Nullable - Map getUrlContentMap(String content); + Map getUrlContentMap(String content); @Nullable UrlInfo getContent(String url); diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java similarity index 95% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java index ccf193e..88496dc 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/WxUrlDiscover.java @@ -26,6 +26,6 @@ public class WxUrlDiscover extends AbstractUrlDiscover { @Override public String getImage(String url, Document document) { String href = document.getElementsByAttributeValue("property", "og:image").attr("content"); - return isConnect(href) ? href: null; + return isConnect(href) ? href : null; } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java similarity index 89% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java index 8f02b7c..ad9d076 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/discover/domain/UrlInfo.java @@ -15,17 +15,17 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class UrlInfo { /** - * 标题 + * 标题 **/ String title; /** - * 描述 + * 描述 **/ String description; /** - * 网站LOGO + * 网站LOGO **/ String image; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/MinIOTemplate.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssFile.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssProperties.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/OssType.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssReq.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/oss/domain/OssResp.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java similarity index 99% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java index 618908f..19fc589 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/ACFilter.java @@ -12,7 +12,7 @@ import java.util.Objects; * 基于ac自动机实现的敏感词过滤工具类 * 可以用来替代{@link ConcurrentHistogram} * 为了兼容提供了相同的api接口 {@code hasSensitiveWord} - * + *

* Created by berg on 2023/6/18. */ public class ACFilter implements SensitiveWordFilter { diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java similarity index 99% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java index e766e2e..2a90a53 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/DFAFilter.java @@ -22,6 +22,7 @@ public final class DFAFilter implements SensitiveWordFilter { private DFAFilter() { } + private static Word root = new Word(' '); // 敏感词字典的根节点 private final static char replace = '*'; // 替代字符 private final static String skipChars = " !*-+_=,，.@;:；：。、？?（）()【】[]《》<>“”\"‘’"; // 遇到这些字符就会跳过 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java similarity index 97% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java index 4259c91..a3b6822 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/IWordDeny.java @@ -11,6 +11,7 @@ import java.util.List; public interface IWordDeny { /** * 获取结果 + * * @return 结果 * @since 0.0.13 */ diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java similarity index 99% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java index 006fd2f..44917f6 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordBs.java @@ -32,10 +32,11 @@ public class SensitiveWordBs { /** * 初始化 - * + *

* 1. 根据配置，初始化对应的 map。比较消耗性能。 - * @since 0.0.13 + * * @return this + * @since 0.0.13 */ public SensitiveWordBs init() { @@ -68,8 +69,6 @@ public class SensitiveWordBs { } - - /** * 有敏感词 * diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordFilter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordFilter.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordFilter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/utils/sensitiveWord/SensitiveWordFilter.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/MyWordDeny.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/MyWordDeny.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/MyWordDeny.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/MyWordDeny.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/dao/SensitiveWordDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/dao/SensitiveWordDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/dao/SensitiveWordDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/dao/SensitiveWordDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/domain/SensitiveWord.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/domain/SensitiveWord.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/domain/SensitiveWord.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/domain/SensitiveWord.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/mapper/SensitiveWordMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/mapper/SensitiveWordMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/sensitive/mapper/SensitiveWordMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/sensitive/mapper/SensitiveWordMapper.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/MsgLoginConsumer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/MsgLoginConsumer.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/MsgLoginConsumer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/MsgLoginConsumer.java index 501b84c..b1606c6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/MsgLoginConsumer.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/MsgLoginConsumer.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.user.consumer; +package com.abin.mallchat.common.user.consumer; import com.abin.mallchat.common.common.constant.MQConstant; import com.abin.mallchat.common.common.domain.dto.LoginMessageDTO; -import com.abin.mallchat.custom.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.WebSocketService; import org.apache.rocketmq.spring.annotation.MessageModel; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/PushConsumer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/PushConsumer.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/PushConsumer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/PushConsumer.java index 84cd50c..cff6fb5 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/PushConsumer.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/PushConsumer.java @@ -1,9 +1,9 @@ -package com.abin.mallchat.custom.user.consumer; +package com.abin.mallchat.common.user.consumer; import com.abin.mallchat.common.common.constant.MQConstant; import com.abin.mallchat.common.common.domain.dto.PushMessageDTO; import com.abin.mallchat.common.user.domain.enums.WSPushTypeEnum; -import com.abin.mallchat.custom.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.WebSocketService; import org.apache.rocketmq.spring.annotation.MessageModel; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/ScanSuccessConsumer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/ScanSuccessConsumer.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/ScanSuccessConsumer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/ScanSuccessConsumer.java index d5f0091..44d017a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/consumer/ScanSuccessConsumer.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/consumer/ScanSuccessConsumer.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.user.consumer; +package com.abin.mallchat.common.user.consumer; import com.abin.mallchat.common.common.constant.MQConstant; import com.abin.mallchat.common.common.domain.dto.ScanSuccessMessageDTO; -import com.abin.mallchat.custom.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.WebSocketService; import org.apache.rocketmq.spring.annotation.MessageModel; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/FriendController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/FriendController.java similarity index 84% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/FriendController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/FriendController.java index e67be0e..5c0ef63 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/FriendController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/FriendController.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.controller; +package com.abin.mallchat.common.user.controller; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; @@ -7,15 +7,15 @@ 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.PageBaseResp; import com.abin.mallchat.common.common.utils.RequestHolder; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApplyReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApproveReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendCheckReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendDeleteReq; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendApplyResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendCheckResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendUnreadResp; import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApplyReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApproveReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendCheckReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendDeleteReq; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendApplyResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendCheckResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendUnreadResp; -import com.abin.mallchat.custom.user.service.FriendService; +import com.abin.mallchat.common.user.service.FriendService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/OssController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java similarity index 86% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/OssController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java index 5221c21..813e9c5 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/OssController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/OssController.java @@ -1,10 +1,10 @@ -package com.abin.mallchat.custom.user.controller; +package com.abin.mallchat.common.user.controller; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.common.utils.oss.domain.OssResp; -import com.abin.mallchat.custom.user.domain.vo.request.oss.UploadUrlReq; -import com.abin.mallchat.custom.user.service.OssService; +import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; +import com.abin.mallchat.common.user.service.OssService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserController.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserController.java index 3380edc..c405a29 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserController.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.controller; +package com.abin.mallchat.common.user.controller; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; @@ -7,11 +7,11 @@ import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.user.domain.dto.ItemInfoDTO; import com.abin.mallchat.common.user.domain.dto.SummeryInfoDTO; import com.abin.mallchat.common.user.domain.enums.RoleEnum; +import com.abin.mallchat.common.user.domain.vo.request.user.*; +import com.abin.mallchat.common.user.domain.vo.response.user.BadgeResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; import com.abin.mallchat.common.user.service.IRoleService; -import com.abin.mallchat.custom.user.domain.vo.request.user.*; -import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; -import com.abin.mallchat.custom.user.service.UserService; +import com.abin.mallchat.common.user.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserEmojiController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserEmojiController.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserEmojiController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserEmojiController.java index 9692359..920fa63 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserEmojiController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/UserEmojiController.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.user.controller; +package com.abin.mallchat.common.user.controller; 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.IdRespVO; import com.abin.mallchat.common.common.utils.RequestHolder; -import com.abin.mallchat.custom.user.domain.vo.request.user.UserEmojiReq; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserEmojiResp; -import com.abin.mallchat.custom.user.service.UserEmojiService; +import com.abin.mallchat.common.user.domain.vo.request.user.UserEmojiReq; +import com.abin.mallchat.common.user.domain.vo.response.user.UserEmojiResp; +import com.abin.mallchat.common.user.service.UserEmojiService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/WxPortalController.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/WxPortalController.java index cc2cbc4..1b0fb34 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/controller/WxPortalController.java @@ -1,6 +1,6 @@ -package com.abin.mallchat.custom.user.controller; +package com.abin.mallchat.common.user.controller; -import com.abin.mallchat.custom.user.service.WxMsgService; +import com.abin.mallchat.common.user.service.WxMsgService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserEmojiDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserEmojiDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserEmojiDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserEmojiDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/IpResult.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/IpResult.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/IpResult.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/IpResult.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/ItemInfoDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/ItemInfoDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/ItemInfoDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/ItemInfoDTO.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/SummeryInfoDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/SummeryInfoDTO.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/dto/SummeryInfoDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/SummeryInfoDTO.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/WSChannelExtraDTO.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/WSChannelExtraDTO.java index 9a920e5..a77cdb4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/dto/WSChannelExtraDTO.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.dto.ws; +package com.abin.mallchat.common.user.domain.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserApply.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserApply.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserApply.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserApply.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserEmoji.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserEmoji.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserEmoji.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserEmoji.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserFriend.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyReadStatusEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyReadStatusEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyReadStatusEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyReadStatusEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyStatusEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyStatusEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyStatusEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyStatusEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ApplyTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ChatActiveStatusEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ChatActiveStatusEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ChatActiveStatusEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ChatActiveStatusEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/ItemTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/OssSceneEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/OssSceneEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/OssSceneEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/OssSceneEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSBaseResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSBaseResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSBaseResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSBaseResp.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSPushTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSPushTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSPushTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSPushTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSReqTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSReqTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSReqTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSReqTypeEnum.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSRespTypeEnum.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSRespTypeEnum.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/WSRespTypeEnum.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/enums/WSRespTypeEnum.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApplyReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApplyReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApplyReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApplyReq.java index 6897ddd..804c7d9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApplyReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApplyReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.friend; +package com.abin.mallchat.common.user.domain.vo.request.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApproveReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApproveReq.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApproveReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApproveReq.java index 94a9b74..1a1aed4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendApproveReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendApproveReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.friend; +package com.abin.mallchat.common.user.domain.vo.request.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendCheckReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendCheckReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendCheckReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendCheckReq.java index f5d71b1..773a27e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendCheckReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendCheckReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.friend; +package com.abin.mallchat.common.user.domain.vo.request.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendDeleteReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendDeleteReq.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendDeleteReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendDeleteReq.java index 6f01201..09e6014 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/friend/FriendDeleteReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/friend/FriendDeleteReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.friend; +package com.abin.mallchat.common.user.domain.vo.request.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/oss/UploadUrlReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/oss/UploadUrlReq.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/oss/UploadUrlReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/oss/UploadUrlReq.java index df1f473..6b37de8 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/oss/UploadUrlReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/oss/UploadUrlReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.oss; +package com.abin.mallchat.common.user.domain.vo.request.oss; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/BlackReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/BlackReq.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/BlackReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/BlackReq.java index 99c88b0..e67dc01 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/BlackReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/BlackReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/EmojisPageReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/EmojisPageReq.java similarity index 80% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/EmojisPageReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/EmojisPageReq.java index 9dfe00f..6118ca6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/EmojisPageReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/EmojisPageReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; import lombok.Data; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ItemInfoReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ItemInfoReq.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ItemInfoReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ItemInfoReq.java index 8d60c86..ee996f3 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ItemInfoReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ItemInfoReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ModifyNameReq.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ModifyNameReq.java index a87b6e1..6e8b939 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/ModifyNameReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/SummeryInfoReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/SummeryInfoReq.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/SummeryInfoReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/SummeryInfoReq.java index 79b9ad2..015eca6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/SummeryInfoReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/SummeryInfoReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/UserEmojiReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/UserEmojiReq.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/UserEmojiReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/UserEmojiReq.java index 5a31343..61214b0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/UserEmojiReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/UserEmojiReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/WearingBadgeReq.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/WearingBadgeReq.java index 2426a18..d6f1e4b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/user/WearingBadgeReq.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.request.user; +package com.abin.mallchat.common.user.domain.vo.request.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSAuthorize.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSAuthorize.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSAuthorize.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSAuthorize.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSBaseReq.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSBaseReq.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSBaseReq.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/request/ws/WSBaseReq.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendApplyResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendApplyResp.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendApplyResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendApplyResp.java index 460bf8c..05ad78a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendApplyResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendApplyResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.friend; +package com.abin.mallchat.common.user.domain.vo.response.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendCheckResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendCheckResp.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendCheckResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendCheckResp.java index d03434d..2f55a7b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendCheckResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendCheckResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.friend; +package com.abin.mallchat.common.user.domain.vo.response.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendResp.java similarity index 87% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendResp.java index 04715f6..3423fc5 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.friend; +package com.abin.mallchat.common.user.domain.vo.response.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendUnreadResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendUnreadResp.java similarity index 87% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendUnreadResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendUnreadResp.java index c2ab89a..73f088a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/friend/FriendUnreadResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/friend/FriendUnreadResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.friend; +package com.abin.mallchat.common.user.domain.vo.response.friend; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/BadgeResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/BadgeResp.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/BadgeResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/BadgeResp.java index 8da2ed1..3717531 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/BadgeResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/BadgeResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.user; +package com.abin.mallchat.common.user.domain.vo.response.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserEmojiResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserEmojiResp.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserEmojiResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserEmojiResp.java index 696393d..32a3053 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserEmojiResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserEmojiResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.user; +package com.abin.mallchat.common.user.domain.vo.response.user; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserInfoResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserInfoResp.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserInfoResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserInfoResp.java index 9dbc230..832b03c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/user/UserInfoResp.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/user/UserInfoResp.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.domain.vo.response.user; +package com.abin.mallchat.common.user.domain.vo.response.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/ChatMemberResp.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/ChatMemberResp.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/ChatMemberResp.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/ChatMemberResp.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSBlack.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSBlack.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSBlack.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSBlack.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSFriendApply.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSFriendApply.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSFriendApply.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSFriendApply.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginSuccess.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginSuccess.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginSuccess.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginSuccess.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginUrl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginUrl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginUrl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSLoginUrl.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMemberChange.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMemberChange.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMemberChange.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMemberChange.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessage.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessage.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessage.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessage.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessageRead.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessageRead.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessageRead.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMessageRead.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgMark.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgMark.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgMark.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgMark.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgRecall.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgRecall.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgRecall.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSMsgRecall.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSOnlineOfflineNotify.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSOnlineOfflineNotify.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSOnlineOfflineNotify.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/domain/vo/response/ws/WSOnlineOfflineNotify.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/BlackMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/BlackMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/BlackMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/BlackMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/ItemConfigMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/ItemConfigMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/ItemConfigMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/ItemConfigMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserApplyMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserBackpackMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserBackpackMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserBackpackMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserBackpackMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojiMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojiMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojiMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojiMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserEmojisMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserFriendMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserFriendMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserFriendMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserFriendMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserMapper.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/FriendService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/FriendService.java similarity index 80% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/FriendService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/FriendService.java index cf1edd6..c275cd6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/FriendService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/FriendService.java @@ -1,16 +1,16 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; import com.abin.mallchat.common.common.domain.vo.request.PageBaseReq; import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp; import com.abin.mallchat.common.common.domain.vo.response.PageBaseResp; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApplyReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApproveReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendCheckReq; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendApplyResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendCheckResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendUnreadResp; import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApplyReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApproveReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendCheckReq; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendApplyResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendCheckResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendUnreadResp; /** * @author : limeng diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IpService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/IpService.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/LoginService.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/LoginService.java index 3f57542..7f70058 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/LoginService.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; /** * Description: 登录相关处理类 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/OssService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java similarity index 75% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/OssService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java index 926d4ba..63c2cca 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/OssService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/OssService.java @@ -1,7 +1,7 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.common.utils.oss.domain.OssResp; -import com.abin.mallchat.custom.user.domain.vo.request.oss.UploadUrlReq; +import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; /** *

diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserEmojiService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserEmojiService.java similarity index 83% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserEmojiService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserEmojiService.java index 302a58b..210ddf4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserEmojiService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserEmojiService.java @@ -1,9 +1,9 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; import com.abin.mallchat.common.common.domain.vo.response.IdRespVO; -import com.abin.mallchat.custom.user.domain.vo.request.user.UserEmojiReq; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserEmojiResp; +import com.abin.mallchat.common.user.domain.vo.request.user.UserEmojiReq; +import com.abin.mallchat.common.user.domain.vo.response.user.UserEmojiResp; import java.util.List; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserService.java similarity index 83% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserService.java index 7047ed7..239e843 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/UserService.java @@ -1,11 +1,11 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.user.domain.dto.ItemInfoDTO; import com.abin.mallchat.common.user.domain.dto.SummeryInfoDTO; import com.abin.mallchat.common.user.domain.entity.User; -import com.abin.mallchat.custom.user.domain.vo.request.user.*; -import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.domain.vo.request.user.*; +import com.abin.mallchat.common.user.domain.vo.response.user.BadgeResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; import java.util.List; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WebSocketService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WebSocketService.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WebSocketService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WebSocketService.java index d849e4e..7ea1424 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WebSocketService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WebSocketService.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.user.domain.enums.WSBaseResp; import com.abin.mallchat.common.user.domain.vo.request.ws.WSAuthorize; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WxMsgService.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WxMsgService.java index 09ff8f0..dee8748 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/WxMsgService.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service; +package com.abin.mallchat.common.user.service; import cn.hutool.core.util.RandomUtil; import com.abin.mallchat.common.common.constant.MQConstant; @@ -8,8 +8,8 @@ import com.abin.mallchat.common.common.domain.dto.ScanSuccessMessageDTO; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.User; -import com.abin.mallchat.custom.user.service.adapter.TextBuilder; -import com.abin.mallchat.custom.user.service.adapter.UserAdapter; +import com.abin.mallchat.common.user.service.adapter.TextBuilder; +import com.abin.mallchat.common.user.service.adapter.UserAdapter; import com.abin.mallchat.transaction.service.MQProducer; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/AbstractBuilder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/AbstractBuilder.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/AbstractBuilder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/AbstractBuilder.java index 7d92567..3a7c90b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/AbstractBuilder.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/AbstractBuilder.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/FriendAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/FriendAdapter.java similarity index 89% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/FriendAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/FriendAdapter.java index 48b61a7..bd99eb5 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/FriendAdapter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/FriendAdapter.java @@ -1,8 +1,8 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import com.abin.mallchat.common.user.domain.entity.UserApply; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApplyReq; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendApplyResp; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApplyReq; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendApplyResp; import java.util.List; import java.util.stream.Collectors; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/ImageBuilder.java similarity index 92% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/ImageBuilder.java index ecee176..0896fc2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/ImageBuilder.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/TextBuilder.java similarity index 84% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/TextBuilder.java index 8d351d0..88ced5d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/TextBuilder.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; @@ -8,9 +8,8 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage; /** * @author Binary Wang */ -public class TextBuilder extends AbstractBuilder { +public class TextBuilder { - @Override public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage, WxMpService service) { WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content(content) diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/UserAdapter.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/UserAdapter.java index e319b4d..188e56c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/UserAdapter.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -7,8 +7,8 @@ import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; import com.abin.mallchat.common.user.domain.entity.ItemConfig; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.entity.UserBackpack; -import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.domain.vo.response.user.BadgeResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/WSAdapter.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/WSAdapter.java index 5c2f0aa..adebf5c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/adapter/WSAdapter.java @@ -1,16 +1,16 @@ -package com.abin.mallchat.custom.user.service.adapter; +package com.abin.mallchat.common.user.service.adapter; import cn.hutool.core.bean.BeanUtil; import com.abin.mallchat.common.chat.domain.dto.ChatMessageMarkDTO; import com.abin.mallchat.common.chat.domain.dto.ChatMsgRecallDTO; +import com.abin.mallchat.common.chat.domain.vo.response.ChatMemberStatisticResp; import com.abin.mallchat.common.chat.domain.vo.response.ChatMessageResp; +import com.abin.mallchat.common.chat.service.ChatService; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.enums.ChatActiveStatusEnum; import com.abin.mallchat.common.user.domain.enums.WSBaseResp; import com.abin.mallchat.common.user.domain.enums.WSRespTypeEnum; import com.abin.mallchat.common.user.domain.vo.response.ws.*; -import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp; -import com.abin.mallchat.custom.chat.service.ChatService; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserInfoCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserInfoCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserInfoCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserInfoCache.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserSummaryCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserSummaryCache.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserSummaryCache.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/cache/UserSummaryCache.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/AbstractHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/AbstractHandler.java similarity index 85% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/AbstractHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/AbstractHandler.java index 29a33b0..af97562 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/AbstractHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/AbstractHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.handler; +package com.abin.mallchat.common.user.service.handler; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import org.slf4j.Logger; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/LogHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/LogHandler.java similarity index 93% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/LogHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/LogHandler.java index f4959ab..018f766 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/LogHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/LogHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.handler; +package com.abin.mallchat.common.user.service.handler; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/MsgHandler.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/MsgHandler.java index 7072a01..15c9f9e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/MsgHandler.java @@ -1,9 +1,9 @@ -package com.abin.mallchat.custom.user.service.handler; +package com.abin.mallchat.common.user.service.handler; import cn.hutool.json.JSONUtil; import com.abin.mallchat.common.chat.dao.WxMsgDao; import com.abin.mallchat.common.chat.domain.entity.WxMsg; -import com.abin.mallchat.custom.user.service.adapter.TextBuilder; +import com.abin.mallchat.common.user.service.adapter.TextBuilder; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/ScanHandler.java similarity index 88% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/ScanHandler.java index f94dd73..1b8552e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/ScanHandler.java @@ -1,6 +1,6 @@ -package com.abin.mallchat.custom.user.service.handler; +package com.abin.mallchat.common.user.service.handler; -import com.abin.mallchat.custom.user.service.WxMsgService; +import com.abin.mallchat.common.user.service.WxMsgService; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/SubscribeHandler.java similarity index 90% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/SubscribeHandler.java index e06793b..b3fc0c0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/handler/SubscribeHandler.java @@ -1,7 +1,7 @@ -package com.abin.mallchat.custom.user.service.handler; +package com.abin.mallchat.common.user.service.handler; -import com.abin.mallchat.custom.user.service.WxMsgService; -import com.abin.mallchat.custom.user.service.adapter.TextBuilder; +import com.abin.mallchat.common.user.service.WxMsgService; +import com.abin.mallchat.common.user.service.adapter.TextBuilder; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/FriendServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/FriendServiceImpl.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/FriendServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/FriendServiceImpl.java index d9e56e9..74c139b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/FriendServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/FriendServiceImpl.java @@ -1,10 +1,13 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.abin.mallchat.common.chat.dao.RoomFriendDao; import com.abin.mallchat.common.chat.domain.entity.RoomFriend; +import com.abin.mallchat.common.chat.service.ChatService; import com.abin.mallchat.common.chat.service.ContactService; import com.abin.mallchat.common.chat.service.RoomService; +import com.abin.mallchat.common.chat.service.adapter.MemberAdapter; +import com.abin.mallchat.common.chat.service.adapter.MessageAdapter; 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.request.PageBaseReq; @@ -18,18 +21,15 @@ import com.abin.mallchat.common.user.dao.UserFriendDao; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.entity.UserApply; import com.abin.mallchat.common.user.domain.entity.UserFriend; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApplyReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendApproveReq; +import com.abin.mallchat.common.user.domain.vo.request.friend.FriendCheckReq; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendApplyResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendCheckResp; +import com.abin.mallchat.common.user.domain.vo.response.friend.FriendUnreadResp; import com.abin.mallchat.common.user.domain.vo.response.ws.ChatMemberResp; -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.user.domain.vo.request.friend.FriendApplyReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendApproveReq; -import com.abin.mallchat.custom.user.domain.vo.request.friend.FriendCheckReq; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendApplyResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendCheckResp; -import com.abin.mallchat.custom.user.domain.vo.response.friend.FriendUnreadResp; -import com.abin.mallchat.custom.user.service.FriendService; -import com.abin.mallchat.custom.user.service.adapter.FriendAdapter; +import com.abin.mallchat.common.user.service.FriendService; +import com.abin.mallchat.common.user.service.adapter.FriendAdapter; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/LoginServiceImpl.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/LoginServiceImpl.java index 3ab066d..c7c17ba 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/LoginServiceImpl.java @@ -1,10 +1,10 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.utils.JwtUtils; import com.abin.mallchat.common.common.utils.RedisUtils; -import com.abin.mallchat.custom.user.service.LoginService; +import com.abin.mallchat.common.user.service.LoginService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/OssServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java similarity index 86% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/OssServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java index f3bc0fe..10dc2e2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/OssServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/OssServiceImpl.java @@ -1,12 +1,12 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import com.abin.mallchat.common.common.utils.AssertUtil; import com.abin.mallchat.common.common.utils.oss.MinIOTemplate; import com.abin.mallchat.common.common.utils.oss.domain.OssReq; import com.abin.mallchat.common.common.utils.oss.domain.OssResp; import com.abin.mallchat.common.user.domain.enums.OssSceneEnum; -import com.abin.mallchat.custom.user.domain.vo.request.oss.UploadUrlReq; -import com.abin.mallchat.custom.user.service.OssService; +import com.abin.mallchat.common.user.domain.vo.request.oss.UploadUrlReq; +import com.abin.mallchat.common.user.service.OssService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/PushService.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/PushService.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/PushService.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/PushService.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java similarity index 100% rename from mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserEmojiServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserEmojiServiceImpl.java similarity index 91% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserEmojiServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserEmojiServiceImpl.java index 3a0b882..f01d827 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserEmojiServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserEmojiServiceImpl.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import com.abin.mallchat.common.common.annotation.RedissonLock; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; @@ -6,9 +6,9 @@ import com.abin.mallchat.common.common.domain.vo.response.IdRespVO; import com.abin.mallchat.common.common.utils.AssertUtil; import com.abin.mallchat.common.user.dao.UserEmojiDao; import com.abin.mallchat.common.user.domain.entity.UserEmoji; -import com.abin.mallchat.custom.user.domain.vo.request.user.UserEmojiReq; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserEmojiResp; -import com.abin.mallchat.custom.user.service.UserEmojiService; +import com.abin.mallchat.common.user.domain.vo.request.user.UserEmojiReq; +import com.abin.mallchat.common.user.domain.vo.response.user.UserEmojiResp; +import com.abin.mallchat.common.user.service.UserEmojiService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserServiceImpl.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserServiceImpl.java index 1385f1a..66d84db 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.common.event.UserBlackEvent; @@ -18,14 +18,14 @@ import com.abin.mallchat.common.user.domain.entity.UserBackpack; import com.abin.mallchat.common.user.domain.enums.BlackTypeEnum; import com.abin.mallchat.common.user.domain.enums.ItemEnum; import com.abin.mallchat.common.user.domain.enums.ItemTypeEnum; +import com.abin.mallchat.common.user.domain.vo.request.user.*; +import com.abin.mallchat.common.user.domain.vo.response.user.BadgeResp; +import com.abin.mallchat.common.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.common.user.service.UserService; +import com.abin.mallchat.common.user.service.adapter.UserAdapter; import com.abin.mallchat.common.user.service.cache.ItemCache; import com.abin.mallchat.common.user.service.cache.UserCache; import com.abin.mallchat.common.user.service.cache.UserSummaryCache; -import com.abin.mallchat.custom.user.domain.vo.request.user.*; -import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; -import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; -import com.abin.mallchat.custom.user.service.UserService; -import com.abin.mallchat.custom.user.service.adapter.UserAdapter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/WebSocketServiceImpl.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/WebSocketServiceImpl.java index 2d9743c..492f227 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/user/service/impl/WebSocketServiceImpl.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.service.impl; +package com.abin.mallchat.common.user.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; @@ -10,17 +10,17 @@ import com.abin.mallchat.common.common.event.UserOfflineEvent; import com.abin.mallchat.common.common.event.UserOnlineEvent; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.common.user.dao.UserDao; +import com.abin.mallchat.common.user.domain.dto.WSChannelExtraDTO; import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.enums.RoleEnum; import com.abin.mallchat.common.user.domain.enums.WSBaseResp; import com.abin.mallchat.common.user.domain.vo.request.ws.WSAuthorize; import com.abin.mallchat.common.user.service.IRoleService; +import com.abin.mallchat.common.user.service.LoginService; +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.custom.user.domain.dto.ws.WSChannelExtraDTO; -import com.abin.mallchat.custom.user.service.LoginService; -import com.abin.mallchat.custom.user.service.WebSocketService; -import com.abin.mallchat.custom.user.service.adapter.WSAdapter; -import com.abin.mallchat.custom.user.websocket.NettyUtil; +import com.abin.mallchat.common.websocket.NettyUtil; import com.abin.mallchat.transaction.service.MQProducer; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @@ -104,7 +104,7 @@ public class WebSocketServiceImpl implements WebSocketService { */ @SneakyThrows @Override - @FrequencyControl(time = 1000, count = 50, spEl = "T(com.abin.mallchat.custom.user.websocket.NettyUtil).getAttr(#channel,T(com.abin.mallchat.custom.user.websocket.NettyUtil).IP)") + @FrequencyControl(time = 1000, count = 50, spEl = "T(com.abin.mallchat.common.websocket.NettyUtil).getAttr(#channel,T(com.abin.mallchat.common.websocket.NettyUtil).IP)") public void handleLoginReq(Channel channel) { //生成随机不重复的登录码,并将channel存在本地cache中 Integer code = generateLoginCode(channel); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/HttpHeadersHandler.java similarity index 97% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/HttpHeadersHandler.java index 6752060..3f26427 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/HttpHeadersHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.websocket; +package com.abin.mallchat.common.websocket; import cn.hutool.core.net.url.UrlBuilder; import io.netty.channel.ChannelHandlerContext; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyUtil.java similarity index 95% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyUtil.java index bcc5b05..17f4883 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyUtil.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.websocket; +package com.abin.mallchat.common.websocket; import io.netty.channel.Channel; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServer.java similarity index 98% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServer.java index 4fca13b..88780dd 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServer.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.websocket; +package com.abin.mallchat.common.websocket; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelInitializer; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServerHandler.java similarity index 96% rename from mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java rename to mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServerHandler.java index 7ff3d01..040ee0b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/websocket/NettyWebSocketServerHandler.java @@ -1,4 +1,4 @@ -package com.abin.mallchat.custom.user.websocket; +package com.abin.mallchat.common.websocket; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; @@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil; import com.abin.mallchat.common.user.domain.enums.WSReqTypeEnum; import com.abin.mallchat.common.user.domain.vo.request.ws.WSAuthorize; import com.abin.mallchat.common.user.domain.vo.request.ws.WSBaseReq; -import com.abin.mallchat.custom.user.service.WebSocketService; +import com.abin.mallchat.common.user.service.WebSocketService; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/mallchat-common/src/main/resources/application-pro.properties b/mallchat-chat-server/src/main/resources/application-pro.properties similarity index 100% rename from mallchat-common/src/main/resources/application-pro.properties rename to mallchat-chat-server/src/main/resources/application-pro.properties diff --git a/mallchat-common/src/main/resources/application-test.properties b/mallchat-chat-server/src/main/resources/application-test.properties similarity index 100% rename from mallchat-common/src/main/resources/application-test.properties rename to mallchat-chat-server/src/main/resources/application-test.properties diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-chat-server/src/main/resources/application.yml similarity index 100% rename from mallchat-common/src/main/resources/application.yml rename to mallchat-chat-server/src/main/resources/application.yml diff --git a/mallchat-custom-server/src/main/resources/logback.xml b/mallchat-chat-server/src/main/resources/logback.xml similarity index 94% rename from mallchat-custom-server/src/main/resources/logback.xml rename to mallchat-chat-server/src/main/resources/logback.xml index e3f1476..8896de0 100644 --- a/mallchat-custom-server/src/main/resources/logback.xml +++ b/mallchat-chat-server/src/main/resources/logback.xml @@ -1,8 +1,8 @@ - - + + diff --git a/mallchat-common/src/main/resources/mapper/chat/ContactMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/ContactMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/ContactMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/ContactMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/chat/GroupMemberMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/GroupMemberMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/GroupMemberMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/GroupMemberMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/chat/MessageMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/MessageMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/MessageMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/MessageMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/chat/MessageMarkMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/MessageMarkMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/MessageMarkMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/MessageMarkMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/chat/RoomMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/RoomMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/RoomMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/RoomMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/chat/WxMsgMapper.xml b/mallchat-chat-server/src/main/resources/mapper/chat/WxMsgMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/chat/WxMsgMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/chat/WxMsgMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/BlackMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/BlackMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/BlackMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/BlackMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/ItemConfigMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/ItemConfigMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/ItemConfigMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/ItemConfigMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/RoleMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/RoleMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/RoleMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/RoleMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserApplyMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserApplyMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserApplyMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserApplyMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserBackpackMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserBackpackMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserBackpackMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserBackpackMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserEmojiMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserEmojiMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserEmojiMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserEmojiMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserFriendMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserFriendMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserFriendMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserFriendMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserMapper.xml diff --git a/mallchat-common/src/main/resources/mapper/user/UserRoleMapper.xml b/mallchat-chat-server/src/main/resources/mapper/user/UserRoleMapper.xml similarity index 100% rename from mallchat-common/src/main/resources/mapper/user/UserRoleMapper.xml rename to mallchat-chat-server/src/main/resources/mapper/user/UserRoleMapper.xml diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserApplyController.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserApplyController.java deleted file mode 100644 index cdd0737..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserApplyController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.abin.mallchat.common.user.controller; - - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - *

- * 用户申请表 前端控制器 - *

- * - * @author abin - * @since 2023-07-16 - */ -@Controller -@RequestMapping("/userApply") -public class UserApplyController { - -} - diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java deleted file mode 100644 index 654c5d3..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/controller/UserFriendController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.abin.mallchat.common.user.controller; - - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - *

- * 用户联系人表 前端控制器 - *

- * - * @author abin - * @since 2023-07-16 - */ -@Controller -@RequestMapping("/userFriend") -public class UserFriendController { - -} - diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IBlackService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IBlackService.java deleted file mode 100644 index 845c226..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IBlackService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.abin.mallchat.common.user.service; - -import com.abin.mallchat.common.user.domain.entity.Black; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 黑名单 服务类 - *

- * - * @author abin - * @since 2023-05-21 - */ -public interface IBlackService extends IService { - -} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IItemConfigService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IItemConfigService.java deleted file mode 100644 index 57add27..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IItemConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.abin.mallchat.common.user.service; - -import com.abin.mallchat.common.user.domain.entity.ItemConfig; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 功能物品配置表 服务类 - *

- * - * @author abin - * @since 2023-03-19 - */ -public interface IItemConfigService extends IService { - -} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserApplyService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserApplyService.java deleted file mode 100644 index 705ac44..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserApplyService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.abin.mallchat.common.user.service; - -import com.abin.mallchat.common.user.domain.entity.UserApply; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 用户申请表 服务类 - *

- * - * @author abin - * @since 2023-07-16 - */ -public interface IUserApplyService extends IService { - -} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserFriendService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserFriendService.java deleted file mode 100644 index 048c380..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserFriendService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.abin.mallchat.common.user.service; - -import com.abin.mallchat.common.user.domain.entity.UserFriend; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 用户联系人表 服务类 - *

- * - * @author abin - * @since 2023-07-16 - */ -public interface IUserFriendService extends IService { - -} diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserRoleService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserRoleService.java deleted file mode 100644 index aac1201..0000000 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserRoleService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.abin.mallchat.common.user.service; - -import com.abin.mallchat.common.user.domain.entity.UserRole; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 用户角色关系表 服务类 - *

- * - * @author abin - * @since 2023-06-04 - */ -public interface IUserRoleService extends IService { - -} diff --git a/mallchat-custom-server/pom.xml b/mallchat-custom-server/pom.xml deleted file mode 100644 index f47902c..0000000 --- a/mallchat-custom-server/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - mallchat - com.abin.mallchat - 1.0-SNAPSHOT - - 4.0.0 - - mallchat-custom-server - - - - com.abin.mallchat - mallchat-common - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - 5.3.19 - test - - - - com.knuddels - jtokkit - 0.6.1 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - \ No newline at end of file diff --git a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/ACTrieTest.java b/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/ACTrieTest.java deleted file mode 100644 index 1d80ab3..0000000 --- a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/ACTrieTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.abin.mallchat.custom.ac; - -import com.abin.mallchat.common.common.algorithm.ac.ACTrie; -import com.abin.mallchat.common.common.algorithm.ac.MatchResult; -import com.google.common.collect.Lists; -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertEquals; - -/** - * Created by berg on 2023/6/18. - */ -public class ACTrieTest { - - private final static List ALPHABET = Lists.newArrayList("abc", "bcd", "cde"); - - private static ACTrie trie(List keywords) { - return new ACTrie(keywords); - } - - @Test - public void test_TextIsLongerThanKeyword() { - final ACTrie trie = trie(ALPHABET); - final String text = " " + ALPHABET.get(0); - List matchResults = trie.matches(text); - checkResult(matchResults.get(0), 1, 4, ALPHABET.get(0), text); - } - - @Test - public void test_VariousKeywordsOneMatch() { - final ACTrie trie = trie(ALPHABET); - final String text = "bcd"; - List matchResults = trie.matches(text); - checkResult(matchResults.get(0), 0, 3, ALPHABET.get(1), text); - } - - @Test - public void test_VariousKeywordsMultiMatch() { - final ACTrie trie = trie(ALPHABET); - final String text = "abcd"; - List matchResults = trie.matches(text); - assertEquals(2, matchResults.size()); - checkResult(matchResults.get(0), 0, 3, ALPHABET.get(0), text); - checkResult(matchResults.get(1), 1, 4, ALPHABET.get(1), text); - } - - @Test - public void test_VariousKeywordsMultiMatch2() { - final ACTrie trie = trie(ALPHABET); - final String text = "abcde"; - List matchResults = trie.matches(text); - assertEquals(3, matchResults.size()); - checkResult(matchResults.get(0), 0, 3, ALPHABET.get(0), text); - checkResult(matchResults.get(1), 1, 4, ALPHABET.get(1), text); - checkResult(matchResults.get(2), 2, 5, ALPHABET.get(2), text); - } - - private void checkResult(MatchResult matchResult, int expectedStart, int expectedEnd, String expectedKeyword, String text) { - assertEquals("Start of match should have been " + expectedStart, expectedStart, matchResult.getStartIndex()); - assertEquals("End of match should have been " + expectedEnd, expectedEnd, matchResult.getEndIndex()); - assertEquals(expectedKeyword, text.substring(expectedStart, expectedEnd)); - } -} diff --git a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java b/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java deleted file mode 100644 index 2acb222..0000000 --- a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.abin.mallchat.custom.ac; - - -import com.auth0.jwt.JWT; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.interfaces.DecodedJWT; -import com.auth0.jwt.interfaces.JWTVerifier; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; - -import java.util.Date; - - -@Slf4j -public class CreateTokenTest { - - @Test - public void create(){ - String token = JWT.create() - .withClaim("uid", 10004L) // 只存一个uid信息，其他的自己去redis查 - .withClaim("createTime", new Date()) - .sign(Algorithm.HMAC256("dsfsdfsdfsdfsd")); // signature - log.info("生成的token为 {}",token); - - - try { - JWTVerifier verifier = JWT.require(Algorithm.HMAC256("dsfsdfsdfsdfsc")).build(); - DecodedJWT jwt = verifier.verify(token); - log.info(jwt.getClaims().toString()); - } catch (Exception e) { - log.info("decode error,token:{}", token, e); - } - } -} diff --git a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/spring/WXTemplate.java b/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/spring/WXTemplate.java deleted file mode 100644 index 12d234e..0000000 --- a/mallchat-custom-server/src/test/java/com/abin/mallchat/custom/spring/WXTemplate.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.abin.mallchat.custom.spring; - -import com.abin.mallchat.custom.chat.service.RoomAppService; -import com.abin.mallchat.custom.chat.service.WeChatMsgOperationService; -import com.abin.mallchat.custom.chat.service.impl.ChatServiceImpl; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.stereotype.Component; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.Collections; - -/** - * Description: 微信模板测试 - * Author: abin - * Date: 2023-07-06 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@Component -public class WXTemplate { - - @Autowired - private WeChatMsgOperationService chatMsgOperationService; - @Autowired - private ChatServiceImpl chatService; - @Autowired - private RoomAppService roomAppService; - - @Test - public void test() { - chatMsgOperationService.publishChatMsgToWeChatUser(1L, Collections.singletonList(10008L), "你家规下去"); - } -} diff --git a/pom.xml b/pom.xml index 34ca18d..2af5e0d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,7 @@ mallchat 1.0-SNAPSHOT - mallchat-common - mallchat-custom-server + mallchat-chat-server mallchat-tools pom