test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

This commit is contained in:
mokun 2020-03-04 11:32:39 +08:00
parent 4423a44c55 6a5c6a2d38
commit cb6291bcb0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
View File

@ -24,8 +24,7 @@ public class RestControllerExceptionHandler {
@ExceptionHandler(MSException.class) @ExceptionHandler(MSException.class)
public ResultHolder msExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) { public ResultHolder msExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) {
// 自定义异常返回200 response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
response.setStatus(HttpStatus.OK.value());
return ResultHolder.error(e.getMessage()); return ResultHolder.error(e.getMessage());
} }
} }

6
frontend/src/common/ajax.js
View File

@ -48,7 +48,11 @@ export default {
function exception(error, result) { function exception(error, result) {
result.loading = false; result.loading = false;
window.console.error(error.response || error.message); window.console.error(error.response || error.message);
Message.error({message: error.message, showClose: true}); if (error.response.data) {
Message.error({message: error.response.data.message, showClose: true});
} else {
Message.error({message: error.message, showClose: true});
}
} }
Vue.prototype.$get = function (url, success) { Vue.prototype.$get = function (url, success) {