Commit 14d4e765 by 王昆

gsb

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