格式化代码

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

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<Integer, Set<String>> getBlackMap() {
         Map<Integer, List<Black>> collect = blackDao.list().stream().collect(Collectors.groupingBy(Black::getType));
-        Map<Integer, Set<String>> result =new HashMap<>();
+        Map<Integer, Set<String>> result = new HashMap<>();
         for (Map.Entry<Integer, List<Black>> 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<Integer, Set<String>> evictBlackMap() {
         return null;

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

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