Commit 4148c086 by 王悦

fix

parent 9b4ec697
...@@ -35,7 +35,12 @@ class UploadinfoCtl extends trademarkCtl { ...@@ -35,7 +35,12 @@ class UploadinfoCtl extends trademarkCtl {
return d.trademark_id return d.trademark_id
} }
}); });
let rtn = await this.execClient.execPost(query, tmurl); let rtn = {}
try {
rtn = await this.execClient.execPost(query, tmurl);
} catch (e) {
return system.getResultFail(-2,e)
}
let data = JSON.parse(rtn.stdout); let data = JSON.parse(rtn.stdout);
return system.getResultList(data.totalCount, data.data || []) return system.getResultList(data.totalCount, data.data || [])
} }
......
...@@ -26,6 +26,12 @@ environment(app);//初始化环境 ...@@ -26,6 +26,12 @@ environment(app);//初始化环境
// console.log('Express server listening on port ' + app.get('port')); // console.log('Express server listening on port ' + app.get('port'));
// }); // });
// } // }
let log4js = require('log4js');
let logger = log4js.getLogger();
logger.level = "all";
console.log=logger.info.bind(logger);
console.error=logger.error.bind(logger);
var server = http.createServer(app); var server = http.createServer(app);
//var socketServer = new SocketServer(server); //var socketServer = new SocketServer(server);
server.listen(setttings.port, function(){ server.listen(setttings.port, function(){
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"glob": "^7.1.6", "glob": "^7.1.6",
"gm": "^1.23.1", "gm": "^1.23.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"log4js": "^2.10.0", "log4js": "^2.11.0",
"marked": "^1.1.1", "marked": "^1.1.1",
"method-override": "^2.3.10", "method-override": "^2.3.10",
"moment": "^2.26.0", "moment": "^2.26.0",
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
"mysql2": "^1.5.3", "mysql2": "^1.5.3",
"node-cron": "^2.0.1", "node-cron": "^2.0.1",
"node-uuid": "^1.4.8", "node-uuid": "^1.4.8",
"node-xlsx": "^0.15.0",
"pdfcrowd": "^4.2.0", "pdfcrowd": "^4.2.0",
"pinyin": "^2.8.3", "pinyin": "^2.8.3",
"qr-image": "^3.2.0", "qr-image": "^3.2.0",
...@@ -55,8 +56,7 @@ ...@@ -55,8 +56,7 @@
"sha256": "^0.2.0", "sha256": "^0.2.0",
"socket.io": "^2.1.1", "socket.io": "^2.1.1",
"uuid": "^3.2.1", "uuid": "^3.2.1",
"xml2js": "^0.4.19", "xml2js": "^0.4.19"
"node-xlsx": "^0.15.0"
}, },
"devDependencies": { "devDependencies": {
"del": "^5.1.0", "del": "^5.1.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment