Skip to content

Commit 9f955ce

Browse files
flystar32flystar32
committed
to #64 
1 parent 6db0d8f commit 9f955ce

File tree

5 files changed

+68
-19
lines changed

5 files changed

+68
-19
lines changed

‎mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AApplication.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.springframework.boot.SpringApplication;
1919
import org.springframework.boot.autoconfigure.SpringBootApplication;
2020
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
21+
import org.springframework.cloud.commons.util.InetUtils;
2122
import org.springframework.context.annotation.Bean;
2223
import org.springframework.web.bind.annotation.GetMapping;
2324
import org.springframework.web.bind.annotation.RestController;
@@ -48,6 +49,9 @@ class AController {
4849
@Autowired
4950
RestTemplate restTemplate;
5051

52+
@Autowired
53+
InetUtils inetUtils;
54+
5155
@GetMapping("/a")
5256
public String a(HttpServletRequest request) {
5357
StringBuilder headerSb = new StringBuilder();
@@ -60,7 +64,7 @@ public String a(HttpServletRequest request) {
6064
headerSb.append(headerName + ":" + headerVal + ",");
6165
}
6266
}
63-
return "A"+SERVICE_TAG+"[" + request.getLocalAddr() + "]" + " -> " +
67+
return "A"+SERVICE_TAG+"[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
6468
restTemplate.getForObject("http://sc-B/b", String.class);
6569
}
6670

@@ -76,7 +80,7 @@ public String dubbo(HttpServletRequest request) {
7680
headerSb.append(headerName + ":" + headerVal + ",");
7781
}
7882
}
79-
return "A"+SERVICE_TAG+"[" + request.getLocalAddr() + "]" + " -> " +
83+
return "A"+SERVICE_TAG+"[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
8084
helloServiceB.hello("A");
8185
}
8286

@@ -110,8 +114,8 @@ public String swagger(@ApiParam(name = "name", value = "我是姓名", required
110114
}
111115
}
112116
SERVICE_TAG = properties.getProperty("alicloud.service.tag").replace("\"","");
113-
}else {
114-
SERVICE_TAG = "";
117+
} else {
118+
SERVICE_TAG = System.getProperty("alicloud.service.tag");
115119
}
116120
} catch (Throwable ignore) {}
117121

‎mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BApplication.java

+17-8
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
2424
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
25+
import org.springframework.cloud.commons.util.InetUtils;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.web.bind.annotation.GetMapping;
2728
import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +31,9 @@
3031
import java.io.File;
3132
import java.io.FileReader;
3233
import java.io.IOException;
34+
import java.net.InetAddress;
35+
import java.net.NetworkInterface;
36+
import java.util.Enumeration;
3337
import java.util.Properties;
3438

3539
@SpringBootApplication
@@ -40,7 +44,6 @@ public static void main(String[] args) {
4044
}
4145

4246

43-
4447
@Bean
4548
@LoadBalanced
4649
RestTemplate restTemplate() {
@@ -53,15 +56,19 @@ class AController {
5356
@Autowired
5457
RestTemplate restTemplate;
5558

59+
@Autowired
60+
InetUtils inetUtils;
61+
5662
@GetMapping("/b")
5763
public String a(HttpServletRequest request) {
58-
return "B"+SERVICE_TAG+"[" + request.getLocalAddr() + "]" + " -> " +
64+
return "B"+SERVICE_TAG+"[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
5965
restTemplate.getForObject("http://sc-C/c", String.class);
6066
// return "B[" + request.getLocalAddr() + "]";
6167
}
6268
}
6369

64-
public static String SERVICE_TAG="";
70+
public static String SERVICE_TAG = "";
71+
6572
static {
6673

6774
try {
@@ -78,14 +85,16 @@ public String a(HttpServletRequest request) {
7885
if (fr != null) {
7986
try {
8087
fr.close();
81-
} catch (Throwable ignore) {}
88+
} catch (Throwable ignore) {
89+
}
8290
}
8391
}
84-
SERVICE_TAG = properties.getProperty("alicloud.service.tag").replace("\"","");
85-
}else {
86-
SERVICE_TAG = "";
92+
SERVICE_TAG = properties.getProperty("alicloud.service.tag").replace("\"", "");
93+
} else {
94+
SERVICE_TAG = System.getProperty("alicloud.service.tag");
8795
}
88-
} catch (Throwable ignore) {}
96+
} catch (Throwable ignore) {
97+
}
8998
if ("null".equalsIgnoreCase(SERVICE_TAG) || null == SERVICE_TAG) {
9099
SERVICE_TAG = "";
91100
}

