Skip to content

Commit 1c8de9e

Browse files
LyricTianLyricTian
committed
Refactoring request
1 parent ac2e2d3 commit 1c8de9e

16 files changed

Lines changed: 333 additions & 261 deletions

File tree

‎src/components/PermButton/index.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React from 'react';
22
import { Button } from 'antd';
3-
import GetGlobalContext from '@/utils/context';
3+
import context from '@/utils/context';
44

55
export default ({ code, children, ...rest }) => {
6-
const GlobalContext = GetGlobalContext();
6+
const { GlobalContext } = context;
7+
78
return (
89
<GlobalContext.Consumer>
910
{global => {

‎src/layouts/AdminLayout.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Debounce from 'lodash-decorators/debounce';
1818
import GlobalFooter from '@/components/GlobalFooter';
1919
import CopyRight from '@/components/CopyRight';
2020
import UpdatePasswordDialog from '@/components/UpdatePasswordDialog';
21-
import GetGlobalContext from '@/utils/context';
21+
import context from '@/utils/context';
2222
import './AdminLayout.less';
2323
import logo from '../assets/logo.svg';
2424

@@ -245,7 +245,6 @@ class AdminLayout extends React.PureComponent {
245245
} = this.props;
246246

247247
const { updatePwdVisible } = this.state;
248-
const GlobalContext = GetGlobalContext();
249248

250249
const menu = (
251250
<Menu className="menu" selectedKeys={[]} onClick={this.onMenuClick}>
@@ -321,7 +320,9 @@ class AdminLayout extends React.PureComponent {
321320
</Header>
322321
<Content className={classNames('content')}>
323322
<div style={{ minHeight: 'calc(100vh - 150px)' }}>
324-
<GlobalContext.Provider value={global}>{children}</GlobalContext.Provider>
323+
<context.GlobalContext.Provider value={global}>
324+
{children}
325+
</context.GlobalContext.Provider>
325326
</div>
326327
<GlobalFooter copyright={<CopyRight title={copyRight} />} />
327328
</Content>

‎src/models/demo.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default {
9595
}
9696
},
9797
*fetchForm({ payload }, { call, put }) {
98-
const response = yield call(demoService.get, payload);
98+
const response = yield call(demoService.get, payload.record_id);
9999
yield [
100100
put({
101101
type: 'saveFormData',
@@ -113,8 +113,8 @@ export default {
113113
const formType = yield select(state => state.demo.formType);
114114
let success = false;
115115
if (formType === 'E') {
116-
params.record_id = yield select(state => state.demo.formID);
117-
const response = yield call(demoService.update, params);
116+
const id = yield select(state => state.demo.formID);
117+
const response = yield call(demoService.update, id, params);
118118
if (response.status === 'OK') {
119119
success = true;
120120
}
@@ -142,7 +142,7 @@ export default {
142142
}
143143
},
144144
*del({ payload }, { call, put }) {
145-
const response = yield call(demoService.del, payload);
145+
const response = yield call(demoService.del, payload.record_id);
146146
if (response.status === 'OK') {
147147
message.success('删除成功');
148148
yield put({ type: 'fetch' });
@@ -151,9 +151,9 @@ export default {
151151
*changeStatus({ payload }, { call, put, select }) {
152152
let response;
153153
if (payload.status === 1) {
154-
response = yield call(demoService.enable, payload);
154+
response = yield call(demoService.enable, payload.record_id);
155155
} else {
156-
response = yield call(demoService.disable, payload);
156+
response = yield call(demoService.disable, payload.record_id);
157157
}
158158

159159
if (response.status === 'OK') {

‎src/models/login.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { history } from 'umi';
2-
import { stringify, parse } from 'qs';
3-
import store from '@/utils/store';
2+
import { parse } from 'qs';
3+
import { setToken, logout } from '@/utils/request';
44
import * as loginService from '@/services/login';
55

66
export default {
@@ -41,16 +41,21 @@ export default {
4141
payload: true,
4242
});
4343
const response = yield call(loginService.login, payload);
44-
if (response.error) {
45-
const { message } = response.error;
44+
if (response.data && response.data.error) {
45+
const {
46+
data: {
47+
error: { message },
48+
},
49+
status,
50+
} = response;
4651
yield [
4752
put({
4853
type: 'saveTip',
4954
payload: message,
5055
}),
5156
put({
5257
type: 'saveStatus',
53-
payload: response.status >= 500 ? 'ERROR' : 'FAIL',
58+
payload: status >= 500 ? 'ERROR' : 'FAIL',
5459
}),
5560
put({
5661
type: 'changeSubmitting',
@@ -64,7 +69,7 @@ export default {
6469
}
6570

6671
// 保存访问令牌
67-
store.setAccessToken(response);
72+
setToken(response);
6873

6974
yield [
7075
put({
@@ -92,13 +97,8 @@ export default {
9297
*logout(_, { call }) {
9398
const response = yield call(loginService.logout);
9499
if (response.status === 'OK') {
95-
history.push('/user/login', {
96-
search: stringify({
97-
redirect: window.location.href,
98-
}),
99-
});
100+
logout();
100101
}
101-
store.clearAccessToken();
102102
},
103103
},
104104

‎src/models/menu.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default {
105105
}
106106
},
107107
*fetchForm({ payload }, { call, put }) {
108-
const response = yield call(menuService.get, payload);
108+
const response = yield call(menuService.get, payload.record_id);
109109
yield put({
110110
type: 'saveFormData',
111111
payload: response,
@@ -121,8 +121,8 @@ export default {
121121
const formType = yield select(state => state.menu.formType);
122122
let success = false;
123123
if (formType === 'E') {
124-
params.record_id = yield select(state => state.menu.formID);
125-
const response = yield call(menuService.update, params);
124+
const id = yield select(state => state.menu.formID);
125+
const response = yield call(menuService.update, id, params);
126126
if (response.status === 'OK') {
127127
success = true;
128128
}
@@ -150,7 +150,7 @@ export default {
150150
}
151151
},
152152
*del({ payload }, { call, put }) {
153-
const response = yield call(menuService.del, payload);
153+
const response = yield call(menuService.del, payload.record_id);
154154
if (response.status === 'OK') {
155155
message.success('删除成功');
156156
yield put({ type: 'fetchTree' });
@@ -171,9 +171,9 @@ export default {
171171
*changeStatus({ payload }, { call, put, select }) {
172172
let response;
173173
if (payload.status === 1) {
174-
response = yield call(menuService.enable, payload);
174+
response = yield call(menuService.enable, payload.record_id);
175175
} else {
176-
response = yield call(menuService.disable, payload);
176+
response = yield call(menuService.disable, payload.record_id);
177177
}
178178

179179
if (response.status === 'OK') {

‎src/models/role.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export default {
9696
}
9797
},
9898
*fetchForm({ payload }, { call, put }) {
99-
const response = yield call(roleService.get, payload);
99+
const response = yield call(roleService.get, payload.record_id);
100100

101101
const { role_menus: roleMenus } = response;
102102
if (roleMenus) {
@@ -133,8 +133,8 @@ export default {
133133

134134
let success = false;
135135
if (formType === 'E') {
136-
params.record_id = yield select(state => state.role.formID);
137-
const response = yield call(roleService.update, params);
136+
const id = yield select(state => state.role.formID);
137+
const response = yield call(roleService.update, id, params);
138138
if (response.status === 'OK') {
139139
success = true;
140140
}
@@ -162,7 +162,7 @@ export default {
162162
}
163163
},
164164
*del({ payload }, { call, put }) {
165-
const response = yield call(roleService.del, payload);
165+
const response = yield call(roleService.del, payload.record_id);
166166
if (response.status === 'OK') {
167167
message.success('删除成功');
168168
yield put({ type: 'fetch' });
@@ -178,9 +178,9 @@ export default {
178178
*changeStatus({ payload }, { call, put, select }) {
179179
let response;
180180
if (payload.status === 1) {
181-
response = yield call(roleService.enable, payload);
181+
response = yield call(roleService.enable, payload.record_id);
182182
} else {
183-
response = yield call(roleService.disable, payload);
183+
response = yield call(roleService.disable, payload.record_id);
184184
}
185185

186186
if (response.status === 'OK') {

‎src/models/user.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default {
9494
}
9595
},
9696
*fetchForm({ payload }, { call, put }) {
97-
const response = yield call(userService.get, payload);
97+
const response = yield call(userService.get, payload.record_id);
9898
yield put({
9999
type: 'saveFormData',
100100
payload: response,
@@ -110,8 +110,8 @@ export default {
110110
const formType = yield select(state => state.user.formType);
111111
let success = false;
112112
if (formType === 'E') {
113-
params.record_id = yield select(state => state.user.formID);
114-
const response = yield call(userService.update, params);
113+
const id = yield select(state => state.user.formID);
114+
const response = yield call(userService.update, id, params);
115115
if (response.status === 'OK') {
116116
success = true;
117117
}
@@ -139,7 +139,7 @@ export default {
139139
}
140140
},
141141
*del({ payload }, { call, put }) {
142-
const response = yield call(userService.del, payload);
142+
const response = yield call(userService.del, payload.record_id);
143143
if (response.status === 'OK') {
144144
message.success('删除成功');
145145
yield put({ type: 'fetch' });
@@ -148,9 +148,9 @@ export default {
148148
*changeStatus({ payload }, { call, put, select }) {
149149
let response;
150150
if (payload.status === 1) {
151-
response = yield call(userService.enable, payload);
151+
response = yield call(userService.enable, payload.record_id);
152152
} else {
153-
response = yield call(userService.disable, payload);
153+
response = yield call(userService.disable, payload.record_id);
154154
}
155155

156156
if (response.status === 'OK') {

‎src/services/demo.js‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
1-
import { stringify } from 'qs';
2-
import request from '../utils/request';
1+
import request, { methods } from '@/utils/request';
32

43
const router = 'demos';
54

6-
export async function query(params) {
7-
return request(`/v1/${router}?${stringify(params)}`);
5+
export async function query(params = {}) {
6+
return request(`/v1/${router}`, { params });
87
}
98

10-
export async function get(params) {
11-
return request(`/v1/${router}/${params.record_id}`);
9+
export async function get(id, params = {}) {
10+
return request(`/v1/${router}/${id}`, { params });
1211
}
1312

14-
export async function create(params) {
13+
export async function create(data) {
1514
return request(`/v1/${router}`, {
16-
method: 'POST',
17-
body: params,
15+
method: methods.POST,
16+
data,
1817
});
1918
}
2019

21-
export async function update(params) {
22-
return request(`/v1/${router}/${params.record_id}`, {
23-
method: 'PUT',
24-
body: params,
20+
export async function update(id, data) {
21+
return request(`/v1/${router}/${id}`, {
22+
method: methods.PUT,
23+
data,
2524
});
2625
}
2726

28-
export async function del(params) {
29-
return request(`/v1/${router}/${params.record_id}`, {
30-
method: 'DELETE',
27+
export async function del(id, params = {}) {
28+
return request(`/v1/${router}/${id}`, {
29+
method: methods.DELETE,
30+
params,
3131
});
3232
}
3333

34-
export async function enable(params) {
35-
return request(`/v1/${router}/${params.record_id}/enable`, {
36-
method: 'PATCH',
34+
export async function enable(id, params = {}) {
35+
return request(`/v1/${router}/${id}/enable`, {
36+
method: methods.PATCH,
37+
params,
3738
});
3839
}
3940

40-
export async function disable(params) {
41-
return request(`/v1/${router}/${params.record_id}/disable`, {
42-
method: 'PATCH',
41+
export async function disable(id, params = {}) {
42+
return request(`/v1/${router}/${id}/disable`, {
43+
method: methods.PATCH,
44+
params,
4345
});
4446
}

‎src/services/login.js‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import request, { baseURL } from '../utils/request';
1+
import request, { methods, baseURL } from '@/utils/request';
22

33
// 验证码ID
44
export async function captchaID() {
@@ -10,36 +10,31 @@ export function captcha(id) {
1010
return `${baseURL}/v1/pub/login/captcha?id=${id}`;
1111
}
1212

13-
// 登录
14-
export async function login(params) {
13+
export async function login(data) {
1514
return request(`/v1/pub/login`, {
16-
method: 'POST',
17-
body: params,
18-
notNotify: true,
15+
method: methods.POST,
16+
data,
17+
hideNotify: true,
1918
});
2019
}
2120

22-
// 退出
2321
export async function logout() {
2422
return request(`/v1/pub/login/exit`, {
25-
method: 'POST',
23+
method: methods.POST,
2624
});
2725
}
2826

29-
// 更新个人密码
30-
export async function updatePwd(params) {
27+
export async function updatePwd(data) {
3128
return request(`/v1/pub/current/password`, {
32-
method: 'PUT',
33-
body: params,
29+
method: methods.PUT,
30+
data,
3431
});
3532
}
3633

37-
// 获取当前用户信息
3834
export async function getCurrentUser() {
3935
return request(`/v1/pub/current/user`);
4036
}
4137

42-
// 查询当前用户菜单树
4338
export async function queryMenuTree() {
4439
return request(`/v1/pub/current/menutree`);
4540
}

0 commit comments

Comments
 (0)