Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

spring cloud 2022.0.5 adaptive #3687

Open
wants to merge 1 commit into
base: 2022.x
Choose a base branch
from
Open

spring cloud 2022.0.5 adaptive #3687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@

<properties>
<!-- Project revision -->
<revision>2022.0.0.0</revision>
<revision>2022.0.0.1</revision>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spring Cloud 2022.0.5 版本对应的 SCA 版本应该调整为 2022.0.5.0，另外，需要全局搜索看其他地方是否需要跟随该版本一起调整（例如文档、依赖等）


<!-- Spring Cloud -->
<spring.cloud.version>2022.0.0</spring.cloud.version>
<spring.cloud.version>2022.0.5</spring.cloud.version>

<!-- Spring Boot -->
<spring-boot.version>3.0.2</spring-boot.version>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<description>Spring Cloud Alibaba Dependencies</description>

<properties>
<revision>2022.0.0.0</revision>
<revision>2022.0.0.1</revision>
<sentinel.version>1.8.6</sentinel.version>
<seata.version>1.8.0</seata.version>
<nacos.client.version>2.2.3</nacos.client.version>
Expand Down
4 changes: 2 additions & 2 deletions ...tarter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Builder contract(Contract contract) {
}

@Override
public Feign build() {
public Feign internalBuild() {
super.invocationHandlerFactory(new InvocationHandlerFactory() {
@Override
public InvocationHandler create(Target target,
Expand Down Expand Up @@ -160,7 +160,7 @@ private Object getFromContext(String name, String type,
});

super.contract(new SentinelContractHolder(contract));
return super.build();
return super.internalBuild();
}

private Object getFieldValue(Object instance, String fieldName) {
Expand Down