reorg demo app

Author: robberphex

mse-simple-demo/A/pom.xml

@@ -86,6 +86,11 @@
             <version>4.5.13</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AApplication.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AApplication.java

@@ -1,5 +1,5 @@
 
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.a;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.SpringApplication;

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AController.java

@@ -1,6 +1,6 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.a;
 
-import com.alibabacloud.mse.demo.service.HelloServiceB;
+import com.alibabacloud.mse.demo.b.service.HelloServiceB;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,9 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 @Api(value = "/", tags = {"入口应用"})
 @RestController

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/Swagger2Config.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/Swagger2Config.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.a;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/MqConsumer.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/mq/MqConsumer.java

@@ -1,9 +1,8 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.a.mq;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import com.alibabacloud.mse.demo.AApplication;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -19,14 +18,17 @@
 @Component
 public class MqConsumer implements MessageListenerConcurrently {
 
-    @Autowired
-    RestTemplate restTemplate;
+    private RestTemplate restTemplate;
 
-    @Autowired
-    InetUtils inetUtils;
+    private InetUtils inetUtils;
 
-    @Autowired
-    String servcieTag;
+    private String serviceTag;
+
+    public MqConsumer(RestTemplate restTemplate, InetUtils inetUtils, String serviceTag) {
+        this.restTemplate = restTemplate;
+        this.inetUtils = inetUtils;
+        this.serviceTag = serviceTag;
+    }
 
     @SneakyThrows
     @Override
@@ -35,7 +37,7 @@ public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> list, ConsumeCo
             MessageExt messageExt = list.get(0);
             String topic = messageExt.getTopic();
             String messageString = new String(messageExt.getBody(), StandardCharsets.UTF_8);
-            String result =  "A"+ servcieTag+"[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
+            String result = "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
                     restTemplate.getForObject("http://sc-B/b", String.class);
 
             log.info("topic:{},producer:{},invoke result:{}", topic, messageString, result);

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

@@ -1,14 +1,16 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.a.mq;
 
-import com.alibabacloud.mse.demo.service.MqConsumer;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
 
 @Slf4j
 @Configuration
@@ -24,7 +26,14 @@ public class RocketMqConfiguration {
     @Value("${rocketmq.consumer.topic}")
     private String topic;
 
-    private final MqConsumer mqConsumer;
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private InetUtils inetUtils;
+
+    @Autowired
+    private String serviceTag;
 
     static {
         System.setProperty("rocketmq.client.log.loadconfig", "false");
@@ -37,6 +46,12 @@ public DefaultMQPushConsumer mqPushConsumer() throws MQClientException {
         consumer.setNamesrvAddr(nameSrvAddr);
         consumer.subscribe(topic, "*");
         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
+
+        MqConsumer mqConsumer = new MqConsumer(
+                restTemplate,
+                inetUtils,
+                serviceTag
+        );
         consumer.registerMessageListener(mqConsumer);
         log.info("完成启动rocketMq的consumer,subscribe:{}", topic);
         return consumer;

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceA.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/service/HelloServiceA.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.a.service;
 
 public interface HelloServiceA {
     String hello(String name);

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceAImpl.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/service/HelloServiceAImpl.java

@@ -1,6 +1,7 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.a.service;
 
 
+import com.alibabacloud.mse.demo.b.service.HelloServiceB;
 import org.apache.dubbo.config.annotation.Reference;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceB.java renamed to mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/b/service/HelloServiceB.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.b.service;
 
 public interface HelloServiceB {
     String hello(String name);

mse-simple-demo/A/src/main/resources/application.properties

@@ -15,7 +15,7 @@ dubbo.registry.id=nacos
 dubbo.registry.address=nacos://${nacos.host}:8848
 dubbo.registry.parameters.namespace=${nacos.namespace}
 dubbo.consumer.check=false
-dubbo.scan.base-packages=com.alibabacloud.mse.demo.service
+dubbo.scan.base-packages=com.alibabacloud.mse.demo
 dubbo.protocol.port=38080
 dubbo.registry.check=false
 

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BApplication.java renamed to mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BApplication.java

@@ -1,5 +1,5 @@
 
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.b;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.SpringApplication;

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BController.java renamed to mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BController.java

@@ -1,6 +1,6 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.b;
 
-import com.alibabacloud.mse.demo.service.HelloServiceC;
+import com.alibabacloud.mse.demo.c.service.HelloServiceC;
 import org.apache.dubbo.config.annotation.Reference;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceB.java renamed to mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/service/HelloServiceB.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.b.service;
 
 public interface HelloServiceB {
     String hello(String name);

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceBImpl.java renamed to mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/service/HelloServiceBImpl.java

@@ -1,5 +1,6 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.b.service;
 
+import com.alibabacloud.mse.demo.c.service.HelloServiceC;
 import org.apache.dubbo.config.annotation.Reference;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceC.java renamed to mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/c/service/HelloServiceC.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.c.service;
 
 public interface HelloServiceC {
     String hello(String name);

mse-simple-demo/B/src/main/resources/application.properties

@@ -14,6 +14,6 @@ dubbo.registry.id=nacos
 dubbo.registry.address=nacos://${nacos.host}:8848
 dubbo.registry.parameters.namespace=${nacos.namespace}
 dubbo.consumer.check=false
-dubbo.scan.base-packages=com.alibabacloud.mse.demo.service
+dubbo.scan.base-packages=com.alibabacloud.mse.demo
 dubbo.protocol.port=48080
 dubbo.registry.check=false

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CApplication.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CApplication.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.c;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.SpringApplication;

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CController.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CController.java

@@ -1,7 +1,7 @@
-package com.alibabacloud.mse.demo;
+package com.alibabacloud.mse.demo.c;
 
-import com.alibabacloud.mse.demo.sql.User;
-import com.alibabacloud.mse.demo.sql.UserDao;
+import com.alibabacloud.mse.demo.c.sql.User;
+import com.alibabacloud.mse.demo.c.sql.UserDao;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
@@ -18,10 +18,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadLocalRandom;

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/interceptor/MyBatisSentinelBlockException.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/interceptor/MyBatisSentinelBlockException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibabacloud.mse.demo.interceptor;
+package com.alibabacloud.mse.demo.c.interceptor;
 
 import org.apache.ibatis.exceptions.PersistenceException;
 

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/mq/RocketMqConfiguration.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/mq/RocketMqConfiguration.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.mq;
+package com.alibabacloud.mse.demo.c.mq;
 
 
 import lombok.RequiredArgsConstructor;

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceC.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/service/HelloServiceC.java

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.c.service;
 
 public interface HelloServiceC {
     String hello(String name);

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

@@ -1,4 +1,4 @@
-package com.alibabacloud.mse.demo.service;
+package com.alibabacloud.mse.demo.c.service;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/sql/User.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/sql/User.java

@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibabacloud.mse.demo.sql;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+package com.alibabacloud.mse.demo.c.sql;
 
 /**
  * @author Eric Zhao

mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/sql/UserDao.java renamed to mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/sql/UserDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibabacloud.mse.demo.sql;
+package com.alibabacloud.mse.demo.c.sql;
 
 import java.util.List;
 

mse-simple-demo/C/src/main/resources/application.properties

@@ -15,7 +15,7 @@ dubbo.registry.id=nacos
 dubbo.registry.address=nacos://${nacos.host}:8848
 dubbo.registry.parameters.namespace=${nacos.namespace}
 dubbo.consumer.check=false
-dubbo.scan.base-packages=com.alibabacloud.mse.demo.service
+dubbo.scan.base-packages=com.alibabacloud.mse.demo
 dubbo.protocol.port=58080
 dubbo.registry.check=false