Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

Dockerfile

@@ -1,8 +1,8 @@
-FROM operationbase:latest
+FROM operationbase:2.0
 
 WORKDIR /ConstructionOperation
 
-RUN git pull http://192.168.1.12:3000/SmartCost/ConstructionOperation master
+COPY . /ConstructionOperation
 
 RUN mkdir tmp
 

Dockerfile_pp

@@ -1,9 +1,10 @@
-FROM operationbase:latest
+FROM operationbase:2.0
 
 WORKDIR /ConstructionOperation
 
-RUN git pull http://192.168.1.12:3000/SmartCost/ConstructionOperation master
+COPY . /ConstructionOperation
 
+RUN mkdir tmp
 
 RUN cnpm install
 

Dockerfile_qa

@@ -1,8 +1,10 @@
-FROM operationbase:latest
+FROM operationbase:2.0
 
 WORKDIR /ConstructionOperation
 
-RUN git pull http://192.168.1.12:3000/SmartCost/ConstructionOperation master
+COPY .  /ConstructionOperation
+
+RUN mkdir tmp
 
 RUN cnpm install
 

config/config.js

@@ -18,7 +18,7 @@ module.exports = {
     pp:{server: "172.18.111.228", port: "27017"},
     prod:{
         dbURL:"mongodb://smartcost:SmartCost3850888@dds-wz9da4d5ca0fdd341.mongodb.rds.aliyuncs.com:3717,dds-wz9da4d5ca0fdd342.mongodb.rds.aliyuncs.com:3717/scConstruct?authSource=admin;replicaSet=mgset-7518601",
-        LicenseKey:"civil.smartcost.com.cn,834986144349993#A0XNdYDO9QzM8IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPnNnMEVXS4RGejhFZkNVMZZHTvVTWBZlcsNTaiZFbKJ HSklmM8cENUJTTnJUN9NGZTVTdrU4LmVHeudDcwtySsNWW5s4UPdVZVRDe7ETNnNHduZnWwsmI0IyUiwSO4MTNwYDO5gTM0IicfJye35XX3JyMiZzZiojIDJCLiETMuYHIT pEIkFWZyB7UiojIOJyebpjIkJHUiwiIzUTNxkDMgQjM7ADOxAjMiojI4J7QiwiIuNmLt36YuQ7cvNGdyFWbz9CbpZXajJiOiMXbEJCLig1jlzahlDZmpnInmb1uk/avoDrlmvJilrKqmXrunfb tmD0jnLiOiEmTDJCLiMTO9kZNdQ"
+        LicenseKey:"civil.smartcost.com.cn,834986144349993#A0XNdYDO9QzM8IiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TPnNnMEVXS4RGejhFZkNVMZZHTvVTWBZlcsNTaiZFbKJHSklmM8cENUJTTnJUN9NGZTVTdrU4LmVHeudDcwtySsNWW5s4UPdVZVRDe7ETNnNHduZnWwsmI0IyUiwSO4MTNwYDO5gTM0IicfJye35XX3JyMiZzZiojIDJCLiETMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIzUTNxkDMgQjM7ADOxAjMiojI4J7QiwiIuNmLt36YuQ7cvNGdyFWbz9CbpZXajJiOiMXbEJCLig1jlzahlDZmpnInmb1uk/avoDrlmvJilrKqmXrunfbtmD0jnLiOiEmTDJCLiMTO9kZNdQ"
     },
     setupDb:function (env="local") {
         let me = this;
@@ -27,6 +27,9 @@ module.exports = {
     },
     getSessionURL:function (env="local") {
         let me = this;
+        if(me[env].dbURL){
+            return me[env].dbURL.replace('scConstruct','usersManagesOpr');
+        }
         if(me[env].options){
             return 'mongodb://'+ me[env].options.user +':'+ me[env].options.pass+'@'+ me[env].server+ ':'+ me[env].port + '/usersManagesOpr?authSource=admin';
         }else {

config/db/db_manager.js

@@ -49,7 +49,9 @@ module.exports = {
     connect:function (env="local") {
         var config = require("../config.js");
         var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/scConstruct';
-        if(config[env].options){
+        if(config[env].dbURL){
+            mg.connect(config[env].dbURL,{connectTimeoutMS: 20000,useMongoClient: true});
+        } else 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这个错