userRecord主外键修改

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Set;
 import javax.persistence.*;
 
+import com.uas.sso.core.Const;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 /**
@@ -89,7 +90,7 @@ public class User implements Serializable {
     /**
      * 用户邮箱
      */
-    @Column(name = "user_email")
+    @Column(name = "user_email", unique = true)
     private String email;
 
     /**
@@ -192,8 +193,7 @@ public class User implements Serializable {
      * 用户登录记录
      */
     @com.fasterxml.jackson.annotation.JsonIgnore
-    @OneToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @JoinColumn(name = "record_id")
+    @OneToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}, mappedBy = "user")
     private UserRecord userRecord;
 
     /**
@@ -294,6 +294,9 @@ public class User implements Serializable {
     }
 
     public String getEmail() {
+        if (email.contains(Const.REPEAT_SEPARATOR)) {
+            return email.substring(0, email.indexOf(Const.REPEAT_SEPARATOR));
+        }
         return email;
     }
 

sso-server/src/main/java/com/uas/sso/entity/UserRecord.java

@@ -18,10 +18,8 @@ import java.sql.Timestamp;
 public class UserRecord implements Serializable {
 
     @Id
-    @Column(name = "_id")
-    @SequenceGenerator(name = "sso$user$record_gen", sequenceName = "sso$user$record_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "sso$user$record_gen")
-    private Long id;
+    @Column(name = "user_uu")
+    private Long userUU;
 
     @Column(name = "last_login_time")
     private Timestamp lastLoginTime;
@@ -30,19 +28,19 @@ public class UserRecord implements Serializable {
     private int pwdErrorCount;
 
     @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_uu", unique = true)
+    @JoinColumn(name = "user_uu", unique = true, insertable = false, updatable = false)
     private User user;
 
     public UserRecord() {
         this.pwdErrorCount = 0;
     }
 
-    public Long getId() {
-        return id;
+    public Long getUserUU() {
+        return userUU;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
     }
 
     public Timestamp getLastLoginTime() {