Bladeren bron

User, Role, Menu, UserRole, RoleMenu 的表明均添加 sys_ 前缀, 方便在 mysql 中查看

reghao 2 jaren geleden
bovenliggende
commit
17db94e547

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Menu.java

@@ -19,8 +19,8 @@ import java.util.*;
 @Getter
 /*@EqualsAndHashCode(callSuper = false, exclude = {"roles"})
 @ToString(exclude = {"roles"})*/
-@Table
-//@Table(name = "sys_menu")
+//@Table
+@Table(name = "sys_menu")
 @Entity
 public class Menu extends BaseEntity {
     // Menu 类型

+ 4 - 6
manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Role.java

@@ -19,8 +19,8 @@ import java.util.Set;
 @Data
 @EqualsAndHashCode(callSuper = false, exclude = {"description", "menus"})
 @ToString(exclude = {"menus"})
-@Table
-//@Table(name = "sys_role")
+//@Table
+@Table(name = "sys_role")
 @Entity
 public class Role extends BaseEntity {
     @Pattern(regexp = "^\\w+$", message = "只能是数字、英文字符和下划线")
@@ -33,9 +33,7 @@ public class Role extends BaseEntity {
     private String description;
     // Role 端维护 Role 和 Menu 之间的关系
     @ManyToMany
-    @JoinTable(name = "role_menu",
-            joinColumns = @JoinColumn(name = "role_id"),
-            inverseJoinColumns = @JoinColumn(name = "menu_id"))
-    //@JoinTable(name = "sys_role_menu", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "menu_id"))
+    //@JoinTable(name = "role_menu", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "menu_id"))
+    @JoinTable(name = "sys_role_menu", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "menu_id"))
     private Set<Menu> menus;
 }

+ 4 - 4
manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/User.java

@@ -21,8 +21,8 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @Getter
 @Setter
-@Table
-//@Table(name = "sys_user")
+//@Table
+@Table(name = "sys_user")
 @Entity
 public class User extends BaseEntity implements UserDetails {
     // 用户名和密码
@@ -37,8 +37,8 @@ public class User extends BaseEntity implements UserDetails {
     private String salt;
     // roles 和 authorities 是同一个东东, 只是 authorities 用于 Spring Security
     @ElementCollection(fetch = FetchType.EAGER)
-    @CollectionTable(name = "user_role")
-    //@CollectionTable(name = "sys_user_role")
+    //@CollectionTable(name = "user_role")
+    @CollectionTable(name = "sys_user_role")
     private Set<String> role;
     @Transient
     @Deprecated