Merge branch 'master' into 20180330-wechat-binding

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -411,27 +411,24 @@ public class InnerController implements IBaseController {
 
   @RequestMapping("/contact/save/contacts")
   public JsonResult save2Contact(Long userId, @RequestParam(value = "contacts") String contactsStr) {
-    LOGGER.info("保存用户联系人:userId:{}, contacts:{}", userId, contactsStr);
-    if (StringUtils.isEmpty(contactsStr)) {
-      return JsonResult.buildErrorStateResult(null, null);
-    }
-    if (userId == null) {
-      LOGGER.info("用户ID不能为空");
-      return JsonResult.buildErrorStateResult(null, null);
+    if (Objects.isNull(userId) || StringUtils.isBlank(contactsStr)) {
+      LOGGER.warn("保存用户联系人:参数不完整：userId:{}, contacts:{}", userId, contactsStr);
+      return JsonResult.buildErrorStateResult("参数不完整", String.valueOf(userId).concat(":").concat(contactsStr));
     }
+    LOGGER.info("保存用户联系人:userId:{}, contacts:{}", userId, contactsStr);
     List<Contact> contacts = JSONObject.parseObject(contactsStr, new TypeReference<List<Contact>>(){});
     if (CollectionUtils.isEmpty(contacts)) {
-      LOGGER.info("联系人不能空");
-      return JsonResult.buildErrorStateResult(null, null);
+      LOGGER.info("联系人不能为空");
+      return JsonResult.buildErrorStateResult("联系人不能为空", contacts);
     }
     for (Contact contact : contacts) {
       if (!contact.valid()) {
         LOGGER.info("用户手机号或姓名错误, phoneNo:{},name:{}", contact.getPhoneNo(), contact.getName());
-        return JsonResult.buildErrorStateResult(null, null);
+        return JsonResult.buildErrorStateResult("用户手机号或姓名错误", contact);
       }
     }
     List<Contact> result = contactService.save(userId, contacts);
-    return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(result));
+    return JsonResult.buildSuccessResult("保存成功", ContactRet.contacts2ContactRets(result));
   }
 
   @RequestMapping("/contact/update/contact")

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

@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
  */
 public class ValidationUtil {
 
-  private static String phoneRegExp = "^1[345789][0-9]{9}$";
+  private static String phoneRegExp = "^1[3456789][0-9]{9}$";
   private static String chineseNameRegExp = "^[\u4e00-\u9fa5]+(\\.|·)?[\u4e00-\u9fa5]+$";
   private static String ipv4RegExp = "^((2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)\\.){3}(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)$";
   private static String localIpv4RegExp = "^((172\\.(1[0-6]|2[0-9]|3[01]))|(192\\.168|169\\.254)|((127|10)\\.(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)))(\\.(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)){2}$";