Compare commits

..

No commits in common. "ee5af33a96a2959f2d49a3c86ff80ab4ffcc8d9f" and "89d4a7c78f8f9a971fd35f7b761c826043e9acdf" have entirely different histories.

6 changed files with 4 additions and 91 deletions

View File

@ -1,5 +1,4 @@
import { Exclude, Expose, Type } from 'class-transformer';
import type { Relation } from 'typeorm';
import {
BaseEntity,
Column,
@ -12,8 +11,9 @@ import {
TreeParent,
} from 'typeorm';
import type { Relation } from 'typeorm';
import { PostEntity } from '@/modules/content/entities/post.entity';
import { UserEntity } from '@/modules/user/entities/UserEntity';
@Exclude()
@Entity('content_comment')
@ -50,11 +50,4 @@ export class CommentEntity extends BaseEntity {
@Expose({ groups: ['comment-tree'] })
@TreeChildren({ cascade: true })
children: Relation<CommentEntity>[];
@ManyToOne(() => UserEntity, (user) => user.comments, {
nullable: false,
onDelete: 'CASCADE',
onUpdate: 'CASCADE',
})
author: Relation<UserEntity>;
}

View File

@ -1,5 +1,4 @@
import { Exclude, Expose, Type } from 'class-transformer';
import type { Relation } from 'typeorm';
import {
BaseEntity,
Column,
@ -14,11 +13,12 @@ import {
UpdateDateColumn,
} from 'typeorm';
import type { Relation } from 'typeorm';
import { PostBodyType } from '@/modules/content/constants';
import { CategoryEntity } from '@/modules/content/entities/category.entity';
import { CommentEntity } from '@/modules/content/entities/comment.entity';
import { TagEntity } from '@/modules/content/entities/tag.entity';
import { UserEntity } from '@/modules/user/entities/UserEntity';
@Exclude()
@Entity('content_posts')
@ -89,11 +89,4 @@ export class PostEntity extends BaseEntity {
@OneToMany(() => CommentEntity, (comment) => comment.post, { cascade: true })
comments: Relation<CommentEntity>[];
@ManyToOne(() => UserEntity, (user) => user.posts, {
nullable: false,
onDelete: 'CASCADE',
onUpdate: 'CASCADE',
})
author: Relation<UserEntity>;
}

View File

@ -4,14 +4,10 @@ import {
CreateDateColumn,
DeleteDateColumn,
Entity,
OneToMany,
PrimaryColumn,
Relation,
UpdateDateColumn,
} from 'typeorm';
import { CommentEntity, PostEntity } from '@/modules/content/entities';
/**
*
*/
@ -82,16 +78,4 @@ export class UserEntity {
@Type(() => Date)
@DeleteDateColumn({ comment: '用户销户时间' })
deletedAt?: Date;
/**
*
*/
@OneToMany(() => PostEntity, (post) => post.author, { cascade: true })
posts: Relation<PostEntity>[];
/**
*
*/
@OneToMany(() => CommentEntity, (comment) => comment.author, { cascade: true })
comments: Relation<CommentEntity>[];
}

View File

@ -1,16 +0,0 @@
import { Entity, OneToOne } from 'typeorm';
import { BaseToken } from '@/modules/user/entities/base.token';
import { RefreshTokenEntity } from '@/modules/user/entities/refresh.token.entity';
/**
* token模型
*/
@Entity('user_access_token')
export class AccessTokenEntity extends BaseToken {
/**
*
*/
@OneToOne(() => RefreshTokenEntity, (token) => token.accessToken, { cascade: true })
refreshToken: string;
}

View File

@ -1,24 +0,0 @@
import { Exclude } from 'class-transformer';
import { BaseEntity, Column, CreateDateColumn, PrimaryColumn } from 'typeorm';
/**
* Token模型
*/
@Exclude()
export abstract class BaseToken extends BaseEntity {
@PrimaryColumn({ type: 'varchar', generated: 'uuid', length: 36 })
id: string;
@Column({ length: 500, comment: '令牌字符串' })
value: string;
@Column({
comment: '令牌过期时间',
})
expired_at: Date;
@CreateDateColumn({
comment: '令牌创建时间',
})
createdAt: Date;
}

View File

@ -1,17 +0,0 @@
import { Entity, JoinColumn, OneToOne, Relation } from 'typeorm';
import { AccessTokenEntity } from '@/modules/user/entities/access.token.entity';
import { BaseToken } from '@/modules/user/entities/base.token';
/**
* Token的Token模型
*/
@Entity('user_refresh_token')
export class RefreshTokenEntity extends BaseToken {
/**
*
*/
@OneToOne(() => AccessTokenEntity, (token) => token.refreshToken, { onDelete: 'CASCADE' })
@JoinColumn()
accessToken: Relation<AccessTokenEntity>;
}