Merge branch 'master' into container

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-framework/src/main/java/com/liquidnet/client/admin/framework/config/ShiroConfig.java

@@ -274,6 +274,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
+        filterChainDefinitionMap.put("/health", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/health/HealthController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.health;
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Api(tags = "健康检查")
+@Controller
+@RequestMapping("/health")
+public class HealthController {
+
+    @GetMapping("")
+    @ResponseBody
+    public AjaxResult health() {
+        return AjaxResult.success("success");
+    }
+
+}

liquidnet-bus-common/liquidnet-common-sms/pom.xml

@@ -21,5 +21,11 @@
             <groupId>com.aliyun</groupId>
             <artifactId>dysmsapi20170525</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/processor/SmsProcessor.java

@@ -4,11 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.aliyun.dysmsapi20170525.Client;
 import com.aliyun.dysmsapi20170525.models.*;
 import com.aliyun.teaopenapi.models.Config;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.ServletUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 
 @Slf4j
 @Component
@@ -83,6 +87,18 @@ public class SmsProcessor {
 
             if (!isSucc) {
                 log.warn("###发送短信API处理失败[pn={},sn={},tc={},tp={},respBody={}]", phoneNumber, signName, templateCode, templateParam, JSON.toJSON(smsResponseBody));
+                String cliIpAddr = CurrentUtil.getCliIpAddr();
+                log.info("[send] cliIpAddr: {}", cliIpAddr);
+
+                StringBuilder sb = new StringBuilder();
+                HttpServletRequest request = ServletUtils.getRequest();
+                Enumeration<String> headerNames = request.getHeaderNames();
+                while (headerNames.hasMoreElements()) {
+                    String headerName = headerNames.nextElement();
+                    String headerValue = request.getHeader(headerName);
+                    sb.append(headerName).append(": ").append(headerValue).append("\n");
+                }
+                log.info("[send] headers: {}.", sb);
             }
 
             return isSucc;

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

@@ -137,6 +137,8 @@ global-auth:
 #    - ${liquidnet.info.context}/wx/oauth2/access_token
     - ${liquidnet.info.context}/rsc/**
     - ${liquidnet.info.context}/user/info/rds
+    # 健康检查
+    - ${liquidnet.info.context}/health
   include-url-pattern: # 模式II（与模式I互斥）
 #    - ${liquidnet.info.context}/**
   oncheck-url-pattern:

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

@@ -157,6 +157,8 @@ global-auth:
     # 福袋
     - ${liquidnet.info.context}/luckyBag/scope
     - ${liquidnet.info.context}/luckyBag/code/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
     - ${liquidnet.info.context}/order/details
     - ${liquidnet.info.context}/order/transfer*

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

@@ -116,6 +116,8 @@ global-auth:
     - ${liquidnet.info.context}/user/logs/in2111
     - ${liquidnet.info.context}/user/logs/de2111
     - ${liquidnet.info.context}/user/logs/in2112
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -94,6 +94,9 @@ public class AdamLoginController {
             return ResponseDto.failure(ErrorMapping.get("10000"));
         }
 
+        String cliIpAddr = CurrentUtil.getCliIpAddr();
+        log.info("cliIpAddr: {}", cliIpAddr);
+
         String smsCode = RandomStringUtils.randomNumeric(6);
         ObjectNode msgNode = JsonUtils.OM().createObjectNode();
         msgNode.put("code", smsCode);

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

+package com.liquidnet.service.adam.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-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/HealthController.java

+package com.liquidnet.service.kylin.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-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/controller/HealthController.java

+package com.liquidnet.service.stone.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");
+    }
+}