Commit 23a5a4cc by 蒋勇

d

parent 9d88930c
......@@ -263,10 +263,10 @@ var settings = {
return localsettings.redis;
}else {
return {
host:"xxxxx",
port:xxxxx,
password:"xxxxx",
db:xx,
host:ENVINPUT.REDIS_HOST,
port:ENVINPUT.REDIS_PORT,
password:ENVINPUT.REDIS_PWD,
db:ENVINPUT.REDIS_DB,
};
}
},
......@@ -276,26 +276,26 @@ var settings = {
return localsettings.database;
}else{
return {
dbname : "xxxxx",
user : "xxxx",
password : "xxxxx",
config : {
host: 'xxxxxx',
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug:false,
dialectOptions:{
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
},
};
dbname : ENVINPUT.DB_NAME,
user : ENVINPUT.DB_USER,
password : ENVINPUT.DB_PWD,
config : {
host: ENVINPUT.DB_HOST,
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug:false,
dialectOptions:{
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
},
};
}
},
databasehb:function(){
......@@ -324,4 +324,5 @@ var settings = {
}
};
module.exports = settings;
settings.ENVINPUT=ENVINPUT;
module.exports = settings;
\ No newline at end of file
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