diff --git a/packages/nger-cli/lib/build.ts b/packages/nger-cli/lib/build.ts index a471ee2..f2f252d 100644 --- a/packages/nger-cli/lib/build.ts +++ b/packages/nger-cli/lib/build.ts @@ -21,10 +21,10 @@ export class BuildCommand { getTypeContext() { if (this.type === 'admin') { - const AppSource = join(root, 'src/admin') + const AppSource = require(join(root, 'src/admin')).default; return visitor.visitType(AppSource); } else { - const AppSource = join(root, 'src/app') + const AppSource = require(join(root, 'src/app')).default; return visitor.visitType(AppSource); } } diff --git a/packages/nger-cli/lib/start.ts b/packages/nger-cli/lib/start.ts index e5299c3..bc3c471 100644 --- a/packages/nger-cli/lib/start.ts +++ b/packages/nger-cli/lib/start.ts @@ -23,9 +23,9 @@ export class StartCommand { run() { this.logger.warn(`start ${this.type}`); const start = new NgerStart(); - const source = join(root, 'src/index') - const Addon = require(source).default; - const app = visitor.visitType(Addon); + const source = join(root, 'src/server') + const serverSource = require(source).default; + const app = visitor.visitType(serverSource); app.set('port', this.port); switch (this.type) { case 'express': diff --git a/packages/nger-platform-express/lib/index.ts b/packages/nger-platform-express/lib/index.ts index 4473833..2883f4c 100644 --- a/packages/nger-platform-express/lib/index.ts +++ b/packages/nger-platform-express/lib/index.ts @@ -2,16 +2,14 @@ import { ConsoleLogger, LogLevel } from 'nger-logger'; import { TypeContext } from 'ims-decorator'; import express from 'express'; import { createServer } from 'http'; -import { AddonMetadataKey, AddonClassAst, NgModuleMetadataKey, NgModuleClassAst, ControllerMetadataKey, ControllerClassAst, GetMetadataKey, GetMethodAst, PostMetadataKey, PostMethodAst } from 'nger-core'; +import { NgModuleMetadataKey, NgModuleClassAst, ControllerMetadataKey, ControllerClassAst, GetMetadataKey, GetMethodAst, PostMetadataKey, PostMethodAst } from 'nger-core'; export class NgerPlatformExpress { logger: ConsoleLogger = new ConsoleLogger(LogLevel.debug); run(context: TypeContext) { const app = express(); const server = createServer(app) const port = context.get(`port`); - const addon = context.getClass(AddonMetadataKey) as AddonClassAst; - const serverContext = addon.server; - const ngModule = serverContext.getClass(NgModuleMetadataKey) as NgModuleClassAst; + const ngModule = context.getClass(NgModuleMetadataKey) as NgModuleClassAst; ngModule.declarations.map(declaration => { const controller = declaration.getClass(ControllerMetadataKey) as ControllerClassAst; const gets = declaration.getMethod(GetMetadataKey) as GetMethodAst[]; diff --git a/src/admin.ts b/src/admin.ts index a54294e..f483631 100644 --- a/src/admin.ts +++ b/src/admin.ts @@ -7,4 +7,4 @@ import { HomePage } from './template/admin/home/home'; HomePage ] }) -export class NgerAdmin { } \ No newline at end of file +export default class NgerAdmin { } \ No newline at end of file diff --git a/src/app.ts b/src/app.ts index d7b25e1..c2a6be1 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,4 +6,4 @@ import { HomePage } from './template/mobile/home/home'; HomePage ] }) -export class NgerApp { } +export default class NgerApp { } diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index 8221781..0000000 --- a/src/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgerApp } from './app' -import { NgerAdmin } from './admin' -import { NgerServer } from './server' - -import { Addon } from 'nger-core' - -@Addon({ - // 移动端 - app: NgerApp, - // pc端 - admin: NgerAdmin, - // api - server: NgerServer -}) -export default class NgerAddon { } \ No newline at end of file diff --git a/src/readme.md b/src/readme.md index 4b40d14..de17443 100644 --- a/src/readme.md +++ b/src/readme.md @@ -1,3 +1,13 @@ ### 跑腿项目 > 多用户,什么是多用户,一个账号可以有多个公众号、小程序、h5账号,每个账号有独立的会员系统等。 -> 跑腿接单、派单、实时监控跑腿位置,路线规划。 \ No newline at end of file +> 跑腿接单、派单、实时监控跑腿位置,路线规划。 + +### 目录说明 + +* inc 存放后台api +* template 存放模板 +* typeorm 存放数据库 +* admin.ts pc端模块 +* app.ts mobile端模块 +* server.ts 服务端api模块 + diff --git a/src/server.ts b/src/server.ts index c1898ba..5b804d7 100644 --- a/src/server.ts +++ b/src/server.ts @@ -7,4 +7,4 @@ import { IndexController } from './inc'; ], providers: [] }) -export class NgerServer { } +export default class NgerServer { }