Skip to content

Commit c3f938f

Browse files
[ISSUE alibaba#12017] Fix bug
* Fix response code * Fix login
1 parent 9de2076 commit c3f938f

File tree

12 files changed

+16
-16
lines changed

12 files changed

+16
-16
lines changed

console-ui/src/components/BatchHandle/BatchHandle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class BatchHandle extends React.Component {
8080
dataSource.pageSize
8181
}`,
8282
success: res => {
83-
if (res.code === 200) {
83+
if (res.code === 0) {
8484
this.setState({
8585
dataSourceList:
8686
res.data.map(obj => ({

console-ui/src/components/CloneDialog/CloneDialog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class CloneDialog extends React.Component {
8080
type: 'get',
8181
url: `/diamond-ops/service/serverId/${serverId}/namespaceInfo`,
8282
success: res => {
83-
if (res.code === 200) {
83+
if (res.code === 0) {
8484
const dataSource = [];
8585
res.data.forEach(value => {
8686
if (value.namespace !== payload.tenantFrom.id) {

console-ui/src/components/ImportDialog/ImportDialog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class ImportDialog extends React.Component {
8585
};
8686

8787
formatter = res => {
88-
if (res.code === 200) {
88+
if (res.code === 0) {
8989
return {
9090
code: '0',
9191
retData: res,

console-ui/src/components/NameSpaceList/NameSpaceList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class NameSpaceList extends React.Component {
6161
linkKey,
6262
},
6363
success: res => {
64-
if (res.code === 200) {
64+
if (res.code === 0) {
6565
window[keyName] = res.data;
6666
this.setState({
6767
[keyName]: res.data,

console-ui/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class ClusterNodeList extends React.Component {
109109
axios
110110
.post(`v3/console/core/cluster/server/leave?accessToken=${accessToken}`, nodes)
111111
.then(response => {
112-
if (response.data.code === 200) {
112+
if (response.data.code === 0) {
113113
Message.success(locale.leaveSucc);
114114
} else {
115115
const errorMessage = response.data.message || locale.leaveFail;

console-ui/src/pages/ConfigurationManagement/ConfigSync/ConfigSync.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class ConfigSync extends React.Component {
7979
request({
8080
url: '/diamond-ops/env/domain',
8181
success(data) {
82-
if (data.code === 200) {
82+
if (data.code === 0) {
8383
const { envGroups } = data.data;
8484

8585
self.setState({
@@ -105,7 +105,7 @@ class ConfigSync extends React.Component {
105105
self.openLoading();
106106
},
107107
success(result) {
108-
if (result.code === 200) {
108+
if (result.code === 0) {
109109
const { data = {} } = result;
110110

111111
self.field.setValue('dataId', data.dataId);
@@ -177,7 +177,7 @@ class ConfigSync extends React.Component {
177177
_payload.content = '';
178178
_payload.dataId = payload.dataId;
179179
_payload.group = payload.group;
180-
_payload.isok = res.code === 200;
180+
_payload.isok = res.code === 0;
181181
if (!_payload.isok) {
182182
_payload.isok = false;
183183
_payload.message = res.message;

console-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ class ConfigurationManagement extends React.Component {
915915

916916
processImportAndCloneResult(ret, locale, confirm, isImport) {
917917
const resultCode = ret.code;
918-
if (resultCode === 200) {
918+
if (resultCode === 0) {
919919
confirm.hide();
920920
let failCount = ret.data.failData ? ret.data.failData.length : 0;
921921
let skipCount = ret.data.skipData ? ret.data.skipData.length : 0;

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class NameSpace extends React.Component {
214214
type: 'get',
215215
url: 'v3/console/core/namespace',
216216
success: res => {
217-
if (res.code === 200) {
217+
if (res.code === 0) {
218218
window.namespaceList = res.data;
219219
}
220220
},

console-ui/src/reducers/authority.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const initialState = {
4040
};
4141

4242
const successMsg = res => {
43-
if (res.code === 200) {
43+
if (res.code === 0) {
4444
Message.success(res.message);
4545
}
4646
return res;

console-ui/src/reducers/base.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ const guide = () => request.get('v3/console/server/guide');
4444
/**
4545
* 单独在login调用 判断是否可以登陆
4646
*/
47-
const state = () => request.get('v1/console/server/state');
47+
const state = () => request.get('v3/console/server/state');
4848

4949
const getState = () => dispatch =>
5050
request
51-
.get('v1/console/server/state')
51+
.get('v3/console/server/state')
5252
.then(res => {
5353
localStorage.setItem(LOGINPAGE_ENABLED, res.login_page_enabled);
5454
dispatch({

console/src/main/java/com/alibaba/nacos/console/controller/v3/ConsoleServerStateController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.alibaba.nacos.console.paramcheck.ConsoleDefaultHttpParamExtractor;
2323
import com.alibaba.nacos.console.proxy.ServerStateProxy;
2424
import com.alibaba.nacos.core.paramcheck.ExtractorManager;
25+
import org.springframework.http.ResponseEntity;
2526
import org.springframework.web.bind.annotation.GetMapping;
2627
import org.springframework.web.bind.annotation.RequestMapping;
2728
import org.springframework.web.bind.annotation.RequestParam;
@@ -51,9 +52,9 @@ public ConsoleServerStateController(ServerStateProxy serverStateProxy) {
5152
* @return state json.
5253
*/
5354
@GetMapping("/state")
54-
public Result<Map<String, String>> serverState() {
55+
public ResponseEntity<Map<String, String>> serverState() {
5556
Map<String, String> serverState = serverStateProxy.getServerState();
56-
return Result.success(serverState);
57+
return ResponseEntity.ok().body(serverState);
5758
}
5859

5960
/**

0 commit comments

Comments
 (0)