Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/users/models/sms.js

@@ -36,7 +36,7 @@ class SMS {
         try {
             const formData = {
                 smsUser: this.smsUser,
-                templateId: 25595,
+                templateId: 14898,
                 msgType: 0,
                 phone: mobile,
                 vars: '{"%code%":'+ code +'}',

pm2_import.json

@@ -1,12 +1,13 @@
 {
   "apps": {
-      "name": "constructionimport",
-      "script": "importserver.js",
-      "output": "/home/logs/out.log",
-      "error": "/home/logs/err.log",
-      "log_date_format": "YYYY-MM-DD HH:mm Z",
-      "exec_mode": "cluster_mode",                
-      "instances": 3, 
-      "merge_logs": true
-    }
+    "name": "constructionimport",
+    "script": "importserver.js",
+    "output": "/home/logs/out.log",
+    "error": "/home/logs/err.log",
+    "log_date_format": "YYYY-MM-DD HH:mm Z",
+    "exec_mode": "cluster_mode",
+    "node_args": "--max-old-space-size=4096",
+    "instances": 3,
+    "merge_logs": true
+  }
 }

pm2_server.json

@@ -1,9 +1,9 @@
 {
   "apps": {
-      "name": "constructionimport",
-      "script": "server.js",
-      "node_args":"--max-old-space-size=2048",
-      "exec_mode": "cluster_mode",                
-      "instances": 3
-    }
+    "name": "constructionimport",
+    "script": "server.js",
+    "node_args": "--max-old-space-size=4096",
+    "exec_mode": "cluster_mode",
+    "instances": 3
+  }
 }

web/building_saas/main/js/models/project.js

@@ -273,7 +273,7 @@ var PROJECT = {
                 })},
                 dataType: 'json',
                 cache: false,
-                timeout: 1000 * 60 * 5,
+                timeout: 1000 * 60 * 10,
                 success: function (result) {
                     if (!result.error) {
                         const isInit = true;