From dd8f984b6314d3aedd7a3695d293329166d03385 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Wed, 28 Jul 2021 19:15:21 +0800
Subject: [PATCH 1/2] modified dubbo-samples-nacos-configcenter for fix
 dubbo#8217

---
 .../dubbo-samples-nacos-configcenter/pom.xml         | 12 ++++++++++++
 .../main/resources/spring/configcenter-consumer.xml  |  2 --
 .../dubbo/samples/configcenter/DemoServiceIT.java    |  8 ++++----
 test/dubbo-test-runner/src/docker/Dockerfile         |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml
index aaea1c637c..98e8958667 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml
@@ -32,6 +32,7 @@
         <source.level>1.8</source.level>
         <target.level>1.8</target.level>
         <dubbo.version>2.7.7</dubbo.version>
+        <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>
         <spring.version>4.3.16.RELEASE</spring.version>
         <junit.version>4.12</junit.version>
         <slf4j.version>1.7.25</slf4j.version>
@@ -63,6 +64,12 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba.spring</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>${alibaba_spring_context_support_version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -78,6 +85,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.alibaba.spring</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
index 7a3350f175..038945ca84 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
@@ -30,6 +30,4 @@
 
     <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848"/>
 
-    <dubbo:reference id="demoService" interface="org.apache.dubbo.samples.configcenter.api.DemoService"/>
-
 </beans>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
index 2a2f98929d..c61f3f4850 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
@@ -19,19 +19,19 @@
 
 import org.apache.dubbo.samples.configcenter.api.DemoService;
 
+import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:spring/configcenter-consumer.xml")
+@EnableDubbo
 public class DemoServiceIT {
-    @Autowired
-    @Qualifier("demoService")
+    @Reference(id = "demoService") 
     private DemoService demoService;
 
     @Test
diff --git a/test/dubbo-test-runner/src/docker/Dockerfile b/test/dubbo-test-runner/src/docker/Dockerfile
index c99668ac90..f21b8948dc 100644
--- a/test/dubbo-test-runner/src/docker/Dockerfile
+++ b/test/dubbo-test-runner/src/docker/Dockerfile
@@ -43,7 +43,7 @@ ENV JAVA_OPTS="" \
     APP_DEPENDENCY_DIR="/usr/local/dubbo/app/dependency" \
     SERVICE_NAME="" \
     SERVICE_TYPE="app" \
-    WAIT_TIMEOUT=60 \
+    WAIT_TIMEOUT=180 \
     WAIT_PORTS_BEFORE_RUN="" \
     RUN_DELAY=0 \
     APP_MAIN_CLASS="" \

From 84363eac382bb59eb32b0d26a8e1553dac7f45ca Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Fri, 30 Jul 2021 11:48:12 +0800
Subject: [PATCH 2/2] reverted configcenter-consumer.xml

---
 .../src/main/resources/spring/configcenter-consumer.xml         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
index 038945ca84..7a3350f175 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
@@ -30,4 +30,6 @@
 
     <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848"/>
 
+    <dubbo:reference id="demoService" interface="org.apache.dubbo.samples.configcenter.api.DemoService"/>
+
 </beans>