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

Fix bootstrap bug for integrated example #2989

Merged
merged 10 commits into from
Dec 20, 2022
Merged

Fix bootstrap bug for integrated example #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca42d1d
Change the external configuration to spring.config.import to import
Phixsura Dec 10, 2022
7314108
Fixed an issue where external configuration could not be introduced
Phixsura Dec 11, 2022
6d35052
Fix the problem that the external configuration of the database canno…
Phixsura Dec 12, 2022
a2c2618
Fix cross-domain filtering configuration due to springboot version ch…
Phixsura Dec 12, 2022
1577c76
Add dependency of loadbalancer missing.
Phixsura Dec 12, 2022
94f85d1
Change to map host.
Phixsura Dec 13, 2022
5398a10
Delete relevant configs.
Phixsura Dec 13, 2022
bbc129b
Delete duplicate define.
Phixsura Dec 14, 2022
f14d854
Delete duplicate define.
Phixsura Dec 14, 2022
9a0bde6
Follow the nacos example to modify the configured import.
Phixsura Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...account/src/main/resources/bootstrap.yaml → ...count/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ spring:
group: integrated-example
config:
server-addr: nacos-server:8848
file-extension: yaml
group: integrated-example
shared-configs[0]:
dataid: datasource-config.yaml
group: integrated-example
file-extension: yaml
config:
import:
- optional:nacos:integrated-account.yaml
- optional:nacos:datasource-config.yaml

seata:
application-id: ${spring.application.name}
Expand Down
2 changes: 1 addition & 1 deletion ...ted-gateway/src/main/java/com/alibaba/cloud/integration/gateway/config/GatewayConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ public Mono<ServerResponse> handleRequest(ServerWebExchange serverWebExchange,
public CorsWebFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.addAllowedOrigin("*");
config.setAllowCredentials(true);
config.addAllowedHeader("*");
config.addAllowedMethod("*");
config.addAllowedOriginPattern("*");
source.registerCorsConfiguration("/**", config);

return new CorsWebFilter(source);
Expand Down
8 changes: 5 additions & 3 deletions ...gateway/src/main/resources/bootstrap.yaml → ...teway/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ spring:
name: integrated-gateway
cloud:
nacos:
discovery:
server-addr: nacos-server:8848
group: integrated-example
config:
server-addr: nacos-server:8848
group: integrated-example
file-extension: yaml
discovery:
server-addr: nacos-server:8848
group: integrated-example
config:
import: optional:nacos:integrated-gateway.yaml
6 changes: 6 additions & 0 deletions spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
</dependency>

<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>integrated-common</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions ...d-order/src/main/resources/bootstrap.yaml → ...order/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ spring:
group: integrated-example
config:
server-addr: nacos-server:8848
file-extension: yaml
group: integrated-example
shared-configs[0]:
dataid: datasource-config.yaml
group: integrated-example
file-extension: yaml
config:
import:
- optional:nacos:integrated-order.yaml
- optional:nacos:datasource-config.yaml

seata:
application-id: ${spring.application.name}
Expand Down
9 changes: 6 additions & 3 deletions ...onsumer/src/main/resources/bootstrap.yaml → ...sumer/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ spring:
file-extension: yaml
server-addr: nacos-server:8848
group: integrated-example
shared-configs[0]:
dataid: datasource-config.yaml
group: integrated-example
discovery:
server-addr: nacos-server:8848
group: integrated-example
config:
import:
- optional:nacos:integrated-consumer.yaml
- optional:nacos:datasource-config.yaml


server:
port: 8014
3 changes: 3 additions & 0 deletions ...rovider/src/main/resources/bootstrap.yaml → ...vider/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ spring:
discovery:
server-addr: nacos-server:8848
group: integrated-example
config:
import: optional:nacos:integrated-provider.yaml

server:
port: 8015
9 changes: 5 additions & 4 deletions ...storage/src/main/resources/bootstrap.yaml → ...orage/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ spring:
group: integrated-example
config:
server-addr: nacos-server:8848
file-extension: yaml
group: integrated-example
shared-configs[0]:
dataid: datasource-config.yaml
group: integrated-example
config:
import:
- optional:nacos:integrated-storage.yaml
- optional:nacos:datasource-config.yaml

seata:
application-id: ${spring.application.name}
Expand All @@ -25,3 +25,4 @@ seata:
integrated-storage-group: default
grouplist:
default: seata-server:8091