diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index a07d783..df03473 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -213,28 +213,10 @@ public class SysLoginController */ @GetMapping("/getWwTjmHlwToken") public AjaxResult getWwTjmHlwToken(HttpServletRequest request){ - String token = request.getHeader("Authorization"); - if (token != null && token.startsWith("Bearer ")) { - token = token.substring(7); - } - - String cookieValue = null; - javax.servlet.http.Cookie[] cookies = request.getCookies(); - if (cookies != null) { - for (javax.servlet.http.Cookie cookie : cookies) { - if ("portal_auth".equals(cookie.getName())) { - cookieValue = cookie.getValue(); - break; - } - } - } - - boolean isTokenValid = validateToken(token); - boolean isCookieValid = validateCookie(cookieValue); - if (isTokenValid && isCookieValid) { + String token = request.getHeader("Access-Token"); + if (StringUtils.isNotBlank(token)) { WwTokenResult wwTokenResult=new WwTokenResult(); wwTokenResult.setAccessToken(token); - wwTokenResult.setSessionCookie(cookieValue); String localToken = oauthLoginHlwService.getWwTjmHlwToken(wwTokenResult); return AjaxResult.success("门户登录成功") .put("token", localToken) @@ -244,21 +226,4 @@ public class SysLoginController } } - /** - * 验证token - * @param token - * @return - */ - private boolean validateToken(String token) { - return token != null && !token.isEmpty() && token.matches("^[A-Za-z0-9_-]{36}$"); - } - - /** - * 验证cookie - * @param cookieValue - * @return - */ - private boolean validateCookie(String cookieValue) { - return cookieValue != null && !cookieValue.isEmpty(); - } }