Skip to content

Commit b0bcd99

Browse files
xlornexlorne
authored
Merge pull request #98 from codingapi/dev
Dev
2 parents 9f92409 + c99d719 commit b0bcd99

File tree

17 files changed

+111
-111
lines changed

17 files changed

+111
-111
lines changed

‎admin-ui/__mocks__/axios.ts

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎admin-ui/__mocks__/fileMock.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎admin-ui/__mocks__/monaco-editor.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎admin-ui/mocks/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎admin-ui/mocks/product.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import Mock from "mockjs";
2+
import webpackMockServer from "webpack-mock-server";
3+
4+
export default webpackMockServer.add((app, helper) => {
5+
app.get('/api/products', (req, res) => {
6+
const products = Mock.mock({
7+
'list|100': [{
8+
'id|+1': 1,
9+
'name': '@name',
10+
'price|100-1000': 1,
11+
}]
12+
}).list;
13+
14+
res.json({
15+
success: true,
16+
data:{
17+
list:products,
18+
total: products.length
19+
},
20+
});
21+
});
22+
});

‎admin-ui/mocks/tsconfig.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": [
4+
"../mocks/*",
5+
"*.mock.ts",
6+
"**/global.d.ts"
7+
],
8+
"files": [],
9+
"exclude": [
10+
"*test.mock.ts"
11+
]
12+
}

‎admin-ui/mocks/user.js renamed to ‎admin-ui/mocks/user.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
module.exports = (app, helper) => {
1+
import webpackMockServer from "webpack-mock-server";
2+
3+
export default webpackMockServer.add((app, helper) => {
24
app.post('/user/login', (req, res) => {
35
const username = req.body.username;
4-
56
if(username==='admin'){
67
res.json({
78
success:true,
@@ -25,4 +26,4 @@ module.exports = (app, helper) => {
2526
}
2627
});
2728
});
28-
};
29+
});

‎admin-ui/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"name": "admin-pro-ui",
2+
"name": "admin-ui",
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@ag-grid-community/locale": "^33.0.3",
76
"@ant-design/icons": "^5.4.0",
8-
"@ant-design/pro-components": "^2.8.2",
7+
"@ant-design/pro-components": "^2.8.7",
98
"@babel/standalone": "^7.25.6",
109
"@codingapi/flow-pc": "^0.0.8",
1110
"@codingapi/form-pc": "^0.0.16",
@@ -20,7 +19,6 @@
2019
"@types/node": "^16.18.108",
2120
"@types/react": "^18.3.5",
2221
"@types/react-dom": "^18.3.0",
23-
"ag-grid-react": "^33.0.3",
2422
"antd": "^5.20.6",
2523
"axios": "^1.7.7",
2624
"base64-js": "^1.5.1",
@@ -72,6 +70,7 @@
7270
"@types/jest": "^29.5.14",
7371
"@types/lodash": "^4.17.7",
7472
"@types/lodash-es": "^4.17.12",
73+
"@types/mockjs": "^1.0.10",
7574
"babel-jest": "^29.7.0",
7675
"clean-webpack-plugin": "^4.0.0",
7776
"copy-webpack-plugin": "^12.0.2",
@@ -93,6 +92,6 @@
9392
"webpack-cli": "^5.1.4",
9493
"webpack-dev-server": "^5.1.0",
9594
"webpack-merge": "^6.0.1",
96-
"webpack-mock-server": "^1.0.21"
95+
"webpack-mock-server": "^1.0.23"
9796
}
9897
}

‎admin-ui/src/api/product.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import {get} from "@/api/index";
2+
3+
4+
export async function products() {
5+
return get('/api/products');
6+
}
7+

‎admin-ui/webpack.config.mock.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
const {merge} = require('webpack-merge');
22
const common = require('./webpack.common.js');
33
const webpackMockServer = require('webpack-mock-server');
4-
const mockFunction = require('./mocks/index.js');
5-
const express = require('express');
64

