Merge remote-tracking branch 'alibaba/2022.x' into 2022.x

# Conflicts:
#	spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/pom.xml

spring-cloud-alibaba-examples/integrated-example/integrated-account/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<mysql.version>8.0.28</mysql.version>
 		<durid.version>1.1.10</durid.version>
-		<mybatis.version>2.1.2</mybatis.version>
+		<mybatis.version>3.0.0</mybatis.version>
 	</properties>
 
 	<dependencies>

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}

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);

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

spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <mysql.version>8.0.28</mysql.version>
         <druid.version>1.1.10</druid.version>
-        <mybatis.version>2.1.2</mybatis.version>
+        <mybatis.version>3.0.0</mybatis.version>
     </properties>
 
     <dependencies>
@@ -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>

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}

spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<mysql.version>8.0.28</mysql.version>
 		<druid.version>1.1.10</druid.version>
-		<mybatis.version>3.0.1</mybatis.version>
+		<mybatis.version>3.0.0</mybatis.version>
 	</properties>
 
 	<dependencies>
@@ -25,11 +25,6 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bootstrap</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rocketmq</artifactId>

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

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

spring-cloud-alibaba-examples/integrated-example/integrated-storage/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <mysql.version>8.0.28</mysql.version>
         <druid.version>1.1.10</druid.version>
-        <mybatis.version>2.1.2</mybatis.version>
+        <mybatis.version>3.0.0</mybatis.version>
     </properties>
 
     <dependencies>

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
+