d

igirl-web/app/config/settings.js

 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,
+
+  DB_NAME:process.env.IGIRl_DB_NAME,
+  REDIS_DB:process.env.IGIRL_REDIS_DB,
+
+  APP_ENV:process.env.APP_ENV?process.env.APP_ENV:"dev"
+};
 var settings = {
 var settings = {
-  env: "dev",
+  env: ENVINPUT.APP_ENV,
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
   wxconfig: {
   wxconfig: {
     appId: "wx76a324c5d201d1a4",
     appId: "wx76a324c5d201d1a4",
@@ -231,8 +245,13 @@ var settings = {
       var localsettings = require("./localsettings");
       var localsettings = require("./localsettings");
       return localsettings.redis;
       return localsettings.redis;
     } else {
     } else {
-      var localsettings = require("./localsettings");
-      return localsettings.redis;;
+      return {
+        host:ENVINPUT.REDIS_HOST,
+        port:ENVINPUT.REDIS_PORT,
+        password:ENVINPUT.REDIS_PWD,
+        db:ENVINPUT.REDIS_DB,
+      };
+
     }
     }
   },
   },
   database: function () {
   database: function () {
@@ -240,9 +259,30 @@ var settings = {
       var localsettings = require("./localsettings");
       var localsettings = require("./localsettings");
       return localsettings.database;
       return localsettings.database;
     } else {
     } else {
-      var localsettings = require("./localsettings");
-      return localsettings.database;
+      return {
+        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超时时间
+        },
+      };
+ 
     }
     }
   }
   }
 };
 };
+settings.ENVINPUT=ENVINPUT;
 module.exports = settings;
 module.exports = settings;