Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/config.js

@@ -1,7 +1,28 @@
 module.exports = {
     current: {server: "192.168.1.184", port: "60666",redis:{server:'192.168.1.184',port:'6379',pwd:'smartCost'}},
     local: {server: "localhost", port: "27017"},
-    qa: {server: "192.168.1.184", port: "60666"},
+    qa: {server: "192.168.1.184", port: "60666", options:{
+        user:'smartcost',
+        pass:'smartcost3850888',
+        auth: {
+            "authdb": "admin"
+        },
+        connectTimeoutMS: 20000,
+        useMongoClient: true
+    }},
+    test_auth: {
+            server: "120.78.150.216",
+            port: "27017",
+            options:{
+                user:'smartcost',
+                pass:'smartcost3850888',
+                auth: {
+                    "authdb": "scConstruct"
+                },
+                connectTimeoutMS: 20000,
+                useMongoClient: true
+            }
+    },
     pp:{server: "172.18.111.228", port: "27017"},
     prod: {server: "", port: ""},
     redis_local:{server:'127.0.0.1',port:'6379',pwd:'smartCost'},
@@ -12,17 +33,12 @@ module.exports = {
         me.current.port = me[env].port;
         me.current.redis=me["redis_"+env];
     },
-    options:{
-            "user": "",
-            "pass": "",
-            "auth": {
-                "authdb": ""
-            },
-            "server": {
-                 "socketOptions": {
-                 "connectTimeoutMS": 20000
-                }
-            }/*,
-           'useMongoClient': true*/ //报 DeprecationWarning: `open()` is deprecated in mongoose这个错时可以用这句配置
+    getSessionURL:function (env="local") {
+        let me = this;
+        if(me[env].options){
+            return 'mongodb://'+ me[env].options.user +':'+ me[env].options.pass+'@'+ me[env].server+ ':'+ me[env].port + '/usersManages?authSource=admin';
+        }else {
+            return  'mongodb://' + me[env].server + ':' + me[env].port + '/usersManages';
         }
+    }
 }

config/db/db_manager.js

@@ -46,10 +46,14 @@ module.exports = {
         return mg;
         //*/
     },
-    connect:function () {
+    connect:function (env="local") {
         var config = require("../config.js");
         var dbURL = 'mongodb://' + config.current.server + ":" + config.current.port + '/scConstruct';
-        mg.connect(dbURL, config.options);
+        if(config[env].options){
+            mg.connect(dbURL,config[env].options);
+        }else {
+            mg.connect(dbURL,{connectTimeoutMS: 20000,useMongoClient: true});//useMongoClient': true*! //报 DeprecationWarning: `open()` is deprecated in mongoose这个错
+        }
         var db = mg.connection;
         db.on("error",function (err) {
             console.log('Could not connect to MongoDB!');

modules/main/models/GLJ_route.js

@@ -1,17 +0,0 @@
-/*
-/!**
- * Created by jimiz on 2017/4/17.
- *!/
-let express = require('express');
-
-module.exports = function (app) {
-    let GLJRouter = express.Router();
-    let GLJController = require('../controllers/GLJ_controller');
-
-    GLJRouter.post('/getData', GLJController.getData);
-    GLJRouter.post('/getItemTemplate', GLJController.getItemTemplate);
-    GLJRouter.post('/allocIDs', GLJController.allocIDs);
-
-    app.use('/glj_bak', GLJRouter);
-};
-*/

package.json

@@ -8,7 +8,7 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "express": "^4.13.1",
-    "mongoose": "~4.10.7",
+    "mongoose": "~4.13.12",
     "async": "^2.1.5",
     "connect-mongo": "^1.3.2",
     "cookie-parser": "~1.4.3",

server.js

@@ -15,7 +15,7 @@ let fs = require('fs');
 let URL = require('url');
 
 
-dbm.connect();
+dbm.connect(process.env.NODE_ENV);
 //这里现在只引入了定额工料机里的models,当其它模块的models修改后使用：./modules/**/models/*.js引入所有的模块
 fileUtils.getGlobbedFiles('./modules/all_models/*.js').forEach(function(modelPath) {
     require(path.resolve(modelPath));
@@ -47,7 +47,7 @@ app.use(session({
     saveUninitialized: true
     //*
     ,store: new DBStore({
-        url: 'mongodb://' + config.current.server + ':' + config.current.port + '/usersManages'
+        url: config.getSessionURL(process.env.NODE_ENV)
     })
     //*/
 }));

web/building_saas/main/js/views/project_view.js

@@ -979,6 +979,9 @@ var projectObj = {
             FX: 'FX', BX: 'BX', UNCBBILL: 'UNCBBILL', CBBILL: 'CBBILL', ZCSB: 'ZCSB'};
         let styleMap = null;
         //中文字段名，由于同一节点中，中文字体大小和数字字体大小不同
+        if(colorSetting == null){
+            return null;
+        }
         let stringFields = [
             'code',
             'subType',