From d9b6e6373399dcbb7d995ca26ff9ef8091e1872a Mon Sep 17 00:00:00 2001
From: shuaiguo <coldplayguo@gmail.com>
Date: Fri, 1 Nov 2019 10:36:56 +0800
Subject: [PATCH] fix: 限流提示
revert 引起代码丢失
---
doraemon/middleware/error-handler.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doraemon/middleware/error-handler.js b/doraemon/middleware/error-handler.js
index c518a74..e91e314 100644
--- a/doraemon/middleware/error-handler.js
+++ b/doraemon/middleware/error-handler.js
@@ -8,14 +8,14 @@ exports.serverError = (err, req, res, next) => { // eslint-disable-line
logger.error(`error at path: ${req.url}`);
logger.error(`${req.url},${typeof err === 'object' ? JSON.stringify(err) : err}`);
- res.status(err.code || 500);
-
if (req.xhr) {
return res.json({
- code: 500,
- message: '服务器错误！'
+ code: err.code || 500,
+ message: err.message || '服务器错误！'
});
}
+ res.status(err.code || 500);
+
return res.send('服务器开小差了~');
};
--
libgit2 0.24.0