格式化代码

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;

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;

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;

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;
 

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: <a href="https://github.com/zongzibinbin">abin</a>

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 com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+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;
 
 /**
  * <p>
@@ -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")

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;

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;
 
 /**
  * <p>
@@ -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")

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 com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 会话表
@@ -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")

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 com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 微信消息表
@@ -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;
 
     /**

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),
+    LIKE(1, "点赞", 10, MessageTypeEnum.LIKE),
-    DISLIKE(2, "点踩",5,MessageTypeEnum.DISLIKE),
+    DISLIKE(2, "点踩", 5, MessageTypeEnum.DISLIKE),
     ;
 
     private final Integer type;

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)//运行时生效

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.ElementType;
-
+import java.lang.annotation.Retention;
-import java.lang.annotation.*;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.concurrent.TimeUnit;
 
 /**

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());
             });
         }
     }

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: 分布式锁切面

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> T deserialize(byte[] source, Class<T> 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));

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){
+    public static Integer toStatus(Boolean bool) {
-        return bool?YES.getStatus():NO.getStatus();
+        return bool ? YES.getStatus() : NO.getStatus();
     }
 }

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;

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)

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;

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;

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;
 

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;

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);
     }

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: 业务校验异常码

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;
 

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);
         }
     }

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;
 
 /**

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状态为失败
+     * 设置CF状态为失败
-   */
+     */
-  public static <T> CompletableFuture<T> failed(Throwable ex) {
+    public static <T> CompletableFuture<T> failed(Throwable ex) {
-   CompletableFuture<T> completableFuture = new CompletableFuture<>();
+        CompletableFuture<T> completableFuture = new CompletableFuture<>();
-   completableFuture.completeExceptionally(ex);
+        completableFuture.completeExceptionally(ex);
-   return completableFuture;
+        return completableFuture;
-  }
+    }
-  /**
+
-   * 设置CF状态为成功
+    /**
-   */
+     * 设置CF状态为成功
-  public static <T> CompletableFuture<T> success(T result) {
+     */
-   CompletableFuture<T> completableFuture = new CompletableFuture<>();
+    public static <T> CompletableFuture<T> success(T result) {
-   completableFuture.complete(result);
+        CompletableFuture<T> completableFuture = new CompletableFuture<>();
-   return completableFuture;
+        completableFuture.complete(result);
-  }
+        return completableFuture;
-  /**
+    }
-   * 将List<CompletableFuture<T>> 转为 CompletableFuture<List<T>>
+
-   */
+    /**
-  public static <T> CompletableFuture<List<T>> sequence(Collection<CompletableFuture<T>> completableFutures) {
+     * 将List<CompletableFuture<T>> 转为 CompletableFuture<List<T>>
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+     */
-           .thenApply(v -> completableFutures.stream()
+    public static <T> CompletableFuture<List<T>> sequence(Collection<CompletableFuture<T>> completableFutures) {
-                   .map(CompletableFuture::join)
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-                   .collect(Collectors.toList())
+                .thenApply(v -> completableFutures.stream()
-           );
+                        .map(CompletableFuture::join)
-  }
+                        .collect(Collectors.toList())
-  /**
+                );
-   * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>
+    }
-   * 多用于分页查询的场景
+
-   */
+    /**
-  public static <T> CompletableFuture<List<T>> sequenceList(Collection<CompletableFuture<List<T>>> completableFutures) {
+     * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+     * 多用于分页查询的场景
-           .thenApply(v -> completableFutures.stream()
+     */
-                   .flatMap( listFuture -> listFuture.join().stream())
+    public static <T> CompletableFuture<List<T>> sequenceList(Collection<CompletableFuture<List<T>>> completableFutures) {
-                   .collect(Collectors.toList())
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-           );
+                .thenApply(v -> completableFutures.stream()
-  }
+                        .flatMap(listFuture -> listFuture.join().stream())
-  /*
+                        .collect(Collectors.toList())
-   * 将List<CompletableFuture<Map<K, V>>> 转为 CompletableFuture<Map<K, V>>
+                );
-   * @Param mergeFunction 自定义key冲突时的merge策略
+    }
-   */
+
-  public static <K, V> CompletableFuture<Map<K, V>> sequenceMap(
+    /*
-       Collection<CompletableFuture<Map<K, V>>> completableFutures, BinaryOperator<V> mergeFunction) {
+     * 将List<CompletableFuture<Map<K, V>>> 转为 CompletableFuture<Map<K, V>>
-   return CompletableFuture
+     * @Param mergeFunction 自定义key冲突时的merge策略
-           .allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+     */
-           .thenApply(v -> completableFutures.stream().map(CompletableFuture::join)
+    public static <K, V> CompletableFuture<Map<K, V>> sequenceMap(
-                   .flatMap(map -> map.entrySet().stream())
+            Collection<CompletableFuture<Map<K, V>>> completableFutures, BinaryOperator<V> mergeFunction) {
-                   .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, mergeFunction)));
+        return CompletableFuture
-  }
+                .allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-  /**
+                .thenApply(v -> completableFutures.stream().map(CompletableFuture::join)
-   * 将List<CompletableFuture<T>> 转为 CompletableFuture<List<T>>，并过滤调null值
+                        .flatMap(map -> map.entrySet().stream())
-   */
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, mergeFunction)));
-  public static <T> CompletableFuture<List<T>> sequenceNonNull(Collection<CompletableFuture<T>> completableFutures) {
+    }
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+
-           .thenApply(v -> completableFutures.stream()
+    /**
-                   .map(CompletableFuture::join)
+     * 将List<CompletableFuture<T>> 转为 CompletableFuture<List<T>>，并过滤调null值
-                   .filter(Objects::nonNull)
+     */
-                   .collect(Collectors.toList())
+    public static <T> CompletableFuture<List<T>> sequenceNonNull(Collection<CompletableFuture<T>> completableFutures) {
-           );
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-  }
+                .thenApply(v -> completableFutures.stream()
-  /**
+                        .map(CompletableFuture::join)
-   * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>，并过滤调null值
+                        .filter(Objects::nonNull)
-   * 多用于分页查询的场景
+                        .collect(Collectors.toList())
-   */
+                );
-  public static <T> CompletableFuture<List<T>> sequenceListNonNull(Collection<CompletableFuture<List<T>>> completableFutures) {
+    }
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+
-           .thenApply(v -> completableFutures.stream()
+    /**
-                   .flatMap( listFuture -> listFuture.join().stream().filter(Objects::nonNull))
+     * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>，并过滤调null值
-                   .collect(Collectors.toList())
+     * 多用于分页查询的场景
-           );
+     */
-  }
+    public static <T> CompletableFuture<List<T>> sequenceListNonNull(Collection<CompletableFuture<List<T>>> completableFutures) {
-  /**
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-   * 将List<CompletableFuture<Map<K, V>>> 转为 CompletableFuture<Map<K, V>>
+                .thenApply(v -> completableFutures.stream()
-   * @Param filterFunction 自定义过滤策略
+                        .flatMap(listFuture -> listFuture.join().stream().filter(Objects::nonNull))
-   */
+                        .collect(Collectors.toList())
-  public static <T> CompletableFuture<List<T>> sequence(Collection<CompletableFuture<T>> completableFutures,
+                );
-                                                     Predicate<? super T> filterFunction) {
+    }
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+
-           .thenApply(v -> completableFutures.stream()
+    /**
-                   .map(CompletableFuture::join)
+     * 将List<CompletableFuture<Map<K, V>>> 转为 CompletableFuture<Map<K, V>>
-                   .filter(filterFunction)
+     *
-                   .collect(Collectors.toList())
+     * @Param filterFunction 自定义过滤策略
-           );
+     */
-  }
+    public static <T> CompletableFuture<List<T>> sequence(Collection<CompletableFuture<T>> completableFutures,
-  /**
+                                                          Predicate<? super T> filterFunction) {
-   * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-   * @Param filterFunction 自定义过滤策略
+                .thenApply(v -> completableFutures.stream()
-   */
+                        .map(CompletableFuture::join)
-  public static <T> CompletableFuture<List<T>> sequenceList(Collection<CompletableFuture<List<T>>> completableFutures,
+                        .filter(filterFunction)
-                                                         Predicate<? super T> filterFunction) {
+                        .collect(Collectors.toList())
-   return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+                );
-           .thenApply(v -> completableFutures.stream()
+    }
-                   .flatMap( listFuture -> listFuture.join().stream().filter(filterFunction))
+
-                   .collect(Collectors.toList())
+    /**
-           );
+     * 将List<CompletableFuture<List<T>>> 转为 CompletableFuture<List<T>>
-  }
+     *
-/**
+     * @Param filterFunction 自定义过滤策略
- * 将CompletableFuture<Map<K,V>>的list转为 CompletableFuture<Map<K,V>>。 多个map合并为一个map。 如果key冲突，采用新的value覆盖。
+     */
- */
+    public static <T> CompletableFuture<List<T>> sequenceList(Collection<CompletableFuture<List<T>>> completableFutures,
-  public static <K, V> CompletableFuture<Map<K, V>> sequenceMap(
+                                                              Predicate<? super T> filterFunction) {
-       Collection<CompletableFuture<Map<K, V>>> completableFutures) {
+        return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
-   return CompletableFuture
+                .thenApply(v -> completableFutures.stream()
-           .allOf(completableFutures.toArray(new CompletableFuture<?>[0]))
+                        .flatMap(listFuture -> listFuture.join().stream().filter(filterFunction))
-           .thenApply(v -> completableFutures.stream().map(CompletableFuture::join)
+                        .collect(Collectors.toList())
-                   .flatMap(map -> map.entrySet().stream())
+                );
-                   .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b)));
+    }
-  }}
+
+    /**
+     * 将CompletableFuture<Map<K,V>>的list转为 CompletableFuture<Map<K,V>>。 多个map合并为一个map。 如果key冲突，采用新的value覆盖。
+     */
+    public static <K, V> CompletableFuture<Map<K, V>> sequenceMap(
+            Collection<CompletableFuture<Map<K, V>>> 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)));
+    }
+}

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;
 

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);
     }
 

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()));
     }
 
     /**

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){
+    public static String getMethodKey(Method method) {
-        return method.getDeclaringClass()+"#"+method.getName();
+        return method.getDeclaringClass() + "#" + method.getName();
     }
 }

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;
 
 /**

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;
 
 /**

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;

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<String, String> contentTitleMap = discover.getContentTitleMap(longStr);
         System.out.println(contentTitleMap);
 //

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;
 

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;
 

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;

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;
 

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;
+
 /**
  * <p>
  * 黑名单
@@ -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")

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;
 

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.Data;
-import lombok.*;
 
 import java.io.Serializable;
 import java.util.Objects;

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;
+
 /**
  * <p>
  * 功能物品配置表
@@ -26,7 +27,7 @@ public class ItemConfig implements Serializable {
     /**
      * id
      */
-      @TableId("id")
+    @TableId("id")
     private Long id;
 
     /**

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>
@@ -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;
 
     /**

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: <a href="https://github.com/zongzibinbin">abin</a>

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;
 
 /**
  * <p>
@@ -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);
 }

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.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * Description: 用户相关缓存