modified eureka server port

weihuanhuan · Apr 25, 2019 · e7435ee · e7435ee
1 parent a8e4299
commit e7435ee
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 deletions.
diff --git a/customer-feign/src/main/java/controller/HelloController.java b/customer-feign/src/main/java/controller/HelloController.java
@@ -16,8 +16,8 @@ public class HelloController {
     @Autowired
     HelloService helloService;
 
-    @GetMapping(value = "/hi")
-    public String sayHello(@RequestParam String name) {
+    @GetMapping(value = "/hello")
+    public String doHello(@RequestParam String name) {
         return helloService.sayHello(name);
     }
 }
diff --git a/customer-feign/src/main/java/feign/ClientFeign.java b/customer-feign/src/main/java/feign/ClientFeign.java
@@ -9,6 +9,7 @@
  */
 @Component
 @EnableDiscoveryClient
+//指定要扫描的feign client的包位置
 @EnableFeignClients("service")
 public class ClientFeign {
 }
diff --git a/customer-feign/src/main/java/service/HelloService.java b/customer-feign/src/main/java/service/HelloService.java
@@ -1,6 +1,5 @@
 package service;
 
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -12,6 +11,6 @@
 @FeignClient("eureka-client-hello")
 public interface HelloService {
 
-    @RequestMapping(value = "/hi", method = RequestMethod.GET)
+    @RequestMapping(value = "/hello", method = RequestMethod.GET)
     String sayHello(@RequestParam(value = "name") String name);
 }
diff --git a/customer-feign/src/main/resources/application.yml b/customer-feign/src/main/resources/application.yml
@@ -8,4 +8,4 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8762/eureka/
diff --git a/customer-ribbon/src/main/java/controller/HelloController.java b/customer-ribbon/src/main/java/controller/HelloController.java
@@ -15,8 +15,8 @@ public class HelloController {
     @Autowired
     HelloService helloService;
 
-    @GetMapping(value = "/hi")
-    public String hi(@RequestParam String name) {
-        return helloService.hiService( name );
+    @GetMapping(value = "/hello")
+    public String doHello(@RequestParam String name) {
+        return helloService.sayHello(name);
     }
 }
diff --git a/customer-ribbon/src/main/java/service/HelloService.java b/customer-ribbon/src/main/java/service/HelloService.java
@@ -13,7 +13,7 @@ public class HelloService {
     @Autowired
     RestTemplate restTemplate;
 
-    public String hiService(String name) {
-        return restTemplate.getForObject("http://EUREKA-CLIENT-HELLO/hi?name=" + name, String.class);
+    public String sayHello(String name) {
+        return restTemplate.getForObject("http://EUREKA-CLIENT-HELLO/hello?name=" + name, String.class);
     }
 }
diff --git a/customer-ribbon/src/main/resources/application.yml b/customer-ribbon/src/main/resources/application.yml
@@ -8,4 +8,4 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8762/eureka/
diff --git a/eureka-client-hello/src/main/java/bootstrap/EurekaClientApplication.java b/eureka-client-hello/src/main/java/bootstrap/EurekaClientApplication.java
@@ -10,7 +10,7 @@
  */
 
 @SpringBootApplication
-@EnableEurekaClient
+//@EnableEurekaClient
 @ComponentScan("controller")
 public class EurekaClientApplication {
 

diff --git a/eureka-client-hello/src/main/java/controller/HelloController.java b/eureka-client-hello/src/main/java/controller/HelloController.java
@@ -14,8 +14,8 @@ public class HelloController {
     @Value("${server.port}")
     String port;
 
-    @RequestMapping("/hi")
-    public String hello(@RequestParam(value = "name", defaultValue = "foo") String name) {
-        return "hi " + name + " ,i am from port:" + port;
+    @RequestMapping("/hello")
+    public String doHello(@RequestParam(value = "name", defaultValue = "foo") String name) {
+        return "hello " + name + " ,i am from port:" + port;
     }
 }
diff --git a/eureka-client-hello/src/main/resources/application.yml b/eureka-client-hello/src/main/resources/application.yml
@@ -5,7 +5,11 @@ spring:
 server:
   port: 18761
 
+#eureka:
+#  client:
+#    serviceUrl:
+#      defaultZone: http://localhost:8761/eureka/
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8762/eureka/
diff --git a/eureka-server/src/main/resources/application.yml b/eureka-server/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring:
     name: eureka-server
 
 server:
-  port: 8761
+  port: 8762
 
 eureka:
   instance: