From 32a5d85cce4a7343650cb0615b0ae05ef6d66c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Thu, 24 Jul 2025 11:25:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AD=98=E5=82=A8=E5=88=B0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/colortitration/app/controller/AuthController.java    | 9 +++++----
 .../com/iflytop/colortitration/common/service/UserService.java   | 8 --------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/iflytop/colortitration/app/controller/AuthController.java b/src/main/java/com/iflytop/colortitration/app/controller/AuthController.java
index 303f5ad..332e155 100644
--- a/src/main/java/com/iflytop/colortitration/app/controller/AuthController.java
+++ b/src/main/java/com/iflytop/colortitration/app/controller/AuthController.java
@@ -1,6 +1,7 @@
 package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.iflytop.colortitration.app.core.state.DeviceState;
 import com.iflytop.colortitration.app.model.dto.LoginDTO;
 import com.iflytop.colortitration.common.enums.EnableStatus;
 import com.iflytop.colortitration.common.model.entity.User;
@@ -25,15 +26,15 @@ import java.util.Objects;
 @RequiredArgsConstructor
 @Slf4j
 public class AuthController {
-
     private final UserService userService;
+    private final DeviceState deviceState;
 
     @Operation(summary = "账号密码登录")
     @PostMapping("/login")
     public Result<User> login(@Valid @RequestBody LoginDTO loginDTO) {
         User user = userService.getOne(new LambdaQueryWrapper<>(User.class).eq(User::getUsername, loginDTO.getUsername()));
         if (user != null && !Objects.equals(user.getDeleted(), EnableStatus.ENABLE) && user.getPassword().equals(loginDTO.getPassword())) {
-            userService.setCurrentUser(user);
+            deviceState.setCurrentUser(user);
             user.setPassword(null);
             return Result.success(user);
         }
@@ -43,13 +44,13 @@ public class AuthController {
     @Operation(summary = "用户登出")
     @PostMapping("/logout")
     public Result<String> logout() {
-        userService.setCurrentUser(null);
+        deviceState.setCurrentUser(null);
         return Result.success();
     }
 
     @Operation(summary = "获取当前登录用户")
     @GetMapping("/current")
     public Result<User> current() {
-        return Result.success(userService.getCurrentUser());
+        return Result.success(deviceState.getCurrentUser());
     }
 }
diff --git a/src/main/java/com/iflytop/colortitration/common/service/UserService.java b/src/main/java/com/iflytop/colortitration/common/service/UserService.java
index b2cbe04..cdc7b11 100644
--- a/src/main/java/com/iflytop/colortitration/common/service/UserService.java
+++ b/src/main/java/com/iflytop/colortitration/common/service/UserService.java
@@ -12,13 +12,5 @@ import org.springframework.stereotype.Service;
 @Service
 @RequiredArgsConstructor
 public class UserService extends ServiceImpl<UserMapper, User> {
-    private User currentUser;
 
-    public User getCurrentUser() {
-        return currentUser;
-    }
-
-    public void setCurrentUser(User currentUser) {
-        this.currentUser = currentUser;
-    }
 }
\ No newline at end of file