refactor: entity relation

apps/api/src/modules/auth/entities/access-token.entity.ts

@@ -3,60 +3,38 @@ import {
   Column,
   CreateDateColumn,
   Entity,
+  JoinColumn,
   ManyToOne,
   OneToOne,
   PrimaryGeneratedColumn,
-  Relation,
 } from 'typeorm'
 
 import { UserEntity } from '~/modules/user/entities/user.entity'
 
 import { RefreshTokenEntity } from './refresh-token.entity'
 
-/**
- * 用户认证token模型
- */
 @Entity('user_access_tokens')
 export class AccessTokenEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  /**
-   * @description 令牌字符串
-   * @type {string}
-   */
   @Column({ length: 500 })
   value!: string
 
-  @Column({
-    comment: '令牌过期时间',
-  })
+  @Column({ comment: '令牌过期时间' })
   expired_at!: Date
 
-  @CreateDateColumn({
-    comment: '令牌创建时间',
-  })
+  @CreateDateColumn({ comment: '令牌创建时间' })
   created_at!: Date
 
-  /**
-   * @description 关联的刷新令牌
-   * @type {RefreshTokenEntity}
-   */
-  @OneToOne(
-    () => RefreshTokenEntity,
-    refreshToken => refreshToken.accessToken,
-    {
-      cascade: true,
-    },
-  )
-  refreshToken!: Relation<RefreshTokenEntity>
-
-  /**
-   * @description 所属用户
-   * @type {UserEntity}
-   */
+  @OneToOne(() => RefreshTokenEntity, refreshToken => refreshToken.accessToken, {
+    cascade: true,
+  })
+  refreshToken!: RefreshTokenEntity
+
   @ManyToOne(() => UserEntity, user => user.accessTokens, {
     onDelete: 'CASCADE',
   })
-  user!: Relation<UserEntity>
+  @JoinColumn({ name: 'user_id' })
+  user!: UserEntity
 }

apps/api/src/modules/auth/entities/refresh-token.entity.ts

@@ -6,47 +6,27 @@ import {
   JoinColumn,
   OneToOne,
   PrimaryGeneratedColumn,
-  Relation,
 } from 'typeorm'
 
 import { AccessTokenEntity } from './access-token.entity'
 
-/**
- * 刷新Token的Token模型
- */
 @Entity('user_refresh_tokens')
 export class RefreshTokenEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  /**
-   * @description 令牌字符串
-   * @type {string}
-   */
   @Column({ length: 500 })
   value!: string
 
-  @Column({
-    comment: '令牌过期时间',
-  })
+  @Column({ comment: '令牌过期时间' })
   expired_at!: Date
 
-  @CreateDateColumn({
-    comment: '令牌创建时间',
-  })
-  createdAt!: Date
+  @CreateDateColumn({ comment: '令牌创建时间' })
+  created_at!: Date
 
-  /**
-   * @description 关联的登录令牌
-   * @type {AccessTokenEntity}
-   */
-  @OneToOne(
-    () => AccessTokenEntity,
-    accessToken => accessToken.refreshToken,
-    {
-      onDelete: 'CASCADE',
-    },
-  )
+  @OneToOne(() => AccessTokenEntity, accessToken => accessToken.refreshToken, {
+    onDelete: 'CASCADE',
+  })
   @JoinColumn()
-  accessToken!: Relation<AccessTokenEntity>
+  accessToken!: AccessTokenEntity
 }

apps/api/src/modules/system/log/entities/captcha-log.entity.ts

@@ -20,8 +20,4 @@ export class CaptchaLogEntity extends AbstractEntity {
   @Column({ nullable: true })
   @ApiProperty({ description: '验证码提供方' })
   provider: 'sms' | 'email'
-
-  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
-  @ApiProperty({ description: '发送时间' })
-  time: Date
 }

apps/api/src/modules/system/log/entities/login-log.entity.ts

@@ -19,15 +19,11 @@ export class LoginLogEntity extends AbstractEntity {
   @ApiProperty({ description: '登录方式' })
   provider: string
 
-  @Column({ type: 'datetime', nullable: true })
-  @ApiProperty({ description: '登录时间' })
-  time: Date
-
   @Column({ length: 500, nullable: true })
   @ApiProperty({ description: '浏览器ua' })
   ua: string
 
   @ManyToOne(() => UserEntity)
-  @JoinColumn()
+  @JoinColumn({ name: 'user_id' })
   user: Relation<UserEntity>
 }

