浏览代码

sync db to QA env

TonyKang 8 年之前
父节点
当前提交
f48da479ce
共有 6 个文件被更改,包括 14 次插入12 次删除
  1. 7 8
      config/db/db_manager.js
  2. 1 0
      modules/pm/db/pm_db.js
  3. 1 1
      modules/pm/models/project.js
  4. 1 0
      modules/users/models/umDB.js
  5. 1 1
      modules/users/models/users_data.js
  6. 3 2
      server.js

+ 7 - 8
config/db/db_manager.js

@@ -6,11 +6,8 @@ var mg = require('mongoose');
 module.exports = {
     getConnection : function(server, port, dbName) {
         //*/
-        if (port) {
-            return mg.createConnection(server + ":" + port,dbName);
-        } else {
-            return mg.createConnection(server,dbName);
-        }
+        var dbURL = 'mongodb://' + server + ":" + port + '/' + dbName;
+        return mg.createConnection(dbURL);
         /*/
         if (port) {
             mg.connect('mongodb://' + server + ":" + port + '/' + dbName);
@@ -22,7 +19,7 @@ module.exports = {
     },
     getQAConnection: function(dbName) {
         //*/
-        return mg.createConnection("192.168.1.184:60666",dbName);
+        return mg.createConnection("mongodb://192.168.1.184:60666/" + dbName);
         /*/
         mg.connect('mongodb://192.168.1.184:60666/' + dbName);
         return mg;
@@ -30,7 +27,7 @@ module.exports = {
     },
     getLocalConnection: function(dbName) {
         //*/
-        return mg.createConnection("localhost:27017",dbName);
+        return mg.createConnection("mongodb://localhost/" + dbName);
         /*/
         mg.connect('mongodb://localhost:27017/' + dbName);
         return mg;
@@ -39,7 +36,9 @@ module.exports = {
     getCfgConnection: function(dbName) {
         var config = require("../config.js");
         //*/
-        return mg.createConnection(config.current.server + ":" + config.current.port, dbName);
+        var port = config.current.port;
+        var dbURL = 'mongodb://' + config.current.server + ":" + config.current.port + '/' + dbName;
+        return mg.createConnection(dbURL);
         /*/
         mg.connect('mongodb://' + config.current.server + ":" + config.current.port + '/' + dbName);
         return mg;

+ 1 - 0
modules/pm/db/pm_db.js

@@ -3,4 +3,5 @@
  */
 var mg = require('mongoose');
 mg.connect('mongodb://localhost/usersManages');
+//mg.connect('mongodb://192.168.1.184:60666/usersManages');
 exports.mongoose = mg;

+ 1 - 1
modules/pm/models/project.js

@@ -2,7 +2,7 @@
  * Created by Mai on 2017/1/18.
  */
 
-/*/
+//*/
 var mongoose = require("mongoose");
 
 var dbm = require("../../../config/db/db_manager");

+ 1 - 0
modules/users/models/umDB.js

@@ -1,5 +1,6 @@
 var mg = require('mongoose');
 mg.connect('mongodb://localhost/usersManages');
+//mg.connect('mongodb://192.168.1.184:60666/usersManages');
 
 mg.connection.on('connected', function(){console.log('Mongoose connected to usersManages.')});
 mg.connection.on('disconnected', function(){console.log('Mongoose disconnected.')});

+ 1 - 1
modules/users/models/users_data.js

@@ -1,4 +1,4 @@
-/*/
+//*/
 var mongoose = require("mongoose");
 
 var dbm = require("../../../config/db/db_manager");

+ 3 - 2
server.js

@@ -1,11 +1,12 @@
 var express = require('express');
 
 var config = require("./config/config.js");
-config.setToLocalDb();
+//config.setToLocalDb();
+config.setToQaDb();
 // chenshilong add this, 2017.03.07 --------------------------------begin
 var path = require('path');
 var session = require('express-session');
-var DBStore = require('connect-mongo')(session);
+//var DBStore = require('connect-mongo')(session);
 // -----------------------------------------------------------------end
 
 var app = express();