fix dubbo2.6 / dubbo3 sample

sofastack · Jan 22, 2024 · 4b4ed7f · 4b4ed7f
1 parent 6433bcc
commit 4b4ed7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/...26/dubbo26base/src/main/java/com/alipay/sofa/rpc/dubbo26/base/Dubbo26BaseApplication.java b/...26/dubbo26base/src/main/java/com/alipay/sofa/rpc/dubbo26/base/Dubbo26BaseApplication.java
@@ -44,8 +44,8 @@ public static void main(String[] args) {
     @Override
     public void run(String... args) throws Exception {
         try {
-//            installBiz("dubbo26biz/target/dubbo26biz-0.0.1-SNAPSHOT-ark-biz.jar");
-//            installBiz("dubbo26biz2/target/dubbo26biz2-0.0.1-SNAPSHOT-ark-biz.jar");
+            installBiz("dubbo26biz/target/dubbo26biz-0.0.1-SNAPSHOT-ark-biz.jar");
+            installBiz("dubbo26biz2/target/dubbo26biz2-0.0.1-SNAPSHOT-ark-biz.jar");
         } catch (Throwable e) {
             LOGGER.error("Install biz failed", e);
         }

diff --git a/samples/dubbo-samples/rpc/dubbo26/dubbo26biz/src/main/resources/application.properties b/samples/dubbo-samples/rpc/dubbo26/dubbo26biz/src/main/resources/application.properties
@@ -5,6 +5,8 @@ logging.level.root=INFO
 logging.level.com.alipay.sofa.arklet=INFO
 #logging.config=classpath:log4j2-spring.xml
 
+spring.main.allow-bean-definition-overriding=true
+
 dubbo.application.logger=slf4j
 dubbo.application.name=biz
 dubbo.consumer.serialization=java

diff --git a/samples/dubbo-samples/rpc/dubbo26/dubbo26biz2/src/main/resources/application.properties b/samples/dubbo-samples/rpc/dubbo26/dubbo26biz2/src/main/resources/application.properties
@@ -5,6 +5,8 @@ logging.level.root=INFO
 logging.level.com.alipay.sofa.arklet=INFO
 #logging.config=classpath:log4j2-spring.xml
 
+spring.main.allow-bean-definition-overriding=true
+
 dubbo.application.logger=slf4j
 dubbo.application.name=biz2
 dubbo.consumer.serialization=java

diff --git a/samples/dubbo-samples/rpc/dubbo3/dubbo3base/src/main/resources/application.yml b/samples/dubbo-samples/rpc/dubbo3/dubbo3base/src/main/resources/application.yml
@@ -8,6 +8,8 @@ dubbo:
     name: tri
     port: 50051
 
+server:
+  port: 8089
 
 spring:
   application: