diff --git a/api-gateway/src/main/java/com/heyu/api/gateway/filter/AuthWebFilter.java b/api-gateway/src/main/java/com/heyu/api/gateway/filter/AuthWebFilter.java index e4ce050..e3d5490 100644 --- a/api-gateway/src/main/java/com/heyu/api/gateway/filter/AuthWebFilter.java +++ b/api-gateway/src/main/java/com/heyu/api/gateway/filter/AuthWebFilter.java @@ -88,14 +88,15 @@ public class AuthWebFilter implements WebFilter { String realIpAddress = getRealIpAddress(request); String m = request.getMethod().toString(); - log.info("AuthWebFilter api start time:{} ip:{} method:{} url:{},uri:{} param:{} headers:{}", + log.info("AuthWebFilter api start time:{} ip:{} method:{} url:{},uri:{} param:{} headers:{},xForwardedPath:{}", startTime, realIpAddress, m, request.getPath(), uri, request.getQueryParams(), - httpHeaders + httpHeaders, + xForwardedPath ); if(xssProperties.getEnabled()) { @@ -196,8 +197,8 @@ public class AuthWebFilter implements WebFilter { ServerHttpRequest request = exchange.getRequest(); if (StringUtils.isNotEmpty(xForwardedPath)) { String originXForwardedPath = xForwardedPath; - if (xForwardedPath.contains(ApiConstants.API_USER)) { - xForwardedPath = "/" + ApiConstants.API_USER + xForwardedPath.split(ApiConstants.API_USER)[1]; + if (xForwardedPath.contains(ApiConstants.API_INTERFACE)) { + xForwardedPath = "/" + ApiConstants.API_INTERFACE + xForwardedPath.split(ApiConstants.API_INTERFACE)[1]; } log.info("getRequest xForwardedPath is not null originXForwardedPath:{},xForwardedPath:{}",originXForwardedPath, xForwardedPath); request = request.mutate().path(xForwardedPath).build(); diff --git a/api-gateway/src/main/java/com/heyu/api/gateway/util/ApiConstants.java b/api-gateway/src/main/java/com/heyu/api/gateway/util/ApiConstants.java index a1a7ba8..7b4fb6e 100644 --- a/api-gateway/src/main/java/com/heyu/api/gateway/util/ApiConstants.java +++ b/api-gateway/src/main/java/com/heyu/api/gateway/util/ApiConstants.java @@ -86,7 +86,7 @@ public class ApiConstants { public static final String ECHOBACK = "echoback"; public static final String X_FORWARDED_PATH = "X-Forwarded-Path"; - public static final String API_USER = "api-user"; + public static final String API_INTERFACE = "api-interface"; } diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/R.java b/api-mapper/src/main/java/com/heyu/api/data/utils/R.java index 9d7bd6f..1aa2cf7 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/utils/R.java +++ b/api-mapper/src/main/java/com/heyu/api/data/utils/R.java @@ -24,11 +24,11 @@ public class R { private String msg; // 联系方式 - private String contactUs = "如果接口有疑问请加微信 fmai0923,shell_quyixiao,wulinq,或 致电18969093321,或发邮" + - "件service@ihzhy.com,如需咨询技术问题,请提供traceId"; + //private String contactUs = "如果接口有疑问请加微信 fmai0923,shell_quyixiao,wulinq,或 致电18969093321,或发邮" + +// "件service@ihzhy.com,如需咨询技术问题,请提供traceId"; // 官网地址 - private String officialWebsiteAddress = "https://www.ihzhy.com"; + // private String officialWebsiteAddress = "https://www.ihzhy.com"; /** * 日志编号 @@ -148,22 +148,5 @@ public class R { this.traceId = traceId; } - - public String getContactUs() { - return contactUs; - } - - public void setContactUs(String contactUs) { - this.contactUs = contactUs; - } - - public String getOfficialWebsiteAddress() { - return officialWebsiteAddress; - } - - public void setOfficialWebsiteAddress(String officialWebsiteAddress) { - this.officialWebsiteAddress = officialWebsiteAddress; - } - }