Merge pull request #162 from hongqiaowei/modules-starter
enhancement: wehotel(#161)
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
package we.filter;
|
package we.filter;
|
||||||
|
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.core.Ordered;
|
import org.springframework.core.Ordered;
|
||||||
@@ -34,6 +35,7 @@ import javax.annotation.Resource;
|
|||||||
* @author hongqiaowei
|
* @author hongqiaowei
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ConditionalOnProperty(name = "cors", havingValue = "true", matchIfMissing = true)
|
||||||
@Configuration
|
@Configuration
|
||||||
public class CorsFilterConfig {
|
public class CorsFilterConfig {
|
||||||
|
|
||||||
|
|||||||
@@ -124,7 +124,9 @@ public class RouteFilter extends FizzWebFilter {
|
|||||||
String k = h.getKey();
|
String k = h.getKey();
|
||||||
if (clientRespHeaders.containsKey(k)) {
|
if (clientRespHeaders.containsKey(k)) {
|
||||||
if (k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN) || k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
if (k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN) || k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
||||||
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS) || k.equals(HttpHeaders.ACCESS_CONTROL_MAX_AGE)) {
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS)
|
||||||
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_MAX_AGE)
|
||||||
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS)) {
|
||||||
} else {
|
} else {
|
||||||
clientRespHeaders.put(k, h.getValue());
|
clientRespHeaders.put(k, h.getValue());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,7 +182,9 @@ public class CallbackService {
|
|||||||
String k = h.getKey();
|
String k = h.getKey();
|
||||||
if (clientRespHeaders.containsKey(k)) {
|
if (clientRespHeaders.containsKey(k)) {
|
||||||
if (k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN) || k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
if (k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN) || k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
||||||
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS) || k.equals(HttpHeaders.ACCESS_CONTROL_MAX_AGE)) {
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS)
|
||||||
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_MAX_AGE)
|
||||||
|
|| k.equals(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS)) {
|
||||||
} else {
|
} else {
|
||||||
clientRespHeaders.put(k, h.getValue());
|
clientRespHeaders.put(k, h.getValue());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user