diff --git a/src/GDEVINTERCEPTOR/gdevinterceptor.module.ts b/src/GDEVINTERCEPTOR/gdevinterceptor.module.ts new file mode 100644 index 0000000..216b3e3 --- /dev/null +++ b/src/GDEVINTERCEPTOR/gdevinterceptor.module.ts @@ -0,0 +1,7 @@ +import { Module } from '@nestjs/common'; +import { GdevinterceptorService } from './gdevinterceptor.service'; + +@Module({ + providers: [GdevinterceptorService] +}) +export class GdevinterceptorModule {} diff --git a/src/GDEVINTERCEPTOR/gdevinterceptor.service.spec.ts b/src/GDEVINTERCEPTOR/gdevinterceptor.service.spec.ts new file mode 100644 index 0000000..7a004ba --- /dev/null +++ b/src/GDEVINTERCEPTOR/gdevinterceptor.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { GdevinterceptorService } from './gdevinterceptor.service'; + +describe('GdevinterceptorService', () => { + let service: GdevinterceptorService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [GdevinterceptorService], + }).compile(); + + service = module.get(GdevinterceptorService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/devInterceptor/devInterceptor.service.ts b/src/GDEVINTERCEPTOR/gdevinterceptor.service.ts similarity index 81% rename from src/devInterceptor/devInterceptor.service.ts rename to src/GDEVINTERCEPTOR/gdevinterceptor.service.ts index 0a23c10..6ca84dd 100644 --- a/src/devInterceptor/devInterceptor.service.ts +++ b/src/GDEVINTERCEPTOR/gdevinterceptor.service.ts @@ -6,12 +6,12 @@ import { } from '@nestjs/common'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { LoggerService } from '../Logger/logger.service'; +import { GloggerService } from '../GLOGGER/glogger.service'; @Injectable() -export class DevInterceptorService implements NestInterceptor { - logger: LoggerService; +export class GdevinterceptorService implements NestInterceptor { + logger: GloggerService; constructor() { - this.logger = new LoggerService(); + this.logger = new GloggerService(); this.logger.setContext(`[DevlInterceptor]`); } intercept(context: ExecutionContext, next: CallHandler): Observable { diff --git a/src/GLOGGER/glogger.module.ts b/src/GLOGGER/glogger.module.ts new file mode 100644 index 0000000..cf59ae4 --- /dev/null +++ b/src/GLOGGER/glogger.module.ts @@ -0,0 +1,7 @@ +import { Global, Module } from '@nestjs/common'; +import { GloggerService } from './glogger.service'; +@Global() +@Module({ + providers: [GloggerService], +}) +export class GloggerModule {} diff --git a/src/Logger/logger.service.ts b/src/GLOGGER/glogger.service.ts similarity index 94% rename from src/Logger/logger.service.ts rename to src/GLOGGER/glogger.service.ts index 8f165ff..446a477 100644 --- a/src/Logger/logger.service.ts +++ b/src/GLOGGER/glogger.service.ts @@ -1,10 +1,12 @@ -import { Injectable, Scope, ConsoleLogger } from '@nestjs/common'; -import { Logger as log4jsLogger, configure, getLogger } from 'log4js'; +import { ConsoleLogger, Injectable, Scope } from '@nestjs/common'; +import { configure, getLogger, Logger as log4jsLogger } from 'log4js'; import config from '../../config'; @Injectable({ scope: Scope.TRANSIENT }) -export class LoggerService extends ConsoleLogger { +export class GloggerService extends ConsoleLogger { + // 默认日志 defaultLog: log4jsLogger; + // 文件日志 fileLog: log4jsLogger; context = ''; diff --git a/src/Logger/logger.module.ts b/src/Logger/logger.module.ts deleted file mode 100644 index df73614..0000000 --- a/src/Logger/logger.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { LoggerService } from './logger.service'; -import { ConfigService } from "@nestjs/config"; - -@Module({ - providers: [LoggerService, ConfigService], - exports: [LoggerService], -}) -export class Logger {} diff --git a/src/Logger/logger.service.spec.ts b/src/Logger/logger.service.spec.ts deleted file mode 100644 index 93da482..0000000 --- a/src/Logger/logger.service.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { LoggerService } from './logger.service'; - -describe('LoggerService', () => { - let service: LoggerService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [LoggerService], - }).compile(); - - service = module.get(LoggerService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); diff --git a/src/app.module.ts b/src/app.module.ts index 3e4a196..020b693 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,9 +1,9 @@ import { Module } from '@nestjs/common'; import { StarlightModule } from './starlight/starlight.module'; -import { Logger } from './logger/logger.module'; -import { DevInterceptorModule } from './devInterceptor/devInterceptor.module'; import { ConfigModule } from '@nestjs/config'; -import { ResponseInterceptorModule } from './response-interceptor/response-interceptor.module'; +// import { ResponseInterceptorModule } from './response-interceptor/response-interceptor.module'; +import { GloggerModule } from './glogger/glogger.module'; +import { GdevinterceptorModule } from './gdevinterceptor/gdevinterceptor.module'; import config from '../config'; @Module({ @@ -13,8 +13,8 @@ import config from '../config'; load: [config], // 加载自定义配置项 }), StarlightModule, - Logger, - DevInterceptorModule, + GloggerModule, + // GdevinterceptorModule, // ResponseInterceptorModule, ], controllers: [], diff --git a/src/devInterceptor/devInterceptor.module.ts b/src/devInterceptor/devInterceptor.module.ts deleted file mode 100644 index 7234fab..0000000 --- a/src/devInterceptor/devInterceptor.module.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Module } from '@nestjs/common'; -import { DevInterceptorService } from './devInterceptor.service'; - -@Module({ - providers: [DevInterceptorService], -}) -export class DevInterceptorModule {} diff --git a/src/devInterceptor/devInterceptor.service.spec.ts b/src/devInterceptor/devInterceptor.service.spec.ts deleted file mode 100644 index bf2ed6d..0000000 --- a/src/devInterceptor/devInterceptor.service.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { DevInterceptorService } from './devInterceptor.service'; - -describe('GlobalInterceptorService', () => { - let service: DevInterceptorService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [DevInterceptorService], - }).compile(); - - service = module.get(DevInterceptorService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); diff --git a/src/main.ts b/src/main.ts index 03e8626..e497761 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,10 +6,10 @@ import { } from '@nestjs/platform-fastify'; import { ValidationPipe } from '@nestjs/common'; import fastifyMultipart from '@fastify/multipart'; -import { LoggerService } from './logger/logger.service'; +import { GloggerService } from './GLOGGER/glogger.service'; import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import * as process from 'process'; -import { DevInterceptorService } from './devInterceptor/devInterceptor.service'; +import { GdevinterceptorService } from './GDEVINTERCEPTOR/gdevinterceptor.service'; import { ConfigService } from '@nestjs/config'; async function bootstrap() { @@ -24,7 +24,7 @@ async function bootstrap() { // 配置服务 const appConfig = app.get(ConfigService); // 日志 Log为文件路径 - const logger = new LoggerService('[BOOTSTRAP]'); + const logger = new GloggerService('[BOOTSTRAP]'); app.useLogger(logger); // 全局路由前缀 app.setGlobalPrefix('api'); @@ -65,7 +65,7 @@ function Swagger(app, state, logger) { function DevInterceptor(app, state, logger) { // 全局拦截器 if (!state) return; - app.useGlobalInterceptors(new DevInterceptorService()); + app.useGlobalInterceptors(new GdevinterceptorService()); logger.warn('DevInterceptorService请求响应拦截器已开启!'); } diff --git a/src/starlight/starlight.controller.ts b/src/starlight/starlight.controller.ts index d0bc1a7..fc136a4 100644 --- a/src/starlight/starlight.controller.ts +++ b/src/starlight/starlight.controller.ts @@ -14,8 +14,9 @@ import { CreateStarlightDto } from './dto/create-starlight.dto'; import { UpdateStarlightDto } from './dto/update-starlight.dto'; import { StarlightGuard } from './starlight.guard'; import { ApiTags } from '@nestjs/swagger'; -import { LoggerService } from '../Logger/logger.service'; +// import { LoggerService } from '../Logger/logger.service'; import { ConfigService } from '@nestjs/config'; +// import { LogService } from '../log/log.service'; @ApiTags('starlight') @Controller('starlight') @@ -24,8 +25,8 @@ import { ConfigService } from '@nestjs/config'; export class StarlightController { constructor( private readonly starlightService: StarlightService, - private readonly logger: LoggerService, - private readonly config: ConfigService, + // private readonly logger: LoggerService, + private readonly config: ConfigService, // private readonly logService: LogService, ) {} @Post() @@ -35,8 +36,9 @@ export class StarlightController { @Get() findAll() { - this.logger.error(this.config.get('master')); - this.logger.warn('xsxs'); + // this.logger.error(this.config.get('master')); + // this.logger.warn('xsxs'); + // this.logService.getName(); return this.starlightService.findAll(); } diff --git a/src/starlight/starlight.guard.ts b/src/starlight/starlight.guard.ts index e609555..1f7efd2 100644 --- a/src/starlight/starlight.guard.ts +++ b/src/starlight/starlight.guard.ts @@ -5,11 +5,11 @@ import { UnauthorizedException, } from '@nestjs/common'; import { Observable } from 'rxjs'; -import { LoggerService } from '../Logger/logger.service'; +// import { LoggerService } from '../Logger/logger.service'; // 此文件为守卫 @Injectable() export class StarlightGuard implements CanActivate { - constructor(private readonly logger: LoggerService) {} + constructor(/*private readonly logger: LoggerService*/) {} canActivate( context: ExecutionContext, ): boolean | Promise | Observable { diff --git a/src/starlight/starlight.module.ts b/src/starlight/starlight.module.ts index 47e59ac..666b9ae 100644 --- a/src/starlight/starlight.module.ts +++ b/src/starlight/starlight.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; import { StarlightService } from './starlight.service'; import { StarlightController } from './starlight.controller'; -import { LoggerService } from '../Logger/logger.service'; +// import { LoggerService } from '../Logger/logger.service'; @Module({ controllers: [StarlightController], - providers: [StarlightService, LoggerService], + providers: [StarlightService], }) export class StarlightModule {} diff --git a/src/starlight/starlight.service.spec.ts b/src/starlight/starlight.service.spec.ts deleted file mode 100644 index fbe2a1e..0000000 --- a/src/starlight/starlight.service.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { StarlightService } from './starlight.service'; - -describe('StarlightService', () => { - let service: StarlightService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [StarlightService], - }).compile(); - - service = module.get(StarlightService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -});