update version to 3.1.0, update mq consumer fallback

Author: flystar32

mse-simple-demo/A/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <name>A</name>

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/mq/RocketMqConfiguration.java

@@ -49,7 +49,7 @@ public class RocketMqConfiguration {
         System.setProperty("rocketmq.client.log.loadconfig", "false");
     }
 
-    @Bean(initMethod = "start", destroyMethod = "shutdown")
+    @Bean(destroyMethod = "shutdown")
     public DefaultMQPushConsumer mqPushConsumer() throws MQClientException {
         log.info("正在启动rocketMq的consumer");
 
@@ -68,7 +68,12 @@ public DefaultMQPushConsumer mqPushConsumer() throws MQClientException {
 
         MqConsumer mqConsumer = new MqConsumer(restTemplate, inetUtils, serviceTag);
         consumer.registerMessageListener(mqConsumer);
-        log.info("完成启动rocketMq的consumer,subscribe:{}", topic);
+        try {
+            consumer.start();
+            log.info("完成启动rocketMq的consumer,subscribe:{}", topic);
+        } catch (Throwable t) {
+            log.error("RocketMQ Consumer 启动失败,已忽略此错误,", t);
+        }
         return consumer;
     }
 }

mse-simple-demo/C/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>C</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <name>C</name>

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/service/HelloServiceCImpl.java

@@ -39,6 +39,7 @@ public String hello(String name) {
             throw new RuntimeException();
         }
 
+        String mqvalue = "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
         String value = "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " param:" + name;
         String invokerTag="";
         String userData = RpcContext.getContext().getAttachment("__microservice_tag__");
@@ -49,9 +50,9 @@ public String hello(String name) {
         try {
             Message msg = new Message();
             msg.setTopic(topic);
-            msg.setBody(value.getBytes(StandardCharsets.UTF_8));
+            msg.setBody(mqvalue.getBytes(StandardCharsets.UTF_8));
             producer.send(msg);
-            log.info("topic:{},messageString:{},__microservice_tag__:{}", topic, value, StringUtils.trimToNull(invokerTag));
+            log.info("topic:{},messageString:{},__microservice_tag__:{}", topic, mqvalue, StringUtils.trimToNull(invokerTag));
         } catch (Exception ignore) {
         }
 

mse-simple-demo/GoApp/build.sh

@@ -1,4 +1,4 @@
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./aliyun-go-agent -mse
-docker build -t gin-server-a:3.0.8 .
-docker tag gin-server-a:3.0.8 registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/gin-server-a:3.0.8
-docker push registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/gin-server-a:3.0.8
+docker build -t gin-server-a:3.1.0 .
+docker tag gin-server-a:3.1.0 registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/gin-server-a:3.1.0
+docker push registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/gin-server-a:3.1.0

mse-simple-demo/SpringCloudGateway/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>SpringCloudGateway</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <properties>

mse-simple-demo/ZuulGateway/build.sh

@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-zuul
-export VERSION="${VERSION:-3.0.8}"
+export VERSION="${VERSION:-3.1.0}"
 
 set -e
 

mse-simple-demo/ZuulGateway/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>ZuulGateway</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <properties>

mse-simple-demo/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Select the correct warehouse prefix
 export REGISTRY=${REGISTRY}
-export VERSION="${VERSION:-3.0.8}"
+export VERSION="${VERSION:-3.1.0}"
 
 set -e
 

mse-simple-demo/mysql/build.sh

@@ -2,7 +2,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=demo-mysql
-export VERSION="${VERSION:-3.0.8}"
+export VERSION="${VERSION:-3.1.0}"
 
 set -e
 

mse-simple-demo/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <all.project.version>3.0.8</all.project.version>
+        <all.project.version>3.1.0</all.project.version>
     </properties>
 
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>mse-simple-demo</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <modules>
         <module>A</module>
         <module>B</module>