Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/config/settings.js

@@ -19,6 +19,7 @@ var settings = {
   port: process.env.NODE_PORT || 8888,
   port: process.env.NODE_PORT || 8888,
   kongurl: function () {
   kongurl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
+      var localsettings = require("./localsettings");
       return localsettings.kongurl;
       return localsettings.kongurl;
     } else {
     } else {
       return ENVINPUT.KONG_ADMIAN;
       return ENVINPUT.KONG_ADMIAN;
@@ -72,6 +73,7 @@ var settings = {
         password: ENVINPUT.DB_PWD,
         password: ENVINPUT.DB_PWD,
         config: {
         config: {
           host: ENVINPUT.DB_HOST,
           host: ENVINPUT.DB_HOST,
+          port: ENVINPUT.DB_PORT,
           dialect: 'mysql',
           dialect: 'mysql',
           operatorsAliases: false,
           operatorsAliases: false,
           pool: {
           pool: {