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

config/config.js

@@ -0,0 +1,21 @@
+module.exports = {
+    current: {server: "192.168.1.184", port: "60666"},
+    local: {server: "localhost", port: "27017"},
+    qa: {server: "192.168.1.184", port: "60666"},
+    prod: {server: "", port: ""},
+    setToLocalDb: function() {
+        var me = this;
+        me.current.server = me.local.server;
+        me.current.port = me.local.port;
+    },
+    setToQaDb: function() {
+        var me = this;
+        me.current.server = me.qa.server;
+        me.current.port = me.qa.port;
+    },
+    setToProdDb: function() {
+        var me = this;
+        me.current.server = me.prod.server;
+        me.current.port = me.prod.port;
+    }
+}

config/db/db_manager.js

@@ -0,0 +1,48 @@
+/**
+ * Created by Tony on 2017/3/9.
+ */
+var mg = require('mongoose');
+//mg.connect('mongodb://localhost/Demo');
+module.exports = {
+    getConnection : function(server, port, dbName) {
+        //*/
+        if (port) {
+            return mg.createConnection(server + ":" + port,dbName);
+        } else {
+            return mg.createConnection(server,dbName);
+        }
+        /*/
+        if (port) {
+            mg.connect('mongodb://' + server + ":" + port + '/' + dbName);
+        } else {
+            mg.connect('mongodb://' + server + '/' + dbName);
+        }
+        return mg;
+        //*/
+    },
+    getQAConnection: function(dbName) {
+        //*/
+        return mg.createConnection("192.168.1.184:60666",dbName);
+        /*/
+        mg.connect('mongodb://192.168.1.184:60666/' + dbName);
+        return mg;
+        //*/
+    },
+    getLocalConnection: function(dbName) {
+        //*/
+        return mg.createConnection("localhost:27017",dbName);
+        /*/
+        mg.connect('mongodb://localhost:27017/' + dbName);
+        return mg;
+        //*/
+    },
+    getCfgConnection: function(dbName) {
+        var config = require("../config.js");
+        //*/
+        return mg.createConnection(config.current.server + ":" + config.current.port, dbName);
+        /*/
+        mg.connect('mongodb://' + config.current.server + ":" + config.current.port + '/' + dbName);
+        return mg;
+        //*/
+    }
+};

modules/pm/models/project.js

@@ -2,8 +2,12 @@
  * Created by Mai on 2017/1/18.
  */
 
-var db = require('../db/pm_db');
-var Schema = db.mongoose.Schema;
+/*/
+var mongoose = require("mongoose");
+
+var dbm = require("../../../config/db/db_manager");
+var db = dbm.getCfgConnection("usersManages");
+var Schema = mongoose.Schema;
 var ProjectSchema = new Schema({
     "name": String,
     "projType": String,
@@ -17,8 +21,27 @@ var ProjectSchema = new Schema({
     'deleteDateTime': Date,
     'deleteFullFolder': Array
 });
+var Projects = db.model("projects", ProjectSchema);
+
+/*/
+var db = require('../db/pm_db');
+var Schema = db.mongoose.Schema;
+ var ProjectSchema = new Schema({
+ "name": String,
+ "projType": String,
+ "lastDateTime": String,
+ "createDateTime": String,
+ "id": Number,
+ "parentId": Number,
+ "nextId": Number,
+ "userId": Number,
+ "deleted": Boolean,
+ 'deleteDateTime': String,
+ 'deleteFullFolder': Array
+ });
 
-var Projects = db.mongoose.model("projects", ProjectSchema);
+ var Projects = db.mongoose.model("projects", ProjectSchema);
+//*/
 
 var ProjectsDAO = function(){};
 

modules/users/models/users_data.js

@@ -1,7 +1,15 @@
-var umDB = require('./umDB');
+/*/
+var mongoose = require("mongoose");
 
+var dbm = require("../../../config/db/db_manager");
+var umDB = dbm.getCfgConnection("usersManages");
+var usersSchema = new mongoose.Schema({ account: String, pw: String, name: String });
+var usersModel = umDB.model('users', usersSchema);
+/*/
+var umDB = require('./umDB');
 var usersSchema = new umDB.mongoose.Schema({ account: String, pw: String, name: String });
 var usersModel = umDB.mongoose.model('users', usersSchema);
+//*/
 
 var usersData = function(){};
 

server.js

@@ -1,5 +1,7 @@
 var express = require('express');
 
+var config = require("./config/config.js");
+config.setToLocalDb();
 // chenshilong add this, 2017.03.07 --------------------------------begin
 var path = require('path');
 var session = require('express-session');
@@ -26,10 +28,13 @@ app.use(session({
     secret: 'session users secret',
     cookie: {maxAge: 1000*60*30},
     resave: false,
-    saveUninitialized: true,
-    store: new DBStore({
-        url: 'mongodb://localhost:27017/usersManages'
+    saveUninitialized: true
+    /*
+    ,store: new DBStore({
+        //url: 'mongodb://localhost:27017/usersManages'
+        url: 'mongodb://' + config.current.server + ':' + config.current.port + '/usersManages'
     })
+    //*/
 }));
 
 var users = require('./modules/users/routes/users_route');

test/testRouter.js

@@ -0,0 +1,33 @@
+/**
+ * Created by Tony on 2017/3/7.
+ */
+var express = require('express');
+var app = express();
+
+var _rootDir = __dirname;
+
+app.use(express.static(_rootDir));
+
+var bodyParser = require('body-parser');
+app.use(bodyParser.urlencoded({extended: false}));
+app.use(bodyParser.json());
+
+//注册路由
+app.get('/', function(req, res){
+    //res.sendFile(_rootDir+'/web/.../project-management.html');
+});
+
+
+var apiRouter = express.Router();
+
+app.use('/api', apiRouter);
+
+app.use(function(req, res, next) {
+    res.status(404).sendFile(_rootDir+'/src/404.html');
+});
+app.use(function(err, req, res, next) {
+    console.error(err.stack);
+    res.status(500).send('500 Error');
+});
+
+app.listen(6060);