tj

igirl-channel/app/config/localsettings.js

@@ -3,7 +3,7 @@ var settings={
     host: "43.247.184.32",
     host: "43.247.184.32",
     port: 8967,
     port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
-    db:10,
+    db:8,
   },
   },
   database:{
   database:{
     dbname : "igirl_channel",
     dbname : "igirl_channel",

igirl-channel/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,
+  DB_NAME:process.env.ZC_CHANNEL_DB_NAME,
+  REDIS_HOST:process.env.REDIS_HOST,
+  REDIS_PORT:process.env.REDIS_PORT,
+  REDIS_PWD:process.env.REDIS_PWD,
+  REDIS_DB:process.env.ZC_CHANNEL_REDIS_DB,
+  APP_ENV:process.env.APP_ENV?process.env.APP_ENV:"dev"
+};
 var settings = {
 var settings = {
-  env: "dev",
+  env:ENVINPUT.APP_ENV,
   appKey: "40d64e586551405c9bcafab87266bc04",
   appKey: "40d64e586551405c9bcafab87266bc04",
   secret: "f99d413b767f09b5dff0b3610366cc46",
   secret: "f99d413b767f09b5dff0b3610366cc46",
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
@@ -244,10 +256,10 @@ var settings = {
       return localsettings.redis;
       return localsettings.redis;
     } else {
     } else {
       return {
       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,
       };
       };
     }
     }
   },
   },
@@ -257,11 +269,11 @@ var settings = {
       return localsettings.database;
       return localsettings.database;
     } else {
     } else {
       return {
       return {
-        dbname: "xxxxx",
-        user: "xxxx",
-        password: "xxxxx",
-        config: {
-          host: 'xxxxxx',
+        dbname : ENVINPUT.DB_NAME,
+        user     : ENVINPUT.DB_USER,
+        password : ENVINPUT.DB_PWD,
+        config   : {
+            host: ENVINPUT.DB_HOST,
             dialect: 'mysql',
             dialect: 'mysql',
             operatorsAliases: false,
             operatorsAliases: false,
             pool: {
             pool: {
@@ -270,8 +282,8 @@ var settings = {
               acquire: 90000000,
               acquire: 90000000,
               idle: 1000000
               idle: 1000000
             },
             },
-          debug: false,
-          dialectOptions: {
+            debug:false,
+            dialectOptions:{
                 requestTimeout: 999999,
                 requestTimeout: 999999,
                 // instanceName:'DEV'
                 // instanceName:'DEV'
             }  //设置MSSQL超时时间
             }  //设置MSSQL超时时间