diff --git a/src/server/start.ts b/src/server/start.ts index d38b65a..b48fd93 100644 --- a/src/server/start.ts +++ b/src/server/start.ts @@ -42,7 +42,7 @@ export async function startup) => Promise, -): Promise<(() => Promise) | undefined> { +): Promise<(() => Promise )| undefined> { const serverConfiguration: ServerConfiguration = require(join( path, 'lib', @@ -68,11 +68,11 @@ export async function startup = { path: connector.getSocketPath(), cors: ['development', 'staging'].includes(process.env.NODE_ENV!) - ? { - origin: '*', - allowedHeaders: corsHeaders.concat(connector.getCorsHeader()), - } - : serverConfiguration.cors + ? { + origin: '*', + allowedHeaders: corsHeaders.concat(connector.getCorsHeader()), + } + : serverConfiguration.cors ? { origin: serverConfiguration.cors.origin, //socket.io配置cors origin是支持数组和字符串 allowedHeaders: [ @@ -102,15 +102,15 @@ export async function startup ({ ...config, lazyConnect: true, }))) - : new Redis({ - ...redisConfig, - lazyConnect: true, - }); + : new Redis({ + ...redisConfig, + lazyConnect: true, + }); const subClient = pubClient.duplicate(); pubClient.on('connect', () => { console.log('PUB已成功连接到Redis服务器'); @@ -156,7 +156,7 @@ export async function startup( path, - io.of(DATA_SUBSCRIBE_NAMESPACE), + io.of(DATA_SUBSCRIBE_NAMESPACE ), io.of(SOCKET_NAMESPACE), io.of(SERVER_SUBSCRIBER_NAMESPACE), connector.getSocketPath() @@ -329,10 +329,14 @@ export async function startup { + endpoints.forEach(([name, method, url, fn]) => { router[method](url, async (ctx) => { + const { req, request, params } = ctx; + const { body, headers, files } = request; try { - await fn(ctx); + const result = await fn(params, headers, req, files ? Object.assign({}, body, files) : body); + ctx.response.body = result; + return; } catch (err) { console.log(err);