mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2024-12-15 05:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

Browse Source
This commit is contained in:
wenbo.dong 2017-08-25 14:39:05 +08:00
commit d21c38c0de
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/containers/Group/GroupList/GroupList.js
View File

@ -116,6 +116,8 @@ export default class GroupList extends Component {
await this.props.fetchGroupList();
this.setState({groupList: this.props.groupList});
this.props.setCurrGroup(res.data.data)
}else{
message.error(res.data.errmsg)
}
}
@autobind

3
client/containers/Project/Interface/InterfaceList/Edit.js
View File

@ -61,7 +61,8 @@ class InterfaceEdit extends Component {
}
componentWillMount() {
let s = new WebSocket('ws://yapi.local.qunar.com:3000/api/interface/solve_conflict?id=' + this.props.match.params.actionId);
let domain = location.hostname + (location.port !== "" ? ":" + location.port : "");
let s = new WebSocket('ws://' + domain + '/api/interface/solve_conflict?id=' + this.props.match.params.actionId);
s.onopen = () => {
this.WebSocket = s;
}