diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java index c298824..3753b2a 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; +import com.bnyer.common.core.constant.TokenConstants; import com.bnyer.common.security.utils.SecurityUtils; import com.bnyer.system.api.model.LoginUser; import org.springframework.util.PatternMatchUtils; @@ -38,7 +39,7 @@ public class AuthLogic */ public void logout() { - String token = SecurityUtils.getToken(); + String token = SecurityUtils.getToken(TokenConstants.AUTHENTICATION); if (token == null) { return; @@ -69,7 +70,7 @@ public class AuthLogic */ public LoginUser getLoginUser() { - String token = SecurityUtils.getToken(); + String token = SecurityUtils.getToken(TokenConstants.AUTHENTICATION); if (token == null) { throw new NotLoginException("未提供token"); diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java index 81d6a69..b1097c2 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java @@ -3,6 +3,7 @@ package com.bnyer.common.security.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.bnyer.common.core.constant.TokenConstants; import com.bnyer.common.security.utils.SecurityUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; @@ -33,7 +34,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME)); SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); - String token = SecurityUtils.getToken(); + String token = SecurityUtils.getToken(TokenConstants.AUTHENTICATION); if (StringUtils.isNotEmpty(token)) { LoginUser loginUser = AuthUtil.getLoginUser(token); diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java index 59d0686..96c597b 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java @@ -10,6 +10,8 @@ import com.bnyer.common.core.context.SecurityContextHolder; import com.bnyer.common.core.utils.ServletUtils; import com.bnyer.common.core.utils.StringUtils; +import java.util.Objects; + /** * 权限获取工具类 * @@ -52,9 +54,25 @@ public class SecurityUtils /** * 获取请求token */ - public static String getToken() + public static String getToken(String authType) { - return getToken(ServletUtils.getRequest()); + //PC + if(authType.equals(TokenConstants.AUTHENTICATION)){ + return getToken(Objects.requireNonNull(ServletUtils.getRequest())); + //抖音 + }else if(authType.equals(TokenConstants.TIKTOK_APP_AUTH)){ + return getTiktokToken(Objects.requireNonNull(ServletUtils.getRequest())); + //快手 + }else if(authType.equals(TokenConstants.FASTHAND_APP_AUTH)){ + return getFhToken(Objects.requireNonNull(ServletUtils.getRequest())); + //微信 + }else if(authType.equals(TokenConstants.WECHAT_APP_AUTH)){ + return getWechatToken(Objects.requireNonNull(ServletUtils.getRequest())); + //艺术家端 + }else{ + return getCreatorToken(Objects.requireNonNull(ServletUtils.getRequest())); + } + } /**