From ce1021fc4447c5f581c5d811f1c0f8efa64762c1 Mon Sep 17 00:00:00 2001 From: chuzhixin <1204505056@qq.com> Date: Mon, 17 Aug 2020 15:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84mock=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=8B=B9=E6=9E=9C=E7=94=B5=E8=84=91=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 -- mock/controller/ad.js | 2 +- mock/controller/blacklist.js | 2 +- mock/controller/changeLog.js | 2 +- mock/controller/colorfulIcon.js | 2 +- mock/controller/goodsDetail.js | 4 ++-- mock/controller/goodsList.js | 4 ++-- mock/controller/icon.js | 2 +- mock/controller/menuManagement.js | 2 +- mock/controller/notice.js | 3 +-- mock/controller/personalCenter.js | 4 ++-- mock/controller/remixIcon.js | 2 +- mock/controller/roleManagement.js | 2 +- mock/controller/router.js | 2 +- mock/controller/table.js | 6 +++--- mock/controller/tree.js | 2 +- mock/controller/upload.js | 2 +- mock/controller/user.js | 2 +- mock/controller/userManagement.js | 2 +- mock/index.js | 33 +++++++------------------------ mock/mockServer.js | 3 +-- mock/utils/index.js | 14 ++++++++----- package.json | 5 +++-- src/config/static.js | 2 +- 24 files changed, 44 insertions(+), 62 deletions(-) delete mode 100644 .env.development diff --git a/.env.development b/.env.development deleted file mode 100644 index 8651fae..0000000 --- a/.env.development +++ /dev/null @@ -1,2 +0,0 @@ -NODE_ENV = development -VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/mock/controller/ad.js b/mock/controller/ad.js index b653da8..bce7c77 100644 --- a/mock/controller/ad.js +++ b/mock/controller/ad.js @@ -14,7 +14,7 @@ const data = [ "//shang.qq.com/wpa/qunwpa?idkey=14f123ac6d4ef3122bbb60d4693f1d8c951a50be2296951efb12d5ab1642f36b", }, ]; -export default [ +module.exports = [ { url: "/ad/getList", type: "get", diff --git a/mock/controller/blacklist.js b/mock/controller/blacklist.js index 2131bb7..29ca21c 100644 --- a/mock/controller/blacklist.js +++ b/mock/controller/blacklist.js @@ -32,7 +32,7 @@ const data = [ }, , ]; -export default [ +module.exports = [ { url: "/blacklist/getList", type: "post", diff --git a/mock/controller/changeLog.js b/mock/controller/changeLog.js index d272895..aca7ce2 100644 --- a/mock/controller/changeLog.js +++ b/mock/controller/changeLog.js @@ -168,7 +168,7 @@ const data = [ }, ]; -export default [ +module.exports = [ { url: "/changeLog/getList", type: "post", diff --git a/mock/controller/colorfulIcon.js b/mock/controller/colorfulIcon.js index 17e8253..e32a5dd 100644 --- a/mock/controller/colorfulIcon.js +++ b/mock/controller/colorfulIcon.js @@ -303,7 +303,7 @@ const data = [ "add_database", "add_row", ]; -export default [ +module.exports = [ { url: "/colorfulIcon/getList", type: "post", diff --git a/mock/controller/goodsDetail.js b/mock/controller/goodsDetail.js index ce14d2c..9548163 100644 --- a/mock/controller/goodsDetail.js +++ b/mock/controller/goodsDetail.js @@ -1,6 +1,6 @@ -import { mock } from "mockjs"; +const { mock } = require("mockjs"); -export default [ +module.exports = [ { url: "/goodsDetail/getList", type: "post", diff --git a/mock/controller/goodsList.js b/mock/controller/goodsList.js index ebf07ac..9f2420d 100644 --- a/mock/controller/goodsList.js +++ b/mock/controller/goodsList.js @@ -1,4 +1,4 @@ -import { mock } from "mockjs"; +const { mock } = require("mockjs"); const List = []; const count = 999; @@ -18,7 +18,7 @@ for (let i = 0; i < count; i++) { ); } -export default [ +module.exports = [ { url: "/goodsList/getList", type: "post", diff --git a/mock/controller/icon.js b/mock/controller/icon.js index f837d09..b772706 100644 --- a/mock/controller/icon.js +++ b/mock/controller/icon.js @@ -964,7 +964,7 @@ const data = [ "yen-sign", "yin-yang", ]; -export default [ +module.exports = [ { url: "/icon/getList", type: "post", diff --git a/mock/controller/menuManagement.js b/mock/controller/menuManagement.js index cb66a40..9a2520d 100644 --- a/mock/controller/menuManagement.js +++ b/mock/controller/menuManagement.js @@ -1,4 +1,4 @@ -export default [ +module.exports = [ { url: "/menuManagement/getTree", type: "post", diff --git a/mock/controller/notice.js b/mock/controller/notice.js index 9772cf4..afbf05b 100644 --- a/mock/controller/notice.js +++ b/mock/controller/notice.js @@ -24,8 +24,7 @@ const data = [ type: "success", }, ]; - -export default [ +module.exports = [ { url: "/notice/getList", type: "post", diff --git a/mock/controller/personalCenter.js b/mock/controller/personalCenter.js index f40f41d..776969f 100644 --- a/mock/controller/personalCenter.js +++ b/mock/controller/personalCenter.js @@ -1,6 +1,6 @@ -import { mock } from "mockjs"; +const { mock } = require("mockjs"); -export default [ +module.exports = [ { url: "/personalCenter/getList", type: "post", diff --git a/mock/controller/remixIcon.js b/mock/controller/remixIcon.js index ca3e940..abe57eb 100644 --- a/mock/controller/remixIcon.js +++ b/mock/controller/remixIcon.js @@ -2271,7 +2271,7 @@ const data = [ "zzz-fill", "zzz-line", ]; -export default [ +module.exports = [ { url: "/remixIcon/getList", type: "post", diff --git a/mock/controller/roleManagement.js b/mock/controller/roleManagement.js index 5e0137b..f1f30d8 100644 --- a/mock/controller/roleManagement.js +++ b/mock/controller/roleManagement.js @@ -9,7 +9,7 @@ const List = [ permission: "editor", }, ]; -export default [ +module.exports = [ { url: "/roleManagement/getList", type: "post", diff --git a/mock/controller/router.js b/mock/controller/router.js index 1e71d8c..fd7026c 100644 --- a/mock/controller/router.js +++ b/mock/controller/router.js @@ -379,7 +379,7 @@ const data = [ ], }, ]; -export default [ +module.exports = [ { url: "/menu/navigate", type: "post", diff --git a/mock/controller/table.js b/mock/controller/table.js index cb30f5b..fa4c38e 100644 --- a/mock/controller/table.js +++ b/mock/controller/table.js @@ -1,5 +1,5 @@ -import { mock } from "mockjs"; -import { handleRandomImage } from "../utils"; +const { mock } = require("mockjs"); +const { handleRandomImage } = require("../utils"); const List = []; const count = 999; @@ -21,7 +21,7 @@ for (let i = 0; i < count; i++) { ); } -export default [ +module.exports = [ { url: "/table/getList", type: "post", diff --git a/mock/controller/tree.js b/mock/controller/tree.js index a489aa8..d0efd8d 100644 --- a/mock/controller/tree.js +++ b/mock/controller/tree.js @@ -43,7 +43,7 @@ const data = [ ], }, ]; -export default [ +module.exports = [ { url: "/tree/list", type: "post", diff --git a/mock/controller/upload.js b/mock/controller/upload.js index 580a56d..a6f9ab0 100644 --- a/mock/controller/upload.js +++ b/mock/controller/upload.js @@ -1,5 +1,5 @@ const data = []; -export default [ +module.exports = [ { url: "/upload", type: "post", diff --git a/mock/controller/user.js b/mock/controller/user.js index 2a21354..de02fec 100644 --- a/mock/controller/user.js +++ b/mock/controller/user.js @@ -4,7 +4,7 @@ const accessTokens = { test: "test-accessToken", }; -export default [ +module.exports = [ { url: "/publicKey", type: "post", diff --git a/mock/controller/userManagement.js b/mock/controller/userManagement.js index 4157cef..30749eb 100644 --- a/mock/controller/userManagement.js +++ b/mock/controller/userManagement.js @@ -25,7 +25,7 @@ const List = [ datatime: "@datetime", }, ]; -export default [ +module.exports = [ { url: "/userManagement/getList", type: "post", diff --git a/mock/index.js b/mock/index.js index 45b3ba0..68566c0 100644 --- a/mock/index.js +++ b/mock/index.js @@ -3,33 +3,14 @@ * @description 导入所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。 */ -import { handleMockArray } from "./utils"; -import chalk from "chalk"; -import fs from "fs"; -import { baseURL, devPort, httpRequestFile } from "../src/config/settings"; +const { handleMockArray } = require("./utils"); const mocks = []; const mockArray = handleMockArray(); - -if (httpRequestFile) { - fs.writeFile("./http/mock.http", "", {}, function (err) { - if (err) throw err; - }); -} -mockArray.forEach(async (item) => { - const obj = require(item).default; - await mocks.push(...obj); - if (httpRequestFile) { - obj.forEach((item) => { - fs.appendFile( - "./http/mock.http", - `\r\n###${item.url}###\r\POST http://localhost:${devPort}/${baseURL}${item.url}\r\nContent-Type: application/x-www-form-urlencoded\r\n###\r\n`, - (error) => { - if (error) - return chalk.red(`\n > 追加HTTP Request失败${error.message}`); - } - ); - }); - } +mockArray.forEach((item) => { + const obj = require(item); + mocks.push(...obj); }); -export default mocks; +module.exports = { + mocks, +}; diff --git a/mock/mockServer.js b/mock/mockServer.js index 720496c..23944fd 100644 --- a/mock/mockServer.js +++ b/mock/mockServer.js @@ -13,7 +13,7 @@ const mockDir = path.join(process.cwd(), "mock"); */ const registerRoutes = (app) => { let mockLastIndex; - const { default: mocks } = require("./index.js"); + const { mocks } = require("./index.js"); const mocksForServer = mocks.map((route) => { return responseFake(route.url, route.type, route.response); }); @@ -58,7 +58,6 @@ const responseFake = (url, type, respond) => { * @param app */ module.exports = (app) => { - require("@babel/register"); app.use(bodyParser.json()); app.use( bodyParser.urlencoded({ diff --git a/mock/utils/index.js b/mock/utils/index.js index 2038ed9..9f04d42 100644 --- a/mock/utils/index.js +++ b/mock/utils/index.js @@ -1,6 +1,6 @@ -import { Random } from "mockjs"; -import { join } from "path"; -import fs from "fs"; +const { Random } = require("mockjs"); +const { join } = require("path"); +const fs = require("fs"); /** * @copyright chuzhixin 1204505056@qq.com @@ -9,7 +9,7 @@ import fs from "fs"; * @param height * @returns {string} */ -export function handleRandomImage(width = 50, height = 50) { +function handleRandomImage(width = 50, height = 50) { return `https://picsum.photos/${width}/${height}?random=${Random.guid()}`; } @@ -18,7 +18,7 @@ export function handleRandomImage(width = 50, height = 50) { * @description 处理所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。 * @returns {[]} */ -export function handleMockArray() { +function handleMockArray() { const mockArray = []; const getFiles = (jsonPath) => { const jsonFiles = []; @@ -37,3 +37,7 @@ export function handleMockArray() { getFiles("mock/controller"); return mockArray; } +module.exports = { + handleRandomImage, + handleMockArray, +}; diff --git a/package.json b/package.json index 02dac6a..2886f9a 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "zx-markdown-editor": "^0.0.2", "zx-player": "^0.9.6", "zx-quill": "^0.0.2", - "zx-templates": "^0.0.13", + "zx-templates": "^0.0.14", "zx-verify": "^0.0.2" }, "devDependencies": { @@ -90,8 +90,9 @@ "@vue/eslint-config-prettier": "^6.0.0", "autoprefixer": "^9.8.6", "babel-eslint": "^10.1.0", + "babel-plugin-dynamic-import-node": "^2.3.3", "compression-webpack-plugin": "^4.0.1", - "eslint": "^7.6.0", + "eslint": "^7.7.0", "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-vue": "^6.2.2", "filemanager-webpack-plugin": "^2.0.5", diff --git a/src/config/static.js b/src/config/static.js index 089bc71..cec0521 100644 --- a/src/config/static.js +++ b/src/config/static.js @@ -9,7 +9,7 @@ const mocks = []; const files = require.context("../../mock/controller", false, /\.js$/); files.keys().forEach((key) => { - const obj = files(key).default; + const obj = files(key); mocks.push(...obj); });