Commit 14d4e765 by 王昆

gsb

parent 2f7c8fe5
......@@ -19,7 +19,7 @@ var settings = {
secret: "f99d413b767f09b5dff0b3610366cc46",
salt: "%iatpD1gcxz7iF#B",
cacheprefix: "sjb",
usertimeout: 3600,//单位秒
usertimeout: 3600, //单位秒
basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 3102,
defaultPassWord: "987456",
......@@ -33,7 +33,7 @@ var settings = {
reqEsAddr: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
return "http://43.247.184.94:7200/";//localsettings.reqEsDevUrl;
return "http://43.247.184.94:7200/"; //localsettings.reqEsDevUrl;
} else {
return "http://43.247.184.94:7200/";
}
......@@ -61,10 +61,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,
};
}
},
......@@ -74,11 +74,11 @@ var settings = {
return localsettings.database;
} else {
return {
dbname: "xxxxx",
user: "xxxx",
password: "xxxxx",
dbname: ENVINPUT.DB_NAME,
user: ENVINPUT.DB_USER,
password: ENVINPUT.DB_PWD,
config: {
host: 'xxxxxx',
host: ENVINPUT.DB_HOST,
dialect: 'mysql',
operatorsAliases: false,
pool: {
......@@ -91,10 +91,10 @@ var settings = {
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
} //设置MSSQL超时时间
},
};
}
}
};
module.exports = settings;
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