Merge branch 'master' into dev-1.3

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalLogTrackInterceptor.java

@@ -12,11 +12,21 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class GlobalLogTrackInterceptor extends HandlerInterceptorAdapter {
     private static final String LNS_TRANCE_ID = "lnsTranceId";
+    private static final String X_SERVER_HEADER = "X-Server";
+    private static final String POD_NAME_ENV = "POD_NAME";
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String t = MDC.get(LNS_TRANCE_ID);
         MDC.put(LNS_TRANCE_ID, null == t ? String.valueOf(System.nanoTime()) : t);
+        
+        // 从环境变量获取POD_NAME并添加到响应头
+        String podName = System.getenv(POD_NAME_ENV);
+        if (podName != null && !podName.isEmpty()) {
+//            log.info("[preHandle] podName: {}", podName);
+            response.setHeader(X_SERVER_HEADER, podName);
+        }
+        
         return true;
     }
 

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -109,6 +109,8 @@ global-auth:
     - ${liquidnet.info.context}/candy-coupon/useBack
     - ${liquidnet.info.context}/candy-coupon/useBackJxl
     - ${liquidnet.info.context}/inner/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml

@@ -92,6 +92,8 @@ global-auth:
     - ${liquidnet.info.context}/user/userLikeOperation
     - ${liquidnet.info.context}/user/userDislikeOperation
     - ${liquidnet.info.context}/performance/getUserListByCon
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -146,6 +146,8 @@ global-auth:
     - ${liquidnet.info.context}/app/mix/details
     - ${liquidnet.info.context}/wdt/**
     - ${liquidnet.info.context}/bracelet/callback
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml

@@ -124,6 +124,8 @@ global-auth:
     - ${liquidnet.info.context}/notify/**
     - ${liquidnet.info.context}/refund/**
     - ${liquidnet.info.context}/pay/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -196,6 +196,8 @@ spring:
 global-auth:
   exclude-url-pattern: # 模式I（与模式II互斥）
 #    - ${liquidnet.info.context}/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   include-url-pattern: # 模式II（与模式I互斥）
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-slime.yml

@@ -112,6 +112,8 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/fields/app/details
+    # 健康检查
+    - ${liquidnet.info.context}/health
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-smile.yml

@@ -115,6 +115,8 @@ global-auth:
     - ${liquidnet.info.context}/frontNoLogin/**
     - ${liquidnet.info.context}/volunteers/project/list
     - ${liquidnet.info.context}/volunteers/project/details
+    # 健康检查
+    - ${liquidnet.info.context}/health
 
   oncheck-url-pattern:
     -

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/HealthController.java

+package com.liquidnet.service.candy.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/HealthController.java

+package com.liquidnet.service.chime.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/HealthController.java

+package com.liquidnet.service.goblin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/HealthController.java

+package com.liquidnet.service.order.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/HealthController.java

+package com.liquidnet.service.platform.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/controller/HealthController.java

+package com.liquidnet.service.slime.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/HealthController.java

+package com.liquidnet.service.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/HealthController.java

+package com.liquidnet.service.sweet.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}