From 0b16f8a6cad7f5d7893494e9e7a6e03a139efcd6 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Mon, 15 Jan 2024 01:52:21 -0800 Subject: [PATCH 1/2] add config --- mockServer/config/config.js | 16 ++++++++++++++++ mockServer/src/app.js | 7 ++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 mockServer/config/config.js diff --git a/mockServer/config/config.js b/mockServer/config/config.js new file mode 100644 index 000000000..8b91406f8 --- /dev/null +++ b/mockServer/config/config.js @@ -0,0 +1,16 @@ +/** + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +module.exports = { + port: 9090, + env: process.env.NODE_ENV || 'development' // Current mode +} diff --git a/mockServer/src/app.js b/mockServer/src/app.js index 3c3f6d2a3..46d94727f 100644 --- a/mockServer/src/app.js +++ b/mockServer/src/app.js @@ -14,13 +14,14 @@ import Koa2 from 'koa' import KoaBody from 'koa-body' import KoaStatic from 'koa-static2' import path from 'path' -import MainRoutes from './routes/main-routes' +import config from '../config/config' import ErrorRoutesCatch from './middleware/ErrorRoutesCatch' import ErrorRoutes from './routes/error-routes' +import MainRoutes from './routes/main-routes' const app = new Koa2() -const env = process.env.NODE_ENV || 'development' // Current mode -const PORT = 9090 +const env = config.env +const PORT = config.port app .use((ctx, next) => { ctx.set('Access-Control-Allow-Origin', '*') From f5d1b6cbe297ec211dcfe481d2cf7ebba56e1037 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 16 Jan 2024 17:11:29 -0800 Subject: [PATCH 2/2] update config --- mockServer/config/config.js | 2 +- mockServer/src/app.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mockServer/config/config.js b/mockServer/config/config.js index 8b91406f8..dcd70e9a1 100644 --- a/mockServer/config/config.js +++ b/mockServer/config/config.js @@ -11,6 +11,6 @@ */ module.exports = { - port: 9090, + port: process.env.MOCK_PORT || 9090, env: process.env.NODE_ENV || 'development' // Current mode } diff --git a/mockServer/src/app.js b/mockServer/src/app.js index 46d94727f..26c5b341c 100644 --- a/mockServer/src/app.js +++ b/mockServer/src/app.js @@ -14,14 +14,12 @@ import Koa2 from 'koa' import KoaBody from 'koa-body' import KoaStatic from 'koa-static2' import path from 'path' -import config from '../config/config' +import { env, port } from '../config/config' import ErrorRoutesCatch from './middleware/ErrorRoutesCatch' import ErrorRoutes from './routes/error-routes' import MainRoutes from './routes/main-routes' const app = new Koa2() -const env = config.env -const PORT = config.port app .use((ctx, next) => { ctx.set('Access-Control-Allow-Origin', '*') @@ -58,6 +56,6 @@ if (env === 'development') { }) } -app.listen(PORT) +app.listen(port) export default app