xiongzhu 2 سال پیش
والد
کامیت
63a3be2543

+ 2 - 2
src/auth/jwt.strategy.ts

@@ -30,10 +30,10 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
         }
         if (!payload.roles.includes(Role.Admin)) {
             if (!user.iat) {
-                throw new UnauthorizedException('账号已在其他地方登录,请重新登录')
+                throw new UnauthorizedException('用户身份已过期,请重新登录')
             }
             if (payload.iat < user.iat) {
-                throw new UnauthorizedException('账号已在其他地方登录,请重新登录')
+                throw new UnauthorizedException('用户身份已过期,请重新登录')
             }
         }
         return {

+ 1 - 1
src/main.ts

@@ -10,7 +10,7 @@ import { join } from 'path'
 async function bootstrap() {
     const app = await NestFactory.create<NestExpressApplication>(AppModule, {
         snapshot: true,
-        abortOnError: true
+        abortOnError: false
     })
     const configService = app.get<ConfigService>(ConfigService)
 

+ 4 - 2
src/membership/entities/memberPlan.entity.ts

@@ -1,4 +1,3 @@
-import { ApiTags } from '@nestjs/swagger'
 import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from 'typeorm'
 
 @Entity()
@@ -11,7 +10,7 @@ export class MemberPlan {
 
     @Column()
     price: number
-    
+
     @Column()
     duration: number
 
@@ -21,6 +20,9 @@ export class MemberPlan {
     @Column()
     tokenLimit: number
 
+    @Column({ default: false })
+    enabled: boolean
+
     @Column()
     commissionable: boolean
 }

+ 6 - 0
src/membership/membership.admin.controller.ts

@@ -8,6 +8,7 @@ import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'
 import { PageRequest } from '../common/dto/page-request'
 import { MemberPlan } from './entities/memberPlan.entity'
 import { Membership } from './entities/membership.entity'
+import { MemberOrder } from './entities/member-order.entity'
 
 @ApiTags('membership.admin')
 @Controller('/admin/membership')
@@ -30,4 +31,9 @@ export class MembershipAdminController {
     async deletePlan(@Param('id') id: number) {
         return await this.membershipService.deletePlanById(id)
     }
+
+    @Post('/orders')
+    public async orders(@Body() page: PageRequest<MemberOrder>) {
+        return await this.membershipService.findAllOrders(page)
+    }
 }

+ 4 - 0
src/membership/membership.service.ts

@@ -28,6 +28,10 @@ export class MembershipService {
         return await paginate<Membership>(this.memberShipRepository, req.page, req.search)
     }
 
+    async findAllOrders(req: PageRequest<MemberOrder>): Promise<Pagination<MemberOrder>> {
+        return await paginate<MemberOrder>(this.memberOrderRepository, req.page, req.search)
+    }
+
     async trial(userId: number) {
         let membership = await this.memberShipRepository.findOneBy({
             userId: userId