‎mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CApplication.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
2424
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
25+
import org.springframework.cloud.commons.util.InetUtils;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.web.bind.annotation.GetMapping;
2728
import org.springframework.web.bind.annotation.RestController;
@@ -51,9 +52,12 @@ class AController {
5152
@Autowired
5253
RestTemplate restTemplate;
5354

55+
@Autowired
56+
InetUtils inetUtils;
57+
5458
@GetMapping("/c")
5559
public String a(HttpServletRequest request) {
56-
return "C" + SERVICE_TAG + "[" + request.getLocalAddr() + "]";
60+
return "C" + SERVICE_TAG + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
5761
}
5862
}
5963

@@ -81,7 +85,7 @@ public String a(HttpServletRequest request) {
8185
}
8286
SERVICE_TAG = properties.getProperty("alicloud.service.tag").replace("\"", "");
8387
} else {
84-
SERVICE_TAG = "";
88+
SERVICE_TAG = System.getProperty("alicloud.service.tag");;
8589
}
8690
} catch (Throwable ignore) {
8791
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public String hello(String name) {
4444
msg.setBody(value.getBytes(StandardCharsets.UTF_8));
4545
producer.send(msg);
4646
log.info("topic:{},messageString:{},__microservice_tag__:{}", topic, value, StringUtils.trimToNull(invokerTag));
47-
} catch (Exception e) {
48-
log.error("error:", e);
47+
} catch (Exception ignore) {
4948
}
5049

5150
return value;

‎mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/DemoController.java

+36-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ public class DemoController {
2222
@Value("${demo.qps:100}")
2323
private int qps;
2424

25+
@Value("${enable.mq.invoke:false}")
26+
private boolean enableMqInvoke;
27+
28+
2529
@Value("${background.color:white}")
2630
private String backgroundColor;
2731

@@ -60,19 +64,48 @@ public void run() {
6064
}, 100, 1000000 / qps, TimeUnit.MICROSECONDS);
6165

6266

63-
6467
FLOW_EXECUTOR.scheduleAtFixedRate(new Runnable() {
6568
@Override
6669
public void run() {
6770

6871
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
69-
HttpGet httpGet = new HttpGet("http://localhost:20000/A/a");
70-
httpGet.addHeader("x-mse-tag", "gray");
72+
HttpGet httpGet = new HttpGet("http://localhost:20000/A/a?name=xiaoming");
73+
// httpGet.addHeader("x-mse-tag", "gray");
7174
httpClient.execute(httpGet);
7275

7376
} catch (Exception ignore) {
7477
}
7578
}
7679
}, 100, 10 * 1000000 / qps , TimeUnit.MICROSECONDS);
80+
81+
if(enableMqInvoke){
82+
FLOW_EXECUTOR.scheduleAtFixedRate(new Runnable() {
83+
@Override
84+
public void run() {
85+
86+
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
87+
HttpGet httpGet = new HttpGet("http://localhost:20000/A/dubbo");
88+
httpClient.execute(httpGet);
89+
90+
} catch (Exception ignore) {
91+
}
92+
}
93+
}, 100, 1000000 / qps, TimeUnit.MICROSECONDS);
94+
95+
96+
FLOW_EXECUTOR.scheduleAtFixedRate(new Runnable() {
97+
@Override
98+
public void run() {
99+
100+
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
101+
HttpGet httpGet = new HttpGet("http://localhost:20000/A/dubbo?name=xiaoming");
102+
// httpGet.addHeader("x-mse-tag", "gray");
103+
httpClient.execute(httpGet);
104+
105+
} catch (Exception ignore) {
106+
}
107+
}
108+
}, 100, 10 * 1000000 / qps , TimeUnit.MICROSECONDS);
109+
}
77110
}
78111
}

0 commit comments

Comments
 (0)