From d58fdb3088d887cfbb530d5f9921a3d5a15b099e Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Mon, 15 Jan 2024 01:52:21 -0800 Subject: [PATCH 1/3] 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 0000000000..8b91406f8c --- /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 3c3f6d2a33..46d94727f8 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 113eee7c7c08454f74db0228665ab50e54afa7b0 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 16 Jan 2024 17:11:29 -0800 Subject: [PATCH 2/3] 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 8b91406f8c..dcd70e9a14 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 46d94727f8..26c5b341c7 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 From f3ac00e954ff7433a36b80f1c22ce379d7e7a7bd Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 23 Jan 2024 18:31:33 -0800 Subject: [PATCH 3/3] Fix mockServer block group deleted bug Signed-off-by: lu17301156525 --- mockServer/src/routes/main-routes.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mockServer/src/routes/main-routes.js b/mockServer/src/routes/main-routes.js index 0a66a8dfb7..06280c494c 100644 --- a/mockServer/src/routes/main-routes.js +++ b/mockServer/src/routes/main-routes.js @@ -10,13 +10,13 @@ * */ -import KoaRouter from 'koa-router' +import fs from 'fs-extra' import * as glob from 'glob' +import KoaRouter from 'koa-router' import path from 'path' -import fs from 'fs-extra' import MockService from '../services/mockService' - import { getResponseData } from '../tool/Common' + const router = new KoaRouter() export const mockService = new MockService() const getJsonPathData = (jpath, method = 'get') => { @@ -140,7 +140,9 @@ router.get('/material-center/api/block-groups/delete/:id', async (ctx) => { router.get('/material-center/api/block-groups', async (ctx) => { const result = await mockService.blockGroupService.find(ctx.query) let blockGroup - if (result.data.length > 1) { + if (result.data.length === 0) { + ctx.body = result + } else if (result.data.length > 1) { blockGroup = await Promise.all( result.data.map(async (group) => { group.blocks = await Promise.all( @@ -153,7 +155,7 @@ router.get('/material-center/api/block-groups', async (ctx) => { }) ) ctx.body = getResponseData(blockGroup) - } else { + } else if (result.data.length === 1) { blockGroup = result.data[0] const blocks = await Promise.all( blockGroup.blocks.map(async (item) => {