删除adminUserService，合并到userService中

tone-page-server/src/admin/controller/admin-user.controller.ts

@@ -1,5 +1,4 @@
 import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post, Put, Query } from "@nestjs/common";
-import { AdminUserService } from "../service/admin-user.service";
 import { ListDto } from "../dto/admin-user/list.dto";
 import { CreateDto } from "../dto/admin-user/create.dto";
 import { UserService } from "src/user/user.service";
@@ -10,7 +9,6 @@ import { UpdatePasswordDto } from "../dto/admin-user/update-password.dto";
 export class AdminUserController {
 
     constructor(
-        private readonly adminUserService: AdminUserService,
         private readonly userService: UserService,
     ) { }
 
@@ -18,7 +16,7 @@ export class AdminUserController {
     async list(
         @Query() listDto: ListDto
     ) {
-        return this.adminUserService.getUser(listDto.page, listDto.pageSize);
+        return this.userService.list(listDto.page, listDto.pageSize);
     }
 
     @Get(':userId')

tone-page-server/src/admin/service/admin-user.service.ts

@@ -1,30 +0,0 @@
-import { Injectable } from "@nestjs/common";
-import { InjectRepository } from "@nestjs/typeorm";
-import { User } from "src/user/entities/user.entity";
-import { Repository } from "typeorm";
-
-@Injectable()
-export class AdminUserService {
-
-    constructor(
-        @InjectRepository(User)
-        private readonly userRepository: Repository<User>,
-    ) { }
-
-    async getUser(page = 1, pageSize = 20) {
-        const queryBuilder = this.userRepository.createQueryBuilder('user')
-
-        queryBuilder.orderBy('user.createdAt', 'DESC');
-
-        queryBuilder.skip((page - 1) * pageSize);
-        queryBuilder.take(pageSize);
-
-        const [items, total] = await queryBuilder.getManyAndCount();
-        return {
-            items,
-            total,
-            page,
-            pageSize,
-        }
-    }
-}

tone-page-server/src/user/user.service.ts

@@ -91,4 +91,21 @@ export class UserService {
         }
         return '数据已存在，请检查输入';
     }
+
+    async list(page = 1, pageSize = 20) {
+        const queryBuilder = this.userRepository.createQueryBuilder('user')
+
+        queryBuilder.orderBy('user.createdAt', 'DESC');
+
+        queryBuilder.skip((page - 1) * pageSize);
+        queryBuilder.take(pageSize);
+
+        const [items, total] = await queryBuilder.getManyAndCount();
+        return {
+            items,
+            total,
+            page,
+            pageSize,
+        }
+    }
 }