From c4a4764762c769d98c36208cb29815bf898d6941 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 8 Jun 2022 11:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/api/config.ts | 3 --- back/api/cron.ts | 16 ---------------- back/api/dependence.ts | 6 ------ back/api/env.ts | 8 -------- back/api/log.ts | 1 - back/api/open.ts | 6 ------ back/api/script.ts | 7 ------- back/api/subscription.ts | 11 ----------- back/api/system.ts | 5 ----- back/api/user.ts | 13 ------------- back/loaders/express.ts | 24 +++++++++++++++++++++++- 11 files changed, 23 insertions(+), 77 deletions(-) diff --git a/back/api/config.ts b/back/api/config.ts index 8e412b8b..ea0b5924 100644 --- a/back/api/config.ts +++ b/back/api/config.ts @@ -25,7 +25,6 @@ export default (app: Router) => { }), }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -51,7 +50,6 @@ export default (app: Router) => { } res.send({ code: 200, data: content }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -76,7 +74,6 @@ export default (app: Router) => { fs.writeFileSync(path, content); res.send({ code: 200, message: '保存成功' }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/cron.ts b/back/api/cron.ts index a5d11f19..9a2b3521 100644 --- a/back/api/cron.ts +++ b/back/api/cron.ts @@ -42,7 +42,6 @@ export default (app: Router) => { return res.send({ code: 400, message: 'param schedule error' }); } } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -60,7 +59,6 @@ export default (app: Router) => { const data = await cronService.run(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -78,7 +76,6 @@ export default (app: Router) => { const data = await cronService.stop(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -102,7 +99,6 @@ export default (app: Router) => { ); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -123,7 +119,6 @@ export default (app: Router) => { const data = await cronService.addLabels(req.body.ids, req.body.labels); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -141,7 +136,6 @@ export default (app: Router) => { const data = await cronService.disabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -159,7 +153,6 @@ export default (app: Router) => { const data = await cronService.enabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -179,7 +172,6 @@ export default (app: Router) => { const data = await cronService.log(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -210,7 +202,6 @@ export default (app: Router) => { return res.send({ code: 400, message: 'param schedule error' }); } } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -228,7 +219,6 @@ export default (app: Router) => { const data = await cronService.remove(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -246,7 +236,6 @@ export default (app: Router) => { const data = await cronService.pin(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -264,7 +253,6 @@ export default (app: Router) => { const data = await cronService.unPin(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -279,7 +267,6 @@ export default (app: Router) => { const data = await cronService.import_crontab(); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -299,7 +286,6 @@ export default (app: Router) => { const data = await cronService.getDb({ id: req.params.id }); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -328,7 +314,6 @@ export default (app: Router) => { }); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -348,7 +333,6 @@ export default (app: Router) => { const data = await cronService.logs(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/dependence.ts b/back/api/dependence.ts index cd493b71..6998ddce 100644 --- a/back/api/dependence.ts +++ b/back/api/dependence.ts @@ -38,7 +38,6 @@ export default (app: Router) => { const data = await dependenceService.create(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -61,7 +60,6 @@ export default (app: Router) => { const data = await dependenceService.update(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -79,7 +77,6 @@ export default (app: Router) => { const data = await dependenceService.remove(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -97,7 +94,6 @@ export default (app: Router) => { const data = await dependenceService.remove(req.body, true); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -117,7 +113,6 @@ export default (app: Router) => { const data = await dependenceService.getDb({ id: req.params.id }); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -135,7 +130,6 @@ export default (app: Router) => { const data = await dependenceService.reInstall(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/env.ts b/back/api/env.ts index 05767b39..39c5b09e 100644 --- a/back/api/env.ts +++ b/back/api/env.ts @@ -38,7 +38,6 @@ export default (app: Router) => { const data = await envService.create(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -61,7 +60,6 @@ export default (app: Router) => { const data = await envService.update(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -79,7 +77,6 @@ export default (app: Router) => { const data = await envService.remove(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -103,7 +100,6 @@ export default (app: Router) => { const data = await envService.move(req.params.id, req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -121,7 +117,6 @@ export default (app: Router) => { const data = await envService.disabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -139,7 +134,6 @@ export default (app: Router) => { const data = await envService.enabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -160,7 +154,6 @@ export default (app: Router) => { const data = await envService.updateNames(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -180,7 +173,6 @@ export default (app: Router) => { const data = await envService.getDb(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/log.ts b/back/api/log.ts index 918d4118..ccd80b9e 100644 --- a/back/api/log.ts +++ b/back/api/log.ts @@ -37,7 +37,6 @@ export default (app: Router) => { const content = getFileContentByName(filePath); res.send({ code: 200, data: content }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/open.ts b/back/api/open.ts index 50a572d8..2cacf018 100644 --- a/back/api/open.ts +++ b/back/api/open.ts @@ -16,7 +16,6 @@ export default (app: Router) => { const data = await openService.list(); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -37,7 +36,6 @@ export default (app: Router) => { const data = await openService.create(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -59,7 +57,6 @@ export default (app: Router) => { const data = await openService.update(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -77,7 +74,6 @@ export default (app: Router) => { const data = await openService.remove(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -97,7 +93,6 @@ export default (app: Router) => { const data = await openService.resetSecret(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -118,7 +113,6 @@ export default (app: Router) => { const result = await openService.authToken(req.query as any); return res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/script.ts b/back/api/script.ts index caba92ef..6187fb97 100644 --- a/back/api/script.ts +++ b/back/api/script.ts @@ -67,7 +67,6 @@ export default (app: Router) => { const content = getFileContentByName(filePath); res.send({ code: 200, data: content }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -124,7 +123,6 @@ export default (app: Router) => { fs.writeFileSync(filePath, content); return res.send({ code: 200 }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -151,7 +149,6 @@ export default (app: Router) => { fs.writeFileSync(filePath, content); return res.send({ code: 200 }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -176,7 +173,6 @@ export default (app: Router) => { fs.unlinkSync(filePath); res.send({ code: 200 }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -207,7 +203,6 @@ export default (app: Router) => { return next(err); }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -234,7 +229,6 @@ export default (app: Router) => { const result = await scriptService.runScript(filePath); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -260,7 +254,6 @@ export default (app: Router) => { const result = await scriptService.stopScript(filePath); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/subscription.ts b/back/api/subscription.ts index 281204fa..68845e9c 100644 --- a/back/api/subscription.ts +++ b/back/api/subscription.ts @@ -65,7 +65,6 @@ export default (app: Router) => { return res.send({ code: 400, message: 'param schedule error' }); } } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -83,7 +82,6 @@ export default (app: Router) => { const data = await subscriptionService.run(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -101,7 +99,6 @@ export default (app: Router) => { const data = await subscriptionService.stop(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -119,7 +116,6 @@ export default (app: Router) => { const data = await subscriptionService.disabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -137,7 +133,6 @@ export default (app: Router) => { const data = await subscriptionService.enabled(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -157,7 +152,6 @@ export default (app: Router) => { const data = await subscriptionService.log(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -201,7 +195,6 @@ export default (app: Router) => { return res.send({ code: 400, message: 'param schedule error' }); } } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -219,7 +212,6 @@ export default (app: Router) => { const data = await subscriptionService.remove(req.body); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -239,7 +231,6 @@ export default (app: Router) => { const data = await subscriptionService.getDb({ id: req.params.id }); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -266,7 +257,6 @@ export default (app: Router) => { }); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -286,7 +276,6 @@ export default (app: Router) => { const data = await subscriptionService.logs(req.params.id); return res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/system.ts b/back/api/system.ts index e4fb65e9..cd6f722f 100644 --- a/back/api/system.ts +++ b/back/api/system.ts @@ -54,7 +54,6 @@ export default (app: Router) => { const data = await systemService.getLogRemoveFrequency(); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -76,7 +75,6 @@ export default (app: Router) => { ); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -91,7 +89,6 @@ export default (app: Router) => { const result = await systemService.checkUpdate(); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -106,7 +103,6 @@ export default (app: Router) => { const result = await systemService.updateSystem(); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -127,7 +123,6 @@ export default (app: Router) => { const result = await systemService.notify(req.body); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/api/user.ts b/back/api/user.ts index 8940557d..8a84a929 100644 --- a/back/api/user.ts +++ b/back/api/user.ts @@ -39,7 +39,6 @@ export default (app: Router) => { const data = await userService.login({ ...req.body }, req); return res.send(data); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -54,7 +53,6 @@ export default (app: Router) => { await userService.logout(req.platform); res.send({ code: 200 }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -75,7 +73,6 @@ export default (app: Router) => { await userService.updateUsernameAndPassword(req.body); res.send({ code: 200, message: '更新成功' }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -109,7 +106,6 @@ export default (app: Router) => { const data = await userService.initTwoFactor(); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -129,7 +125,6 @@ export default (app: Router) => { const data = await userService.activeTwoFactor(req.body.code); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -144,7 +139,6 @@ export default (app: Router) => { const data = await userService.deactiveTwoFactor(); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -166,7 +160,6 @@ export default (app: Router) => { const data = await userService.twoFactorLogin(req.body, req); res.send(data); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -181,7 +174,6 @@ export default (app: Router) => { const data = await userService.getLoginLog(); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -196,7 +188,6 @@ export default (app: Router) => { const data = await userService.getNotificationMode(); res.send({ code: 200, data }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -211,7 +202,6 @@ export default (app: Router) => { const result = await userService.updateNotificationMode(req.body); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -232,7 +222,6 @@ export default (app: Router) => { await userService.updateUsernameAndPassword(req.body); res.send({ code: 200, message: '更新成功' }); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -247,7 +236,6 @@ export default (app: Router) => { const result = await userService.updateNotificationMode(req.body); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, @@ -263,7 +251,6 @@ export default (app: Router) => { const result = await userService.updateAvatar(req.file!.filename); res.send(result); } catch (e) { - logger.error('🔥 error: %o', e); return next(e); } }, diff --git a/back/loaders/express.ts b/back/loaders/express.ts index 423b4e82..d686e0e5 100644 --- a/back/loaders/express.ts +++ b/back/loaders/express.ts @@ -136,7 +136,6 @@ export default ({ app }: { app: Application }) => { }); app.use(errors()); - app.use(Sentry.Handlers.errorHandler()); app.use( ( @@ -155,6 +154,29 @@ export default ({ app }: { app: Application }) => { }, ); + app.use( + ( + err: Error & { errors: any[] }, + req: Request, + res: Response, + next: NextFunction, + ) => { + if (err.name.includes('Sequelize')) { + return res + .status(500) + .send({ + code: 400, + message: `${err.name} ${err.message}`, + validation: err.errors, + }) + .end(); + } + return next(err); + }, + ); + + app.use(Sentry.Handlers.errorHandler()); + app.use( ( err: Error & { status: number },