diff --git a/.config/.dev.yaml b/.config/.dev.yaml index dc214f6..05b7cad 100644 --- a/.config/.dev.yaml +++ b/.config/.dev.yaml @@ -3,6 +3,6 @@ TEST_VALUE: # 数据库相关 DATABASE: drive USER: root -PORT: 3306 +PORT: 3307 HOST: 127.0.0.1 -PASSWORD: zhonglian405 \ No newline at end of file +PASSWORD: '123456' \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a197644..bf392ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /app COPY . . # npm 源,选用国内镜像源以提高下载速度 -RUN npm config set registry https://registry.npm.taobao.org/ +RUN npm config set registry http://registry.npmmirror.com # 使用通配符来确保 package.json 和 package-lock.json 被复制 COPY package.json /app/package.json diff --git a/src/client/client.module.ts b/src/client/client.module.ts index 545a5f9..2474ca1 100644 --- a/src/client/client.module.ts +++ b/src/client/client.module.ts @@ -1,14 +1,13 @@ import { Module } from '@nestjs/common'; import { ClientService } from './client.service'; import { ClientController } from './client.controller'; -import { AppLoggerModule } from 'src/common/logger/logger.module'; import { GatewayModule } from 'src/gateway/gateway.module'; import { EventGateway } from '../gateway/gateway'; @Module({ - imports: [AppLoggerModule, GatewayModule, EventGateway], + imports: [GatewayModule, EventGateway], controllers: [ClientController], providers: [ClientService, EventGateway], - exports: [ClientService, AppLoggerModule, GatewayModule, EventGateway], + exports: [ClientService, GatewayModule, EventGateway], }) export class ClientModule { } diff --git a/src/client/client.service.ts b/src/client/client.service.ts index 32d12cc..7491f55 100644 --- a/src/client/client.service.ts +++ b/src/client/client.service.ts @@ -288,8 +288,8 @@ export class ClientService { areaCode: code, dataType: '04', timeLimit: time, - pageNo: page.pageIndex, - pageSize: page.pageSize, + pageNo: pageIndex, + pageSize: pageSize, dataTypeSub: type, }, { diff --git a/src/utils/logger.ts b/src/utils/logger.ts deleted file mode 100644 index 6e57907..0000000 --- a/src/utils/logger.ts +++ /dev/null @@ -1,79 +0,0 @@ -// import { Logger, createLogger, format, transports } from 'winston'; -// import 'winston-daily-rotate-file'; - -// const customFormat = format.combine( -// format.timestamp({ format: 'MMM-DD-YYYY HH:mm:ss' }), -// format.align(), -// format.printf((i) => `${i.level}: ${[i.timestamp]}: ${i.message}`), -// ); - -// const defaultOptions: any = { -// format: customFormat, -// datePattern: 'YYYY-MM-DD', -// zippedArchive: true, -// maxSize: '20m', -// maxFiles: '14d', -// }; - -// export default class AppLogger { -// private context?: string; -// private logger: Logger; - -// public setContext(context: string): void { -// this.context = context; -// } -// constructor() { -// this.logger = createLogger({ -// format: customFormat, -// transports: [ -// // new transports.Console(), -// new transports.DailyRotateFile({ -// filename: 'logs/info-%DATE%.log', -// level: 'info', -// ...defaultOptions, -// }), -// new transports.DailyRotateFile({ -// filename: 'logs/error-%DATE%.log', -// level: 'error', -// ...defaultOptions, -// }), -// ], -// }); -// } - -// error(ctx: any, message: string, meta?: Record): Logger { -// return this.logger.error({ -// message: `${this.context}:${message}`, -// contextName: this.context, -// ctx, -// ...meta, -// }); -// } - -// warn(ctx: any, message: string, meta?: Record): Logger { -// return this.logger.warn({ -// message: `${this.context}:${message}`, -// contextName: this.context, -// ctx, -// ...meta, -// }); -// } - -// debug(ctx: any, message: string, meta?: Record): Logger { -// return this.logger.debug({ -// message: `${this.context}:${message}`, -// contextName: this.context, -// ctx, -// ...meta, -// }); -// } - -// info(ctx: any, message: string, meta?: Record): Logger { -// return this.logger.info({ -// message: `${this.context}:${message}`, -// contextName: this.context, -// ctx, -// ...meta, -// }); -// } -// }