diff --git a/src/main/java/vvpkassistant/User/model/DTO/LoginInfoDTO.java b/src/main/java/vvpkassistant/User/model/DTO/LoginInfoDTO.java
index 4f70a20..e5c6d7d 100644
--- a/src/main/java/vvpkassistant/User/model/DTO/LoginInfoDTO.java
+++ b/src/main/java/vvpkassistant/User/model/DTO/LoginInfoDTO.java
@@ -25,5 +25,5 @@ public class LoginInfoDTO {
      */
     private String status;
 
-    private Integer userId;
+    private Integer id;
 }
\ No newline at end of file
diff --git a/src/main/java/vvpkassistant/User/model/DTO/ScanInfoDTO.java b/src/main/java/vvpkassistant/User/model/DTO/ScanInfoDTO.java
index 59a17c4..e6a3a89 100644
--- a/src/main/java/vvpkassistant/User/model/DTO/ScanInfoDTO.java
+++ b/src/main/java/vvpkassistant/User/model/DTO/ScanInfoDTO.java
@@ -9,5 +9,5 @@ import lombok.Data;
 @Data
 public class ScanInfoDTO {
     private String uuid;
-    private Integer userId;
+    private Integer id;
 }
diff --git a/src/main/java/vvpkassistant/User/service/UserService.java b/src/main/java/vvpkassistant/User/service/UserService.java
index e7ebeb1..a21c933 100644
--- a/src/main/java/vvpkassistant/User/service/UserService.java
+++ b/src/main/java/vvpkassistant/User/service/UserService.java
@@ -1,6 +1,7 @@
 package vvpkassistant.User.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import vvpkassistant.User.model.DTO.LoginInfoDTO;
 import vvpkassistant.User.model.DTO.ScanInfoDTO;
 import vvpkassistant.User.model.DTO.UserModelDTO;
 import vvpkassistant.User.model.UserModel;
@@ -27,7 +28,7 @@ public interface UserService extends IService<UserModel> {
 
     Object checkQrcode(String uuid);
 
-    void scanQrcode(ScanInfoDTO scanInfoDTO);
+    LoginInfoDTO scanQrcode(ScanInfoDTO scanInfoDTO);
 
     void confirm(ScanInfoDTO scanInfoDTO);
 
diff --git a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
index 6c63c88..d133c33 100644
--- a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
+++ b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
@@ -230,7 +230,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
             return loginInfoDTO;
         }
         if (LoginStatusEnum.CONFIRMED.name().equals(loginInfoDTO.getStatus())) {
-            UserModel userModel = userDao.selectById(loginInfoDTO.getUserId());
+            UserModel userModel = userDao.selectById(loginInfoDTO.getId());
             StpUtil.login(userModel.getId());
             UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class);
             userModelVO.setToken(StpUtil.getTokenValue());
@@ -241,16 +241,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
     }
 
     @Override
-    public void scanQrcode(ScanInfoDTO scanInfoDTO) {
+    public LoginInfoDTO scanQrcode(ScanInfoDTO scanInfoDTO) {
         LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
         if (loginInfoDTO != null) {
             loginInfoDTO.setStatus(LoginStatusEnum.SCANNED.name());
-        }
-        if (loginInfoDTO != null) {
             qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
         }
-
         log.info("-------扫码成功uuid:{}-------", scanInfoDTO.getUuid());
+        return loginInfoDTO;
     }
 
     @Override
@@ -258,7 +256,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
         LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
         if (loginInfoDTO != null) {
             loginInfoDTO.setStatus(LoginStatusEnum.CONFIRMED.name());
-            loginInfoDTO.setUserId(scanInfoDTO.getUserId());
+            loginInfoDTO.setId(scanInfoDTO.getId());
             qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
         }
         log.info("-------确认登录成功uuid:{}-------", scanInfoDTO.getUuid());
diff --git a/src/main/java/vvpkassistant/controller/UserController.java b/src/main/java/vvpkassistant/controller/UserController.java
index 98af04e..660d84a 100644
--- a/src/main/java/vvpkassistant/controller/UserController.java
+++ b/src/main/java/vvpkassistant/controller/UserController.java
@@ -427,8 +427,7 @@ public class UserController {
 
     @PostMapping("/scan")
     public ResponseData<?> scanQrCode(@RequestBody ScanInfoDTO scanInfoDTO) {
-        userService.scanQrcode(scanInfoDTO);
-        return ResponseData.success("");
+        return ResponseData.success( userService.scanQrcode(scanInfoDTO));
     }
 
     @PostMapping("/confirm")
diff --git a/src/main/java/vvpkassistant/mail/service/MailServiceImpl.java b/src/main/java/vvpkassistant/mail/service/MailServiceImpl.java
index 7117dbb..45a3133 100644
--- a/src/main/java/vvpkassistant/mail/service/MailServiceImpl.java
+++ b/src/main/java/vvpkassistant/mail/service/MailServiceImpl.java
@@ -6,7 +6,6 @@ import cn.hutool.extra.mail.MailUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import com.ibm.j9ddr.tools.ddrinteractive.IFieldFormatter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;