Merge branch 'bpo-web' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-web

bpo-web/app/config/localsettings.js

 var settings = {
 var settings = {
-  redis:{
+  redis: {
     host: "43.247.184.32",
     host: "43.247.184.32",
     port: 8967,
     port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
-    db:11,
+    db: 11,
   },
   },
   database: {
   database: {
-    dbname : "bpo2",
-      user     : "write",
-      password : "write",
-      config   : {
+    dbname: "bpo2",
+    user: "write",
+    password: "write",
+    config: {
       dialect: 'mysql',
       dialect: 'mysql',
       operatorsAliases: false,
       operatorsAliases: false,
       host: '43.247.184.35',
       host: '43.247.184.35',
@@ -24,8 +24,8 @@ var settings = {
         idle: 1000000
         idle: 1000000
       },
       },
       logging: true,
       logging: true,
-        debug:true,
-        dialectOptions:{
+      debug: true,
+      dialectOptions: {
         requestTimeout: 999999,
         requestTimeout: 999999,
         // instanceName:'DEV'
         // instanceName:'DEV'
       }  //设置MSSQL超时时间
       }  //设置MSSQL超时时间