请求风控时非空判断

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AuthCodeServiceImpl.java

@@ -80,12 +80,20 @@ public class AuthCodeServiceImpl implements AuthCodeService {
             String publicIp = IPUtil.getIpAdrress(request);
             String deviceToken = baseRequest.getDevice_token();
             CheckcodeRiskReq rcReq = new CheckcodeRiskReq();
-            rcReq.setMobile(baseRequest.getMobile());
-            rcReq.setIp(publicIp);
-            rcReq.setDeviceIp(deviceInfo.getDevice_ip());
-            rcReq.setDeviceId(deviceToken);
+            if (StringUtils.isNotEmpty(baseRequest.getMobile())) {
+                rcReq.setMobile(baseRequest.getMobile());
+            }
+            if (StringUtils.isNotEmpty(publicIp)) {
+                rcReq.setIp(publicIp);
+            }
+            if (StringUtils.isNotEmpty(deviceInfo.getDevice_ip())) {
+                rcReq.setDeviceIp(deviceInfo.getDevice_ip());
+            }
+            if (StringUtils.isNotEmpty(deviceToken)) {
+                rcReq.setDeviceId(deviceToken);
+            }
             rcReq.setSourceType(sourceType);
-            logger.info("rc-checkcodeRisk-req:{}", JSON.toJSONString(rcReq));
+            logger.info("rc-checkcodeRisk-req:{}", rcReq.toString());
             picaResponse = rcClient.checkcodeRisk(rcReq);
             logger.info("rc-checkcodeRisk-{}-resp:{}", baseRequest.getMobile(), JSON.toJSONString(picaResponse));
         } catch (JSONException e) {
@@ -151,6 +159,19 @@ public class AuthCodeServiceImpl implements AuthCodeService {
         return needCheck;
     }
 
+    public static void main(String[] args) {
+        CheckcodeRiskReq rcReq = new CheckcodeRiskReq();
+        rcReq.setMobile("1232");
+        rcReq.setIp("134.192.123.23");
+        rcReq.setDeviceIp(null);
+        rcReq.setDeviceId(null);
+        rcReq.setSourceType(4);
+        System.out.println("rc-checkcodeRisk-req2:{}"+rcReq.toString());
+        System.out.println(rcReq.getDeviceId());
+
+        System.out.println("rc-checkcodeRisk-req:{}"+JSON.toJSONString(rcReq));
+    }
+
     /**
      * @Description 记录风控数据
      * @Author Chongwen.jiang