Merge branches 'master' and 'xyqb-user2-userCenter' of...

Merge branches 'master' and 'xyqb-user2-userCenter' of http://gitabc.xyqb.com/head_group/xyqb-user2 into xyqb-user2-userCenter

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

README.md

-# han_gu_guan
\ No newline at end of file
+# han_gu_guan
+4月6日合并微信推送分支和短信sdk分支到master
\ No newline at end of file

pom.xml

@@ -235,7 +235,7 @@
                 <dependency>
                     <groupId>cn.quantgroup</groupId>
                     <artifactId>quantgroup-sms-sdk</artifactId>
-                    <version>1.0.5</version>
+                    <version>2.0.0</version>
                 </dependency>
             </dependencies>
             <build>
@@ -257,7 +257,7 @@
             <dependency>
                 <groupId>cn.quantgroup</groupId>
                 <artifactId>quantgroup-sms-sdk</artifactId>
-                <version>1.0.5-SNAPSHOT</version>
+                <version>2.0.0.3-SNAPSHOT</version>
             </dependency>
         </dependencies>
         <build>

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

@@ -80,7 +80,7 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方用户登录, loginFrom:{}, requestIp:{}", registerFrom, requestIp);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
-            user = register(registerFrom, phoneNo, idNo, name);
+            user = register(registerFrom, phoneNo, idNo, name, channelId);
         }
         if (user == null) {
             return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
@@ -121,7 +121,7 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方用户登录, loginFrom:{}, requestIp:{}", registerFrom, requestIp);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
-            user = register(registerFrom, phoneNo, idNo, name);
+            user = register(registerFrom, phoneNo, idNo, name, channelId);
         }
         if (user == null) {
             return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
@@ -156,7 +156,7 @@ public class AppController implements IBaseController {
      *
      * @return
      */
-    private User register(Long registerFrom, String phoneNo, String idNo, String name) {
+    private User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId) {
 
         String randomCode = String.valueOf(random.nextInt(899999) + 100000);
 
@@ -166,7 +166,12 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方登录用户，保存 User");
 
         User user = new User();
-        user.setRegisteredFrom(registerFrom);
+        if(channelId == 222L) {
+            user.setRegisteredFrom(channelId);
+        } else {
+            user.setRegisteredFrom(registerFrom);
+        }
+        //user.setRegisteredFrom(registerFrom);
         user.setUuid(uuid);
         user.setEnable(true);
         user.setPhoneNo(phoneNo);

src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java

 package cn.quantgroup.xyqb.controller.internal.sms;
 
-import cn.quantgroup.sms.ConfirmableMsg;
+import cn.quantgroup.sms.MsgParams;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaValidator;
 import cn.quantgroup.xyqb.model.JsonResult;
@@ -16,10 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -105,11 +102,13 @@ public class SmsController {
         String uniqueId = phoneNo + UUID.randomUUID().toString().replaceAll("-", "");
         List<String> newList = new ArrayList<>();
         newList.add(randomCode);
-        ConfirmableMsg confirmableMsg = new ConfirmableMsg(
+        /*ConfirmableMsg confirmableMsg = new ConfirmableMsg(
                 uniqueId, newList, "1", "1", phoneNo
-        );
+        );*/
+        MsgParams message = new MsgParams(Collections.singletonList(2), phoneNo, "1", "1", Collections.singletonList(randomCode), uniqueId);
         try {
-            smsService.getSmsSender().sendConfirmableMessage(confirmableMsg);
+            //smsService.getSmsSender().sendConfirmableMessage(confirmableMsg);
+            smsService.getSmsSender().sendMsg(message);
             redisTemplate.opsForValue().set(key, uniqueId + ":" + randomCode, EXPIRE_MINUTES, TimeUnit.MINUTES);
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -194,7 +194,7 @@ public class UserController implements IBaseController {
             LOGGER.info("用户快速注册失败，短信验证码错误, registerFrom:{}, phoneNo:{}, verificationCode:{}", registerFrom, phoneNo, verificationCode);
             return JsonResult.buildErrorStateResult("短信验证码错误", null);
         }
-        if (!userService.register(phoneNo, password, registerFrom, getIp())) {
+        if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId)) {
             LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
         }
@@ -242,8 +242,8 @@ public class UserController implements IBaseController {
             LOGGER.info("用户注册失败，短信验证码错误, registerFrom:{}, phoneNo:{}, verificationCode:{}", registerFrom, phoneNo, verificationCode);
             return JsonResult.buildErrorStateResult("短信验证码错误", null);
         }
-        if (!userService.register(phoneNo, password, registerFrom, getIp())) {
-            LOGGER.info("用户注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+        if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId)) {
+            LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
         }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserDetailController.java

@@ -12,6 +12,7 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -58,7 +59,11 @@ public class UserDetailController implements IBaseController {
             userDetail.setIdType(IdType.ID_CARD);
             userDetail.setIsAuthenticated(false);
             userDetail.setQq("");
-            userDetailService.saveUserDetail(userDetail);
+            try {
+                userDetailService.saveUserDetail(userDetail);
+            } catch (DataIntegrityViolationException ex) {
+                return JsonResult.buildSuccessResult("", null);
+            }
             return JsonResult.buildSuccessResult("", null);
         } catch (ParseException ex) {
             LOGGER.error("身份证号错误, idNo: {}", idNo);

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

 package cn.quantgroup.xyqb.entity;
 
 import cn.quantgroup.xyqb.entity.enumerate.*;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -31,13 +32,13 @@ public class UserExtInfo implements Serializable {
     @Column(name = "education")
     private EducationEnum educationEnum = EducationEnum.UNKNOWN;
     @Column(name = "has_car")
-    private boolean hasCar = false;
+    private Boolean hasCar = false;
     @Column(name = "has_social_security")
-    private boolean hasSocialSecurity = false;
+    private Boolean hasSocialSecurity = false;
     @Column(name = "has_house")
-    private boolean hasHouse = false;
+    private Boolean hasHouse = false;
     @Column(name = "has_credit_card")
-    private boolean hasCreditCard = false;
+    private Boolean hasCreditCard = false;
     @Column(name = "marry_status")
     private MaritalStatus marryStatus = MaritalStatus.UNKNOWN;
     @Column(name = "created_at")

src/main/java/cn/quantgroup/xyqb/entity/UserSpouse.java

+package cn.quantgroup.xyqb.entity;
+
+
+import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import lombok.*;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Data
+@Entity
+@Table(name = "user_spouse", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class UserSpouse implements Serializable {
+  private static final long serialVersionUID = -1L;
+
+  @Id
+  @Column(name = "id")
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @Column(name = "user_id")
+  private Long userId;
+
+  @Column(name = "spouse_phone")
+  private String spousePhone;
+
+  @Column(name = "spouse_name")
+  private String spouseName;
+
+  @Column(name = "created_at")
+  private Timestamp createdAt;
+
+  @Column(name = "updated_at")
+  private Timestamp updateAt;
+
+  @Column(name = "status")
+  private MaritalStatus status;
+
+  public UserSpouse(Long userId) {
+    this.userId = userId;
+  }
+}

src/main/java/cn/quantgroup/xyqb/entity/WechatUserInfo.java

@@ -25,7 +25,7 @@ public class WechatUserInfo implements Serializable{
     @Column(name = "open_id")
     private String openId;
     @Column(name = "phone_no")
-    private String phoneNo;
+    private String phoneNo = "";
     @Column(name = "nick_name")
     private String nickName;
     @Column(name = "sex")

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

@@ -27,6 +27,10 @@ public class UserExtInfoRet {
     private Long createdAt;
     private Long updateAt;
 
+    private static boolean defaultBoolean(Boolean k) {
+        return k == null ? false : k;
+    }
+
     public static UserExtInfoRet getUserExtInfoRet(UserExtInfo extInfo) {
         if (extInfo == null) {
             return null;
@@ -38,10 +42,10 @@ public class UserExtInfoRet {
         ret.setIncomeRangeEnum(extInfo.getIncomeRangeEnum());
         ret.setOccupationEnum(extInfo.getOccupationEnum());
         ret.setEducationEnum(extInfo.getEducationEnum());
-        ret.setHasCar(extInfo.isHasCar());
-        ret.setHasSocialSecurity(extInfo.isHasSocialSecurity());
-        ret.setHasHouse(extInfo.isHasHouse());
-        ret.setHasCreditCard(extInfo.isHasCreditCard());
+        ret.setHasCar(defaultBoolean(extInfo.getHasCar()));
+        ret.setHasSocialSecurity(defaultBoolean(extInfo.getHasSocialSecurity()));
+        ret.setHasHouse(defaultBoolean(extInfo.getHasHouse()));
+        ret.setHasCreditCard(defaultBoolean(extInfo.getHasCreditCard()));
         ret.setMarryStatus(extInfo.getMarryStatus());
         ret.setCreatedAt(extInfo.getCreatedAt().getTime());
         ret.setUpdateAt(extInfo.getUpdateAt().getTime());

src/main/java/cn/quantgroup/xyqb/model/UserSpouseRet.java

+package cn.quantgroup.xyqb.model;
+
+import cn.quantgroup.xyqb.entity.UserSpouse;
+import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import lombok.Data;
+
+/**
+ * Created by 11 on 2017/4/19.
+ */
+@Data
+public class UserSpouseRet {
+
+  private Long userId;
+
+  private String spousePhone;
+
+  private String spouseName;
+
+  private Long createdAt;
+
+  private Long updateAt;
+
+  private MaritalStatus status;
+
+  public static UserSpouseRet getUserSpouseRet(UserSpouse userSpouse) {
+    if (userSpouse == null) {
+      return null;
+    }
+    UserSpouseRet ret = new UserSpouseRet();
+    ret.setUserId(userSpouse.getUserId());
+    ret.setSpouseName(userSpouse.getSpouseName());
+    ret.setSpousePhone(userSpouse.getSpousePhone());
+    if (userSpouse.getUpdateAt() != null) {
+      ret.setUpdateAt(userSpouse.getUpdateAt().getTime());
+    }
+    if (userSpouse.getCreatedAt() != null) {
+      ret.setCreatedAt(userSpouse.getCreatedAt().getTime());
+    }
+    ret.setStatus(userSpouse.getStatus());
+    return ret;
+  }
+}

src/main/java/cn/quantgroup/xyqb/repository/IUserSpouseRepository.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.UserSpouse;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface IUserSpouseRepository extends JpaRepository<UserSpouse, Long> {
+  UserSpouse findByUserId(Long userId);
+}

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

 package cn.quantgroup.xyqb.service.sms.impl;
 
+import cn.quantgroup.sms.MsgParams;
 import cn.quantgroup.sms.SendAndForgetMsg;
 import cn.quantgroup.sms.SmsSender;
 import cn.quantgroup.xyqb.Constants;
@@ -34,12 +35,12 @@ public class SmsServiceImpl implements ISmsService {
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> stringRedisTemplate;
 
-    private SmsSender smsSender = null;
+    private static final SmsSender smsSender = new SmsSender();
 
     @Override
     public SmsSender getSmsSender() {
         if (null == smsSender) {
-            smsSender = new SmsSender();
+            return smsSender;
         }
         return this.smsSender;
     }
@@ -47,7 +48,9 @@ public class SmsServiceImpl implements ISmsService {
     @Override
     public void sendAfterRegister(String phoneNo) {
         try {
-            smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
+            MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList());
+            smsSender.sendMsg(msgParams);
+            //smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
             LOGGER.info("注册完成，发送短信, phoneNo:{}", phoneNo);
         } catch (Exception e) {
             e.printStackTrace();
@@ -95,12 +98,17 @@ public class SmsServiceImpl implements ISmsService {
 
 
     private boolean confirmSms(String smsVerificationCode, String unqiueId, String code) {
+        try {
+            MsgParams message = new MsgParams(Collections.singletonList(2), unqiueId);
+            //MsgParams messageVoice = new MsgParams(Collections.singletonList(4), unqiueId);
+            getSmsSender().confirmMsg(message);
+            //getSmsSender().confirmMsg(messageVoice);
+            //smsSender.confirmSmsResult("1", unqiueId);
+            LOGGER.info("confirmMsg send success, uniqueId={}", unqiueId);
+        } catch (Exception e) {
+            LOGGER.info("短信验证像短信中心确认失效");
+        }
         if (StringUtils.equals(code, smsVerificationCode)) {
-            try {
-                smsSender.confirmSmsResult("1", unqiueId);
-            } catch (Exception e) {
-                LOGGER.info("短信验证像短信中心确认失效");
-            }
             return true;
         }
         return false;

src/main/java/cn/quantgroup/xyqb/service/user/IUserDetailService.java

 package cn.quantgroup.xyqb.service.user;
 
 import cn.quantgroup.xyqb.entity.UserDetail;
+import org.springframework.dao.DataIntegrityViolationException;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
 public interface IUserDetailService {
     UserDetail findByUserId(Long userId);
 
-    UserDetail saveUserDetail(UserDetail userDetail);
+    UserDetail saveUserDetail(UserDetail userDetail) throws DataIntegrityViolationException;
 
     UserDetail findByPhoneNo(String phoneNo);
 

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -12,7 +12,7 @@ public interface IUserService {
 
     User findByUuidWithCache(String uuid);
 
-    boolean register(String phoneNo, String password, Long registerFrom, String userIp);
+    boolean register(String phoneNo, String password, Long registerFrom, String userIp, Long channelId);
 
     User registerAndReturn(String phoneNo, String password, Long registerFrom);
 

src/main/java/cn/quantgroup/xyqb/service/user/IUserSpouseService.java

+package cn.quantgroup.xyqb.service.user;
+
+import cn.quantgroup.xyqb.entity.UserSpouse;
+
+public interface IUserSpouseService {
+
+  UserSpouse findByUserId(Long userId);
+
+  UserSpouse save(UserSpouse userSpouse);
+}

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

@@ -5,10 +5,12 @@ import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,7 +28,7 @@ public class UserDetailServiceImpl implements IUserDetailService {
     }
 
     @Override
-    public UserDetail saveUserDetail(UserDetail userDetail) {
+    public UserDetail saveUserDetail(UserDetail userDetail) throws DataIntegrityViolationException {
         return userDetailRepository.save(userDetail);
     }
 
@@ -46,22 +48,21 @@ public class UserDetailServiceImpl implements IUserDetailService {
     }
 
     private Specification<UserDetail> getSpecification(String name, String phoneNo, String idNo) {
+        List<Predicate> list = new ArrayList<>();
         Specification<UserDetail> specification = new Specification<UserDetail>() {
             @Override
             public Predicate toPredicate(Root<UserDetail> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                 if (!StringUtils.isEmpty(name)) {
-                    Path<String> namePath = root.get("name");
-                    criteriaQuery.where(criteriaBuilder.equal(namePath, name));
+                    list.add(criteriaBuilder.equal(root.get("name").as(String.class), name));
                 }
                 if (!StringUtils.isEmpty(phoneNo)) {
-                    Path<String> phonePath = root.get("phoneNo");
-                    criteriaQuery.where(criteriaBuilder.equal(phonePath, phoneNo));
+                    list.add(criteriaBuilder.equal(root.get("phoneNo").as(String.class), phoneNo));
                 }
                 if (!StringUtils.isEmpty(idNo)) {
-                    Path<String> idNoPath = root.get("idNo");
-                    criteriaQuery.where(criteriaBuilder.equal(idNoPath, idNo));
+                    list.add(criteriaBuilder.equal(root.get("idNo").as(String.class), idNo));
                 }
-                return null;
+                Predicate[] p = new Predicate[list.size()];
+                return criteriaBuilder.and(list.toArray(p));
             }
         };
         return specification;

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

@@ -89,8 +89,7 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     @Transactional(value = Transactional.TxType.REQUIRED)
-    public boolean register(String phoneNo, String password, Long registerFrom, String userIp) {
-
+    public boolean register(String phoneNo, String password, Long registerFrom, String userIp, Long channelId) {
         String uuid = lkbUserService.registerApp(phoneNo, password);
         Timestamp currentTime = new Timestamp(System.currentTimeMillis());
 
@@ -101,7 +100,13 @@ public class UserServiceImpl implements IUserService {
         user.setCreatedAt(currentTime);
         user.setUuid(uuid);
         user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));
-        user.setRegisteredFrom(registerFrom);
+        //解决线上白条registerFrom为1的问题
+        if(channelId == 222L) {
+            user.setRegisteredFrom(channelId);
+        } else {
+            user.setRegisteredFrom(registerFrom);
+        }
+        //user.setRegisteredFrom(registerFrom);
 
         user = userRepository.save(user);
         smsService.sendAfterRegister(phoneNo);

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

+package cn.quantgroup.xyqb.service.user.impl;
+
+import cn.quantgroup.xyqb.entity.UserSpouse;
+import cn.quantgroup.xyqb.repository.IUserSpouseRepository;
+import cn.quantgroup.xyqb.service.user.IUserSpouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserSpouseServiceImpl implements IUserSpouseService {
+
+  @Autowired
+  private IUserSpouseRepository userSpouseRepository;
+
+  @Override
+  @Cacheable(value = "userSpouseCache", key = "'spouse' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+  public UserSpouse findByUserId(Long userId) {
+    return userSpouseRepository.findByUserId(userId);
+  }
+
+  @Override
+  @CacheEvict(value = "userSpouseCache", key = "'spouse' + #userSpouse.userId", cacheManager = "cacheManager")
+  public UserSpouse save(UserSpouse userSpouse) {
+    return userSpouseRepository.save(userSpouse);
+  }
+
+
+}

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

@@ -112,6 +112,9 @@ public class WechatServiceImpl implements IWechatService {
     @Override
     @Transactional
     public WechatUserInfo saveWechatUserInfo(WechatUserInfo userInfo) {
+        if(null == userInfo.getPhoneNo()) {
+            userInfo.setPhoneNo("");
+        }
         return weChatUserRepository.save(userInfo);
     }