apps/api/src/modules/system/log/entities/task-log.entity.ts

@@ -20,6 +20,6 @@ export class TaskLogEntity extends AbstractEntity {
   consumeTime: number
 
   @ManyToOne(() => TaskEntity)
-  @JoinColumn()
+  @JoinColumn({ name: 'task_id' })
   task: Relation<TaskEntity>
 }

apps/api/src/modules/system/log/models/log.model.ts

@@ -16,9 +16,6 @@ export class LoginLogInfo {
   @ApiProperty({ description: '浏览器', example: 'Chrome' })
   browser: string
 
-  @ApiProperty({ description: '时间', example: '2022-01-01 00:00:00' })
-  time: string
-
   @ApiProperty({ description: '登录用户名', example: 'admin' })
   username: string
 }

apps/api/src/modules/system/log/services/login-log.service.ts

@@ -22,7 +22,6 @@ async function parseLoginLog(e: any, parser: UAParser): Promise<LoginLogInfo> {
     address: e.login_log_address,
     os: `${`${uaResult.os.name ?? ''} `}${uaResult.os.version}`,
     browser: `${`${uaResult.browser.name ?? ''} `}${uaResult.browser.version}`,
-    time: e.login_log_created_at,
     username: e.user_username,
   }
 }

apps/api/src/modules/system/online/online.model.ts

@@ -16,9 +16,6 @@ export class OnlineUserInfo {
   @ApiProperty({ description: '是否当前' })
   isCurrent: boolean
 
-  @ApiProperty({ description: '登陆时间' })
-  time: string
-
   @ApiProperty({ description: '系统' })
   os: string
 

apps/api/src/modules/system/role/role.entity.ts

@@ -24,10 +24,18 @@ export class RoleEntity extends AbstractEntity {
   @ApiProperty({ description: '状态：1启用，0禁用' })
   status: number
 
+  @Column({ nullable: true })
+  @ApiProperty({ description: '是否默认用户' })
+  default: boolean
+
   @ManyToMany(() => UserEntity, user => user.roles)
   users: Relation<UserEntity[]>
 
   @ManyToMany(() => MenuEntity, menu => menu.roles, {})
-  @JoinTable()
+  @JoinTable({
+    name: 'sys_role_menus',
+    joinColumn: { name: 'role_id', referencedColumnName: 'id' },
+    inverseJoinColumn: { name: 'menu_id', referencedColumnName: 'id' },
+  })
   menus: Relation<MenuEntity[]>
 }

apps/api/src/modules/todo/todo.entity.ts

@@ -15,6 +15,6 @@ export class TodoEntity extends AbstractEntity {
   status: boolean
 
   @ManyToOne(() => UserEntity)
-  @JoinColumn()
+  @JoinColumn({ name: 'user_id' })
   user: Relation<UserEntity>
 }

apps/api/src/modules/user/entities/user.entity.ts

@@ -29,7 +29,7 @@ export class UserEntity extends AbstractEntity {
   @Column({ length: 32 })
   psalt: string
 
-  @Column({ name: 'nick_name', nullable: true })
+  @Column({ nullable: true })
   nickname: string
 
   @Column({ name: 'avatar', nullable: true })
@@ -51,11 +51,15 @@ export class UserEntity extends AbstractEntity {
   status: number
 
   @ManyToMany(() => RoleEntity, role => role.users)
-  @JoinTable()
+  @JoinTable({
+    name: 'sys_user_roles',
+    joinColumn: { name: 'user_id', referencedColumnName: 'id' },
+    inverseJoinColumn: { name: 'role_id', referencedColumnName: 'id' },
+  })
   roles: Relation<RoleEntity[]>
 
   @ManyToOne(() => DeptEntity, dept => dept.users)
-  @JoinColumn()
+  @JoinColumn({ name: 'dept_id' })
   dept: Relation<DeptEntity>
 
   @OneToMany(() => AccessTokenEntity, accessToken => accessToken.user, {