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

Conflicts:
	modules/ration_glj/facade/glj_calculate_facade.js

config/db/db_manager.js

@@ -48,7 +48,7 @@ module.exports = {
     },
     connect:function (env="local") {
         var config = require("../config.js");
-        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/scConstruct';
+        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/yanghu';
         if(config[env].dbURL){
             mg.connect(config[env].dbURL,{connectTimeoutMS: 20000,useMongoClient: true});
         } else if(config[env].options){

logs/log4js.json

@@ -1,5 +1,5 @@
 {
-  "customBaseDir" :"../logs/ConstructionCost/",
+  "customBaseDir" :"../logs/YanghuCost/",
   "customDefaultAtt" :{
     "type": "dateFile",
     "alwaysIncludePattern": false,

modules/main/db/project_db.js

@@ -3,6 +3,6 @@
  */
 var mongoose = require("mongoose");
 var dbm = require("../../../config/db/db_manager");
-var db = dbm.getCfgConnection("scConstruct");
+var db = dbm.getCfgConnection("yanghu");
 
 module.exports = db;

modules/pm/db/pm_db.js

@@ -2,6 +2,6 @@
  * Created by Mai on 2017/3/8.
  */
 var mg = require('mongoose');
-mg.connect('mongodb://localhost/usersManages');
-//mg.connect('mongodb://192.168.1.184:60666/usersManages');
+mg.connect('mongodb://localhost/yanghuUsers');
+//mg.connect('mongodb://192.168.1.184:60666/yanghuUsers');
 exports.mongoose = mg;

public/web/socket/connection.js

@@ -8,7 +8,7 @@ socketObject={
       // 连接socket服务器
       var hostName = window.location.hostname;
       let me = this;
-      let port = window.location.protocol ==='http:'?3300:3301;
+      let port = window.location.protocol ==='http:'?5500:5501;
       socket = io(window.location.protocol+'//'+hostName+':'+port);
       socket.on('connect', function () {
           if(from == 'pm'){

server.js

@@ -39,7 +39,7 @@ app.use(bodyParser.urlencoded({limit: '10mb', extended: false}));
 app.use(bodyParser.json({limit: '10mb'}));
 
 app.use(session({
-    name: 'usersSession',
+    name: 'yanghuSession',
     secret: 'session users secret',
     // @todo 上线前修改回正常值 （目前为24小时）
     cookie: {maxAge: 3600 * 24 * 1000},
@@ -107,7 +107,7 @@ app.use(function(err, req, res, next) {
 //备注： 经过测试nodejs 8.9.3版本不支持eval的方式修改prototype，为兼容考虑，把方法调整到stringUtil文件里
 require('./public/stringUtil').setupDateFormat();
 
-app.listen(6060, function(){
+app.listen(2060, function(){
     console.log('server started!');
 });
 

socket.js

@@ -7,7 +7,7 @@
  */
 import socket from "socket.io";
 
-const socketIO = socket(3300);
+const socketIO = socket(5500);
 
 // socket.io相关操作
 socketIO.on('connection', function(socket) {