From 7a812cd9e435343f761a6198c8fec4943772797d Mon Sep 17 00:00:00 2001 From: zhongzb <972627721@qq.com> Date: Sun, 28 May 2023 19:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mallchat/common/chat/dao/MessageDao.java | 3 - .../common/chat/dao/MessageMarkDao.java | 1 - .../mallchat/common/chat/dao/RoomDao.java | 2 - .../mallchat/common/chat/dao/WxMsgDao.java | 1 - .../chat/domain/dto/ChatMessageMarkDTO.java | 2 - .../common/chat/domain/entity/Message.java | 19 +- .../chat/domain/entity/MessageExtra.java | 1 - .../chat/domain/entity/MessageMark.java | 14 +- .../common/chat/domain/entity/Room.java | 14 +- .../common/chat/domain/entity/WxMsg.java | 13 +- .../domain/enums/MessageMarkTypeEnum.java | 4 +- .../annotation/FrequencyControlContainer.java | 5 +- .../common/annotation/RedissonLock.java | 7 +- .../common/aspect/FrequencyControlAspect.java | 10 +- .../common/aspect/RedissonLockAspect.java | 15 -- .../common/common/config/RedisConfig.java | 10 +- .../common/domain/enums/YesOrNoEnum.java | 4 +- .../domain/vo/request/CursorPageBaseReq.java | 1 - .../common/domain/vo/request/PageBaseReq.java | 2 +- .../vo/response/CursorPageBaseResp.java | 2 - .../common/common/event/ItemReceiveEvent.java | 1 - .../common/common/event/MessageSendEvent.java | 1 - .../common/common/event/UserOnlineEvent.java | 2 - .../exception/GlobalExceptionHandler.java | 6 +- .../common/exception/HttpErrorEnum.java | 9 - .../common/common/service/LockService.java | 1 - .../common/common/utils/AssertUtil.java | 8 +- .../common/common/utils/CursorUtils.java | 15 +- .../common/common/utils/FutureUtils.java | 226 +++++++++--------- .../common/common/utils/JsonUtils.java | 1 - .../common/common/utils/JwtUtils.java | 10 +- .../common/common/utils/RedisUtils.java | 12 +- .../common/common/utils/SpElUtils.java | 5 +- .../discover/AbstractUrlTitleDiscover.java | 10 +- .../discover/CommonUrlTitleDiscover.java | 1 - .../discover/PrioritizedUrlTitleDiscover.java | 1 - .../utils/discover/UrlTitleDiscover.java | 5 +- .../mallchat/common/user/dao/BlackDao.java | 1 - .../common/user/dao/ItemConfigDao.java | 2 - .../common/user/dao/UserBackpackDao.java | 2 - .../mallchat/common/user/dao/UserDao.java | 1 - .../common/user/domain/entity/Black.java | 12 +- .../common/user/domain/entity/IpDetail.java | 5 +- .../common/user/domain/entity/IpInfo.java | 3 +- .../common/user/domain/entity/ItemConfig.java | 11 +- .../common/user/domain/entity/User.java | 14 +- .../user/domain/entity/UserBackpack.java | 13 +- .../user/domain/enums/BlackTypeEnum.java | 5 - .../user/service/IUserBackpackService.java | 10 +- .../common/user/service/cache/ItemCache.java | 13 +- .../common/user/service/cache/UserCache.java | 10 +- .../user/service/impl/IpServiceImpl.java | 10 +- .../service/impl/UserBackpackServiceImpl.java | 4 +- .../src/main/resources/application.yml | 2 +- .../custom/MallchatCustomApplication.java | 3 +- .../chat/controller/ChatController.java | 20 +- .../domain/vo/request/ChatMessageMarkReq.java | 4 +- .../domain/vo/request/ChatMessagePageReq.java | 1 - .../domain/vo/request/ChatMessageReq.java | 3 +- .../domain/vo/response/ChatMemberResp.java | 2 - .../vo/response/ChatMemberStatisticResp.java | 3 - .../domain/vo/response/ChatMessageResp.java | 4 +- .../chat/domain/vo/response/ChatRoomResp.java | 1 - .../custom/chat/service/ChatService.java | 17 +- .../chat/service/adapter/MemberAdapter.java | 7 - .../chat/service/adapter/MessageAdapter.java | 3 - .../chat/service/adapter/RoomAdapter.java | 7 - .../chat/service/impl/ChatServiceImpl.java | 9 +- .../common/config/InterceptorConfig.java | 1 + .../custom/common/config/SwaggerConfig.java | 7 +- .../common/config/WxMpConfiguration.java | 12 +- .../event/listener/ItemReceiveListener.java | 2 +- .../event/listener/MessageMarkListener.java | 2 +- .../event/listener/MessageSendListener.java | 2 +- .../event/listener/UserOfflineListener.java | 2 +- .../event/listener/UserOnlineListener.java | 2 +- .../event/listener/UserRegisterListener.java | 3 +- .../common/intecepter/BlackInterceptor.java | 15 +- .../intecepter/CollectorInterceptor.java | 6 +- .../common/intecepter/HttpTraceIdFilter.java | 5 - .../common/intecepter/TokenInterceptor.java | 12 - .../common/intecepter/WebLogAspect.java | 2 +- .../user/controller/UserController.java | 4 +- .../user/controller/WxPortalController.java | 4 +- .../user/domain/dto/ws/WSChannelExtraDTO.java | 3 - .../user/domain/enums/WSReqTypeEnum.java | 4 +- .../domain/vo/request/user/ModifyNameReq.java | 3 +- .../vo/request/user/WearingBadgeReq.java | 2 - .../domain/vo/request/ws/WSAuthorize.java | 1 - .../user/domain/vo/request/ws/WSBaseReq.java | 1 + .../domain/vo/response/ws/WSBaseResp.java | 1 + .../domain/vo/response/ws/WSLoginSuccess.java | 1 - .../domain/vo/response/ws/WSLoginUrl.java | 1 - .../user/domain/vo/response/ws/WSMessage.java | 8 - .../vo/response/ws/WSOnlineOfflineNotify.java | 2 - .../custom/user/service/LoginService.java | 4 +- .../custom/user/service/UserService.java | 9 +- .../custom/user/service/WxMsgService.java | 9 +- .../user/service/adapter/ImageBuilder.java | 4 +- .../user/service/adapter/TextBuilder.java | 4 +- .../user/service/adapter/UserAdapter.java | 7 +- .../user/service/adapter/WSAdapter.java | 9 +- .../user/service/handler/MsgHandler.java | 4 +- .../user/service/handler/ScanHandler.java | 14 +- .../service/handler/SubscribeHandler.java | 1 - .../user/service/impl/LoginServiceImpl.java | 2 - .../user/service/impl/UserServiceImpl.java | 4 +- .../service/impl/WebSocketServiceImpl.java | 4 +- .../user/websocket/HttpHeadersHandler.java | 1 - .../custom/user/websocket/NettyUtil.java | 2 - .../user/websocket/NettyWebSocketServer.java | 10 +- .../NettyWebSocketServerHandler.java | 7 +- .../src/main/resources/logback.xml | 6 +- 113 files changed, 332 insertions(+), 523 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java index e143014..65949fb 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageDao.java @@ -1,14 +1,11 @@ package com.abin.mallchat.common.chat.dao; -import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.enums.MessageStatusEnum; import com.abin.mallchat.common.chat.mapper.MessageMapper; 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.common.utils.CursorUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java index f99e4ee..5361ef0 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java @@ -2,7 +2,6 @@ package com.abin.mallchat.common.chat.dao; import com.abin.mallchat.common.chat.domain.entity.MessageMark; import com.abin.mallchat.common.chat.mapper.MessageMarkMapper; -import com.abin.mallchat.common.chat.service.IMessageMarkService; import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java index 4f2868d..bc8669e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/RoomDao.java @@ -1,8 +1,6 @@ package com.abin.mallchat.common.chat.dao; -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.MessageStatusEnum; import com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum; import com.abin.mallchat.common.chat.mapper.RoomMapper; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java index a8accce..d6a1333 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/dao/WxMsgDao.java @@ -2,7 +2,6 @@ package com.abin.mallchat.common.chat.dao; import com.abin.mallchat.common.chat.domain.entity.WxMsg; import com.abin.mallchat.common.chat.mapper.WxMsgMapper; -import com.abin.mallchat.common.chat.service.IWxMsgService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java index 5288aa1..558baef 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/dto/ChatMessageMarkDTO.java @@ -6,8 +6,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; - /** * Description: 消息标记请求 * Author: abin diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java index 64f0a09..c0a4b65 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Message.java @@ -1,17 +1,14 @@ package com.abin.mallchat.common.chat.domain.entity; -import com.abin.mallchat.common.user.domain.entity.IpInfo; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import java.util.Date; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.*; -import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; /** *

@@ -23,7 +20,7 @@ import lombok.experimental.Accessors; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "message",autoResultMap = true) +@TableName(value = "message", autoResultMap = true) @Builder @AllArgsConstructor @NoArgsConstructor @@ -34,7 +31,7 @@ public class Message implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -63,6 +60,7 @@ public class Message implements Serializable { /** * 消息状态 0正常 1删除 + * * @see com.abin.mallchat.common.chat.domain.enums.MessageStatusEnum */ @TableField("status") @@ -76,6 +74,7 @@ public class Message implements Serializable { /** * 消息类型 1正常文本 2.爆赞 （点赞超过10）3.危险发言（举报超5） + * * @see com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum */ @TableField("type") diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageExtra.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageExtra.java index 56c70f0..33ed8bc 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageExtra.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageExtra.java @@ -1,6 +1,5 @@ package com.abin.mallchat.common.chat.domain.entity; -import com.abin.mallchat.common.user.domain.entity.IpDetail; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java index 0f27280..25a551c 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/MessageMark.java @@ -1,14 +1,13 @@ package com.abin.mallchat.common.chat.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

@@ -31,7 +30,7 @@ public class MessageMark implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -48,6 +47,7 @@ public class MessageMark implements Serializable { /** * 标记类型 1点赞 2举报 + * * @see com.abin.mallchat.common.chat.domain.enums.MessageMarkTypeEnum */ @TableField("type") diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java index 12e8ac4..ef74c67 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java @@ -1,16 +1,15 @@ package com.abin.mallchat.common.chat.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import java.util.Date; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; + /** *

* 会话表 @@ -29,7 +28,7 @@ public class Room implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -40,6 +39,7 @@ public class Room implements Serializable { /** * 会话类型 1大群聊 2沸点 + * * @see com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum */ @TableField("type") diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java index f744c25..68d7d77 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/WxMsg.java @@ -1,16 +1,15 @@ package com.abin.mallchat.common.chat.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import java.util.Date; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; + /** *

* 微信消息表 @@ -29,7 +28,7 @@ public class WxMsg implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java index 5b77fdb..b8010dd 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/enums/MessageMarkTypeEnum.java @@ -16,8 +16,8 @@ import java.util.stream.Collectors; @AllArgsConstructor @Getter public enum MessageMarkTypeEnum { - LIKE(1, "点赞",10,MessageTypeEnum.LIKE), - DISLIKE(2, "点踩",5,MessageTypeEnum.DISLIKE), + LIKE(1, "点赞", 10, MessageTypeEnum.LIKE), + DISLIKE(2, "点踩", 5, MessageTypeEnum.DISLIKE), ; private final Integer type; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java index ad6de09..c537dac 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/FrequencyControlContainer.java @@ -1,6 +1,9 @@ package com.abin.mallchat.common.common.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME)//运行时生效 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java index aad905e..e5ea086 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/annotation/RedissonLock.java @@ -1,8 +1,9 @@ package com.abin.mallchat.common.common.annotation; -import org.springframework.core.annotation.AliasFor; - -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.util.concurrent.TimeUnit; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java index dfe7ca1..25418a6 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/FrequencyControlAspect.java @@ -12,14 +12,8 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.DefaultParameterNameDiscoverer; -import org.springframework.expression.EvaluationContext; -import org.springframework.expression.Expression; -import org.springframework.expression.ExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.stereotype.Component; + import java.lang.reflect.Method; import java.util.*; @@ -71,7 +65,7 @@ public class FrequencyControlAspect { } finally { //不管成功还是失败，都增加次数 keyMap.forEach((k, v) -> { - RedisUtils.inc(k,v.time(),v.unit()); + RedisUtils.inc(k, v.time(), v.unit()); }); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java index db30d45..da2a790 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/aspect/RedissonLockAspect.java @@ -1,34 +1,19 @@ package com.abin.mallchat.common.common.aspect; import cn.hutool.core.util.StrUtil; -import com.abin.mallchat.common.common.annotation.FrequencyControl; import com.abin.mallchat.common.common.annotation.RedissonLock; -import com.abin.mallchat.common.common.exception.BusinessException; -import com.abin.mallchat.common.common.exception.CommonErrorEnum; import com.abin.mallchat.common.common.service.LockService; -import com.abin.mallchat.common.common.utils.RedisUtils; -import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.common.utils.SpElUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; -import org.aspectj.weaver.ast.Test; -import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.annotation.Order; -import org.springframework.expression.EvaluationContext; -import org.springframework.expression.Expression; -import org.springframework.expression.ExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.stereotype.Component; import java.lang.reflect.Method; -import java.util.*; -import java.util.concurrent.TimeUnit; /** * Description: 分布式锁切面 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java index 1988a54..85518d5 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/config/RedisConfig.java @@ -1,9 +1,7 @@ package com.abin.mallchat.common.common.config; -import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; -import net.sf.json.util.JSONUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -11,10 +9,8 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; -import org.springframework.data.redis.serializer.SerializationUtils; import org.springframework.util.Assert; -import java.net.UnknownHostException; import java.util.Objects; @Configuration @@ -36,6 +32,7 @@ public class RedisConfig { redisTemplate.setHashValueSerializer(jsonRedisSerializer); return redisTemplate; } + public class MyRedisSerializerCustomized extends GenericJackson2JsonRedisSerializer { @Override public byte[] serialize(Object source) throws SerializationException { @@ -46,6 +43,7 @@ public class RedisConfig { } return super.serialize(source); } + @Override public T deserialize(byte[] source, Class type) throws SerializationException { Assert.notNull(type, @@ -53,7 +51,7 @@ public class RedisConfig { if (source == null || source.length == 0) { return null; } - if (type.isAssignableFrom(String.class) || type.isAssignableFrom(Character.class)) { + if (type.isAssignableFrom(String.class) || type.isAssignableFrom(Character.class)) { return (T) new String(source); } return super.deserialize(source, type); @@ -62,7 +60,7 @@ public class RedisConfig { @SneakyThrows public static void main(String[] args) { - ObjectMapper objectMapper =new ObjectMapper(); + ObjectMapper objectMapper = new ObjectMapper(); System.out.println(objectMapper.writeValueAsString(1)); System.out.println(objectMapper.writeValueAsString("1")); System.out.println(objectMapper.writeValueAsString(Boolean.TRUE)); diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java index ce344ea..4362384 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/enums/YesOrNoEnum.java @@ -33,7 +33,7 @@ public enum YesOrNoEnum { return cache.get(type); } - public static Integer toStatus(Boolean bool){ - return bool?YES.getStatus():NO.getStatus(); + public static Integer toStatus(Boolean bool) { + return bool ? YES.getStatus() : NO.getStatus(); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java index a6c2529..54c4cf7 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/CursorPageBaseReq.java @@ -1,7 +1,6 @@ package com.abin.mallchat.common.common.domain.vo.request; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.generator.config.querys.XuguQuery; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java index 2e8b1f5..1c8186e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/request/PageBaseReq.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Max; */ @Data @ApiModel("基础翻页请求") -public class PageBaseReq{ +public class PageBaseReq { @ApiModelProperty("页面大小") @Max(50) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java index eede4e2..77e2f87 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/domain/vo/response/CursorPageBaseResp.java @@ -1,8 +1,6 @@ package com.abin.mallchat.common.common.domain.vo.response; import cn.hutool.core.collection.CollectionUtil; -import com.abin.mallchat.common.chat.domain.entity.Message; -import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java index 00bb601..3f6b81d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/ItemReceiveEvent.java @@ -1,6 +1,5 @@ package com.abin.mallchat.common.common.event; -import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.entity.UserBackpack; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java index 02bcddb..8d0db8f 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/MessageSendEvent.java @@ -1,6 +1,5 @@ package com.abin.mallchat.common.common.event; -import com.abin.mallchat.common.chat.domain.entity.Message; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java index 87c18c4..9948c42 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/event/UserOnlineEvent.java @@ -4,8 +4,6 @@ import com.abin.mallchat.common.user.domain.entity.User; import lombok.Getter; import org.springframework.context.ApplicationEvent; -import java.util.Date; - @Getter public class UserOnlineEvent extends ApplicationEvent { private User user; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java index 18ee2f4..01c841d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java @@ -22,19 +22,21 @@ public class GlobalExceptionHandler { log.info("validation parameters error！The reason is:{}", message); return ApiResult.fail(-1, message.substring(0, message.length() - 1)); } + /** * 处理空指针的异常 */ @ExceptionHandler(value = NullPointerException.class) - public ApiResult exceptionHandler( NullPointerException e) { + public ApiResult exceptionHandler(NullPointerException e) { log.error("null point exception！The reason is:{}", e.getMessage(), e); return ApiResult.fail(CommonErrorEnum.SYSTEM_ERROR); } + /** * 未知异常 */ @ExceptionHandler(value = Exception.class) - public ApiResult systemExceptionHandler( Exception e) { + public ApiResult systemExceptionHandler(Exception e) { log.error("system exception！The reason is：{}", e.getMessage(), e); return ApiResult.fail(CommonErrorEnum.SYSTEM_ERROR); } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java index 75be440..ceb06f4 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/HttpErrorEnum.java @@ -1,23 +1,14 @@ package com.abin.mallchat.common.common.exception; import cn.hutool.http.ContentType; -import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.abin.mallchat.common.common.domain.vo.response.ApiResult; import com.google.common.base.Charsets; -import io.netty.handler.codec.http.HttpContent; import lombok.AllArgsConstructor; import lombok.Getter; -import org.apache.commons.lang3.CharSet; -import org.apache.commons.lang3.CharSetUtils; -import org.springframework.http.HttpStatus; -import sun.awt.CharsetString; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.nio.charset.Charset; /** * Description: 业务校验异常码 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java index 98c8ffe..aa8e2bb 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/service/LockService.java @@ -9,7 +9,6 @@ import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java index 14e0a53..2182707 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java @@ -4,8 +4,6 @@ import cn.hutool.core.util.ObjectUtil; import com.abin.mallchat.common.common.exception.BusinessErrorEnum; import com.abin.mallchat.common.common.exception.BusinessException; import com.abin.mallchat.common.common.exception.ErrorEnum; -import com.abin.mallchat.common.user.domain.entity.UserBackpack; -import org.apache.commons.lang3.StringUtils; import java.text.MessageFormat; import java.util.Objects; @@ -48,14 +46,16 @@ public class AssertUtil { throwException(msg); } } + //如果不是非空对象，则抛异常 public static void isEmpty(Object obj, String msg) { if (!isEmpty(obj)) { throwException(msg); } } - public static void equal(Object o1,Object o2, String msg) { - if (!ObjectUtil.equal(o1,o2)) { + + public static void equal(Object o1, Object o2, String msg) { + if (!ObjectUtil.equal(o1, o2)) { throwException(msg); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java index be49bcf..4eb2ff5 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/CursorUtils.java @@ -2,30 +2,21 @@ package com.abin.mallchat.common.common.utils; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Pair; -import cn.hutool.core.lang.Tuple; import cn.hutool.core.util.StrUtil; -import com.abin.mallchat.common.chat.dao.MessageDao; -import com.abin.mallchat.common.chat.domain.entity.Message; 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.errorprone.annotations.Var; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.ZSetOperations; import org.springframework.stereotype.Component; -import reactor.util.function.Tuple2; -import java.util.*; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; import java.util.stream.Collectors; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java index 076331d..4f44290 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/FutureUtils.java @@ -16,110 +16,122 @@ import java.util.stream.Collectors; */ @Slf4j public class FutureUtils { - /** - * 设置CF状态为失败 - */ - public static CompletableFuture failed(Throwable ex) { - CompletableFuture completableFuture = new CompletableFuture<>(); - completableFuture.completeExceptionally(ex); - return completableFuture; - } - /** - * 设置CF状态为成功 - */ - public static CompletableFuture success(T result) { - CompletableFuture completableFuture = new CompletableFuture<>(); - completableFuture.complete(result); - return completableFuture; - } - /** - * 将List> 转为 CompletableFuture> - */ - public static CompletableFuture> sequence(Collection> completableFutures) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .map(CompletableFuture::join) - .collect(Collectors.toList()) - ); - } - /** - * 将List>> 转为 CompletableFuture> - * 多用于分页查询的场景 - */ - public static CompletableFuture> sequenceList(Collection>> completableFutures) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .flatMap( listFuture -> listFuture.join().stream()) - .collect(Collectors.toList()) - ); - } - /* - * 将List>> 转为 CompletableFuture> - * @Param mergeFunction 自定义key冲突时的merge策略 - */ - public static CompletableFuture> sequenceMap( - Collection>> completableFutures, BinaryOperator mergeFunction) { - return CompletableFuture - .allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream().map(CompletableFuture::join) - .flatMap(map -> map.entrySet().stream()) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, mergeFunction))); - } - /** - * 将List> 转为 CompletableFuture>，并过滤调null值 - */ - public static CompletableFuture> sequenceNonNull(Collection> completableFutures) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .map(CompletableFuture::join) - .filter(Objects::nonNull) - .collect(Collectors.toList()) - ); - } - /** - * 将List>> 转为 CompletableFuture>，并过滤调null值 - * 多用于分页查询的场景 - */ - public static CompletableFuture> sequenceListNonNull(Collection>> completableFutures) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .flatMap( listFuture -> listFuture.join().stream().filter(Objects::nonNull)) - .collect(Collectors.toList()) - ); - } - /** - * 将List>> 转为 CompletableFuture> - * @Param filterFunction 自定义过滤策略 - */ - public static CompletableFuture> sequence(Collection> completableFutures, - Predicate filterFunction) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .map(CompletableFuture::join) - .filter(filterFunction) - .collect(Collectors.toList()) - ); - } - /** - * 将List>> 转为 CompletableFuture> - * @Param filterFunction 自定义过滤策略 - */ - public static CompletableFuture> sequenceList(Collection>> completableFutures, - Predicate filterFunction) { - return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream() - .flatMap( listFuture -> listFuture.join().stream().filter(filterFunction)) - .collect(Collectors.toList()) - ); - } -/** - * 将CompletableFuture>的list转为 CompletableFuture>。 多个map合并为一个map。 如果key冲突，采用新的value覆盖。 - */ - public static CompletableFuture> sequenceMap( - Collection>> completableFutures) { - return CompletableFuture - .allOf(completableFutures.toArray(new CompletableFuture[0])) - .thenApply(v -> completableFutures.stream().map(CompletableFuture::join) - .flatMap(map -> map.entrySet().stream()) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b))); - }} \ No newline at end of file + /** + * 设置CF状态为失败 + */ + public static CompletableFuture failed(Throwable ex) { + CompletableFuture completableFuture = new CompletableFuture<>(); + completableFuture.completeExceptionally(ex); + return completableFuture; + } + + /** + * 设置CF状态为成功 + */ + public static CompletableFuture success(T result) { + CompletableFuture completableFuture = new CompletableFuture<>(); + completableFuture.complete(result); + return completableFuture; + } + + /** + * 将List> 转为 CompletableFuture> + */ + public static CompletableFuture> sequence(Collection> completableFutures) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .map(CompletableFuture::join) + .collect(Collectors.toList()) + ); + } + + /** + * 将List>> 转为 CompletableFuture> + * 多用于分页查询的场景 + */ + public static CompletableFuture> sequenceList(Collection>> completableFutures) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .flatMap(listFuture -> listFuture.join().stream()) + .collect(Collectors.toList()) + ); + } + + /* + * 将List>> 转为 CompletableFuture> + * @Param mergeFunction 自定义key冲突时的merge策略 + */ + public static CompletableFuture> sequenceMap( + Collection>> completableFutures, BinaryOperator mergeFunction) { + return CompletableFuture + .allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream().map(CompletableFuture::join) + .flatMap(map -> map.entrySet().stream()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, mergeFunction))); + } + + /** + * 将List> 转为 CompletableFuture>，并过滤调null值 + */ + public static CompletableFuture> sequenceNonNull(Collection> completableFutures) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .map(CompletableFuture::join) + .filter(Objects::nonNull) + .collect(Collectors.toList()) + ); + } + + /** + * 将List>> 转为 CompletableFuture>，并过滤调null值 + * 多用于分页查询的场景 + */ + public static CompletableFuture> sequenceListNonNull(Collection>> completableFutures) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .flatMap(listFuture -> listFuture.join().stream().filter(Objects::nonNull)) + .collect(Collectors.toList()) + ); + } + + /** + * 将List>> 转为 CompletableFuture> + * + * @Param filterFunction 自定义过滤策略 + */ + public static CompletableFuture> sequence(Collection> completableFutures, + Predicate filterFunction) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .map(CompletableFuture::join) + .filter(filterFunction) + .collect(Collectors.toList()) + ); + } + + /** + * 将List>> 转为 CompletableFuture> + * + * @Param filterFunction 自定义过滤策略 + */ + public static CompletableFuture> sequenceList(Collection>> completableFutures, + Predicate filterFunction) { + return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream() + .flatMap(listFuture -> listFuture.join().stream().filter(filterFunction)) + .collect(Collectors.toList()) + ); + } + + /** + * 将CompletableFuture>的list转为 CompletableFuture>。 多个map合并为一个map。 如果key冲突，采用新的value覆盖。 + */ + public static CompletableFuture> sequenceMap( + Collection>> completableFutures) { + return CompletableFuture + .allOf(completableFutures.toArray(new CompletableFuture[0])) + .thenApply(v -> completableFutures.stream().map(CompletableFuture::join) + .flatMap(map -> map.entrySet().stream()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b))); + } +} \ No newline at end of file diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JsonUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JsonUtils.java index dbd20f9..2c086fc 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JsonUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JsonUtils.java @@ -1,6 +1,5 @@ package com.abin.mallchat.common.common.utils; -import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java index c7206dd..dd2443e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/JwtUtils.java @@ -1,18 +1,18 @@ package com.abin.mallchat.common.common.utils; -import cn.hutool.json.JSONUtil; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.JWTVerifier; -import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Date; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; /** * Description: jwt的token生成与解析 @@ -82,7 +82,7 @@ public class JwtUtils { public Long getUidOrNull(String token) { return Optional.ofNullable(verifyToken(token)) .map(map -> map.get(UID_CLAIM)) - .map(Claim::asLong) + .map(Claim::asLong) .orElse(null); } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java index 311f5c5..4300ce8 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/RedisUtils.java @@ -1,20 +1,16 @@ package com.abin.mallchat.common.common.utils; import cn.hutool.extra.spring.SpringUtil; -import cn.hutool.json.JSONUtil; -import com.fasterxml.jackson.databind.ObjectMapper; -import net.sf.json.util.JSONUtils; -import org.springframework.data.redis.core.ZSetOperations.TypedTuple; 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.ZSetOperations.TypedTuple; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.security.Key; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -218,6 +214,7 @@ public class RedisUtils { private static String get(String key) { return key == null ? null : stringRedisTemplate.opsForValue().get(key); } + /** * 普通缓存放入 * @@ -234,6 +231,7 @@ public class RedisUtils { return false; } } + public static String getStr(String key) { return get(key, String.class); } @@ -265,7 +263,6 @@ public class RedisUtils { } - /** * 普通缓存放入并设置时间 * @@ -754,8 +751,9 @@ public class RedisUtils { public static Boolean zAdd(String key, Object value, double score) { return zAdd(key, value.toString(), score); } + public static Boolean zIsMember(String key, Object value) { - return Objects.nonNull(stringRedisTemplate.opsForZSet().score(key,value.toString())); + return Objects.nonNull(stringRedisTemplate.opsForZSet().score(key, value.toString())); } /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java index 79c5c8c..ac7e90d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SpElUtils.java @@ -6,7 +6,6 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.stereotype.Component; import java.lang.reflect.Method; @@ -29,7 +28,7 @@ public class SpElUtils { return expression.getValue(context, String.class); } - public static String getMethodKey(Method method){ - return method.getDeclaringClass()+"#"+method.getName(); + public static String getMethodKey(Method method) { + return method.getDeclaringClass() + "#" + method.getName(); } } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java index d6f04a2..b6ebe0c 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/AbstractUrlTitleDiscover.java @@ -3,7 +3,6 @@ package com.abin.mallchat.common.common.utils.discover; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import com.abin.mallchat.common.common.utils.FutureUtils; -import com.google.errorprone.annotations.Var; import lombok.extern.slf4j.Slf4j; import org.jsoup.Connection; import org.jsoup.Jsoup; @@ -11,13 +10,12 @@ import org.jsoup.nodes.Document; import org.springframework.data.util.Pair; import javax.annotation.Nullable; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; -import java.util.stream.Collector; import java.util.stream.Collectors; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlTitleDiscover.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlTitleDiscover.java index ac38d87..6471610 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlTitleDiscover.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/CommonUrlTitleDiscover.java @@ -1,6 +1,5 @@ package com.abin.mallchat.common.common.utils.discover; -import cn.hutool.core.util.StrUtil; import org.jsoup.nodes.Document; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlTitleDiscover.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlTitleDiscover.java index bd7c7e6..8c7fb4d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlTitleDiscover.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/PrioritizedUrlTitleDiscover.java @@ -2,7 +2,6 @@ package com.abin.mallchat.common.common.utils.discover; import cn.hutool.core.util.StrUtil; import org.jsoup.nodes.Document; -import org.springframework.core.ParameterNameDiscoverer; import java.util.ArrayList; import java.util.List; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlTitleDiscover.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlTitleDiscover.java index beba0e7..e2fac68 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlTitleDiscover.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/discover/UrlTitleDiscover.java @@ -1,12 +1,9 @@ package com.abin.mallchat.common.common.utils.discover; import cn.hutool.core.date.StopWatch; -import com.google.common.base.Stopwatch; -import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import javax.annotation.Nullable; -import javax.annotation.Signed; import java.util.Map; public interface UrlTitleDiscover { @@ -26,7 +23,7 @@ public interface UrlTitleDiscover { StopWatch stopWatch = new StopWatch(); stopWatch.start(); String longStr = "这是一个很长的字符串再来 www.github.com，其中包含一个URL www.baidu.com,, 一个带有端口号的URL http://www.jd.com:80, 一个带有路径的URL http://mallchat.cn, 还有美团技术文章https://mp.weixin.qq.com/s/hwTf4bDck9_tlFpgVDeIKg "; - PrioritizedUrlTitleDiscover discover =new PrioritizedUrlTitleDiscover(); + PrioritizedUrlTitleDiscover discover = new PrioritizedUrlTitleDiscover(); Map contentTitleMap = discover.getContentTitleMap(longStr); System.out.println(contentTitleMap); // diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java index facee4f..a4a5015 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/BlackDao.java @@ -2,7 +2,6 @@ package com.abin.mallchat.common.user.dao; import com.abin.mallchat.common.user.domain.entity.Black; import com.abin.mallchat.common.user.mapper.BlackMapper; -import com.abin.mallchat.common.user.service.IBlackService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java index 9c9fcce..d14c24e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/ItemConfigDao.java @@ -2,8 +2,6 @@ package com.abin.mallchat.common.user.dao; import com.abin.mallchat.common.user.domain.entity.ItemConfig; import com.abin.mallchat.common.user.mapper.ItemConfigMapper; -import com.abin.mallchat.common.user.service.IItemConfigService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java index c7ea47a..22d7827 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserBackpackDao.java @@ -1,10 +1,8 @@ package com.abin.mallchat.common.user.dao; import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; -import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.domain.entity.UserBackpack; import com.abin.mallchat.common.user.mapper.UserBackpackMapper; -import com.abin.mallchat.common.user.service.IUserBackpackService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java index a85de0e..8184271 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserDao.java @@ -4,7 +4,6 @@ import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.common.user.mapper.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java index a2520a8..ff8b82a 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Black.java @@ -1,14 +1,15 @@ package com.abin.mallchat.common.user.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 黑名单 @@ -27,11 +28,12 @@ public class Black implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 拉黑目标类型 1.ip 2uid + * * @see com.abin.mallchat.common.user.domain.enums.BlackTypeEnum */ @TableField("type") diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java index 323c568..38dffc8 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpDetail.java @@ -1,6 +1,9 @@ package com.abin.mallchat.common.user.domain.entity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java index 08f5b99..3480bd8 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java @@ -1,7 +1,6 @@ package com.abin.mallchat.common.user.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.Data; import java.io.Serializable; import java.util.Objects; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java index 55b0127..a46646b 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/ItemConfig.java @@ -1,13 +1,14 @@ package com.abin.mallchat.common.user.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 功能物品配置表 @@ -26,7 +27,7 @@ public class ItemConfig implements Serializable { /** * id */ - @TableId("id") + @TableId("id") private Long id; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java index 1eda7b4..0421526 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java @@ -1,20 +1,14 @@ package com.abin.mallchat.common.user.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - -import java.time.LocalDateTime; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.*; import java.io.Serializable; import java.util.Date; -import java.util.Objects; - -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import lombok.*; -import lombok.experimental.Accessors; /** *

diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java index 48f88f9..da96761 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserBackpack.java @@ -1,14 +1,13 @@ package com.abin.mallchat.common.user.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

@@ -31,7 +30,7 @@ public class UserBackpack implements Serializable { /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java index 23e9969..76ef38d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/BlackTypeEnum.java @@ -3,11 +3,6 @@ package com.abin.mallchat.common.user.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.Arrays; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - /** * Description: 物品枚举 * Author: abin diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java index 4971b85..e1a691e 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserBackpackService.java @@ -1,9 +1,6 @@ package com.abin.mallchat.common.user.service; import com.abin.mallchat.common.common.domain.enums.IdempotentEnum; -import com.abin.mallchat.common.user.domain.entity.UserBackpack; -import com.abin.mallchat.common.user.domain.enums.ItemEnum; -import com.baomidou.mybatisplus.extension.service.IService; /** *

@@ -18,10 +15,11 @@ public interface IUserBackpackService { /** * 用户获取一个物品 - * @param uid 用户id - * @param itemId 物品id + * + * @param uid 用户id + * @param itemId 物品id * @param idempotentEnum 幂等类型 - * @param businessId 上层业务发送的唯一标识 + * @param businessId 上层业务发送的唯一标识 */ void acquireItem(Long uid, Long itemId, IdempotentEnum idempotentEnum, String businessId); } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java index 39ecf55..4f3192d 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/ItemCache.java @@ -1,23 +1,12 @@ package com.abin.mallchat.common.user.service.cache; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Pair; -import com.abin.mallchat.common.common.constant.RedisKey; -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.common.utils.CursorUtils; -import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.common.user.dao.ItemConfigDao; -import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.ItemConfig; -import com.abin.mallchat.common.user.domain.entity.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.List; /** * Description: 用户相关缓存 diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java index 940f3d8..ee759e0 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java @@ -1,7 +1,6 @@ package com.abin.mallchat.common.user.service.cache; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Pair; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; @@ -16,14 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import java.security.PublicKey; import java.util.*; import java.util.function.Function; -import java.util.stream.Collector; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * Description: 用户相关缓存 @@ -122,12 +117,13 @@ public class UserCache { @Cacheable(cacheNames = "user", key = "'blackList'") public Map> getBlackMap() { Map> collect = blackDao.list().stream().collect(Collectors.groupingBy(Black::getType)); - Map> result =new HashMap<>(); + Map> result = new HashMap<>(); for (Map.Entry> entry : collect.entrySet()) { - result.put(entry.getKey(),entry.getValue().stream().map(Black::getTarget).collect(Collectors.toSet())); + result.put(entry.getKey(), entry.getValue().stream().map(Black::getTarget).collect(Collectors.toSet())); } return result; } + @CacheEvict(cacheNames = "user", key = "'blackList'") public Map> evictBlackMap() { return null; diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java index 3868051..c443958 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/IpServiceImpl.java @@ -3,10 +3,8 @@ package com.abin.mallchat.common.user.service.impl; import cn.hutool.core.lang.TypeReference; import cn.hutool.core.thread.NamedThreadFactory; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; -import com.abin.mallchat.common.common.domain.vo.response.ApiResult; import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.dto.IpResult; import com.abin.mallchat.common.user.domain.entity.IpDetail; @@ -16,14 +14,14 @@ import com.abin.mallchat.common.user.service.IpService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import java.util.Date; -import java.util.List; import java.util.Objects; -import java.util.concurrent.*; -import java.util.jar.Manifest; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * Description: ip diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java index dcf1a4d..b9b1a69 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java @@ -12,10 +12,8 @@ import com.abin.mallchat.common.user.domain.enums.ItemTypeEnum; import com.abin.mallchat.common.user.service.IUserBackpackService; import com.abin.mallchat.common.user.service.cache.ItemCache; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.event.SpringApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Objects; @@ -39,7 +37,7 @@ public class UserBackpackServiceImpl implements IUserBackpackService { private ApplicationEventPublisher applicationEventPublisher; @Override - @RedissonLock(key = "#uid",waitTime = 5000)//相同用户会同时发奖，需要排队不能直接拒绝 + @RedissonLock(key = "#uid", waitTime = 5000)//相同用户会同时发奖，需要排队不能直接拒绝 public void acquireItem(Long uid, Long itemId, IdempotentEnum idempotentEnum, String businessId) { String idempotent = getIdempotent(itemId, idempotentEnum, businessId); UserBackpack userBackpack = userBackpackDao.getByIdp(idempotent); diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml index 7080519..53b6b9b 100644 --- a/mallchat-common/src/main/resources/application.yml +++ b/mallchat-common/src/main/resources/application.yml @@ -56,7 +56,7 @@ jwt: secret: ${mallchat.jwt.secret} wx: mp: -# callback: http://f4cd-113-92-129-127.ngrok.io + # callback: http://f4cd-113-92-129-127.ngrok.io callback: ${mallchat.wx.callback} configs: - appId: ${mallchat.wx.appId} # 第一个公众号的appid diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java index 4ca05aa..90634e2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/MallchatCustomApplication.java @@ -1,6 +1,5 @@ package com.abin.mallchat.custom; -import com.abin.mallchat.custom.user.controller.WxPortalController; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,7 +10,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; * @date 2021/05/27 */ @SpringBootApplication(scanBasePackages = {"com.abin.mallchat"}) -@MapperScan({"com.abin.mallchat.common.**.mapper" }) +@MapperScan({"com.abin.mallchat.common.**.mapper"}) @ServletComponentScan public class MallchatCustomApplication { diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java index 16f3220..77975d8 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/controller/ChatController.java @@ -2,12 +2,10 @@ package com.abin.mallchat.custom.chat.controller; import com.abin.mallchat.common.common.annotation.FrequencyControl; -import com.abin.mallchat.common.common.annotation.FrequencyControlContainer; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; 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.user.dao.UserDao; +import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.user.domain.enums.BlackTypeEnum; import com.abin.mallchat.common.user.service.cache.UserCache; import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageMarkReq; @@ -18,17 +16,14 @@ import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp; import com.abin.mallchat.custom.chat.service.ChatService; -import com.abin.mallchat.common.common.utils.RequestHolder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Map; +import java.util.HashSet; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** *

@@ -62,10 +57,11 @@ public class ChatController { } private void filterBlackMember(CursorPageBaseResp memberPage) { - memberPage.getList().removeIf(a->getBlackUidSet().contains(a.getUid().toString())); + memberPage.getList().removeIf(a -> getBlackUidSet().contains(a.getUid().toString())); } - private Set getBlackUidSet(){ - return userCache.getBlackMap().get(BlackTypeEnum.UID.getType()); + + private Set getBlackUidSet() { + return userCache.getBlackMap().getOrDefault(BlackTypeEnum.UID.getType(), new HashSet<>()); } @GetMapping("public/member/statistic/") @@ -81,10 +77,12 @@ public class ChatController { filterBlackMsg(msgPage); return ApiResult.success(msgPage); } + private void filterBlackMsg(CursorPageBaseResp memberPage) { - memberPage.getList().removeIf(a->getBlackUidSet().contains(a.getFromUser().getUid().toString())); + memberPage.getList().removeIf(a -> getBlackUidSet().contains(a.getFromUser().getUid().toString())); System.out.println(1); } + @PostMapping("/msg") @ApiOperation("发送消息") @FrequencyControl(time = 5, count = 2, target = FrequencyControl.Target.UID) diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java index 70e4b0a..d1e2be4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageMarkReq.java @@ -1,12 +1,10 @@ package com.abin.mallchat.custom.chat.domain.vo.request; -import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; @@ -19,7 +17,7 @@ import javax.validation.constraints.NotNull; @Builder @AllArgsConstructor @NoArgsConstructor -public class ChatMessageMarkReq{ +public class ChatMessageMarkReq { @NotNull @ApiModelProperty("消息id") private Long msgId; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java index 331102d..13863bd 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessagePageReq.java @@ -6,7 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java index 295f9b0..0d3b589 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/ChatMessageReq.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; @@ -23,7 +22,7 @@ import javax.validation.constraints.NotNull; public class ChatMessageReq { @NotNull - @Length( max = 10000,message = "消息内容过长，服务器扛不住啊，兄dei") + @Length(max = 10000, message = "消息内容过长，服务器扛不住啊，兄dei") @ApiModelProperty("消息内容") private String content; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberResp.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberResp.java index 7178f07..0ba1a1a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberResp.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberResp.java @@ -1,12 +1,10 @@ package com.abin.mallchat.custom.chat.domain.vo.response; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import java.util.Date; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java index cd9ea08..80a321f 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMemberStatisticResp.java @@ -5,9 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.Date; /** * Description: 群成员统计信息 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageResp.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageResp.java index ce5a89f..76f67a3 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageResp.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatMessageResp.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + import java.util.Date; import java.util.Map; @@ -47,7 +48,7 @@ public class ChatMessageResp { @ApiModelProperty("消息内容") private String content; @ApiModelProperty("消息链接映射") - private Map urlTitleMap; + private Map urlTitleMap; @ApiModelProperty("消息类型 1正常文本 2.爆赞 （点赞超过10）3.危险发言（举报超5）") private Integer type; @ApiModelProperty("消息标记") @@ -82,6 +83,7 @@ public class ChatMessageResp { @ApiModelProperty("该用户是否已经举报 0否 1是") private Integer userDislike; } + @Data public static class Badge { @ApiModelProperty("徽章图像") diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java index 6467685..b7f22b7 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/response/ChatRoomResp.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import java.util.Date; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java index de2080f..19e2cf2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/ChatService.java @@ -1,6 +1,5 @@ package com.abin.mallchat.custom.chat.service; -import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.common.domain.vo.request.CursorPageBaseReq; import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp; @@ -11,10 +10,6 @@ import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp; -import com.abin.mallchat.custom.chat.service.adapter.MessageAdapter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import javax.annotation.Nullable; @@ -34,21 +29,25 @@ public interface ChatService { /** * 根据消息获取消息前端展示的物料 + * * @param message * @param receiveUid 接受消息的uid，可null * @return */ - ChatMessageResp getMsgResp(Message message,Long receiveUid); + ChatMessageResp getMsgResp(Message message, Long receiveUid); + /** * 根据消息获取消息前端展示的物料 + * * @param msgId * @param receiveUid 接受消息的uid，可null * @return */ - ChatMessageResp getMsgResp(Long msgId,Long receiveUid); + ChatMessageResp getMsgResp(Long msgId, Long receiveUid); /** * 获取群成员列表 + * * @param request * @return */ @@ -56,13 +55,15 @@ public interface ChatService { /** * 获取消息列表 + * * @param request * @return */ - CursorPageBaseResp getMsgPage(ChatMessagePageReq request,@Nullable Long receiveUid); + CursorPageBaseResp getMsgPage(ChatMessagePageReq request, @Nullable Long receiveUid); /** * 获取会话列表 + * * @param request * @param uid * @return diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java index 93dd8c6..c23ff11 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MemberAdapter.java @@ -1,23 +1,16 @@ package com.abin.mallchat.custom.chat.service.adapter; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Pair; -import com.abin.mallchat.common.chat.domain.entity.Message; -import com.abin.mallchat.common.chat.domain.enums.MessageStatusEnum; 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.cache.UserCache; -import com.abin.mallchat.custom.chat.domain.vo.request.ChatMessageReq; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; -import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Collection; import java.util.Date; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java index 9acd0c0..13cbe76 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/MessageAdapter.java @@ -6,7 +6,6 @@ import com.abin.mallchat.common.chat.domain.entity.MessageExtra; 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.common.domain.enums.YesOrNoEnum; import com.abin.mallchat.common.common.utils.discover.PrioritizedUrlTitleDiscover; import com.abin.mallchat.common.user.domain.entity.IpDetail; @@ -15,8 +14,6 @@ import com.abin.mallchat.common.user.domain.entity.ItemConfig; 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.ChatMessageResp; -import com.sun.org.apache.regexp.internal.RE; -import org.yaml.snakeyaml.error.Mark; 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-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java index 372cae9..58a69c4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/adapter/RoomAdapter.java @@ -1,17 +1,10 @@ package com.abin.mallchat.custom.chat.service.adapter; import cn.hutool.core.bean.BeanUtil; -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.MessageStatusEnum; -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.ChatMessageResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatRoomResp; import java.util.List; -import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java index 92afcb0..d003217 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java @@ -14,9 +14,10 @@ import com.abin.mallchat.common.common.annotation.RedissonLock; import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; 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.common.event.MessageMarkEvent; +import com.abin.mallchat.common.common.event.MessageSendEvent; import com.abin.mallchat.common.common.exception.BusinessException; import com.abin.mallchat.common.common.utils.AssertUtil; -import com.abin.mallchat.common.common.utils.discover.PrioritizedUrlTitleDiscover; import com.abin.mallchat.common.user.dao.UserDao; import com.abin.mallchat.common.user.domain.entity.ItemConfig; import com.abin.mallchat.common.user.domain.entity.User; @@ -30,13 +31,11 @@ import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; 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.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.common.common.event.MessageMarkEvent; -import com.abin.mallchat.common.common.event.MessageSendEvent; -import com.abin.mallchat.custom.chat.service.ChatService; -import com.abin.mallchat.custom.chat.service.adapter.MessageAdapter; 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/common/config/InterceptorConfig.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java index ad55fbe..6fc0e65 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/InterceptorConfig.java @@ -22,6 +22,7 @@ public class InterceptorConfig implements WebMvcConfigurer { private CollectorInterceptor collectorInterceptor; @Autowired private BlackInterceptor blackInterceptor; + @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(tokenInterceptor) diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java index 4446156..e7f810b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/SwaggerConfig.java @@ -10,14 +10,9 @@ import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpoints import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; -import org.springframework.core.env.Profiles; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; @@ -59,6 +54,7 @@ public class SwaggerConfig { .paths(PathSelectors.any()) .build(); } + /** * 增加如下配置可解决Spring Boot 6.x 与Swagger 3.0.0 不兼容问题 **/ @@ -74,6 +70,7 @@ public class SwaggerConfig { boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment, basePath); return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath), shouldRegisterLinksMapping, null); } + private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, String basePath) { return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath) || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT)); } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java index 6196427..088802b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/config/WxMpConfiguration.java @@ -1,28 +1,24 @@ package com.abin.mallchat.custom.common.config; -import com.abin.mallchat.custom.user.service.handler.*; +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 lombok.AllArgsConstructor; -import me.chanjar.weixin.common.redis.JedisWxRedisOps; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; -import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; import java.util.List; import java.util.stream.Collectors; import static me.chanjar.weixin.common.api.WxConsts.EventType; import static me.chanjar.weixin.common.api.WxConsts.EventType.SUBSCRIBE; -import static me.chanjar.weixin.common.api.WxConsts.EventType.UNSUBSCRIBE; -import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType; import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType.EVENT; -import static me.chanjar.weixin.mp.constant.WxMpEventConstants.CustomerService.*; -import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY; /** * wechat mp configuration diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java index eb6721e..67d59f1 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/ItemReceiveListener.java @@ -1,12 +1,12 @@ package com.abin.mallchat.custom.common.event.listener; +import com.abin.mallchat.common.common.event.ItemReceiveEvent; import com.abin.mallchat.common.user.dao.UserDao; 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.common.user.domain.enums.ItemTypeEnum; import com.abin.mallchat.common.user.service.cache.ItemCache; -import com.abin.mallchat.common.common.event.ItemReceiveEvent; 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/MessageMarkListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java index a6e6e27..550ae33 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageMarkListener.java @@ -7,9 +7,9 @@ import com.abin.mallchat.common.chat.domain.entity.Message; import com.abin.mallchat.common.chat.domain.enums.MessageMarkTypeEnum; import com.abin.mallchat.common.chat.domain.enums.MessageTypeEnum; 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.common.common.event.MessageMarkEvent; 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/MessageSendListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java index ce9a803..a095c7d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/MessageSendListener.java @@ -2,8 +2,8 @@ package com.abin.mallchat.custom.common.event.listener; import com.abin.mallchat.common.chat.dao.MessageDao; import com.abin.mallchat.common.chat.domain.entity.Message; -import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; import com.abin.mallchat.common.common.event.MessageSendEvent; +import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; 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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java index d67f0c5..8d4203c 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOfflineListener.java @@ -1,9 +1,9 @@ package com.abin.mallchat.custom.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.service.cache.UserCache; -import com.abin.mallchat.common.common.event.UserOfflineEvent; import com.abin.mallchat.custom.user.service.WebSocketService; import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java index e298312..07fd514 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserOnlineListener.java @@ -1,10 +1,10 @@ package com.abin.mallchat.custom.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.service.IpService; import com.abin.mallchat.common.user.service.cache.UserCache; -import com.abin.mallchat.common.common.event.UserOnlineEvent; import com.abin.mallchat.custom.user.service.WebSocketService; import com.abin.mallchat.custom.user.service.adapter.WSAdapter; import lombok.extern.slf4j.Slf4j; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java index ddc1ac6..1336082 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/event/listener/UserRegisterListener.java @@ -1,12 +1,11 @@ package com.abin.mallchat.custom.common.event.listener; import com.abin.mallchat.common.common.domain.enums.IdempotentEnum; +import com.abin.mallchat.common.common.event.UserRegisterEvent; 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.ItemEnum; import com.abin.mallchat.common.user.service.IUserBackpackService; -import com.abin.mallchat.common.common.event.UserOnlineEvent; -import com.abin.mallchat.common.common.event.UserRegisterEvent; 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/intecepter/BlackInterceptor.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java index bc2b704..a289e13 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/BlackInterceptor.java @@ -1,6 +1,5 @@ package com.abin.mallchat.custom.common.intecepter; -import cn.hutool.extra.servlet.ServletUtil; import com.abin.mallchat.common.common.domain.dto.RequestInfo; import com.abin.mallchat.common.common.exception.HttpErrorEnum; import com.abin.mallchat.common.common.utils.RequestHolder; @@ -11,14 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.Set; /** @@ -27,7 +23,7 @@ import java.util.Set; @Order(2) @Slf4j @Component -public class BlackInterceptor implements HandlerInterceptor{ +public class BlackInterceptor implements HandlerInterceptor { @Autowired private UserCache userCache; @@ -36,18 +32,19 @@ public class BlackInterceptor implements HandlerInterceptor{ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { Map> blackMap = userCache.getBlackMap(); RequestInfo requestInfo = RequestHolder.get(); - if(inBlackList(requestInfo.getUid(),blackMap.get(BlackTypeEnum.UID.getType()))){ + if (inBlackList(requestInfo.getUid(), blackMap.get(BlackTypeEnum.UID.getType()))) { HttpErrorEnum.ACCESS_DENIED.sendHttpError(response); return false; } - if(inBlackList(requestInfo.getIp(),blackMap.get(BlackTypeEnum.IP.getType()))){ + if (inBlackList(requestInfo.getIp(), blackMap.get(BlackTypeEnum.IP.getType()))) { HttpErrorEnum.ACCESS_DENIED.sendHttpError(response); return false; } return true; } - private boolean inBlackList(Object target, Set blackSet){ - if(Objects.isNull(target)||Objects.isNull(blackSet)){ + + private boolean inBlackList(Object target, Set blackSet) { + if (Objects.isNull(target) || Objects.isNull(blackSet)) { return false; } return blackSet.contains(target.toString()); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java index 2fb8d6e..afd440a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/CollectorInterceptor.java @@ -1,14 +1,12 @@ package com.abin.mallchat.custom.common.intecepter; import cn.hutool.extra.servlet.ServletUtil; -import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.common.domain.dto.RequestInfo; +import com.abin.mallchat.common.common.utils.RequestHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,7 +18,7 @@ import java.util.Optional; @Order(1) @Slf4j @Component -public class CollectorInterceptor implements HandlerInterceptor{ +public class CollectorInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java index 3659965..35c9ac9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/HttpTraceIdFilter.java @@ -2,15 +2,10 @@ package com.abin.mallchat.custom.common.intecepter; import com.abin.mallchat.common.common.constant.MDCKey; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import javax.servlet.*; -import javax.servlet.FilterConfig; import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.UUID; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java index fba7381..719fb0d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/TokenInterceptor.java @@ -1,29 +1,17 @@ package com.abin.mallchat.custom.common.intecepter; -import cn.hutool.http.HttpUtil; 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 lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; -import org.springframework.http.MediaType; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java index c3b686a..0009183 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/common/intecepter/WebLogAspect.java @@ -2,8 +2,8 @@ package com.abin.mallchat.custom.common.intecepter; import cn.hutool.core.date.StopWatch; import cn.hutool.json.JSONUtil; -import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.common.common.domain.dto.RequestInfo; +import com.abin.mallchat.common.common.utils.RequestHolder; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java index 8e957de..2fbda4e 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/UserController.java @@ -6,8 +6,8 @@ import com.abin.mallchat.common.common.utils.RequestHolder; import com.abin.mallchat.custom.user.domain.vo.request.user.ModifyNameReq; import com.abin.mallchat.custom.user.domain.vo.request.user.WearingBadgeReq; import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; -import com.abin.mallchat.custom.user.service.UserService; import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import com.abin.mallchat.custom.user.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +53,7 @@ public class UserController { @PutMapping("/badge") @ApiOperation("佩戴徽章") public ApiResult wearingBadge(@Valid @RequestBody WearingBadgeReq req) { - userService.wearingBadge(RequestHolder.get().getUid(),req); + userService.wearingBadge(RequestHolder.get().getUid(), req); return ApiResult.success(); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java index b47e130..84c4135 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/controller/WxPortalController.java @@ -55,8 +55,8 @@ public class WxPortalController { WxOAuth2AccessToken accessToken = wxService.getOAuth2Service().getAccessToken(code); WxOAuth2UserInfo userInfo = wxService.getOAuth2Service().getUserInfo(accessToken, "zh_CN"); wxMsgService.authorize(userInfo); - }catch (Exception e){ - log.error("callBack error",e); + } catch (Exception e) { + log.error("callBack error", e); } RedirectView redirectView = new RedirectView(); redirectView.setUrl("https://mp.weixin.qq.com/s/m1SRsBG96kLJW5mPe4AVGA"); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java index f3eae5c..9a920e5 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/dto/ws/WSChannelExtraDTO.java @@ -4,9 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.Date; /** * Description: 记录和前端连接的一些映射信息 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/enums/WSReqTypeEnum.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/enums/WSReqTypeEnum.java index 8e76df7..af5a726 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/enums/WSReqTypeEnum.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/enums/WSReqTypeEnum.java @@ -15,11 +15,11 @@ import java.util.stream.Collectors; */ @AllArgsConstructor @Getter -public enum WSReqTypeEnum { +public enum WSReqTypeEnum { LOGIN(1, "请求登录二维码"), HEARTBEAT(2, "心跳包"), AUTHORIZE(3, "登录认证"), - ; + ; private final Integer type; private final String desc; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java index bb3e5a3..a87b6e1 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/ModifyNameReq.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; @@ -23,7 +22,7 @@ import javax.validation.constraints.NotNull; public class ModifyNameReq { @NotNull - @Length(max = 6,message = "用户名可别取太长，不然我记不住噢") + @Length(max = 6, message = "用户名可别取太长，不然我记不住噢") @ApiModelProperty("用户名") private String name; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java index 38251ec..2426a18 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/user/WearingBadgeReq.java @@ -5,8 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSAuthorize.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSAuthorize.java index c62fd55..c12fb05 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSAuthorize.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSAuthorize.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; /** * Description: diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSBaseReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSBaseReq.java index 8f8f431..58f64cb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSBaseReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/request/ws/WSBaseReq.java @@ -11,6 +11,7 @@ import lombok.Data; public class WSBaseReq { /** * 请求类型 1.请求登录二维码，2心跳检测 + * * @see com.abin.mallchat.custom.user.domain.enums.WSReqTypeEnum */ private Integer type; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSBaseResp.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSBaseResp.java index 65c4767..1326bda 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSBaseResp.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSBaseResp.java @@ -11,6 +11,7 @@ import lombok.Data; public class WSBaseResp { /** * ws推送给前端的消息 + * * @see com.abin.mallchat.custom.user.domain.enums.WSRespTypeEnum */ private Integer type; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginSuccess.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginSuccess.java index f874715..4d312f9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginSuccess.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginSuccess.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; /** * Description: diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginUrl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginUrl.java index 433ccdf..ff3f486 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginUrl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSLoginUrl.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; /** * Description: diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSMessage.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSMessage.java index 9c7ba12..a3259d3 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSMessage.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSMessage.java @@ -1,15 +1,7 @@ package com.abin.mallchat.custom.user.domain.vo.response.ws; -import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.ArrayList; -import java.util.List; /** * Description: 用户消息推送 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSOnlineOfflineNotify.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSOnlineOfflineNotify.java index a5e9bbb..8ec1f23 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSOnlineOfflineNotify.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/domain/vo/response/ws/WSOnlineOfflineNotify.java @@ -5,8 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - import java.util.ArrayList; import java.util.List; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java index 64c1fa1..ed28384 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/LoginService.java @@ -1,8 +1,5 @@ package com.abin.mallchat.custom.user.service; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - /** * Description: 登录相关处理类 * Author: abin @@ -36,6 +33,7 @@ public interface LoginService { /** * 如果token有效，返回uid + * * @param token * @return */ diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java index 1150320..f70db05 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/UserService.java @@ -1,11 +1,9 @@ package com.abin.mallchat.custom.user.service; -import com.abin.mallchat.common.user.domain.entity.User; import com.abin.mallchat.custom.user.domain.vo.request.user.ModifyNameReq; import com.abin.mallchat.custom.user.domain.vo.request.user.WearingBadgeReq; import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -17,10 +15,11 @@ import java.util.List; * @author abin * @since 2023-03-19 */ -public interface UserService { +public interface UserService { /** * 获取前端展示信息 + * * @param uid * @return */ @@ -28,6 +27,7 @@ public interface UserService { /** * 修改用户名 + * * @param uid * @param req */ @@ -35,12 +35,14 @@ public interface UserService { /** * 用户徽章列表 + * * @param uid */ List badges(Long uid); /** * 佩戴徽章 + * * @param uid * @param req */ @@ -48,6 +50,7 @@ public interface UserService { /** * 用户注册 + * * @param openId */ void register(String openId); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java index 6ab7ea4..f0318b2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/WxMsgService.java @@ -1,32 +1,25 @@ package com.abin.mallchat.custom.user.service; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import com.abin.mallchat.common.common.config.ThreadPoolConfig; 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 io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.dao.DuplicateKeyException; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import java.net.URLEncoder; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; /** * Description: 处理与微信api的交互逻辑 @@ -91,7 +84,7 @@ public class WxMsgService { public void authorize(WxOAuth2UserInfo userInfo) { User user = userDao.getByOpenId(userInfo.getOpenid()); //更新用户信息 - if(Objects.isNull(user.getName())){ + if (Objects.isNull(user.getName())) { fillUserInfo(user.getId(), userInfo); } //触发用户登录成功操作 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java index 10484f3..ecee176 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/ImageBuilder.java @@ -15,8 +15,8 @@ public class ImageBuilder extends AbstractBuilder { WxMpService service) { WxMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId(content) - .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .build(); + .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) + .build(); return m; } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java index b314885..8d351d0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/TextBuilder.java @@ -14,8 +14,8 @@ public class TextBuilder extends AbstractBuilder { public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage, WxMpService service) { WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content(content) - .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .build(); + .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) + .build(); return m; } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java index 4f169a1..69357a7 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/UserAdapter.java @@ -11,7 +11,6 @@ import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import java.util.Comparator; import java.util.List; @@ -38,9 +37,9 @@ public class UserAdapter { user.setAvatar(userInfo.getHeadImgUrl()); user.setName(userInfo.getNickname()); user.setSex(userInfo.getSex()); - if(userInfo.getNickname().length()>6){ - user.setName("名字过长"+RandomUtil.randomInt(100000)); - }else { + if (userInfo.getNickname().length() > 6) { + user.setName("名字过长" + RandomUtil.randomInt(100000)); + } else { user.setName(userInfo.getNickname()); } return user; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java index 339df3d..7412b0a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/adapter/WSAdapter.java @@ -3,19 +3,20 @@ package com.abin.mallchat.custom.user.service.adapter; import cn.hutool.core.bean.BeanUtil; 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.cache.UserCache; +import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberStatisticResp; import com.abin.mallchat.custom.chat.domain.vo.response.ChatMessageResp; import com.abin.mallchat.custom.chat.service.ChatService; import com.abin.mallchat.custom.user.domain.enums.WSRespTypeEnum; -import com.abin.mallchat.custom.chat.domain.vo.response.ChatMemberResp; -import com.abin.mallchat.custom.user.domain.vo.response.ws.*; +import com.abin.mallchat.custom.user.domain.vo.response.ws.WSBaseResp; +import com.abin.mallchat.custom.user.domain.vo.response.ws.WSLoginSuccess; +import com.abin.mallchat.custom.user.domain.vo.response.ws.WSLoginUrl; +import com.abin.mallchat.custom.user.domain.vo.response.ws.WSOnlineOfflineNotify; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Collections; -import java.util.Date; /** * Description: ws消息适配器 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java index efb8c8e..7072a01 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java @@ -9,7 +9,6 @@ import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; -import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,12 +25,13 @@ public class MsgHandler extends AbstractHandler { @Autowired private WxMsgDao wxMsgDao; + @Override public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService weixinService, WxSessionManager sessionManager) { if (true) { - WxMsg msg =new WxMsg(); + WxMsg msg = new WxMsg(); msg.setOpenId(wxMessage.getFromUser()); msg.setMsg(wxMessage.getContent()); wxMsgDao.save(msg); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java index 1b3efd3..f94dd73 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/ScanHandler.java @@ -1,26 +1,15 @@ package com.abin.mallchat.custom.user.service.handler; -import cn.hutool.core.util.URLUtil; -import com.abin.mallchat.common.user.dao.UserDao; -import com.abin.mallchat.common.user.domain.entity.User; -import com.abin.mallchat.custom.user.service.LoginService; -import com.abin.mallchat.custom.user.service.WebSocketService; import com.abin.mallchat.custom.user.service.WxMsgService; -import com.abin.mallchat.custom.user.service.adapter.TextBuilder; -import com.abin.mallchat.custom.user.service.adapter.UserAdapter; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.net.URLEncoder; import java.util.Map; -import java.util.Objects; @Component public class ScanHandler extends AbstractHandler { @@ -28,11 +17,12 @@ public class ScanHandler extends AbstractHandler { @Autowired private WxMsgService wxMsgService; + @Override public WxMpXmlOutMessage handle(WxMpXmlMessage wxMpXmlMessage, Map map, WxMpService wxMpService, WxSessionManager wxSessionManager) throws WxErrorException { // 扫码事件处理 - return wxMsgService.scan(wxMpService,wxMpXmlMessage); + return wxMsgService.scan(wxMpService, wxMpXmlMessage); } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java index 9a1a875..e06793b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/SubscribeHandler.java @@ -7,7 +7,6 @@ import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; -import me.chanjar.weixin.mp.bean.result.WxMpUser; 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/user/service/impl/LoginServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java index 14f916a..c21d3e1 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/LoginServiceImpl.java @@ -5,13 +5,11 @@ 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.auth0.jwt.interfaces.Claim; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java index 0984560..03bdb37 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java @@ -1,5 +1,6 @@ package com.abin.mallchat.custom.user.service.impl; +import com.abin.mallchat.common.common.event.UserRegisterEvent; import com.abin.mallchat.common.common.utils.AssertUtil; import com.abin.mallchat.common.user.dao.ItemConfigDao; import com.abin.mallchat.common.user.dao.UserBackpackDao; @@ -12,7 +13,6 @@ import com.abin.mallchat.common.user.domain.enums.ItemTypeEnum; import com.abin.mallchat.common.user.service.IUserBackpackService; import com.abin.mallchat.common.user.service.cache.ItemCache; import com.abin.mallchat.common.user.service.cache.UserCache; -import com.abin.mallchat.common.common.event.UserRegisterEvent; import com.abin.mallchat.custom.user.domain.vo.request.user.ModifyNameReq; import com.abin.mallchat.custom.user.domain.vo.request.user.WearingBadgeReq; import com.abin.mallchat.custom.user.domain.vo.response.user.BadgeResp; @@ -64,7 +64,7 @@ public class UserServiceImpl implements UserService { public void modifyName(Long uid, ModifyNameReq req) { //判断名字是不是重复 User oldUser = userDao.getByName(req.getName()); - AssertUtil.isEmpty(oldUser,"名字已经被抢占了，请换一个哦~~"); + AssertUtil.isEmpty(oldUser, "名字已经被抢占了，请换一个哦~~"); //判断改名卡够不够 UserBackpack firstValidItem = userBackpackDao.getFirstValidItem(uid, ItemEnum.MODIFY_NAME_CARD.getId()); AssertUtil.isNotEmpty(firstValidItem, "改名次数不够了，等后续活动送改名卡哦"); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java index cc1ddb4..26ba0f6 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/WebSocketServiceImpl.java @@ -5,14 +5,14 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.json.JSONUtil; import com.abin.mallchat.common.common.config.ThreadPoolConfig; +import com.abin.mallchat.common.common.event.UserOfflineEvent; +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.common.event.UserOfflineEvent; 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.domain.vo.request.ws.WSAuthorize; import com.abin.mallchat.custom.user.domain.vo.response.ws.WSBaseResp; -import com.abin.mallchat.common.common.event.UserOnlineEvent; 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; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java index 33460c0..1543617 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/HttpHeadersHandler.java @@ -4,7 +4,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpHeaders; -import io.netty.util.Attribute; import io.netty.util.AttributeKey; import java.net.InetSocketAddress; diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java index d10a562..2d6a9d0 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyUtil.java @@ -1,10 +1,8 @@ package com.abin.mallchat.custom.user.websocket; import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; import io.netty.util.Attribute; import io.netty.util.AttributeKey; -import org.omg.CORBA.PUBLIC_MEMBER; /** * Description: netty工具类 diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java index 4c29c67..f609c69 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java @@ -1,7 +1,10 @@ package com.abin.mallchat.custom.user.websocket; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.*; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; @@ -11,17 +14,12 @@ import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.stream.ChunkedWriteHandler; -import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.concurrent.Future; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import java.net.InetSocketAddress; @Slf4j @Configuration diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java index 3c3f305..d7639b8 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java @@ -6,7 +6,6 @@ import com.abin.mallchat.custom.user.domain.enums.WSReqTypeEnum; import com.abin.mallchat.custom.user.domain.vo.request.ws.WSAuthorize; import com.abin.mallchat.custom.user.domain.vo.request.ws.WSBaseReq; import com.abin.mallchat.custom.user.service.WebSocketService; -import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; @@ -14,10 +13,6 @@ import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; import lombok.extern.slf4j.Slf4j; -import java.net.SocketAddress; -import java.util.HashSet; -import java.util.Set; - @Slf4j public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler { @@ -75,7 +70,7 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler - + ${CONSOLE_LOG_PATTERN} @@ -19,7 +19,7 @@ ${LOG_PATH}/${LOG_FILE}.log true - + ${CONSOLE_LOG_PATTERN} @@ -43,7 +43,7 @@ ${LOG_PATH}/${LOG_FILE}.error.log true - + ${CONSOLE_LOG_PATTERN}