From 8fdba253915b0ff12ae63dca4ca4dd92d5551aec Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 20 Jul 2024 22:59:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implatform/controller/FriendController.java | 4 ++-- .../implatform/controller/GroupController.java | 4 ++-- .../controller/GroupMessageController.java | 4 ++-- .../implatform/controller/LoginController.java | 4 ++-- .../controller/PrivateMessageController.java | 4 ++-- .../implatform/controller/UserController.java | 4 ++-- .../controller/WebrtcGroupController.java | 4 ++-- .../controller/WebrtcPrivateController.java | 4 ++-- .../listener/PrivateMessageListener.java | 4 ++-- .../{IFriendService.java => FriendService.java} | 2 +- ...mberService.java => GroupMemberService.java} | 2 +- ...ageService.java => GroupMessageService.java} | 2 +- .../{IGroupService.java => GroupService.java} | 2 +- ...eService.java => PrivateMessageService.java} | 2 +- .../{IUserService.java => UserService.java} | 2 +- ...roupService.java => WebrtcGroupService.java} | 2 +- ...teService.java => WebrtcPrivateService.java} | 2 +- .../service/impl/FriendServiceImpl.java | 5 ++--- .../service/impl/GroupMemberServiceImpl.java | 4 ++-- .../service/impl/GroupMessageServiceImpl.java | 13 +++++++------ .../service/impl/GroupServiceImpl.java | 16 ++++++++-------- .../service/impl/PrivateMessageServiceImpl.java | 10 +++++----- .../service/impl/UserServiceImpl.java | 12 ++++++------ .../service/impl/WebrtcGroupServiceImpl.java | 16 ++++++++-------- .../service/impl/WebrtcPrivateServiceImpl.java | 8 ++++---- .../task/GroupBannedConsumerTask.java | 17 ++++------------- .../implatform/task/GroupUnbanConsumerTask.java | 10 ++++------ 27 files changed, 76 insertions(+), 87 deletions(-) rename im-platform/src/main/java/com/bx/implatform/service/{IFriendService.java => FriendService.java} (95%) rename im-platform/src/main/java/com/bx/implatform/service/{IGroupMemberService.java => GroupMemberService.java} (96%) rename im-platform/src/main/java/com/bx/implatform/service/{IGroupMessageService.java => GroupMessageService.java} (95%) rename im-platform/src/main/java/com/bx/implatform/service/{IGroupService.java => GroupService.java} (96%) rename im-platform/src/main/java/com/bx/implatform/service/{IPrivateMessageService.java => PrivateMessageService.java} (94%) rename im-platform/src/main/java/com/bx/implatform/service/{IUserService.java => UserService.java} (97%) rename im-platform/src/main/java/com/bx/implatform/service/{IWebrtcGroupService.java => WebrtcGroupService.java} (97%) rename im-platform/src/main/java/com/bx/implatform/service/{IWebrtcPrivateService.java => WebrtcPrivateService.java} (90%) diff --git a/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java b/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java index 8076fc4..e66be74 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.entity.Friend; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IFriendService; +import com.bx.implatform.service.FriendService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.vo.FriendVO; import io.swagger.v3.oas.annotations.Operation; @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class FriendController { - private final IFriendService friendService; + private final FriendService friendService; @GetMapping("/list") @Operation(summary = "好友列表", description = "获取好友列表") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java index 6398030..7f29c23 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java @@ -2,7 +2,7 @@ package com.bx.implatform.controller; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IGroupService; +import com.bx.implatform.service.GroupService; import com.bx.implatform.vo.GroupInviteVO; import com.bx.implatform.vo.GroupMemberVO; import com.bx.implatform.vo.GroupVO; @@ -21,7 +21,7 @@ import java.util.List; @RequiredArgsConstructor public class GroupController { - private final IGroupService groupService; + private final GroupService groupService; @Operation(summary = "创建群聊", description = "创建群聊") @PostMapping("/create") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java index 9117c0e..3f803e5 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.dto.GroupMessageDTO; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IGroupMessageService; +import com.bx.implatform.service.GroupMessageService; import com.bx.implatform.vo.GroupMessageVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -20,7 +20,7 @@ import java.util.List; @RequiredArgsConstructor public class GroupMessageController { - private final IGroupMessageService groupMessageService; + private final GroupMessageService groupMessageService; @PostMapping("/send") @Operation(summary = "发送群聊消息", description = "发送群聊消息") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java index 840838f..8ab4cdb 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java @@ -5,7 +5,7 @@ import com.bx.implatform.dto.ModifyPwdDTO; import com.bx.implatform.dto.RegisterDTO; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IUserService; +import com.bx.implatform.service.UserService; import com.bx.implatform.vo.LoginVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class LoginController { - private final IUserService userService; + private final UserService userService; @PostMapping("/login") @Operation(summary = "用户登陆", description = "用户登陆") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java index 2ae4b57..f18c68d 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.dto.PrivateMessageDTO; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IPrivateMessageService; +import com.bx.implatform.service.PrivateMessageService; import com.bx.implatform.vo.PrivateMessageVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -20,7 +20,7 @@ import java.util.List; @RequiredArgsConstructor public class PrivateMessageController { - private final IPrivateMessageService privateMessageService; + private final PrivateMessageService privateMessageService; @PostMapping("/send") @Operation(summary = "发送消息", description = "发送私聊消息") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java index bd2959f..9c5af89 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.entity.User; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IUserService; +import com.bx.implatform.service.UserService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; @@ -24,7 +24,7 @@ import java.util.List; @RequiredArgsConstructor public class UserController { - private final IUserService userService; + private final UserService userService; @GetMapping("/terminal/online") @Operation(summary = "判断用户哪个终端在线", description = "返回在线的用户id的终端集合") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java index 2639da2..fb14e07 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.dto.*; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IWebrtcGroupService; +import com.bx.implatform.service.WebrtcGroupService; import com.bx.implatform.vo.WebrtcGroupInfoVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class WebrtcGroupController { - private final IWebrtcGroupService webrtcGroupService; + private final WebrtcGroupService webrtcGroupService; @Operation(summary = "发起群视频通话") @PostMapping("/setup") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java index 2b0f241..3bf3764 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java @@ -3,7 +3,7 @@ package com.bx.implatform.controller; import com.bx.implatform.annotation.OnlineCheck; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IWebrtcPrivateService; +import com.bx.implatform.service.WebrtcPrivateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class WebrtcPrivateController { - private final IWebrtcPrivateService webrtcPrivateService; + private final WebrtcPrivateService webrtcPrivateService; @OnlineCheck @Operation(summary = "呼叫视频通话") diff --git a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java index 194f469..2a2f44f 100644 --- a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java +++ b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java @@ -9,7 +9,7 @@ import com.bx.imcommon.enums.IMSendCode; import com.bx.imcommon.model.IMSendResult; import com.bx.implatform.entity.PrivateMessage; import com.bx.implatform.enums.MessageStatus; -import com.bx.implatform.service.IPrivateMessageService; +import com.bx.implatform.service.PrivateMessageService; import com.bx.implatform.vo.PrivateMessageVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ import java.util.Set; public class PrivateMessageListener implements MessageListener { @Lazy @Autowired - private IPrivateMessageService privateMessageService; + private PrivateMessageService privateMessageService; @Override public void process(List> results) { Set messageIds = new HashSet<>(); diff --git a/im-platform/src/main/java/com/bx/implatform/service/IFriendService.java b/im-platform/src/main/java/com/bx/implatform/service/FriendService.java similarity index 95% rename from im-platform/src/main/java/com/bx/implatform/service/IFriendService.java rename to im-platform/src/main/java/com/bx/implatform/service/FriendService.java index 92e7345..4fdf32f 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IFriendService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/FriendService.java @@ -6,7 +6,7 @@ import com.bx.implatform.vo.FriendVO; import java.util.List; -public interface IFriendService extends IService { +public interface FriendService extends IService { /** * 判断用户2是否用户1的好友 diff --git a/im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java b/im-platform/src/main/java/com/bx/implatform/service/GroupMemberService.java similarity index 96% rename from im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java rename to im-platform/src/main/java/com/bx/implatform/service/GroupMemberService.java index bfa2440..87ced17 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/GroupMemberService.java @@ -5,7 +5,7 @@ import com.bx.implatform.entity.GroupMember; import java.util.List; -public interface IGroupMemberService extends IService { +public interface GroupMemberService extends IService { /** * 根据群聊id和用户id查询群聊成员 diff --git a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/GroupMessageService.java similarity index 95% rename from im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java rename to im-platform/src/main/java/com/bx/implatform/service/GroupMessageService.java index 54f9f5e..a7e67c6 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/GroupMessageService.java @@ -7,7 +7,7 @@ import com.bx.implatform.vo.GroupMessageVO; import java.util.List; -public interface IGroupMessageService extends IService { +public interface GroupMessageService extends IService { /** * 发送群聊消息(高并发接口，查询mysql接口都要进行缓存) diff --git a/im-platform/src/main/java/com/bx/implatform/service/IGroupService.java b/im-platform/src/main/java/com/bx/implatform/service/GroupService.java similarity index 96% rename from im-platform/src/main/java/com/bx/implatform/service/IGroupService.java rename to im-platform/src/main/java/com/bx/implatform/service/GroupService.java index 57c1e58..fe2f6fa 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IGroupService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/GroupService.java @@ -8,7 +8,7 @@ import com.bx.implatform.vo.GroupVO; import java.util.List; -public interface IGroupService extends IService { +public interface GroupService extends IService { /** * 创建新群聊 diff --git a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/PrivateMessageService.java similarity index 94% rename from im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java rename to im-platform/src/main/java/com/bx/implatform/service/PrivateMessageService.java index 89669b8..ed40c30 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/PrivateMessageService.java @@ -7,7 +7,7 @@ import com.bx.implatform.vo.PrivateMessageVO; import java.util.List; -public interface IPrivateMessageService extends IService { +public interface PrivateMessageService extends IService { /** * 发送私聊消息(高并发接口，查询mysql接口都要进行缓存) diff --git a/im-platform/src/main/java/com/bx/implatform/service/IUserService.java b/im-platform/src/main/java/com/bx/implatform/service/UserService.java similarity index 97% rename from im-platform/src/main/java/com/bx/implatform/service/IUserService.java rename to im-platform/src/main/java/com/bx/implatform/service/UserService.java index a24e0c3..37bcc8b 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IUserService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/UserService.java @@ -11,7 +11,7 @@ import com.bx.implatform.vo.UserVO; import java.util.List; -public interface IUserService extends IService { +public interface UserService extends IService { /** * 用户登录 diff --git a/im-platform/src/main/java/com/bx/implatform/service/IWebrtcGroupService.java b/im-platform/src/main/java/com/bx/implatform/service/WebrtcGroupService.java similarity index 97% rename from im-platform/src/main/java/com/bx/implatform/service/IWebrtcGroupService.java rename to im-platform/src/main/java/com/bx/implatform/service/WebrtcGroupService.java index 144a118..08e6760 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IWebrtcGroupService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/WebrtcGroupService.java @@ -3,7 +3,7 @@ package com.bx.implatform.service; import com.bx.implatform.dto.*; import com.bx.implatform.vo.WebrtcGroupInfoVO; -public interface IWebrtcGroupService { +public interface WebrtcGroupService { /** * 发起通话 diff --git a/im-platform/src/main/java/com/bx/implatform/service/IWebrtcPrivateService.java b/im-platform/src/main/java/com/bx/implatform/service/WebrtcPrivateService.java similarity index 90% rename from im-platform/src/main/java/com/bx/implatform/service/IWebrtcPrivateService.java rename to im-platform/src/main/java/com/bx/implatform/service/WebrtcPrivateService.java index dbf4944..c2f9c3f 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IWebrtcPrivateService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/WebrtcPrivateService.java @@ -5,7 +5,7 @@ package com.bx.implatform.service; * * @author */ -public interface IWebrtcPrivateService { +public interface WebrtcPrivateService { void call(Long uid, String mode,String offer); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java index 0aa688d..c67a0d0 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java @@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bx.implatform.contant.RedisKey; import com.bx.implatform.entity.Friend; import com.bx.implatform.entity.User; -import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.FriendMapper; import com.bx.implatform.mapper.UserMapper; -import com.bx.implatform.service.IFriendService; +import com.bx.implatform.service.FriendService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.vo.FriendVO; @@ -31,7 +30,7 @@ import java.util.Objects; @Service @RequiredArgsConstructor @CacheConfig(cacheNames = RedisKey.IM_CACHE_FRIEND) -public class FriendServiceImpl extends ServiceImpl implements IFriendService { +public class FriendServiceImpl extends ServiceImpl implements FriendService { private final UserMapper userMapper; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java index 592f761..caf4b37 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bx.implatform.contant.RedisKey; import com.bx.implatform.entity.GroupMember; import com.bx.implatform.mapper.GroupMemberMapper; -import com.bx.implatform.service.IGroupMemberService; +import com.bx.implatform.service.GroupMemberService; import com.bx.implatform.util.DateTimeUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @Service @CacheConfig(cacheNames = RedisKey.IM_CACHE_GROUP_MEMBER_ID) -public class GroupMemberServiceImpl extends ServiceImpl implements IGroupMemberService { +public class GroupMemberServiceImpl extends ServiceImpl implements GroupMemberService { @CacheEvict(key = "#member.getGroupId()") @Override public boolean save(GroupMember member) { diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index 512241a..c44fc32 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -23,9 +23,9 @@ import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.GroupMessageMapper; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IGroupMessageService; -import com.bx.implatform.service.IGroupService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.GroupMessageService; +import com.bx.implatform.service.GroupService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; @@ -46,9 +46,10 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class GroupMessageServiceImpl extends ServiceImpl implements IGroupMessageService { - private final IGroupService groupService; - private final IGroupMemberService groupMemberService; +public class GroupMessageServiceImpl extends ServiceImpl implements + GroupMessageService { + private final GroupService groupService; + private final GroupMemberService groupMemberService; private final RedisTemplate redisTemplate; private final IMClient imClient; private final SensitiveFilterUtil sensitiveFilterUtil; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index 6b9979a..46d50e2 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -17,10 +17,10 @@ import com.bx.implatform.enums.MessageType; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.GroupMapper; import com.bx.implatform.mapper.GroupMessageMapper; -import com.bx.implatform.service.IFriendService; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IGroupService; -import com.bx.implatform.service.IUserService; +import com.bx.implatform.service.FriendService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.GroupService; +import com.bx.implatform.service.UserService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; @@ -45,11 +45,11 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @CacheConfig(cacheNames = RedisKey.IM_CACHE_GROUP) -public class GroupServiceImpl extends ServiceImpl implements IGroupService { - private final IUserService userService; - private final IGroupMemberService groupMemberService; +public class GroupServiceImpl extends ServiceImpl implements GroupService { + private final UserService userService; + private final GroupMemberService groupMemberService; private final GroupMessageMapper groupMessageMapper; - private final IFriendService friendsService; + private final FriendService friendsService; private final IMClient imClient; private final RedisTemplate redisTemplate; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java index 91d5bdd..ca9b91d 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java @@ -16,11 +16,10 @@ import com.bx.implatform.entity.Friend; import com.bx.implatform.entity.PrivateMessage; import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; -import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.PrivateMessageMapper; -import com.bx.implatform.service.IFriendService; -import com.bx.implatform.service.IPrivateMessageService; +import com.bx.implatform.service.FriendService; +import com.bx.implatform.service.PrivateMessageService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; @@ -38,9 +37,10 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class PrivateMessageServiceImpl extends ServiceImpl implements IPrivateMessageService { +public class PrivateMessageServiceImpl extends ServiceImpl implements + PrivateMessageService { - private final IFriendService friendService; + private final FriendService friendService; private final IMClient imClient; private final SensitiveFilterUtil sensitiveFilterUtil; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 2478731..574a088 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -18,9 +18,9 @@ import com.bx.implatform.entity.User; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.UserMapper; -import com.bx.implatform.service.IFriendService; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IUserService; +import com.bx.implatform.service.FriendService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.UserService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; @@ -39,11 +39,11 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class UserServiceImpl extends ServiceImpl implements IUserService { +public class UserServiceImpl extends ServiceImpl implements UserService { private final PasswordEncoder passwordEncoder; - private final IGroupMemberService groupMemberService; - private final IFriendService friendService; + private final GroupMemberService groupMemberService; + private final FriendService friendService; private final JwtProperties jwtProperties; private final IMClient imClient; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java index 6f91f4a..b27190f 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java @@ -15,10 +15,10 @@ import com.bx.implatform.entity.GroupMessage; import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; import com.bx.implatform.exception.GlobalException; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IGroupMessageService; -import com.bx.implatform.service.IGroupService; -import com.bx.implatform.service.IWebrtcGroupService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.GroupMessageService; +import com.bx.implatform.service.GroupService; +import com.bx.implatform.service.WebrtcGroupService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.session.WebrtcGroupSession; @@ -47,10 +47,10 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class WebrtcGroupServiceImpl implements IWebrtcGroupService { - private final IGroupService groupService; - private final IGroupMemberService groupMemberService; - private final IGroupMessageService groupMessageService; +public class WebrtcGroupServiceImpl implements WebrtcGroupService { + private final GroupService groupService; + private final GroupMemberService groupMemberService; + private final GroupMessageService groupMessageService; private final RedisTemplate redisTemplate; private final IMClient imClient; private final UserStateUtils userStateUtils; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java index ac9ca1a..a741e09 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java @@ -9,8 +9,8 @@ import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; import com.bx.implatform.enums.WebrtcMode; import com.bx.implatform.exception.GlobalException; -import com.bx.implatform.service.IPrivateMessageService; -import com.bx.implatform.service.IWebrtcPrivateService; +import com.bx.implatform.service.PrivateMessageService; +import com.bx.implatform.service.WebrtcPrivateService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.session.WebrtcPrivateSession; @@ -30,11 +30,11 @@ import java.util.concurrent.TimeUnit; @Slf4j @Service @RequiredArgsConstructor -public class WebrtcPrivateServiceImpl implements IWebrtcPrivateService { +public class WebrtcPrivateServiceImpl implements WebrtcPrivateService { private final IMClient imClient; private final RedisTemplate redisTemplate; - private final IPrivateMessageService privateMessageService; + private final PrivateMessageService privateMessageService; private final UserStateUtils userStateUtils; @Override diff --git a/im-platform/src/main/java/com/bx/implatform/task/GroupBannedConsumerTask.java b/im-platform/src/main/java/com/bx/implatform/task/GroupBannedConsumerTask.java index 76e94e0..baacfba 100644 --- a/im-platform/src/main/java/com/bx/implatform/task/GroupBannedConsumerTask.java +++ b/im-platform/src/main/java/com/bx/implatform/task/GroupBannedConsumerTask.java @@ -1,34 +1,25 @@ package com.bx.implatform.task; -import cn.hutool.core.util.StrUtil; import com.bx.imclient.IMClient; import com.bx.imcommon.enums.IMTerminalType; import com.bx.imcommon.model.IMGroupMessage; -import com.bx.imcommon.model.IMSystemMessage; import com.bx.imcommon.model.IMUserInfo; import com.bx.imcommon.mq.RedisMQConsumer; import com.bx.imcommon.mq.RedisMQListener; import com.bx.implatform.contant.Constant; import com.bx.implatform.contant.RedisKey; import com.bx.implatform.dto.GroupBanDTO; -import com.bx.implatform.dto.UserBanDTO; -import com.bx.implatform.entity.Group; import com.bx.implatform.entity.GroupMessage; import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IGroupMessageService; -import com.bx.implatform.service.IGroupService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.GroupMessageService; import com.bx.implatform.util.BeanUtils; import com.bx.implatform.vo.GroupMessageVO; -import com.bx.implatform.vo.SystemMessageVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.logging.log4j.util.Strings; -import org.springframework.boot.context.properties.source.ConfigurationPropertyState; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -45,9 +36,9 @@ public class GroupBannedConsumerTask extends RedisMQConsumer { private final IMClient imClient; - private final IGroupMessageService groupMessageService; + private final GroupMessageService groupMessageService; - private final IGroupMemberService groupMemberService; + private final GroupMemberService groupMemberService; @Override public void onMessage(GroupBanDTO dto) { diff --git a/im-platform/src/main/java/com/bx/implatform/task/GroupUnbanConsumerTask.java b/im-platform/src/main/java/com/bx/implatform/task/GroupUnbanConsumerTask.java index 6551a80..a5adda0 100644 --- a/im-platform/src/main/java/com/bx/implatform/task/GroupUnbanConsumerTask.java +++ b/im-platform/src/main/java/com/bx/implatform/task/GroupUnbanConsumerTask.java @@ -1,6 +1,5 @@ package com.bx.implatform.task; -import cn.hutool.core.util.StrUtil; import com.bx.imclient.IMClient; import com.bx.imcommon.enums.IMTerminalType; import com.bx.imcommon.model.IMGroupMessage; @@ -9,13 +8,12 @@ import com.bx.imcommon.mq.RedisMQConsumer; import com.bx.imcommon.mq.RedisMQListener; import com.bx.implatform.contant.Constant; import com.bx.implatform.contant.RedisKey; -import com.bx.implatform.dto.GroupBanDTO; import com.bx.implatform.dto.GroupUnbanDTO; import com.bx.implatform.entity.GroupMessage; import com.bx.implatform.enums.MessageStatus; import com.bx.implatform.enums.MessageType; -import com.bx.implatform.service.IGroupMemberService; -import com.bx.implatform.service.IGroupMessageService; +import com.bx.implatform.service.GroupMemberService; +import com.bx.implatform.service.GroupMessageService; import com.bx.implatform.util.BeanUtils; import com.bx.implatform.vo.GroupMessageVO; import lombok.RequiredArgsConstructor; @@ -38,9 +36,9 @@ public class GroupUnbanConsumerTask extends RedisMQConsumer { private final IMClient imClient; - private final IGroupMessageService groupMessageService; + private final GroupMessageService groupMessageService; - private final IGroupMemberService groupMemberService; + private final GroupMemberService groupMemberService; @Override public void onMessage(GroupUnbanDTO dto) {