Oak-Team
/
oak-cli
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 19 Wiki Activity

start中的一个小问题，template中access.prod的修正

This commit is contained in:
Xu Chang 2024-04-16 15:37:09 +08:00
parent 469927f4f1
commit df8f05f4d8
5 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/server/start.d.ts vendored
View File

@ -4,5 +4,4 @@ import { Connector, EntityDict } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import { SyncContext } from 'oak-domain/lib/store/SyncRowStore';
import { AccessConfiguration } from 'oak-domain/lib/types/Configuration';
export declare function startup<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>>(path: string, connector: Connector<ED, FrontCxt>, accessConfiguration: AccessConfiguration, omitWatchers?: boolean, omitTimers?: boolean, routine?: (context: AsyncContext<EntityDict & BaseEntityDict>) => Promise<void>): Promise<void>;
export declare function startup<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>>(path: string, connector: Connector<ED, FrontCxt>, omitWatchers?: boolean, omitTimers?: boolean, routine?: (context: AsyncContext<EntityDict & BaseEntityDict>) => Promise<void>): Promise<void>;

9
lib/server/start.js
View File

@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
/// <reference path="../typings/polyfill.d.ts" />
require("./polyfill");
const http_1 = require("http");
const path_1 = require("path");
const koa_1 = tslib_1.__importDefault(require("koa"));
const koa_router_1 = tslib_1.__importDefault(require("koa-router"));
const koa_body_1 = tslib_1.__importDefault(require("koa-body"));
@ -15,7 +16,7 @@ const sticky_1 = require("@socket.io/sticky");
const socket_io_1 = require("socket.io");
const DATA_SUBSCRIBER_NAMESPACE = '/ds';
const SERVER_SUBSCRIBER_NAMESPACE = process.env.OAK_SSUB_NAMESPACE || '/ssub';
async function startup(path, connector, accessConfiguration, omitWatchers, omitTimers, routine) {
async function startup(path, connector, omitWatchers, omitTimers, routine) {
const koa = new koa_1.default();
// socket
const httpServer = (0, http_1.createServer)(koa.callback());
@ -98,6 +99,12 @@ async function startup(path, connector, accessConfiguration, omitWatchers, omitT
response.body = res.body;
return;
});
const filenameDict = {
'development': 'access.dev',
'staging': 'access.staging',
'production': 'access.prod',
};
const accessConfiguration = require((0, path_1.join)(path, 'lib', 'configuration', filenameDict[process.env.NODE_ENV])).default;
// 外部socket接口
router.get(connector.getSubscribePointRouter(), async (ctx) => {
const { response } = ctx;

24
lib/template.js
View File

@ -351,18 +351,6 @@ function tsConfigBuildPathsJsonContent() {
"@oak-app-domain/*": [
"src/oak-app-domain/*"
],
"@oak-general-business": [
"node_modules/oak-general-business/lib/index"
],
"@oak-general-business/*": [
"node_modules/oak-general-business/lib/*"
],
"@oak-frontend-base": [
"node_modules/oak-frontend-base/lib/index"
],
"@oak-frontend-base/*": [
"node_modules/oak-frontend-base/lib/*"
],
},
"typeRoots": ["./typings"]
}
@ -383,18 +371,6 @@ function tsConfigPathsJsonContent() {
"@oak-app-domain/*": [
"src/oak-app-domain/*"
],
"@oak-general-business": [
"node_modules/oak-general-business/es/index"
],
"@oak-general-business/*": [
"node_modules/oak-general-business/es/*"
],
"@oak-frontend-base": [
"node_modules/oak-frontend-base/es/index"
],
"@oak-frontend-base/*": [
"node_modules/oak-frontend-base/es/*"
],
},
"typeRoots": ["./typings"]
}

9
src/server/start.ts
View File

@ -1,7 +1,7 @@
/// <reference path="../typings/polyfill.d.ts" />
import './polyfill';
import { IncomingHttpHeaders, createServer } from "http";
import PathLib from 'path';
import PathLib, { join } from 'path';
import Koa from 'koa';
import KoaRouter from 'koa-router';
import KoaBody from 'koa-body';
@ -21,7 +21,6 @@ const SERVER_SUBSCRIBER_NAMESPACE = process.env.OAK_SSUB_NAMESPACE || '/ssub';
export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>>(
path: string,
connector: Connector<ED, FrontCxt>,
accessConfiguration: AccessConfiguration,
omitWatchers?: boolean,
omitTimers?: boolean,
routine?: (context: AsyncContext<EntityDict & BaseEntityDict>) => Promise<void>,
@ -115,6 +114,12 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
return;
});
const filenameDict = {
'development': 'access.dev',
'staging': 'access.staging',
'production': 'access.prod',
};
const accessConfiguration: AccessConfiguration = require(join(path, 'lib', 'configuration', filenameDict[process.env.NODE_ENV as 'development'])).default;
// 外部socket接口
router.get(connector.getSubscribePointRouter(), async (ctx) => {
const { response } = ctx;

4
template/src/configuration/access.prod.ts
View File

@ -1,5 +1,5 @@
import { AccessConfiguration } from 'oak-domain/lib/types/Configuration';
import devConfiguration from './access.dev';
const accessConfiguration: AccessConfiguration = {
http: {
hostname: 'www.oak-framework.test',
@ -8,4 +8,4 @@ const accessConfiguration: AccessConfiguration = {
},
};
export default accessConfiguration;
export default process.env.NODE_ENV === 'development' ? devConfiguration : accessConfiguration;