Merge branch 'dev-ip' into 'master'

打印IP

See merge request !404

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-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);