Skip to content

Commit 073bc6d

Browse files
robberphexrobberphex
committed
do not call via svc
1 parent 7c09e88 commit 073bc6d

File tree

8 files changed

+21
-102
lines changed

8 files changed

+21
-102
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,10 @@ public static void main(String[] args) {
3030
SpringApplication.run(AApplication.class, args);
3131
}
3232

33-
@Bean(name = "loadBalancedRestTemplate")
33+
@Bean
3434
@LoadBalanced
35-
RestTemplate loadBalancedRestTemplate() {
36-
return new RestTemplate();
37-
}
38-
39-
@Bean(name = "restTemplate")
4035
RestTemplate restTemplate() {
41-
return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
42-
request.getHeaders().add("Connection", "close");
43-
return execution.execute(request, body);
44-
})).build();
36+
return new RestTemplate();
4537
}
4638

4739
@Bean(name = "serviceTag")

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

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
import org.apache.http.client.methods.HttpGet;
1616
import org.apache.http.impl.client.HttpClientBuilder;
1717
import org.apache.http.util.EntityUtils;
18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
1820
import org.springframework.beans.factory.annotation.Autowired;
19-
import org.springframework.beans.factory.annotation.Qualifier;
2021
import org.springframework.beans.factory.annotation.Value;
2122
import org.springframework.cloud.commons.util.InetUtils;
2223
import org.springframework.http.HttpStatus;
@@ -34,19 +35,14 @@
3435
@Api(value = "/", tags = {"入口应用"})
3536
@RestController
3637
class AController {
37-
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(AController.class);
38+
private static final Logger log = LoggerFactory.getLogger(AController.class);
3839

3940
@Autowired
40-
@Qualifier("loadBalancedRestTemplate")
41-
private RestTemplate loadBalancedRestTemplate;
41+
private RestTemplate restTemplate;
4242

4343
@Autowired
4444
private FeignClientTest feignClient;
4545

46-
@Autowired
47-
@Qualifier("restTemplate")
48-
private RestTemplate restTemplate;
49-
5046
@Autowired
5147
InetUtils inetUtils;
5248

@@ -104,7 +100,7 @@ public String a(HttpServletRequest request) throws ExecutionException, Interrupt
104100
}
105101
}
106102
//这是rpc调用的方式
107-
String result = loadBalancedRestTemplate.getForObject("http://sc-B/b", String.class);
103+
String result = restTemplate.getForObject("http://sc-B/b", String.class);
108104

109105
return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
110106
"[config=" + configValue + "]" + " -> " + result;
@@ -125,9 +121,9 @@ public String a2bc(HttpServletRequest request) throws ExecutionException, Interr
125121
}
126122

127123
String resultB = "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
128-
"[config=" + configValue + "]" + " -> " + loadBalancedRestTemplate.getForObject("http://sc-B/b", String.class);
124+
"[config=" + configValue + "]" + " -> " + restTemplate.getForObject("http://sc-B/b", String.class);
129125
String resultA = "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
130-
"[config=" + configValue + "]" + " -> " + loadBalancedRestTemplate.getForObject("http://sc-C/c", String.class);
126+
"[config=" + configValue + "]" + " -> " + restTemplate.getForObject("http://sc-C/c", String.class);
131127

132128
return resultA + "\n" + resultB;
133129
}
@@ -156,7 +152,7 @@ public String aByFeign(HttpServletRequest request) throws ExecutionException, In
156152
@GetMapping("/flow")
157153
public String flow(HttpServletRequest request) throws ExecutionException, InterruptedException {
158154

159-
ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/flow", String.class);
155+
ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://sc-B/flow", String.class);
160156
HttpStatus status = responseEntity.getStatusCode();
161157
String result = responseEntity.getBody() + " code:" + status.value();
162158

@@ -168,7 +164,7 @@ public String flow(HttpServletRequest request) throws ExecutionException, Interr
168164
@ApiOperation(value = "测试热点规则", tags = {"流量防护"})
169165
@GetMapping("/params/{hot}")
170166
public String params(HttpServletRequest request,@PathVariable("hot") String hot) throws ExecutionException, InterruptedException {
171-
ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/params/" + hot, String.class);
167+
ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://sc-B/params/" + hot, String.class);
172168

173169
HttpStatus status = responseEntity.getStatusCode();
174170
String result = responseEntity.getBody() + " code:" + status.value();
@@ -180,7 +176,7 @@ public String params(HttpServletRequest request,@PathVariable("hot") String hot)
180176
@ApiOperation(value = "测试隔离规则", tags = { "流量防护"})
181177
@GetMapping("/isolate")
182178
public String isolate(HttpServletRequest request) throws ExecutionException, InterruptedException {
183-
ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/isolate", String.class);
179+
ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://sc-B/isolate", String.class);
184180

185181
HttpStatus status = responseEntity.getStatusCode();
186182
String result = responseEntity.getBody() + " code:" + status.value();
@@ -189,20 +185,11 @@ public String isolate(HttpServletRequest request) throws ExecutionException, Int
189185
"[config=" + configValue + "]" + " -> " + result;
190186
}
191187

192-
193-
@GetMapping("/spring_boot")
194-
public String spring_boot(HttpServletRequest request) {
195-
String result = restTemplate.getForObject("http://sc-b:20002/spring_boot", String.class);
196-
197-
return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
198-
" -> " + result;
199-
}
200-
201188
@GetMapping("/sql")
202189
public String sql(HttpServletRequest request) {
203190

204191
String url = "http://sc-B/sql?" + request.getQueryString();
205-
String result = loadBalancedRestTemplate.getForObject(url, String.class);
192+
String result = restTemplate.getForObject(url, String.class);
206193
return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
207194
"[config=" + configValue + "]" + " -> " + result;
208195
}
@@ -221,7 +208,7 @@ public String aZone(HttpServletRequest request) {
221208
}
222209
}
223210
return "A" + serviceTag + "[" + currentZone + "]" + " -> " +
224-
loadBalancedRestTemplate.getForObject("http://sc-B/b-zone", String.class);
211+
restTemplate.getForObject("http://sc-B/b-zone", String.class);
225212
}
226213

