|
|
|
@ -125,7 +125,12 @@ public class HttpRequestLocal {
|
|
|
|
|
*/
|
|
|
|
|
public String getRequestToken() {
|
|
|
|
|
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();
|
|
|
|
|
|
|
|
|
|
String cookieTokenValue = null;
|
|
|
|
@ -149,11 +154,15 @@ public class HttpRequestLocal {
|
|
|
|
|
|
|
|
|
|
// 获取url中的_role_tag 时间戳属性,匹配cookie中的时间戳值。来拿到token
|
|
|
|
|
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)
|
|
|
|
|
// 时间戳结尾判断
|
|
|
|
|
.filter(item -> item.getValue().endsWith("." + roleTag)).findFirst();
|
|
|
|
|
.filter(item -> item.getValue().endsWith("." + finalRoleTag)).findFirst();
|
|
|
|
|
|
|
|
|
|
String cookieValue = null;
|
|
|
|
|
if (first.isPresent()) {
|
|
|
|
@ -173,7 +182,12 @@ public class HttpRequestLocal {
|
|
|
|
|
*/
|
|
|
|
|
public static String getOriginRequestToken() {
|
|
|
|
|
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();
|
|
|
|
|
|
|
|
|
|
String cookieTokenValue = null;
|
|
|
|
@ -197,11 +211,15 @@ public class HttpRequestLocal {
|
|
|
|
|
|
|
|
|
|
// 获取url中的_role_tag 时间戳属性,匹配cookie中的时间戳值。来拿到token
|
|
|
|
|
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)
|
|
|
|
|
// 时间戳结尾判断
|
|
|
|
|
.filter(item -> item.getValue().endsWith("." + roleTag)).findFirst();
|
|
|
|
|
.filter(item -> item.getValue().endsWith("." + finalRoleTag)).findFirst();
|
|
|
|
|
|
|
|
|
|
String cookieValue = null;
|
|
|
|
|
if (first.isPresent()) {
|
|
|
|
|