From 043165fe70e3d89b96d24dbc20966c384e7fbdc1 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Wed, 22 Jan 2025 17:26:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=AE=A2=E6=88=B7=E5=92=8C=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/wfc/auth/controller/TokenController.java   | 14 ++++++++++----
 .../wfc/user/service/impl/UClientServiceImpl.java  |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java
index 9de1ea2..b27d4e2 100644
--- a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java
+++ b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java
@@ -77,10 +77,15 @@ public class TokenController {
         String token = SecurityUtils.getToken(request);
         if (StringUtils.isNotEmpty(token)) {
             String username = JwtUtils.getUserName(token);
+            String userPlatform = JwtUtils.getUserPlatform(token);
             // 删除用户缓存记录
             AuthUtil.logoutByToken(token);
             // 记录用户退出日志
-            sysLoginService.logout(username);
+            if ("user".equals(userPlatform)) {
+                uLoginService.logout(username);
+            } else {
+                sysLoginService.logout(username);
+            }
         }
         return R.ok();
     }
@@ -115,13 +120,14 @@ public class TokenController {
             uLoginService.checkRepeat(form);
             return R.ok();
         }
-        if ("sys".equals(form.getAuthType())) {}
+        if ("sys".equals(form.getAuthType())) {
+        }
         return R.fail("auth.authentication.type.not.supported");
     }
 
     @GetMapping("health")
     public R<?> health(HttpServletRequest request) {
         // check health
-        return R.ok(null,"auth.is.healthy");
-    }    
+        return R.ok(null, "auth.is.healthy");
+    }
 }
diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
index bd64134..3e33ea5 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
@@ -48,7 +48,9 @@ public class UClientServiceImpl extends ServiceImpl<UClientMapper, UClient> impl
         }
         boolean flag = this.saveOrUpdate(uClient);
         // 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi，且根据套餐限制带宽
-        accountService.authClientAndRateLimit(uClientBo);
+        if (StrUtil.isNotBlank(uClientBo.getClientName()) && StrUtil.isNotBlank(uClientBo.getSiteId())) {
+            accountService.authClientAndRateLimit(uClientBo);
+        }
         return flag;
     }