Merge remote-tracking branch 'origin/master'

src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogCallHttpAspect.java

@@ -52,7 +52,6 @@ public class LogCallHttpAspect {
         return result;
     }
 
-    @Async
     public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP){
         Object[] args = pjp.getArgs();
         String  methodName = pjp.getSignature().getName();

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

 package cn.quantgroup.xyqb.controller.external.user;
 
-import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
-import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.xyqb.entity.enumerate.*;
-import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
-import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
-import cn.quantgroup.xyqb.entity.enumerate.Relation;
-import cn.quantgroup.xyqb.model.*;
-import cn.quantgroup.user.enums.*;
-import cn.quantgroup.xyqb.model.*;
-import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.entity.Address;
 import cn.quantgroup.xyqb.entity.Contact;
 import cn.quantgroup.xyqb.entity.User;
@@ -22,12 +9,11 @@ import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.entity.UserSpouse;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
-//import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
-//import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
-//import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
-//import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
-//import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
-//import cn.quantgroup.xyqb.entity.enumerate.Relation;
+import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
+import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
+import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
+import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
 import cn.quantgroup.xyqb.model.AddressRet;
 import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.IdType;
@@ -39,13 +25,18 @@ import cn.quantgroup.xyqb.model.UserSpouseRet;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.user.*;
+import cn.quantgroup.xyqb.service.user.IAddressService;
+import cn.quantgroup.xyqb.service.user.IContactService;
+import cn.quantgroup.xyqb.service.user.ILkbUserService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
+import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
+import cn.quantgroup.xyqb.service.user.IUserService;
+import cn.quantgroup.xyqb.service.user.IUserSpouseService;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.google.common.base.MoreObjects;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -56,6 +47,7 @@ import java.text.ParseException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -68,13 +60,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
+//import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+//import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.Relation;
 
 /**
  * Created by Miraculous on 2016/12/19.
@@ -133,7 +124,18 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("", null);
     }
-    UserRet userRet = UserRet.getUserRet(user);
+    UserRet userRet = new UserRet();
+    Long createTimeStamp = user.getCreatedAt().getTime();
+    Long updateTimeStamp = user.getUpdatedAt().getTime();
+    userRet.setId(user.getId());
+    userRet.setPhoneNo(user.getPhoneNo());
+    userRet.setEnable(user.getEnable());
+    userRet.setPassword(org.apache.commons.lang.StringUtils.defaultIfEmpty(user.getPassword(), ""));
+    userRet.setRegisteredFrom(user.getRegisteredFrom());
+    userRet.setUuid(user.getUuid());
+    userRet.setCreatedAt(createTimeStamp);
+    userRet.setUpdatedAt(updateTimeStamp);
+
     return JsonResult.buildSuccessResult("", userRet);
   }
 
@@ -157,11 +159,11 @@ public class InnerController implements IBaseController {
     }
     List<Long> userIds = JSONObject.parseObject(userIdsString, new TypeReference<List<Long>>() {
     });
-    if(!CollectionUtils.isEmpty(userIds) && userIds.size()<=500) {
+    if (!CollectionUtils.isEmpty(userIds) && userIds.size() <= 500) {
       Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds);
       return JsonResult.buildSuccessResult("", userIdAndPhoneMap);
-    }else {
-      return JsonResult.buildErrorStateResult("批量查询每次最多进行500条用户信息的查询",null);
+    } else {
+      return JsonResult.buildErrorStateResult("批量查询每次最多进行500条用户信息的查询", null);
     }
   }
 
@@ -189,7 +191,7 @@ public class InnerController implements IBaseController {
     User user = userService.findByPhoneWithCache(phoneNo);
     if (user == null) {
       user = new User();
-    }else if(!user.getEnable()){
+    } else if (!user.getEnable()) {
       return JsonResult.buildErrorStateResult("用户已经注销", null);
     }
     if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
@@ -212,17 +214,10 @@ public class InnerController implements IBaseController {
 
   /**
    * 保存用户详细信息
-   *
-   * @param userId
-   * @param phoneNo
-   * @param name
-   * @param idNo
-   * @param email
-   * @return
    */
   @RequestMapping("/user_detail/save")
   public JsonResult saveUserDetail(Long userId, String phoneNo, String name, String idNo,
-                                   String email, Long id) {
+      String email, Long id) {
     //参数验证
     if (userId == null || userId == 0L) {
       return JsonResult.buildErrorStateResult("用户id为空.", null);
@@ -264,9 +259,6 @@ public class InnerController implements IBaseController {
 
   /**
    * 根据用户id查询用户的详细信息
-   *
-   * @param userId
-   * @return
    */
   @RequestMapping("/user_detail/search/userId")
   @LogHttpCaller
@@ -348,14 +340,12 @@ public class InnerController implements IBaseController {
     for (Contact c : contacts) {
       c.setId(null);
       c.setUserId(userId);
-      c.setRelation(c.getRelation() == null ? cn.quantgroup.user.enums.Relation.OTHER: c.getRelation());
+      c.setRelation(c.getRelation() == null ? cn.quantgroup.user.enums.Relation.OTHER : c.getRelation());
       c.setCreatedAt(now);
       c.setUpdateAt(now);
     }
   }
 
-
-
   @RequestMapping("/address/search/user_id")
   public JsonResult findAddressByUserId(Long userId) {
     if (userId == null) {
@@ -395,7 +385,6 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj));
   }
 
-
   @RequestMapping("/user_ext_info/update")
   public JsonResult updateMarryStatus(
       Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
@@ -444,7 +433,7 @@ public class InnerController implements IBaseController {
   @LogHttpCaller
   public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) {
 
-    LOGGER.info("searchUserDetailList ,param.name:{},phone:{},idNo:{},ip:{}",name,phoneNo,idNo,getIp());
+    LOGGER.info("searchUserDetailList ,param.name:{},phone:{},idNo:{},ip:{}", name, phoneNo, idNo, getIp());
     if (StringUtils.isBlank(name) && StringUtils.isBlank(phoneNo) && StringUtils.isBlank(idNo)) {
       return JsonResult.buildErrorStateResult("至少必须满足一个条件不为空", null);
     }
@@ -453,18 +442,18 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("success", userDetails);*/
 
     ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    if(StringUtils.isNotBlank(name)){
-      builder.put("name",name);
+    if (StringUtils.isNotBlank(name)) {
+      builder.put("name", name);
     }
-    if(StringUtils.isNotBlank(phoneNo)){
-      builder.put("phoneNo",phoneNo);
+    if (StringUtils.isNotBlank(phoneNo)) {
+      builder.put("phoneNo", phoneNo);
     }
-    if(StringUtils.isNotBlank(idNo)){
-      builder.put("idNo",idNo);
+    if (StringUtils.isNotBlank(idNo)) {
+      builder.put("idNo", idNo);
     }
-    Map<String, String> param =builder.build();
+    Map<String, String> param = builder.build();
     String s = httpService.get(queryUrl.concat("/innerapi/user_detail/search_list"), param);
-    return  JSON.parseObject(s, JsonResult.class);
+    return JSON.parseObject(s, JsonResult.class);
   }
 
   @RequestMapping("/user_ext_info/search/user_id")
@@ -522,7 +511,7 @@ public class InnerController implements IBaseController {
       sessionService.deleteByUserId(userId);
     }
     LOGGER.info("去清除函谷关的缓存");
-    httpService.get(hanguguanUrl.concat("/innerapi/disableUserCache"),ImmutableMap.of("phone",user.getPhoneNo()));
+    httpService.get(hanguguanUrl.concat("/innerapi/disableUserCache"), ImmutableMap.of("phone", user.getPhoneNo()));
     return JsonResult.buildSuccessResult("用户已禁用.", user.getEnable() == false);
   }
 
@@ -567,128 +556,109 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }
 
-
   @RequestMapping("/user/findByPhones")
-  public JsonResult getUserIdByPhones(@RequestParam("userPhones")String userPhones){
-    if(StringUtils.isBlank(userPhones)){
-      return JsonResult.buildErrorStateResult("传入用户手机号不可为空",null);
+  public JsonResult getUserIdByPhones(@RequestParam("userPhones") String userPhones) {
+    if (StringUtils.isBlank(userPhones)) {
+      return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null);
     }
     List<String> phones = JSONObject.parseObject(userPhones, new TypeReference<List<String>>() {
     });
-    if(org.apache.commons.collections.CollectionUtils.isNotEmpty(phones)) {
-      if(!(phones.size()>500)) {
+    if (org.apache.commons.collections.CollectionUtils.isNotEmpty(phones)) {
+      if (!(phones.size() > 500)) {
         List<User> users = userService.findByPhones(phones);
-        if(org.apache.commons.collections.CollectionUtils.isNotEmpty(users)) {
-          return JsonResult.buildSuccessResult(null, users.stream().collect(Collectors.toMap(User::getPhoneNo,User::getId)));
-        }else {
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(users)) {
+          return JsonResult.buildSuccessResult(null, users.stream().collect(Collectors.toMap(User::getPhoneNo, User::getId)));
+        } else {
           return JsonResult.buildSuccessResult(null, null);
         }
       }
-      return JsonResult.buildErrorStateResult("单次批量查询不可超过500个手机号",null);
+      return JsonResult.buildErrorStateResult("单次批量查询不可超过500个手机号", null);
     }
     return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null);
   }
 
-
   /**
    * 重置密码接口，供内部人员使用（例如绝影）
-   * @param key
-   * @param phone
-   * @return
    */
   @RequestMapping("/user/password/reset/{key}/{phone}")
-  public JsonResult resetPassword(@PathVariable("key")String key,@PathVariable("phone")String phone) {
-    LOGGER.info("密码重置请求,phone:[{}]",phone);
-    if(StringUtils.isBlank(key)){
+  public JsonResult resetPassword(@PathVariable("key") String key, @PathVariable("phone") String phone) {
+    LOGGER.info("密码重置请求,phone:[{}]", phone);
+    if (StringUtils.isBlank(key)) {
       return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
     }
-    if(!"ecf75c1f-2ccb-4661-8e4b-2874c0f45a2b".equalsIgnoreCase(key)){
+    if (!"ecf75c1f-2ccb-4661-8e4b-2874c0f45a2b".equalsIgnoreCase(key)) {
       LOGGER.error("密码重置失败,key错误!@!,phone:[{}]", phone);
       return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
     }
     try {
       userService.resetPassword(phone, "123456"); //默认重置的密码是123456
       return JsonResult.buildSuccessResult("用户密码已重置.", "null");
-    }catch (Exception e){
-      LOGGER.error("密码重置失败,phone[{}],err:[{}]",phone, e);
+    } catch (Exception e) {
+      LOGGER.error("密码重置失败,phone[{}],err:[{}]", phone, e);
     }
     return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
-
   }
 
-
   /**
    * 保存用户信息，地址信息，联系人信息
-   * @param registeredFrom
-   * @param channelId
-   * @param phoneNo
-   * @param name
-   * @param idNo
-   * @param provinceCode
-   * @param cityCode
-   * @param districtCode
-   * @param address
-   * @param contacts
-   * @return
    */
   @RequestMapping("/user/save_multi")
   public JsonResult saveMulti(
-          String registeredFrom,
-          String channelId,
-          String phoneNo,
-          String name,
-          String idNo,
-          String provinceCode,
-          String province,
-          String cityCode,
-          String city,
-          String districtCode,
-          String district,
-          String address,
-          String contacts) {
+      String registeredFrom,
+      String channelId,
+      String phoneNo,
+      String name,
+      String idNo,
+      String provinceCode,
+      String province,
+      String cityCode,
+      String city,
+      String districtCode,
+      String district,
+      String address,
+      String contacts) {
     LOGGER.info("保存用户、联系人、地址信息:registeredFrom:[{}], phoneNo[{}]，name[{}]，idNo[{}]，provinceCode[{}]，cityCode[{}]，districtCode[{}]，" +
-            "address[{}]，contacts[{}]",registeredFrom,phoneNo,name,idNo,provinceCode,cityCode,districtCode,address,contacts);
+        "address[{}]，contacts[{}]", registeredFrom, phoneNo, name, idNo, provinceCode, cityCode, districtCode, address, contacts);
 
-    if(!NumberUtils.isDigits(registeredFrom)){
+    if (!NumberUtils.isDigits(registeredFrom)) {
       return JsonResult.buildErrorStateResult("注册渠道异常.", null);
     }
 
-    if(!NumberUtils.isDigits(phoneNo)){
+    if (!NumberUtils.isDigits(phoneNo)) {
       return JsonResult.buildErrorStateResult("手机号异常.", null);
     }
-    if(StringUtils.isBlank(name)){
+    if (StringUtils.isBlank(name)) {
       return JsonResult.buildErrorStateResult("用户名异常.", null);
     }
-    if(!NumberUtils.isDigits(idNo)){
+    if (!NumberUtils.isDigits(idNo)) {
       return JsonResult.buildErrorStateResult("用户身份证号异常.", null);
     }
-    if(!NumberUtils.isDigits(provinceCode)){
+    if (!NumberUtils.isDigits(provinceCode)) {
       return JsonResult.buildErrorStateResult("省份编号异常.", null);
     }
-    if(StringUtils.isBlank(province)){
+    if (StringUtils.isBlank(province)) {
       return JsonResult.buildErrorStateResult("省份异常.", null);
     }
-    if(!NumberUtils.isDigits(cityCode)){
+    if (!NumberUtils.isDigits(cityCode)) {
       return JsonResult.buildErrorStateResult("城市编号异常.", null);
     }
-    if(StringUtils.isBlank(city)){
+    if (StringUtils.isBlank(city)) {
       return JsonResult.buildErrorStateResult("城市异常.", null);
     }
-    if(!NumberUtils.isDigits(districtCode)){
+    if (!NumberUtils.isDigits(districtCode)) {
       return JsonResult.buildErrorStateResult("区县编号异常.", null);
     }
-    if(StringUtils.isBlank(district)){
+    if (StringUtils.isBlank(district)) {
       return JsonResult.buildErrorStateResult("区县异常.", null);
     }
     if (StringUtils.isBlank(address)) {
       return JsonResult.buildErrorStateResult("详细地址异常.", null);
     }
 
-
     channelId = MoreObjects.firstNonNull(channelId, "-1");
     // 验证用户是否已存在
     User user = userService.findByPhoneInDb(phoneNo);
-    if(null != user){
+    if (null != user) {
       return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null);
     }
 
@@ -696,7 +666,6 @@ public class InnerController implements IBaseController {
 
     UserRet userRet = UserRet.getUserRet(user);
     return JsonResult.buildSuccessResult(null, userRet);
-
   }
 
   @RequestMapping("/user/register")
@@ -713,5 +682,4 @@ public class InnerController implements IBaseController {
     }
     return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user));
   }
-
 }
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -81,6 +81,7 @@ public class UserServiceImpl implements IUserService {
   private final static Random random = new Random();
 
   @Override
+  @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
   public User findByPhoneInDb(String phone) {
     return userRepository.findByPhoneNo(phone);
   }

src/main/resources/config/dev/xyqb.properties

@@ -3,7 +3,7 @@ configserver.disable=1
 configserver.system=xyqb-user
 
 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.163:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
+xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.23:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
 
 xyqb.data.mysql.password=qatest