From 1bdb6bf1b85f1c98f3693884ef2204147025f7b2 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 27 Jun 2024 10:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 das/pom.xml                                           | 11 ++---------
 .../main/java/com/das/common/utils/PageDataInfo.java  | 10 ++++++----
 .../das/modules/auth/controller/LoginController.java  |  8 ++------
 .../com/das/modules/auth/service/LoginService.java    |  2 +-
 .../modules/auth/service/impl/LoginServiceImpl.java   |  3 +--
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/das/pom.xml b/das/pom.xml
index 4f9eda19..10141311 100644
--- a/das/pom.xml
+++ b/das/pom.xml
@@ -65,14 +65,6 @@
             <version>${sa.version}</version>
         </dependency>
 
-        <!-- hutool 的依赖配置-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis-jackson</artifactId>
@@ -108,7 +100,8 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <version>${mybatis.plus.spring.boot}</version>
         </dependency>
-        <!--hutool-->
+
+        <!-- hutool 的依赖配置-->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
diff --git a/das/src/main/java/com/das/common/utils/PageDataInfo.java b/das/src/main/java/com/das/common/utils/PageDataInfo.java
index 86d76267..4c4ed900 100644
--- a/das/src/main/java/com/das/common/utils/PageDataInfo.java
+++ b/das/src/main/java/com/das/common/utils/PageDataInfo.java
@@ -1,11 +1,13 @@
 package com.das.common.utils;
 
-import cn.hutool.http.HttpStatus;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.HttpStatus;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.net.http.HttpResponse;
 import java.util.List;
 
 /**
@@ -52,7 +54,7 @@ public class PageDataInfo<T> implements Serializable {
 
     public static <T> PageDataInfo<T> build(List<T> list, long total) {
         PageDataInfo<T> rspData = new PageDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setCode(HttpStatus.OK.value());
         rspData.setMsg("查询成功");
         rspData.setRows(list);
         rspData.setTotal(total);
@@ -61,7 +63,7 @@ public class PageDataInfo<T> implements Serializable {
 
     public static <T> PageDataInfo<T> build(List<T> list) {
         PageDataInfo<T> rspData = new PageDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setCode(HttpStatus.OK.value());
         rspData.setMsg("查询成功");
         rspData.setRows(list);
         rspData.setTotal(list.size());
@@ -70,7 +72,7 @@ public class PageDataInfo<T> implements Serializable {
 
     public static <T> PageDataInfo<T> build() {
         PageDataInfo<T> rspData = new PageDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setCode(HttpStatus.OK.value());
         rspData.setMsg("查询成功");
         return rspData;
     }
diff --git a/das/src/main/java/com/das/modules/auth/controller/LoginController.java b/das/src/main/java/com/das/modules/auth/controller/LoginController.java
index 5ac74b3a..38ca19ea 100644
--- a/das/src/main/java/com/das/modules/auth/controller/LoginController.java
+++ b/das/src/main/java/com/das/modules/auth/controller/LoginController.java
@@ -59,12 +59,8 @@ public class LoginController {
      */
     @PostMapping("/logout")
     public R<?> logout(HttpServletRequest request) {
-        if (loginService.logout(request)) {
-            return R.success("退出成功");
-        } else {
-            return R.fail("退出失败");
-        }
-
+        loginService.logout(request);
+        return R.success("退出成功");
     }
 
     @PostMapping("/captchaImage")
diff --git a/das/src/main/java/com/das/modules/auth/service/LoginService.java b/das/src/main/java/com/das/modules/auth/service/LoginService.java
index 7912ffda..0f88eb35 100644
--- a/das/src/main/java/com/das/modules/auth/service/LoginService.java
+++ b/das/src/main/java/com/das/modules/auth/service/LoginService.java
@@ -28,7 +28,7 @@ public interface LoginService {
      * 退出登录
      * @return 是否退出成功
      */
-    boolean logout(HttpServletRequest request);
+    void logout(HttpServletRequest request);
 
     /**
      * 刷新token
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
index 1221d8f3..8eb9c1c6 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
@@ -93,11 +93,10 @@ public class LoginServiceImpl implements LoginService {
 
 
     @Override
-    public boolean logout(HttpServletRequest request) {
+    public void logout(HttpServletRequest request) {
         String token = request.getHeader("token");
         adminRedisTemplate.del(token);
         StpUtil.logoutByTokenValue(token);
-        return true;
     }
 
     @Override