227214
@ApiOperation(value = "Dubbo 全链路灰度入口", tags = {"入口应用"})

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class RocketMqConfiguration {
2828
private String topic;
2929

3030
@Autowired
31-
@Qualifier("loadBalancedRestTemplate")
3231
private RestTemplate restTemplate;
3332

3433
@Autowired

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,10 @@ public static void main(String[] args) {
3030
SpringApplication.run(BApplication.class, args);
3131
}
3232

33-
@Bean(name = "loadBalancedRestTemplate")
33+
@Bean
3434
@LoadBalanced
35-
RestTemplate loadBalancedRestTemplate() {
36-
return new RestTemplate();
37-
}
38-
39-
@Bean(name = "restTemplate")
4035
RestTemplate restTemplate() {
41-
return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
42-
request.getHeaders().add("Connection", "close");
43-
return execution.execute(request, body);
44-
})).build();
36+
return new RestTemplate();
4537
}
4638

4739
@Bean(name = "serviceTag")

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.apache.http.impl.client.HttpClientBuilder;
1313
import org.apache.http.util.EntityUtils;
1414
import org.springframework.beans.factory.annotation.Autowired;
15-
import org.springframework.beans.factory.annotation.Qualifier;
1615
import org.springframework.cloud.commons.util.InetUtils;
1716
import org.springframework.web.bind.annotation.GetMapping;
1817
import org.springframework.web.bind.annotation.PathVariable;
@@ -30,11 +29,6 @@
3029
class BController {
3130

3231
@Autowired
33-
@Qualifier("loadBalancedRestTemplate")
34-
private RestTemplate loadBalancedRestTemplate;
35-
36-
@Autowired
37-
@Qualifier("restTemplate")
3832
private RestTemplate restTemplate;
3933

4034
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
@@ -73,30 +67,30 @@ private void init() {
7367
public String flow(HttpServletRequest request) throws ExecutionException, InterruptedException {
7468
long sleepTime = 5 + RANDOM.nextInt(5);
7569
silentSleep(sleepTime);
76-
String result = loadBalancedRestTemplate.getForObject("http://sc-C/flow", String.class);
70+
String result = restTemplate.getForObject("http://sc-C/flow", String.class);
7771
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
7872
}
7973

8074
@GetMapping("/params/{hot}")
8175
public String params(@PathVariable("hot") String hot) throws ExecutionException, InterruptedException {
8276
long sleepTime = 5 + RANDOM.nextInt(5);
8377
silentSleep(sleepTime);
84-
String result = loadBalancedRestTemplate.getForObject("http://sc-C/params/" + hot, String.class);
78+
String result = restTemplate.getForObject("http://sc-C/params/" + hot, String.class);
8579
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " params:" + hot + " -> " + result;
8680
}
8781

8882
@GetMapping("/isolate")
8983
public String isolate(HttpServletRequest request) throws ExecutionException, InterruptedException {
9084
long sleepTime = 500 + RANDOM.nextInt(5);
9185
silentSleep(sleepTime);
92-
String result = loadBalancedRestTemplate.getForObject("http://sc-C/isolate", String.class);
86+
String result = restTemplate.getForObject("http://sc-C/isolate", String.class);
9387
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
9488
}
9589

9690
@GetMapping("/b")
9791
public String b(HttpServletRequest request) {
9892
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
99-
loadBalancedRestTemplate.getForObject("http://sc-C/c", String.class);
93+
restTemplate.getForObject("http://sc-C/c", String.class);
10094
}
10195

10296
@GetMapping("/bByFeign")
@@ -133,13 +127,7 @@ public String circuit_breaker_exception_b() {
133127
@GetMapping("/b-zone")
134128
public String bZone(HttpServletRequest request) {
135129
return "B" + serviceTag + "[" + currentZone + "]" + " -> " +
136-
loadBalancedRestTemplate.getForObject("http://sc-C/c-zone", String.class);
137-
}
138-
139-
@GetMapping("/spring_boot")
140-
public String spring_boot(HttpServletRequest request) {
141-
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
142-
restTemplate.getForObject("http://sc-c:20003/spring_boot", String.class);
130+
restTemplate.getForObject("http://sc-C/c-zone", String.class);
143131
}
144132

145133
@GetMapping("/sql")

‎mse-simple-demo/helm/mse-simple-demo/templates/sc-a-svc.yaml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎mse-simple-demo/helm/mse-simple-demo/templates/sc-b-svc.yaml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎mse-simple-demo/helm/mse-simple-demo/templates/sc-c-svc.yaml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)