study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

sentinel upgrade to 1.6.2, close #787

Browse Source
This commit is contained in:
fangjian0423 2019-07-29 20:52:50 +08:00
parent 0203af88d9
commit 8ed7e8b7c8
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -18,7 +18,7 @@
<description>Spring Cloud Alibaba Dependencies</description> <description>Spring Cloud Alibaba Dependencies</description>
<properties> <properties>
<sentinel.version>1.6.2</sentinel.version> <sentinel.version>1.6.3</sentinel.version>
<oss.version>3.1.0</oss.version> <oss.version>3.1.0</oss.version>
<seata.version>0.7.1</seata.version> <seata.version>0.7.1</seata.version>
<nacos.client.version>1.1.1</nacos.client.version> <nacos.client.version>1.1.1</nacos.client.version>

2
spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/resources/application.yaml
View File

@ -37,5 +37,7 @@ spring:
mode: response mode: response
response-status: 444 response-status: 444
response-body: 1234 response-body: 1234
scg:
order: -100
management.endpoints.web.exposure.include: "*" management.endpoints.web.exposure.include: "*"

1
spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java
View File

@ -22,6 +22,7 @@ package com.alibaba.cloud.sentinel.gateway;
public interface ConfigConstants { public interface ConfigConstants {
String APP_TYPE_ZUUL_GATEWAY = "12"; String APP_TYPE_ZUUL_GATEWAY = "12";
String APP_TYPE_SCG_GATEWAY = "11";
String ZUUl_PREFIX = "spring.cloud.sentinel.zuul"; String ZUUl_PREFIX = "spring.cloud.sentinel.zuul";

10
spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java
View File

@ -18,6 +18,7 @@ package com.alibaba.cloud.sentinel.gateway.scg;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.core.Ordered;
import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
import com.alibaba.cloud.sentinel.gateway.FallbackProperties; import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
@ -31,6 +32,8 @@ public class SentinelGatewayProperties {
@NestedConfigurationProperty @NestedConfigurationProperty
private FallbackProperties fallback; private FallbackProperties fallback;
private Integer order = Ordered.HIGHEST_PRECEDENCE;
public FallbackProperties getFallback() { public FallbackProperties getFallback() {
return fallback; return fallback;
} }
@ -40,4 +43,11 @@ public class SentinelGatewayProperties {
return this; return this;
} }
public Integer getOrder() {
return order;
}
public void setOrder(Integer order) {
this.order = order;
}
} }

9
spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
View File

@ -45,7 +45,6 @@ import org.springframework.web.server.ServerWebExchange;
import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
import com.alibaba.cloud.sentinel.gateway.FallbackProperties; import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
import com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants;
import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter; import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter;
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
@ -94,7 +93,7 @@ public class SentinelSCGAutoConfiguration {
private void initAppType() { private void initAppType() {
System.setProperty(SentinelConfig.APP_TYPE, System.setProperty(SentinelConfig.APP_TYPE,
String.valueOf(SentinelGatewayConstants.APP_TYPE_GATEWAY)); String.valueOf(ConfigConstants.APP_TYPE_SCG_GATEWAY));
} }
private void initFallback() { private void initFallback() {
@ -149,8 +148,10 @@ public class SentinelSCGAutoConfiguration {
@Order(-1) @Order(-1)
@ConditionalOnMissingBean @ConditionalOnMissingBean
public SentinelGatewayFilter sentinelGatewayFilter() { public SentinelGatewayFilter sentinelGatewayFilter() {
logger.info("[Sentinel SpringCloudGateway] register SentinelGatewayFilter"); logger.info(
return new SentinelGatewayFilter(); "[Sentinel SpringCloudGateway] register SentinelGatewayFilter with order: {}",
gatewayProperties.getOrder());
return new SentinelGatewayFilter(gatewayProperties.getOrder());
} }
} }