From 11b9bbe1f71be558f79266f1e9d7bc246ee19d28 Mon Sep 17 00:00:00 2001 From: MieAh <100568933+MieAh@users.noreply.github.com> Date: Tue, 20 Dec 2022 12:45:56 +0800 Subject: [PATCH] Fix bootstrap bug for integrated example (#2989) * Change the external configuration to spring.config.import to import * Fixed an issue where external configuration could not be introduced * Fix the problem that the external configuration of the database cannot be imported. * Fix cross-domain filtering configuration due to springboot version change * Add dependency of loadbalancer missing. * Change to map host. * Delete relevant configs. * Delete duplicate define. * Delete duplicate define. * Follow the nacos example to modify the configured import. --- .../main/resources/{bootstrap.yaml => application.yaml} | 9 +++++---- .../cloud/integration/gateway/config/GatewayConfig.java | 2 +- .../main/resources/{bootstrap.yaml => application.yaml} | 8 +++++--- .../integrated-example/integrated-order/pom.xml | 6 ++++++ .../main/resources/{bootstrap.yaml => application.yaml} | 9 +++++---- .../main/resources/{bootstrap.yaml => application.yaml} | 9 ++++++--- .../main/resources/{bootstrap.yaml => application.yaml} | 3 +++ .../main/resources/{bootstrap.yaml => application.yaml} | 9 +++++---- 8 files changed, 36 insertions(+), 19 deletions(-) rename spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/{bootstrap.yaml => application.yaml} (82%) rename spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/{bootstrap.yaml => application.yaml} (83%) rename spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/{bootstrap.yaml => application.yaml} (82%) rename spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/{bootstrap.yaml => application.yaml} (71%) rename spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/{bootstrap.yaml => application.yaml} (82%) rename spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/{bootstrap.yaml => application.yaml} (78%) diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/application.yaml similarity index 82% rename from spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/application.yaml index 585d3cd25..5ca020659 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-account/src/main/resources/application.yaml @@ -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} diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/java/com/alibaba/cloud/integration/gateway/config/GatewayConfig.java b/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/java/com/alibaba/cloud/integration/gateway/config/GatewayConfig.java index 76a303405..937d15dd4 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/java/com/alibaba/cloud/integration/gateway/config/GatewayConfig.java +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/java/com/alibaba/cloud/integration/gateway/config/GatewayConfig.java @@ -104,10 +104,10 @@ public class GatewayConfig { 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); diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/application.yaml similarity index 83% rename from spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/application.yaml index 77de7637a..d98397469 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-gateway/src/main/resources/application.yaml @@ -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 diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml b/spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml index c3c692b0f..01d056356 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml @@ -66,6 +66,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + com.alibaba.cloud integrated-common diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/application.yaml similarity index 82% rename from spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/application.yaml index 74c6f31ea..828990095 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-order/src/main/resources/application.yaml @@ -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} diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/application.yaml similarity index 71% rename from spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/application.yaml index 4ba69967b..5f00908a9 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/src/main/resources/application.yaml @@ -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 diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/application.yaml similarity index 82% rename from spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/application.yaml index 33c62f118..e554c1308 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-praise-provider/src/main/resources/application.yaml @@ -10,5 +10,8 @@ spring: discovery: server-addr: nacos-server:8848 group: integrated-example + config: + import: optional:nacos:integrated-provider.yaml + server: port: 8015 diff --git a/spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/application.yaml similarity index 78% rename from spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/application.yaml index 36e287db5..d07828925 100644 --- a/spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/integrated-storage/src/main/resources/application.yaml @@ -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} @@ -25,3 +25,4 @@ seata: integrated-storage-group: default grouplist: default: seata-server:8091 +