From 66db17b7964634207e77a799c4e241118ca6d3f1 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Sat, 2 Aug 2025 23:15:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91AuthApi?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vip/xiaonuo/auth/api/AuthApi.java | 8 ++++---- .../auth/modular/auth/AuthApiProvider.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/AuthApi.java b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/AuthApi.java index 46e0487b..05ee04ea 100644 --- a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/AuthApi.java +++ b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/AuthApi.java @@ -84,7 +84,7 @@ public interface AuthApi { * @author yubaoshan * @date 2024/7/18 17:35 */ - String doLoginByIdForB(String userId); + String doLoginByIdForB(String userId, String device); /** * C端用户id登录 @@ -92,7 +92,7 @@ public interface AuthApi { * @author yubaoshan * @date 2024/7/18 17:35 */ - String doLoginByIdForC(String userId); + String doLoginByIdForC(String userId, String device); /** * B端账号登录 @@ -100,7 +100,7 @@ public interface AuthApi { * @author yubaoshan * @date 2024/7/18 17:35 */ - String doLoginByAccountForB(String account); + String doLoginByAccountForB(String account, String device); /** * C端账号登录 @@ -108,5 +108,5 @@ public interface AuthApi { * @author yubaoshan * @date 2024/7/18 17:35 */ - String doLoginByAccountForC(String account); + String doLoginByAccountForC(String account, String device); } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/auth/AuthApiProvider.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/auth/AuthApiProvider.java index 24c7078f..0b292f50 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/auth/AuthApiProvider.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/auth/AuthApiProvider.java @@ -16,6 +16,7 @@ package vip.xiaonuo.auth.modular.auth; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -30,7 +31,6 @@ import vip.xiaonuo.auth.modular.login.service.AuthService; import vip.xiaonuo.auth.modular.third.service.AuthThirdService; import java.util.List; -import java.util.stream.Collectors; /** * 认证鉴权API实现类 @@ -119,22 +119,22 @@ public class AuthApiProvider implements AuthApi { } @Override - public String doLoginByIdForB(String userId) { - return authService.doLoginById(userId, AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.B.getValue()); + public String doLoginByIdForB(String userId, String device) { + return authService.doLoginById(userId, ObjectUtil.isNotEmpty(device)?device:AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.B.getValue()); } @Override - public String doLoginByIdForC(String userId) { - return authService.doLoginById(userId, AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.C.getValue()); + public String doLoginByIdForC(String userId, String device) { + return authService.doLoginById(userId, ObjectUtil.isNotEmpty(device)?device:AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.C.getValue()); } @Override - public String doLoginByAccountForB(String account) { - return authService.doLoginByAccount(account, AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.B.getValue()); + public String doLoginByAccountForB(String account, String device) { + return authService.doLoginByAccount(account, ObjectUtil.isNotEmpty(device)?device:AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.B.getValue()); } @Override - public String doLoginByAccountForC(String account) { - return authService.doLoginByAccount(account, AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.C.getValue()); + public String doLoginByAccountForC(String account, String device) { + return authService.doLoginByAccount(account, ObjectUtil.isNotEmpty(device)?device:AuthDeviceTypeEnum.PC.getValue(), SaClientTypeEnum.C.getValue()); } }