diff --git a/src/config/redis.config.ts b/src/config/redis.config.ts index c8f8024..03d4bf6 100644 --- a/src/config/redis.config.ts +++ b/src/config/redis.config.ts @@ -1,6 +1,7 @@ import { RedisOptions } from '@/modules/core/types'; export const redis: () => RedisOptions = () => ({ - host: '127.0.0.1', + host: '192.168.50.137', port: 6379, + password: '123456&Qw', }); diff --git a/src/config/sms.config.ts b/src/config/sms.config.ts index d6141e4..cf2a6bc 100644 --- a/src/config/sms.config.ts +++ b/src/config/sms.config.ts @@ -2,9 +2,9 @@ import { Configure } from '@/modules/config/configure'; import { SmsOptions } from '@/modules/core/types'; export const sms: (configure: Configure) => SmsOptions = (configure) => ({ - sign: configure.env.get('SMS_CLOUD_SING', '极客科技'), + sign: configure.env.get('SMS_CLOUD_SING', 'liuyi'), region: configure.env.get('SMS_CLOUD_REGION', 'ap-guangzhou'), - appid: configure.env.get('SMS_CLOUD_APPID', '1400437232'), + appid: configure.env.get('SMS_CLOUD_APPID', 'app-id'), secretId: configure.env.get('SMS_CLOUD_ID', 'your-secret-id'), secretKey: configure.env.get('SMS_CLOUD_KEY', 'your-secret-key'), }); diff --git a/src/modules/core/core.module.ts b/src/modules/core/core.module.ts index 3ec2500..770c905 100644 --- a/src/modules/core/core.module.ts +++ b/src/modules/core/core.module.ts @@ -4,7 +4,13 @@ import { DynamicModule, Module, ModuleMetadata } from '@nestjs/common'; import { isArray, isNil, omit } from 'lodash'; import { RedisService, SmsService, SmtpService } from '@/modules/core/services'; -import { QueueOptions, RedisOptions, SmsOptions, SmtpOptions } from '@/modules/core/types'; +import type { + QueueOptions, + RedisOption, + RedisOptions, + SmsOptions, + SmtpOptions, +} from '@/modules/core/types'; import { createQueueOptions, createRedisOptions } from '@/options'; @@ -17,7 +23,9 @@ export class CoreModule { const providers: ModuleMetadata['providers'] = []; const exports: ModuleMetadata['exports'] = []; let imports: ModuleMetadata['imports'] = []; - const redis = createRedisOptions(await configure.get('redis')); + const redis: RedisOption[] | undefined = createRedisOptions( + await configure.get('redis'), + ); if (!isNil(redis)) { providers.push({ provide: RedisService, diff --git a/src/modules/core/types.ts b/src/modules/core/types.ts index a9e2ab4..035b461 100644 --- a/src/modules/core/types.ts +++ b/src/modules/core/types.ts @@ -151,7 +151,7 @@ export interface DynamicRelation { /** * 嵌套对象 */ -export type NestedRecord = Record>; +export type NestedRecord = Record; /** * core模块参数选项 @@ -159,6 +159,9 @@ export type NestedRecord = Record>; export interface CoreOptions { database?: () => TypeOrmModuleOptions; sms?: () => SmsOptions; + smtp?: () => SmtpOptions; + redis?: () => RedisOptions; + queue?: () => QueueOptions; } /** * 腾讯云短信驱动配置 diff --git a/src/options.ts b/src/options.ts index 730b1f4..463bbbb 100644 --- a/src/options.ts +++ b/src/options.ts @@ -69,7 +69,7 @@ export const createOptions: CreateOptions = { * 生成Redis配置 * @param options */ -export const createRedisOptions = (options: RedisOptions) => { +export const createRedisOptions = (options: RedisOptions): RedisOption[] | undefined => { if (isNil(options)) { return undefined; }