Commit e886fae4 by lixinming

no message

parent 74fd707f
...@@ -490,6 +490,11 @@ ...@@ -490,6 +490,11 @@
"resolved": "https://registry.npm.taobao.org/express-async-handler/download/express-async-handler-1.1.4.tgz", "resolved": "https://registry.npm.taobao.org/express-async-handler/download/express-async-handler-1.1.4.tgz",
"integrity": "sha1-IlqEkI32OzWunflLbw8a8GEmZCY=" "integrity": "sha1-IlqEkI32OzWunflLbw8a8GEmZCY="
}, },
"express-history-api-fallback": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz",
"integrity": "sha1-OirSf3vryQ/FM9EQ18bYMJe80Fc="
},
"extend": { "extend": {
"version": "3.0.2", "version": "3.0.2",
"resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"compression": "^1.7.4", "compression": "^1.7.4",
"express": "^4.17.1", "express": "^4.17.1",
"express-async-handler": "^1.1.4", "express-async-handler": "^1.1.4",
"express-history-api-fallback": "^2.2.1",
"formidable": "^1.2.1", "formidable": "^1.2.1",
"lru-cache": "^4.1.5", "lru-cache": "^4.1.5",
"md5": "^2.2.1", "md5": "^2.2.1",
......
import { testdb } from "./biz/test";
import { createOrcaleConnect } from "./db/orcale/orcale_connect"; import { createOrcaleConnect } from "./db/orcale/orcale_connect";
import { initOrcale } from "./db/orcale/orcale_init"; import { initOrcale } from "./db/orcale/orcale_init";
import { httpServer } from "./net/http_server"; import { httpServer } from "./net/http_server";
...@@ -8,13 +7,9 @@ import { getPort, orcaleConfig } from "./serverConfig"; ...@@ -8,13 +7,9 @@ import { getPort, orcaleConfig } from "./serverConfig";
async function lanuch() { async function lanuch() {
await initOrcale(); await initOrcale();
httpServer.createServer(getPort()) httpServer.createServer(getPort());
test();
} }
async function test() {
await testdb()
}
......
...@@ -4,7 +4,10 @@ import sign = require('../middleware/sign'); ...@@ -4,7 +4,10 @@ import sign = require('../middleware/sign');
import routers = require('../routers/router'); import routers = require('../routers/router');
import compression = require('compression'); import compression = require('compression');
import { encryptionReturn } from '../middleware/encryptionReturn'; import { encryptionReturn } from '../middleware/encryptionReturn';
import * as fallback from 'express-history-api-fallback';
import { getEnv } from '../serverConfig'; import { getEnv } from '../serverConfig';
import * as path from "path";
export class httpServer { export class httpServer {
...@@ -37,6 +40,10 @@ export class httpServer { ...@@ -37,6 +40,10 @@ export class httpServer {
} }
routers.setRouter(httpServer); routers.setRouter(httpServer);
const root = path.join(__dirname, "../../public/")
httpServer.use(express.static(root))
httpServer.use(fallback('index.html', { root }))
httpServer.listen(port); httpServer.listen(port);
console.log('server listen on port:'+port); console.log('server listen on port:'+port);
......
//端口 //端口
export function getPort() : number { export function getPort() : number {
return Number(process.env.PORT) || Number(process.argv[3]) || 7537; //7536 return Number(process.env.PORT) || Number(process.argv[3]) || 7536; //7536
} }
// sit 测试环境 prod 生产环境 dem 演示环境(测试数据,前端无密码访问) // sit 测试环境 prod 生产环境 dem 演示环境(测试数据,前端无密码访问)
...@@ -31,7 +31,7 @@ export const mySqlConfig = { ...@@ -31,7 +31,7 @@ export const mySqlConfig = {
export const orcaleConfig = { export const orcaleConfig = {
user:'root', user:'root',
password:'root', password:'root',
connectString : "127.0.0.1:1521/orcl" connectString : "192.168.0.140:1521/orcl"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment