更新实体类

This commit is contained in:
2022-10-02 08:34:40 -04:00
parent a96363f9c4
commit 9afb93a4fc
2 changed files with 29 additions and 93 deletions
@@ -1,11 +1,13 @@
package com.ossez.spring.security.models.entity; package com.ossez.spring.security.models.entity;
import com.ossez.spring.security.models.ERole; import com.ossez.spring.security.models.ERole;
import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
@Entity @Entity
@Table(name = "roles") @Table(name = "roles")
@Data
public class Role { public class Role {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -14,28 +16,4 @@ public class Role {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(length = 20) @Column(length = 20)
private ERole name; private ERole name;
public Role() {
}
public Role(ERole name) {
this.name = name;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public ERole getName() {
return name;
}
public void setName(ERole name) {
this.name = name;
}
} }
@@ -1,5 +1,7 @@
package com.ossez.spring.security.models.entity; package com.ossez.spring.security.models.entity;
import lombok.Data;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -9,81 +11,37 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@Entity @Entity
@Table(name = "users", @Table(name = "users", uniqueConstraints = {@UniqueConstraint(columnNames = "username"), @UniqueConstraint(columnNames = "email")})
uniqueConstraints = { @Data
@UniqueConstraint(columnNames = "username"),
@UniqueConstraint(columnNames = "email")
})
public class User { public class User {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
@NotBlank @NotBlank
@Size(max = 20) @Size(max = 20)
private String username; private String username;
@NotBlank @NotBlank
@Size(max = 50) @Size(max = 50)
@Email @Email
private String email; private String email;
@NotBlank @NotBlank
@Size(max = 120) @Size(max = 120)
private String password; private String password;
@ManyToMany(fetch = FetchType.LAZY) @ManyToMany(fetch = FetchType.LAZY)
@JoinTable( name = "user_roles", @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
joinColumns = @JoinColumn(name = "user_id"), private Set<Role> roles = new HashSet<>();
inverseJoinColumns = @JoinColumn(name = "role_id"))
private Set<Role> roles = new HashSet<>();
public User() { public User() {
} }
public User(String username, String email, String password) { public User(String username, String email, String password) {
this.username = username; this.username = username;
this.email = email; this.email = email;
this.password = password; this.password = password;
} }
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Set<Role> getRoles() {
return roles;
}
public void setRoles(Set<Role> roles) {
this.roles = roles;
}
} }