Commit d4f2e317 by 蒋勇

d

parent 932fb7e2
var path = require('path'); var path = require('path');
var ENVINPUT={
DB_HOST:process.env.DB_HOST,
DB_PORT:process.env.DB_PORT,
DB_USER:process.env.DB_USER,
DB_PWD:process.env.DB_PWD,
REDIS_HOST:process.env.REDIS_HOST,
REDIS_PORT:process.env.REDIS_PORT,
REDIS_PWD:process.env.REDIS_PWD,
REDIS_DB:process.env.JIAXIYA_REDIS_DB,
DB_NAME:process.env.JIAXIYA_DB_NAME,
APP_ENV:process.env.APP_ENV?process.env.APP_ENV:"dev"
};
var settings = { var settings = {
env:"dev", env:ENVINPUT.APP_ENV,
appKey:"d47f72a7228243a3bad03541d2a2c22c", appKey:"d47f72a7228243a3bad03541d2a2c22c",
paasKey:"wx76a324c5d201d1a4", paasKey:"wx76a324c5d201d1a4",
secret:"047c51d2f0974802a17dde560d2871cb", secret:"047c51d2f0974802a17dde560d2871cb",
...@@ -17,14 +29,6 @@ var settings = { ...@@ -17,14 +29,6 @@ var settings = {
return "https://open.gongsibao.com/"; return "https://open.gongsibao.com/";
} }
}, },
channelApiUrl: function () {
if (this.env == "dev") {
return "http://192.168.18.61:4003";
} else {
return "http://zc-channel-service";
}
},
reqEsAddr:function(){ reqEsAddr:function(){
if(this.env=="dev"){ if(this.env=="dev"){
var localsettings=require("./localsettings"); var localsettings=require("./localsettings");
...@@ -47,10 +51,10 @@ var settings = { ...@@ -47,10 +51,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,
}; };
} }
}, },
...@@ -60,11 +64,11 @@ var settings = { ...@@ -60,11 +64,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: {
...@@ -81,6 +85,7 @@ var settings = { ...@@ -81,6 +85,7 @@ var settings = {
}, },
}; };
} }
}, }
}; };
settings.ENVINPUT=ENVINPUT;
module.exports = settings; module.exports = settings;
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