Skip to content

Commit 9de2076

Browse files
RickonZhang0929RickonZhang0929
committed
[ISSUE alibaba#12017] Update the frontend of the console by using the Console API for other section
* Update the request path * Update the request parameters * Update the return values
1 parent 5267c2e commit 9de2076

File tree

14 files changed

+55
-52
lines changed

14 files changed

+55
-52
lines changed

‎console-ui/src/pages/Login/Login.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class Login extends React.Component {
7373
}
7474
login(values)
7575
.then(res => {
76+
res= res.data;
7677
localStorage.setItem('token', JSON.stringify(res));
7778
this.props.history.push('/');
7879
})

‎console-ui/src/pages/NameSpace/NameSpace.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ class NameSpace extends React.Component {
5757
request({
5858
type: 'get',
5959
beforeSend() {},
60-
url: 'v1/console/namespaces',
60+
url: 'v3/console/core/namespace/list',
6161
success: res => {
62-
if (res.code === 200) {
62+
if (res.code === 0) {
6363
const data = res.data || [];
6464
window.namespaceList = data;
6565

@@ -113,11 +113,12 @@ class NameSpace extends React.Component {
113113
const { namespaceDetails, namespaceName, namespaceID, configuration, description } = locale;
114114
const { namespace } = record; // 获取ak,sk
115115
request({
116-
url: `v1/console/namespaces?show=all&namespaceId=${namespace}`,
116+
url: `v3/console/core/namespace?namespaceId=${namespace}`,
117117
beforeSend: () => {
118118
this.openLoading();
119119
},
120120
success: res => {
121+
res = res.data;
121122
if (res !== null) {
122123
Dialog.alert({
123124
style: { width: '500px' },
@@ -182,11 +183,12 @@ class NameSpace extends React.Component {
182183
</div>
183184
),
184185
onOk: () => {
185-
const url = `v1/console/namespaces?namespaceId=${record.namespace}`;
186+
const url = `v3/console/core/namespace?namespaceId=${record.namespace}`;
186187
request({
187188
url,
188189
type: 'delete',
189190
success: res => {
191+
res = res.data;
190192
const _payload = {};
191193
_payload.title = configurationManagement;
192194
if (res === true) {
@@ -210,7 +212,7 @@ class NameSpace extends React.Component {
210212
refreshNameSpace() {
211213
request({
212214
type: 'get',
213-
url: 'v1/console/namespaces',
215+
url: 'v3/console/core/namespace',
214216
success: res => {
215217
if (res.code === 200) {
216218
window.namespaceList = res.data;

‎console-ui/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class EditClusterDialog extends React.Component {
6969
} = this.state.editCluster;
7070
request({
7171
method: 'PUT',
72-
url: 'v1/ns/cluster',
72+
url: 'v3/console/ns/service/cluster',
7373
data: {
7474
serviceName,
7575
clusterName: name,
@@ -81,7 +81,7 @@ class EditClusterDialog extends React.Component {
8181
dataType: 'text',
8282
beforeSend: () => openLoading(),
8383
success: res => {
84-
if (res !== 'ok') {
84+
if (res.data !== 'ok') {
8585
Message.error(res);
8686
return;
8787
}

‎console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class EditInstanceDialog extends React.Component {
6969
const { ip, port, ephemeral, weight, enabled, metadataText } = this.state.editInstance;
7070
request({
7171
method: 'PUT',
72-
url: 'v1/ns/instance',
72+
url: 'v3/console/ns/instance',
7373
data: {
7474
serviceName,
7575
clusterName,
@@ -84,7 +84,7 @@ class EditInstanceDialog extends React.Component {
8484
dataType: 'text',
8585
beforeSend: () => openLoading(),
8686
success: res => {
87-
if (res !== 'ok') {
87+
if (res.data !== 'ok') {
8888
Message.error(res);
8989
return;
9090
}

‎console-ui/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class EditServiceDialog extends React.Component {
8686
if (!this.validator({ name, protectThreshold })) return;
8787
request({
8888
method: isCreate ? 'POST' : 'PUT',
89-
url: 'v1/ns/service',
89+
url: 'v3/console/ns/service',
9090
data: {
9191
serviceName: name,
9292
groupName: groupName || 'DEFAULT_GROUP',
@@ -97,7 +97,7 @@ class EditServiceDialog extends React.Component {
9797
dataType: 'text',
9898
beforeSend: () => this.setState({ loading: true }),
9999
success: res => {
100-
if (res !== 'ok') {
100+
if (res.data !== 'ok') {
101101
Message.error(res);
102102
return;
103103
}
@@ -107,7 +107,7 @@ class EditServiceDialog extends React.Component {
107107
this.props.getServiceDetail();
108108
}
109109
},
110-
error: res => Message.error(res.responseText || res.statusText),
110+
error: res => Message.error(res.data.responseText || res.data.statusText),
111111
complete: () => this.setState({ loading: false }),
112112
});
113113
this.hide();
@@ -136,9 +136,9 @@ class EditServiceDialog extends React.Component {
136136
getSelectorTypes() {
137137
request({
138138
method: 'GET',
139-
url: 'v1/ns/service/selector/types',
139+
url: 'v3/console/ns/service/selector/types',
140140
success: response => {
141-
if (response.code !== 200) {
141+
if (response.code !== 0) {
142142
Message.error(response.message);
143143
return;
144144
}

‎console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class InstanceTable extends React.Component {
6969
if (!clusterName) return;
7070
const { pageSize, pageNum } = this.state;
7171
request({
72-
url: 'v1/ns/catalog/instances',
72+
url: 'v3/console/ns/instance/list',
7373
data: {
7474
serviceName,
7575
clusterName,
@@ -78,7 +78,7 @@ class InstanceTable extends React.Component {
7878
pageNo: pageNum,
7979
},
8080
beforeSend: () => this.openLoading(),
81-
success: instance => this.setState({ instance }),
81+
success: ({ data: instance }) => this.setState({ instance }),
8282
complete: () => this.closeLoading(),
8383
});
8484
}
@@ -93,7 +93,7 @@ class InstanceTable extends React.Component {
9393
const { clusterName, serviceName, groupName } = this.props;
9494
request({
9595
method: 'PUT',
96-
url: 'v1/ns/instance',
96+
url: 'v3/console/ns/instance',
9797
data: {
9898
serviceName,
9999
clusterName,
@@ -107,7 +107,7 @@ class InstanceTable extends React.Component {
107107
},
108108
dataType: 'text',
109109
beforeSend: () => this.openLoading(),
110-
success: () => {
110+
success: ({ data }) => {
111111
const newVal = Object.assign({}, instance);
112112
newVal.list[index].enabled = !enabled;
113113
this.setState({ instance: newVal });

‎console-ui/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class ServiceDetail extends React.Component {
7272
getServiceDetail() {
7373
const { serviceName, groupName } = this.state;
7474
request({
75-
url: `v1/ns/catalog/service?serviceName=${serviceName}&groupName=${groupName}`,
75+
url: `v3/console/ns/service?serviceName=${serviceName}&groupName=${groupName}`,
7676
beforeSend: () => this.openLoading(),
77-
success: ({ clusters = [], service = {} }) => this.setState({ service, clusters }),
77+
success: ({ data: { clusters = [], service = {} } }) => this.setState({ service, clusters }),
7878
error: e => Message.error(e.responseText || 'error'),
7979
complete: () => this.closeLoading(),
8080
});

‎console-ui/src/pages/ServiceManagement/ServiceList/ServiceList.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ class ServiceList extends React.Component {
103103
});
104104
this.openLoading();
105105
request({
106-
url: `v1/ns/catalog/services?${parameter.join('&')}`,
107-
success: ({ count = 0, serviceList = [] } = {}) => {
106+
url: `v3/console/ns/service/list?${parameter.join('&')}`,
107+
success: ({ data: { count = 0, serviceList = [] } = {} }) => {
108108
this.setState({
109109
dataSource: serviceList,
110110
total: count,
@@ -158,17 +158,17 @@ class ServiceList extends React.Component {
158158
onOk: () => {
159159
request({
160160
method: 'DELETE',
161-
url: `v1/ns/service?serviceName=${service.name}&groupName=${service.groupName}`,
161+
url: `v3/console/ns/service?serviceName=${service.name}&groupName=${service.groupName}`,
162162
dataType: 'text',
163163
beforeSend: () => this.openLoading(),
164164
success: res => {
165-
if (res !== 'ok') {
165+
if (res.data !== 'ok') {
166166
Message.error(res);
167167
return;
168168
}
169169
this.queryServiceList();
170170
},
171-
error: res => Message.error(res.responseText || res.statusText),
171+
error: res => Message.error(res.data.responseText || res.data.statusText),
172172
complete: () => this.closeLoading(),
173173
});
174174
},

‎console-ui/src/reducers/authority.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -51,87 +51,87 @@ const successMsg = res => {
5151
* @param {*} params
5252
*/
5353
const getUsers = params => dispatch =>
54-
request.get('v1/auth/users', { params }).then(data => dispatch({ type: USER_LIST, data }));
54+
request.get('v3/auth/user/list', { params }).then(data => dispatch({ type: USER_LIST, data: data.data }));
5555

5656
/**
5757
* 创建用户
5858
* @param {*} param0
5959
*/
6060
const createUser = ([username, password]) =>
61-
request.post('v1/auth/users', { username, password }).then(res => successMsg(res));
61+
request.post('v3/auth/user', { username, password }).then(res => successMsg(res));
6262

6363
/**
6464
* 通过username 模糊匹配
6565
* @param {*} param0
6666
*/
6767
const searchUsers = username =>
68-
request.get('v1/auth/users/search', { params: { username } }).then(res => successMsg(res));
68+
request.get('v3/auth/user/search', { params: { username } }).then(res => successMsg(res.data));
6969

7070
/**
7171
* 删除用户
7272
* @param {*} username
7373
*/
7474
const deleteUser = username =>
75-
request.delete('v1/auth/users', { params: { username } }).then(res => successMsg(res));
75+
request.delete('v3/auth/user', { params: { username } }).then(res => successMsg(res));
7676

7777
/**
7878
* 重置密码
7979
* @param {*} param0
8080
*/
8181
const passwordReset = ([username, newPassword]) =>
82-
request.put('v1/auth/users', { username, newPassword }).then(res => successMsg(res));
82+
request.put('v3/auth/user', { username, newPassword }).then(res => successMsg(res));
8383

8484
/**
8585
* 角色列表
8686
* @param {*} params
8787
*/
8888

8989
const getRoles = params => dispatch =>
90-
request.get('v1/auth/roles', { params }).then(data => dispatch({ type: ROLE_LIST, data }));
90+
request.get('v3/auth/role/list', { params }).then(data => dispatch({ type: ROLE_LIST, data: data.data }));
9191

9292
/**
9393
* 通过username 模糊匹配
9494
* @param {*} param0
9595
*/
9696
const searchRoles = role =>
97-
request.get('v1/auth/roles/search', { params: { role } }).then(res => successMsg(res));
97+
request.get('v3/auth/role/search', { params: { role } }).then(res => successMsg(res.data));
9898

9999
/**
100100
* 创建角色
101101
* @param {*} param0
102102
*/
103103
const createRole = ([role, username]) =>
104-
request.post('v1/auth/roles', { role, username }).then(res => successMsg(res));
104+
request.post('v3/auth/role', { role, username }).then(res => successMsg(res));
105105

106106
/**
107107
* 删除角色
108108
* @param {*} param0
109109
*/
110110
const deleteRole = role =>
111-
request.delete('v1/auth/roles', { params: role }).then(res => successMsg(res));
111+
request.delete('v3/auth/role', { params: role }).then(res => successMsg(res));
112112

113113
/**
114114
* 权限列表
115115
* @param {*} params
116116
*/
117117
const getPermissions = params => dispatch =>
118118
request
119-
.get('v1/auth/permissions', { params })
120-
.then(data => dispatch({ type: PERMISSIONS_LIST, data }));
119+
.get('v3/auth/permission/list', { params })
120+
.then(data => dispatch({ type: PERMISSIONS_LIST, data: data.data }));
121121

122122
/**
123123
* 给角色添加权限
124124
* @param {*} param0
125125
*/
126126
const createPermission = ([role, resource, action]) =>
127-
request.post('v1/auth/permissions', { role, resource, action }).then(res => successMsg(res));
127+
request.post('v3/auth/permission', { role, resource, action }).then(res => successMsg(res));
128128

129129
/**
130130
* 删除权限
131131
* @param {*} param0
132132
*/
133133
const deletePermission = permission =>
134-
request.delete('v1/auth/permissions', { params: permission }).then(res => successMsg(res));
134+
request.delete('v3/auth/permission', { params: permission }).then(res => successMsg(res));
135135

136136
export default (state = initialState, action) => {
137137
switch (action.type) {

‎console-ui/src/reducers/base.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ const initialState = {
3333
* 用户登录
3434
* @param {*} param0
3535
*/
36-
const login = user => request.post('v1/auth/users/login', user);
37-
const admin = user => request.post('v1/auth/users/admin', user);
36+
const login = user => request.post('v3/auth/user/login', user);
37+
const admin = user => request.post('v3/auth/user/admin', user);
3838

3939
/**
4040
* 单独在login处调用 获取提示信息
4141
*/
42-
const guide = () => request.get('v1/console/server/guide');
42+
const guide = () => request.get('v3/console/server/guide');
4343

4444
/**
4545
* 单独在login调用 判断是否可以登陆
@@ -82,7 +82,7 @@ const getState = () => dispatch =>
8282

8383
const getNotice = () => dispatch =>
8484
request
85-
.get('v1/console/server/announcement?language=' + localStorage.getItem(LANGUAGE_KEY))
85+
.get('v3/console/server/announcement?language=' + localStorage.getItem(LANGUAGE_KEY))
8686
.then(res => {
8787
dispatch({
8888
type: GET_NOTICE,
@@ -102,7 +102,7 @@ const getNotice = () => dispatch =>
102102

103103
const getGuide = () => dispatch =>
104104
request
105-
.get('v1/console/server/guide')
105+
.get('v3/console/server/guide')
106106
.then(res => {
107107
dispatch({
108108
type: SERVER_GUIDE,

‎console-ui/src/reducers/configuration.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ const initialState = {
2323

2424
const getConfigs = params => dispatch =>
2525
request
26-
.get('v1/cs/configs', { params })
27-
.then(data => dispatch({ type: GET_CONFIGURATION, data }));
26+
.get('v3/console/cs/config/list', { params })
27+
.then(data => dispatch({ type: GET_CONFIGURATION, data: data.data }));
2828

2929
const getConfigsV2 = params => dispatch =>
3030
request
31-
.get('v2/cs/config/searchDetail', { params })
32-
.then(data => dispatch({ type: GET_CONFIGURATION, data }));
31+
.get('v3/console/cs/config/searchDetail', { params })
32+
.then(data => dispatch({ type: GET_CONFIGURATION, data: data.data }));
3333

3434
export default (state = initialState, action) => {
3535
switch (action.type) {

‎console-ui/src/reducers/namespace.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ const initialState = {
2222
};
2323

2424
const getNamespaces = params => dispatch =>
25-
request.get('v1/console/namespaces', { params }).then(response => {
25+
request.get('v3/console/core/namespace/list', { params }).then(response => {
2626
const { code, data } = response;
2727
dispatch({
2828
type: GET_NAMESPACES,
29-
data: code === 200 ? data : [],
29+
data: code === 0 ? data : [],
3030
});
3131
});
3232

‎console-ui/src/reducers/subscribers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ const initialState = {
2222
};
2323

2424
const getSubscribers = params => dispatch =>
25-
request.get('v1/ns/service/subscribers', { params }).then(data => {
25+
request.get('v3/console/ns/service/subscribers', { params }).then(data => {
2626
dispatch({
2727
type: GET_SUBSCRIBERS,
28-
data,
28+
data: data.data,
2929
});
3030
});
3131
const removeSubscribers = () => dispatch => dispatch({ type: REMOVE_SUBSCRIBERS });

0 commit comments

Comments
 (0)