Bladeren bron

add all models

zhangweicheng 7 jaren geleden
bovenliggende
commit
c1491919ea
6 gewijzigde bestanden met toevoegingen van 39 en 8 verwijderingen
  1. 22 2
      config/config.js
  2. 7 3
      config/db/db_manager.js
  3. 3 0
      modules/all_models/a.js
  4. 3 0
      modules/all_schemas/b.js
  5. 3 3
      operation.js
  6. 1 0
      web/users/js/main_tree_col.js

+ 22 - 2
config/config.js

@@ -1,7 +1,19 @@
 module.exports = {
     current: {server: "192.168.1.184", port: "60666"},
     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
+        }
+    },
     pp:{server: "172.18.111.228", port: "27017"},
     prod: {server: "", port: ""},
     setupDb:function (env="local") {
@@ -9,5 +21,13 @@ module.exports = {
         me.current.server = me[env].server;
         me.current.port = me[env].port;
     },
+    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 + '/usersManagesOpr?authSource=admin';
+        }else {
+            return  'mongodb://' + me[env].server + ':' + me[env].port + '/usersManagesOpr';//'mongodb://' + config.current.server + ':' + config.current.port + '/usersManagesOpr'
+        }
+    },
     pageSize: 30
-}
+};

+ 7 - 3
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);
+        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/scConstruct';
+        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!');

+ 3 - 0
modules/all_models/a.js

@@ -0,0 +1,3 @@
+/**
+ * Created by zhang on 2018/3/23.
+ */

+ 3 - 0
modules/all_schemas/b.js

@@ -0,0 +1,3 @@
+/**
+ * Created by zhang on 2018/3/23.
+ */

+ 3 - 3
operation.js

@@ -18,10 +18,10 @@ let app = express();
 let _rootDir = __dirname;
 app.locals.rootDir = _rootDir;
 
-dbm.connect();
+dbm.connect(process.env.NODE_ENV);
 
 //引入报表模块
-fileUtils.getGlobbedFiles('./modules/reports/models/*.js').forEach(function(modelPath) {
+fileUtils.getGlobbedFiles('./modules/all_models/*.js').forEach(function(modelPath) {
     require(path.resolve(modelPath));
 });
 
@@ -55,7 +55,7 @@ app.use(session({
     saveUninitialized: true
     //*
     ,store: new DBStore({
-        url: 'mongodb://' + config.current.server + ':' + config.current.port + '/usersManagesOpr'
+        url: config.getSessionURL(process.env.NODE_ENV)
     })
     //*/
 }));

+ 1 - 0
web/users/js/main_tree_col.js

@@ -33,6 +33,7 @@ let MainTreeCol = {
 
         },
         marketPrice: function (node) {
+
         }
 
     },