From 46e71d8213391e63e39288263ecdc70144a6f01e Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 12 Jun 2024 13:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/loaders/app.ts | 43 ++++++++++++++++------------------- back/loaders/initData.ts | 7 +++--- back/services/cron.ts | 2 +- back/services/cronView.ts | 2 +- back/services/dependence.ts | 2 +- back/services/env.ts | 2 +- back/services/open.ts | 2 +- back/services/subscription.ts | 2 +- back/services/system.ts | 2 +- 9 files changed, 30 insertions(+), 34 deletions(-) diff --git a/back/loaders/app.ts b/back/loaders/app.ts index 4a1c16c142d..37e43dfea11 100644 --- a/back/loaders/app.ts +++ b/back/loaders/app.ts @@ -7,28 +7,23 @@ import linkDeps from './deps'; import initTask from './initTask'; export default async ({ expressApp }: { expressApp: Application }) => { - try { - depInjectorLoader(); - Logger.info('✌️ Dependency Injector loaded'); - console.log('✌️ Dependency Injector loaded'); - - expressLoader({ app: expressApp }); - Logger.info('✌️ Express loaded'); - console.log('✌️ Express loaded'); - - await initData(); - Logger.info('✌️ init data loaded'); - console.log('✌️ init data loaded'); - - await linkDeps(); - Logger.info('✌️ link deps loaded'); - console.log('✌️ link deps loaded'); - - initTask(); - Logger.info('✌️ init task loaded'); - console.log('✌️ init task loaded'); - } catch (error) { - Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`); - console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`); - } + depInjectorLoader(); + Logger.info('✌️ Dependency loaded'); + console.log('✌️ Dependency loaded'); + + await initData(); + Logger.info('✌️ Init data loaded'); + console.log('✌️ Init data loaded'); + + await linkDeps(); + Logger.info('✌️ Link deps loaded'); + console.log('✌️ Link deps loaded'); + + initTask(); + Logger.info('✌️ Init task loaded'); + console.log('✌️ Init task loaded'); + + expressLoader({ app: expressApp }); + Logger.info('✌️ Express loaded'); + console.log('✌️ Express loaded'); }; diff --git a/back/loaders/initData.ts b/back/loaders/initData.ts index 64b3b6dfb92..8ed5a52cead 100644 --- a/back/loaders/initData.ts +++ b/back/loaders/initData.ts @@ -18,6 +18,10 @@ export default async () => { const dependenceService = Container.get(DependenceService); const systemService = Container.get(SystemService); + // 初始化增加系统配置 + await SystemModel.upsert({ type: AuthDataType.systemConfig }); + await SystemModel.upsert({ type: AuthDataType.notification }); + const installDependencies = () => { // 初始化时安装所有处于安装中，安装成功，安装失败的依赖 DependenceModel.findAll({ @@ -158,7 +162,4 @@ export default async () => { // 初始化保存一次ck和定时任务数据 await cronService.autosave_crontab(); await envService.set_envs(); - - // 初始化增加系统配置 - await SystemModel.upsert({ type: AuthDataType.systemConfig }); }; diff --git a/back/services/cron.ts b/back/services/cron.ts index 0045b4f9408..3ac3958ea53 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -376,7 +376,7 @@ export default class CronService { public async getDb(query: FindOptions['where']): Promise { const doc: any = await CrontabModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`Cron ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/cronView.ts b/back/services/cronView.ts index f147b529e85..14c5679c217 100644 --- a/back/services/cronView.ts +++ b/back/services/cronView.ts @@ -64,7 +64,7 @@ export default class CronViewService { ): Promise { const doc: any = await CrontabViewModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`CronView ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/dependence.ts b/back/services/dependence.ts index 5b3c2eddabf..72cd911fa24 100644 --- a/back/services/dependence.ts +++ b/back/services/dependence.ts @@ -184,7 +184,7 @@ export default class DependenceService { ): Promise { const doc: any = await DependenceModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`Dependency ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/env.ts b/back/services/env.ts index fdfd0a90a28..836b7211eb1 100644 --- a/back/services/env.ts +++ b/back/services/env.ts @@ -166,7 +166,7 @@ export default class EnvService { public async getDb(query: FindOptions['where']): Promise { const doc: any = await EnvModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`Env ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/open.ts b/back/services/open.ts index 83276f41469..573f5cb3be3 100644 --- a/back/services/open.ts +++ b/back/services/open.ts @@ -46,7 +46,7 @@ export default class OpenService { public async getDb(query: any): Promise { const doc: any = await AppModel.findOne({ where: query }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`App ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/subscription.ts b/back/services/subscription.ts index a8c28ded1b7..44728eb251f 100644 --- a/back/services/subscription.ts +++ b/back/services/subscription.ts @@ -281,7 +281,7 @@ export default class SubscriptionService { ): Promise { const doc = await SubscriptionModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`Subscription ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); } diff --git a/back/services/system.ts b/back/services/system.ts index c968f901c1d..812be695810 100644 --- a/back/services/system.ts +++ b/back/services/system.ts @@ -59,7 +59,7 @@ export default class SystemService { public async getDb(query: any): Promise { const doc = await SystemModel.findOne({ where: { ...query } }); if (!doc) { - throw new Error(`${JSON.stringify(query)} not found`); + throw new Error(`System ${JSON.stringify(query)} not found`); } return doc.get({ plain: true }); }