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 8515083..04efa6d 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
@@ -2,7 +2,6 @@ package com.abin.mallchat.custom.user.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.json.JSONUtil;
 import com.abin.mallchat.common.common.annotation.FrequencyControl;
 import com.abin.mallchat.common.common.config.ThreadPoolConfig;
@@ -20,6 +19,8 @@ import com.abin.mallchat.custom.user.service.LoginService;
 import com.abin.mallchat.custom.user.service.WebSocketService;
 import com.abin.mallchat.custom.user.service.adapter.WSAdapter;
 import com.abin.mallchat.custom.user.websocket.NettyUtil;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import lombok.SneakyThrows;
@@ -32,13 +33,13 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+
+import java.time.Duration;
+import java.util.*;
+
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -51,12 +52,18 @@ import java.util.concurrent.locks.ReentrantLock;
 @Slf4j
 public class WebSocketServiceImpl implements WebSocketService {
 
+    private static final Duration EXPIRE_TIME = Duration.ofHours(1);
+    private static final Long MAX_MUM_SIZE = 10000L;
+
+    private static final AtomicInteger CODE = new AtomicInteger();
 
     /**
      * 所有请求登录的code与channel关系
-     * todo 有可能有人请求了二维码，就是不登录，留个坑，之后处理
      */
-    private static final ConcurrentHashMap<Integer, Channel> WAIT_LOGIN_MAP = new ConcurrentHashMap<>();
+    private static final Cache<Integer, Channel> WAIT_LOGIN_MAP = Caffeine.newBuilder()
+            .expireAfterWrite(EXPIRE_TIME)
+            .maximumSize(MAX_MUM_SIZE)
+            .build();
     /**
      * 所有已连接的websocket连接列表和一些额外参数
      */
@@ -70,7 +77,6 @@ public class WebSocketServiceImpl implements WebSocketService {
         return ONLINE_WS_MAP;
     }
 
-    public static final int EXPIRE_SECONDS = 60 * 60;
     @Autowired
     private WxMpService wxMpService;
     @Autowired
@@ -99,7 +105,7 @@ public class WebSocketServiceImpl implements WebSocketService {
         //生成随机不重复的登录码
         Integer code = generateLoginCode(channel);
         //请求微信接口，获取登录码地址
-        WxMpQrCodeTicket wxMpQrCodeTicket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(code, EXPIRE_SECONDS);
+        WxMpQrCodeTicket wxMpQrCodeTicket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(code, (int) EXPIRE_TIME.getSeconds());
         //返回给前端
         sendMsg(channel, WSAdapter.buildLoginResp(wxMpQrCodeTicket));
     }
@@ -111,12 +117,11 @@ public class WebSocketServiceImpl implements WebSocketService {
      * @return
      */
     private Integer generateLoginCode(Channel channel) {
-        int code;
         do {
-            code = RandomUtil.randomInt(Integer.MAX_VALUE);
-        } while (WAIT_LOGIN_MAP.contains(code)
-                || Objects.nonNull(WAIT_LOGIN_MAP.putIfAbsent(code, channel)));
-        return code;
+            CODE.getAndIncrement();
+        } while (WAIT_LOGIN_MAP.asMap().containsKey(CODE.get())
+                || Objects.isNull(WAIT_LOGIN_MAP.get(CODE.get(), c -> channel)));
+        return CODE.get();
     }
 
     /**
@@ -203,12 +208,12 @@ public class WebSocketServiceImpl implements WebSocketService {
     @Override
     public Boolean scanLoginSuccess(Integer loginCode, User user, String token) {
         //发送消息
-        Channel channel = WAIT_LOGIN_MAP.get(loginCode);
+        Channel channel = WAIT_LOGIN_MAP.getIfPresent(loginCode);
         if (Objects.isNull(channel)) {
             return Boolean.FALSE;
         }
         //移除code
-        WAIT_LOGIN_MAP.remove(loginCode);
+        WAIT_LOGIN_MAP.invalidate(loginCode);
         //用户登录
         loginSuccess(channel, user, token);
         return true;
@@ -216,7 +221,7 @@ public class WebSocketServiceImpl implements WebSocketService {
 
     @Override
     public Boolean scanSuccess(Integer loginCode) {
-        Channel channel = WAIT_LOGIN_MAP.get(loginCode);
+        Channel channel = WAIT_LOGIN_MAP.getIfPresent(loginCode);
         if (Objects.isNull(channel)) {
             return Boolean.FALSE;
         }
@@ -291,4 +296,6 @@ public class WebSocketServiceImpl implements WebSocketService {
         reentrantLock.unlock();
         Thread.sleep(1000);
     }
+
+
 }