Commit c2c98b70 by lixinming

no message

parent f8d5386c
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,7 +16,6 @@
"lru-cache": "^4.1.5",
"md5": "^2.2.1",
"moment": "^2.24.0",
"mongoose": "^7.6.0",
"mysql": "^2.18.1",
"mysql2": "^3.6.0",
"node-xlsx": "^0.16.1",
......@@ -29,7 +28,6 @@
"ws": "^5.2.2",
"xml2js": "^0.4.23"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
......
......@@ -10,7 +10,7 @@
</mongodb>
<mysqldb>
<!-- 本地mysql配置 -->
<mysqlHost>192.168.0.105</mysqlHost>
<mysqlHost>127.0.0.1</mysqlHost>
<mysqlPort>3306</mysqlPort>
<mysqlUser>root</mysqlUser>
<mysqlPwd>123456</mysqlPwd>
......
import mongoose = require('mongoose');
// import mongoose = require('mongoose');
let defaultOptions = {
useNewUrlParser:true,
auto_reconnect:true,
// reconnectTries:1000,
// reconnectInterval:3000,
keepAlive: 1,
connectTimeoutMS: 3000,
useCreateIndex: true,
useUnifiedTopology: true
};
// let defaultOptions = {
// useNewUrlParser:true,
// auto_reconnect:true,
// // reconnectTries:1000,
// // reconnectInterval:3000,
// keepAlive: 1,
// connectTimeoutMS: 3000,
// useCreateIndex: true,
// useUnifiedTopology: true
// };
export async function createDbConnect(connectUrl:string, options?:object) {
if (!options) options = defaultOptions;
return await mongoose.createConnection(connectUrl, options).catch(
(err)=>{
throw err
});
}
// export async function createDbConnect(connectUrl:string, options?:object) {
// if (!options) options = defaultOptions;
// return await mongoose.createConnection(connectUrl, options).catch(
// (err)=>{
// throw err
// });
// }
......@@ -4,23 +4,23 @@
import { systemConfig } from "../../config/serverConfig";
import { BizError } from "../../util/bizError";
import { createDbConnect } from "./dbConnect";
// import { createDbConnect } from "./dbConnect";
let baseDB;
export async function initDB() {
//如果配置了mongoServerConstVal 才会连接mongo
if (systemConfig.mongodbStr) {
baseDB = await createDbConnect(systemConfig.mongodbStr).catch(err => {
throw err
});
// export async function initDB() {
// //如果配置了mongoServerConstVal 才会连接mongo
// if (systemConfig.mongodbStr) {
// baseDB = await createDbConnect(systemConfig.mongodbStr).catch(err => {
// throw err
// });
console.log('mongodb init success');
} else {
throw new BizError("xml中未配置mongo连接字符串 无法连接到mongodb");
}
// console.log('mongodb init success');
// } else {
// throw new BizError("xml中未配置mongo连接字符串 无法连接到mongodb");
// }
}
// }
export { baseDB };
\ No newline at end of file
import { initConfig, systemConfig} from "./config/serverConfig";
import * as mongoDB from "./db/mongo/dbInit";
import * as mysqlDB from "./db/mysql/mysqlInit";
import { initModel } from "./model/modelBind";
import { initMysqlModel } from "./model/sqlModelBind";
import { httpServer } from "./net/http_server";
async function lanuch() {
/**初始化配置解析 */
await initConfig();
/**初始化数据库 */
// await mongoDB.initDB();
// await initModel();
/**初始化sql */
await mysqlDB.initMysqlDB();
await initMysqlModel();
......
......@@ -2,10 +2,8 @@
* 总路由入口
*/
import * as mongoRouter from './mongoRouter';
import * as mysqlRouter from './mysqlRouter';
export function setRouter(httpServer){
mongoRouter.setRouter(httpServer);
mysqlRouter.setRouter(httpServer);
}
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