更新服务内部调用demo

4 files changed, 34 insertions, 7 deletions

diff --git a/galaxy-auth-center/src/main/java/com/mesalab/authcenter/controller/IndexController.java b/galaxy-auth-center/src/main/java/com/mesalab/authcenter/controller/IndexController.java
index 97dc152..017766e 100644
--- a/galaxy-auth-center/src/main/java/com/mesalab/authcenter/controller/IndexController.java
+++ b/galaxy-auth-center/src/main/java/com/mesalab/authcenter/controller/IndexController.java
@@ -1,18 +1,31 @@
 package com.mesalab.authcenter.controller;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Slf4j
 @RestController
-@RequestMapping("auth")
+@RequestMapping("index")
 public class IndexController {
 
-    @GetMapping("index")
-    public String index() {
-        log.info("galaxy-auth-center index execute...");
-        return "index";
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    @Value("${server.port}")
+    private String serverPort;
+
+    @GetMapping("info")
+    public Map<String, Object> info() {
+        log.info(">>>applicationName:{}>>>Port:{}", applicationName, serverPort);
+        Map<String, Object> results = new HashMap<>();
+        results.put("applicationName", applicationName);
+        results.put("serverPort", serverPort);
+        return results;
     }
 }
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java
index 510e988..6e5c3e0 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java
@@ -1,7 +1,9 @@
 package com.mesalab.api.modules.demo.controller;
 
 import com.mesalab.api.modules.demo.service.DemoService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @ClassName : DemoController
  * @Description : 内部服务调用Demo
  */
+@Slf4j
 @RestController
 @RequestMapping("demo")
 public class DemoController {
@@ -18,8 +21,15 @@ public class DemoController {
     @Autowired
     DemoService demoService;
 
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    @Value("${server.port}")
+    private String serverPort;
+
     @RequestMapping("index")
     public String index() {
+        log.info(">>>applicationName:{}>>>Port:{}", applicationName, serverPort);
         return demoService.demo();
     }
 
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java
index 6c8de06..49e1928 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java
@@ -19,7 +19,7 @@ public class DemoServiceImpl implements DemoService {
 
     @Override
     public String demo() {
-        String url = "http://galaxy-auth-center/auth/index";
-        return restTemplate.getForObject(url,String.class);
+        String url = "http://galaxy-auth-center/index/info";
+        return restTemplate.getForObject(url, String.class);
     }
 }
diff --git a/galaxy-gateway/config/application.yml b/galaxy-gateway/config/application.yml
index e4f4915..4b12036 100644
--- a/galaxy-gateway/config/application.yml
+++ b/galaxy-gateway/config/application.yml
@@ -15,6 +15,10 @@ spring:
         instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
     gateway:
       routes:
+        - id: demo
+          uri: lb://galaxy-business-api
+          predicates:
+            - Path=/demo/**
         - id: metadata
           uri: lb://galaxy-query-engine
           predicates: