beetlsql3-dev
Mlxa0324
parent 6e3cadcd7a
commit 144ded43c0

@ -125,7 +125,12 @@ public class HttpRequestLocal {
*/ */
public String getRequestToken() { public String getRequestToken() {
HttpServletRequest request = getRequest(); HttpServletRequest request = getRequest();
final String tokenHeader = request.getHeader(AUTHORIZATION); String tokenHeader = request.getHeader(AUTHORIZATION);
// 临时解决方案
if (tokenHeader != null) {
tokenHeader = tokenHeader.split(",")[0];
}
final Cookie cookies[] = request.getCookies(); final Cookie cookies[] = request.getCookies();
String cookieTokenValue = null; String cookieTokenValue = null;
@ -149,11 +154,15 @@ public class HttpRequestLocal {
// 获取url中的_role_tag 时间戳属性匹配cookie中的时间戳值。来拿到token // 获取url中的_role_tag 时间戳属性匹配cookie中的时间戳值。来拿到token
String roleTag = defaultIfNull(request.getParameter("_role_tag"), request.getHeader("_role_tag")); String roleTag = defaultIfNull(request.getParameter("_role_tag"), request.getHeader("_role_tag"));
// 临时解决方案
if (roleTag != null) {
roleTag = roleTag.split(",")[0];
}
final String finalRoleTag = roleTag;
Optional<Cookie> first = isNull(cookies) ? Optional.empty() : Arrays.stream(cookies) Optional<Cookie> first = isNull(cookies) ? Optional.empty() : Arrays.stream(cookies)
// 时间戳结尾判断 // 时间戳结尾判断
.filter(item -> item.getValue().endsWith("." + roleTag)).findFirst(); .filter(item -> item.getValue().endsWith("." + finalRoleTag)).findFirst();
String cookieValue = null; String cookieValue = null;
if (first.isPresent()) { if (first.isPresent()) {
@ -173,7 +182,12 @@ public class HttpRequestLocal {
*/ */
public static String getOriginRequestToken() { public static String getOriginRequestToken() {
HttpServletRequest request = getRequest(); HttpServletRequest request = getRequest();
final String tokenHeader = request.getHeader(AUTHORIZATION); String tokenHeader = request.getHeader(AUTHORIZATION);
// 临时解决方案
if (tokenHeader != null) {
tokenHeader = tokenHeader.split(",")[0];
}
final Cookie cookies[] = request.getCookies(); final Cookie cookies[] = request.getCookies();
String cookieTokenValue = null; String cookieTokenValue = null;
@ -197,11 +211,15 @@ public class HttpRequestLocal {
// 获取url中的_role_tag 时间戳属性匹配cookie中的时间戳值。来拿到token // 获取url中的_role_tag 时间戳属性匹配cookie中的时间戳值。来拿到token
String roleTag = defaultIfNull(request.getParameter("_role_tag"), request.getHeader("_role_tag")); String roleTag = defaultIfNull(request.getParameter("_role_tag"), request.getHeader("_role_tag"));
// 临时解决方案
if (roleTag != null) {
roleTag = roleTag.split(",")[0];
}
final String finalRoleTag = roleTag;
Optional<Cookie> first = isNull(cookies) ? Optional.empty() : Arrays.stream(cookies) Optional<Cookie> first = isNull(cookies) ? Optional.empty() : Arrays.stream(cookies)
// 时间戳结尾判断 // 时间戳结尾判断
.filter(item -> item.getValue().endsWith("." + roleTag)).findFirst(); .filter(item -> item.getValue().endsWith("." + finalRoleTag)).findFirst();
String cookieValue = null; String cookieValue = null;
if (first.isPresent()) { if (first.isPresent()) {

@ -56,6 +56,10 @@ public class RedisTokenInterceptor implements HandlerInterceptor {
//获取请求头中的token //获取请求头中的token
//根据前端的请求来确定Header中的参数 //根据前端的请求来确定Header中的参数
String token = request.getHeader(AUTHORIZATION); String token = request.getHeader(AUTHORIZATION);
// 临时解决方案
if (token != null) {
token = token.split(",")[0];
}
if(StringUtils.isEmpty(token)) { if(StringUtils.isEmpty(token)) {
return true; return true;
} }

@ -26,7 +26,7 @@ import java.util.stream.Collectors;
*/ */
@Data @Data
@EqualsAndHashCode @EqualsAndHashCode
public class FileQuestionLogListPageVO extends BaseEntity { public class FileQuestionLogListVO extends BaseEntity {
/** /**
* ================ =================== * ================ ===================
Loading…
Cancel
Save