75
module.exports = merge(common, {
86
mode: 'development',
@@ -13,12 +11,16 @@ module.exports = merge(common, {
1311
if (!devServer) {
1412
throw new Error('webpack-dev-server is not defined');
1513
}
16-
// 使用 express.json() 来解析请求体
17-
devServer.app.use(express.json());
1814

1915
// 使用 webpackMockServer 来添加 mock 功能
20-
webpackMockServer.use(devServer.app);
21-
webpackMockServer.add(mockFunction)(devServer.app);
16+
webpackMockServer.use(devServer.app,{
17+
port: 8090,
18+
entry:[
19+
'./mocks/user.ts',
20+
'./mocks/product.ts',
21+
],
22+
tsConfigFileName: "mocks/tsconfig.json"
23+
});
2224

2325
console.log('mock server is running');
2426
return middlewares; // 返回 middlewares

‎mobile-ui/mocks/index.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎admin-ui/mocks/product.js renamed to ‎mobile-ui/mocks/product.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const Mock = require('mockjs');
1+
import Mock from "mockjs";
2+
import webpackMockServer from "webpack-mock-server";
23

3-
module.exports = (app, helper) => {
4+
export default webpackMockServer.add((app, helper) => {
45
app.get('/api/products', (req, res) => {
5-
66
const products = Mock.mock({
77
'list|100': [{
88
'id|+1': 1,
@@ -13,4 +13,4 @@ module.exports = (app, helper) => {
1313

1414
res.json(products);
1515
});
16-
};
16+
});

‎mobile-ui/mocks/tsconfig.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": [
4+
"../mocks/*",
5+
"*.mock.ts",
6+
"**/global.d.ts"
7+
],
8+
"files": [],
9+
"exclude": [
10+
"*test.mock.ts"
11+
]
12+
}

‎mobile-ui/mocks/user.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import webpackMockServer from "webpack-mock-server";
2+
3+
export default webpackMockServer.add((app, helper) => {
4+
app.post('/user/login', (req, res) => {
5+
const username = req.body.username;
6+
if(username==='admin'){
7+
res.json({
8+
success:true,
9+
data:{
10+
'username': username,
11+
'token':'test token',
12+
'avatar':'/logo.png',
13+
'authorities': ['ROLE_ADMIN','ROLE_DEVELOPER'],
14+
}
15+
});
16+
return;
17+
}
18+
19+
res.json({
20+
success:true,
21+
data:{
22+
'username': username,
23+
'token':'test token',
24+
'avatar':'/logo.png',
25+
'authorities': ['ROLE_USER'],
26+
}
27+
});
28+
});
29+
});

‎mobile-ui/mocks/user/index.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎mobile-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@
7474
"webpack-cli": "^5.1.4",
7575
"webpack-dev-server": "^5.1.0",
7676
"webpack-merge": "^6.0.1",
77-
"webpack-mock-server": "^1.0.21"
77+
"webpack-mock-server": "^1.0.23"
7878
}
7979
}

‎mobile-ui/webpack.config.mock.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
const {merge} = require('webpack-merge');
22
const common = require('./webpack.common.js');
33
const webpackMockServer = require('webpack-mock-server');
4-
const mockFunction = require('./mocks/index.js');
5-
const express = require('express');
64

75
module.exports = merge(common, {
86
mode: 'development',
@@ -13,12 +11,15 @@ module.exports = merge(common, {
1311
if (!devServer) {
1412
throw new Error('webpack-dev-server is not defined');
1513
}
16-
// 使用 express.json() 来解析请求体
17-
devServer.app.use(express.json());
18-
1914
// 使用 webpackMockServer 来添加 mock 功能
20-
webpackMockServer.use(devServer.app);
21-
webpackMockServer.add(mockFunction)(devServer.app);
15+
webpackMockServer.use(devServer.app,{
16+
port: 8090,
17+
entry:[
18+
'./mocks/user.ts',
19+
'./mocks/product.ts',
20+
],
21+
tsConfigFileName: "mocks/tsconfig.json"
22+
});
2223

2324
console.log('mock server is running');
2425
return middlewares; // 返回 middlewares

0 commit comments

Comments
 (0)