合并master

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BaseUserRegisterHandler.java

@@ -17,6 +17,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -60,11 +61,11 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
         user.setEnable(true);
         user.setPhoneNo(userRegisterParam.getPhoneNo());
         Long registerFrom = userRegisterParam.getRegisterFrom();
-        if (null == registerFrom) {
+        if (Objects.isNull(registerFrom)) {
             registerFrom = 1L;
         }
         Long channelId = userRegisterParam.getChannelId();
-        if (channelId == 222L) {
+        if (Objects.equals(channelId, 222L)) {
             user.setRegisteredFrom(channelId);
         } else {
             user.setRegisteredFrom(registerFrom);

src/main/java/cn/quantgroup/xyqb/util/IPUtil.java

@@ -32,6 +32,7 @@ public class IPUtil {
     String jvmTest = System.getProperty("test");
     if(Boolean.valueOf(jvmTest)){
       WHITE_ADDRESS.add("192.168.");
+      WHITE_ADDRESS.add(LOCAL_ADDRESS);
     }
   }
 

src/test/java/demo/DemoApplicationTests.java

-package demo;
-
-import cn.quantgroup.xyqb.Bootstrap;
-import cn.quantgroup.xyqb.controller.internal.sms.SmsController;
-import cn.quantgroup.xyqb.controller.internal.user.UserController;
-import cn.quantgroup.xyqb.model.JsonResult;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Bootstrap.class)
-@WebAppConfiguration
-public class DemoApplicationTests {
-
-  @Autowired
-  private UserController userController;
-
-  @Autowired
-  private SmsController smsController;
-
-  private String smsRegCode = "";
-
-  @Test
-  public void sendRegCode() {
+//package demo;
+//
+//import cn.quantgroup.xyqb.Bootstrap;
+//import cn.quantgroup.xyqb.controller.internal.sms.SmsController;
+//import cn.quantgroup.xyqb.controller.internal.user.UserController;
+//import cn.quantgroup.xyqb.model.JsonResult;
+//import org.junit.Assert;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.test.context.web.WebAppConfiguration;
+//
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringBootTest(classes = Bootstrap.class)
+//@WebAppConfiguration
+//public class DemoApplicationTests {
+//
+//  @Autowired
+//  private UserController userController;
+//
+//  @Autowired
+//  private SmsController smsController;
+//
+//  private String smsRegCode = "";
+//
+//  @Test
+//  public void sendRegCode() {
 //    JsonResult jsonResult = smsController.sendRegistCode("18611428880", null);
 //    System.out.print(jsonResult.getMsg());
 //    Assert.assertEquals(jsonResult.getCode(), "0000");
 //    Assert.assertEquals(jsonResult.getBusinessCode(), "0000");
-
-  }
-
-  @Test
-  public void registerFast() {
-//    JsonResult jsonResult = userController.registerFast("18611428880", "000000", null, null, "");
-//    Assert.assertEquals(jsonResult.getCode(), "0000");
-  }
-
+//
+//  }
+//
+//  @Test
+//  public void registerFast() {
+////    JsonResult jsonResult = userController.registerFast("18611428880", "000000", null, null, "");
+////    Assert.assertEquals(jsonResult.getCode(), "0000");
+//  }
+//
 //  @Test
 //  public void sendLoginCode() {
 //    JsonResult jsonResult = smsController.sendLoginCode("18611428880", null);
 //    Assert.assertEquals(jsonResult.getCode(), "0000");
 //  }
-
-  @Test
-  public void loginFast() {
-
-  }
-
-
-}
+//
+//  @Test
+//  public void loginFast() {
+//
+//  }
+//
+//
+//}