Merge branch 'user_detail_hash' into 'master'

User detail hash

已上线

See merge request !26

src/main/java/cn/quantgroup/xyqb/event/PhoneHashEventListener.java

@@ -4,12 +4,16 @@ import cn.quantgroup.xyqb.entity.UserHashMapping;
 import cn.quantgroup.xyqb.model.UserRegisterParam;
 import cn.quantgroup.xyqb.repository.IUserHashMappingRepository;
 import cn.quantgroup.xyqb.util.encrypt.MD5Util;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
+import javax.persistence.PersistenceException;
+
 @Component
+@Slf4j
 public class PhoneHashEventListener implements ApplicationListener<RegisterEvent> {
 
     @Autowired
@@ -40,7 +44,11 @@ public class PhoneHashEventListener implements ApplicationListener<RegisterEvent
             userHashMapping.setIdNoMd5(MD5Util.build(idNo));
         }
 
-        userHashMappingRepository.saveAndFlush(userHashMapping);
+        try {
+            userHashMappingRepository.saveAndFlush(userHashMapping);
+        } catch (PersistenceException e) {
+            log.error("保存userHashMapping重复, 无需再保存, userId:{}", userId);
+        }
 
     }
 }

src/main/java/cn/quantgroup/xyqb/event/UserDetailHashEventListener.java

@@ -4,15 +4,20 @@ import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.entity.UserHashMapping;
 import cn.quantgroup.xyqb.repository.IUserHashMappingRepository;
 import cn.quantgroup.xyqb.util.encrypt.MD5Util;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
+import javax.persistence.PersistenceException;
+
+
 /**
  * userDetail 更新时, 保存 hashMapping 数据
  */
 @Component
+@Slf4j
 public class UserDetailHashEventListener implements ApplicationListener<UserDetailUpdateEvent> {
 
     @Autowired
@@ -25,6 +30,13 @@ public class UserDetailHashEventListener implements ApplicationListener<UserDeta
 
         UserHashMapping userHashMapping = userHashMappingRepository.findByUserId(userDetail.getUserId());
 
+        //如果不存在, 我先保存一下
+        if (userHashMapping == null) {
+            userHashMapping = new UserHashMapping(userDetail.getUserId());
+            String phoneNo = userDetail.getPhoneNo();
+            userHashMapping.setPhoneNoMd5(MD5Util.build(phoneNo));
+        }
+
         String idNoMd5 = userHashMapping.getIdNoMd5();
 
         String idNo = userDetail.getIdNo().toUpperCase();
@@ -37,8 +49,11 @@ public class UserDetailHashEventListener implements ApplicationListener<UserDeta
         }
 
         userHashMapping.setIdNoMd5(idNoMd5New);
-
-        userHashMappingRepository.save(userHashMapping);
+        try {
+            userHashMappingRepository.save(userHashMapping);
+        } catch (PersistenceException e){
+            log.error("保存userHashMapping重复, 无需再保存, userId:{}", userDetail.getUserId());
+        }
 
     }
 }