Merge branch 'master' of http://git.sourcecode.co.th/nattaponw/spw

Nattapon Wongpaet
2 parents e2039477 dd1da2d3
Showing 5 changed files with 40 additions and 18 deletions Show diff stats
ais-structure/src/config/express.js
ais-structure/src/modules/customer/customer.ctrl.js
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/vizcard/vizCard.ctrl.js
ais-structure/src/modules/vizcard/vizCard.route.js
@@ -18,6 +18,7 @@ var passport = require(&#39;passport&#39;);
 var memCache = require('memory-cache');
 var jwtDecode = require('jwt-decode');
 var uuid = require('uuid');
+var log = require('../modules/helper/log.js');
  
 var expireTimeDef = 30 * 60 * 1000; //minutes * seconds * 1000 ==> ms
 memCache.put('expires-ms-def', expireTimeDef);
@@ -266,6 +267,13 @@ module.exports = function () {
   //   // Future Action.
   // });
   /* ------------- [END NOT MATCH ROUTE - 404 ] ------------ */
+
+  app.use( function( req, res, next ) {
+    // console.log("end");
+    // console.log(req.res.resBody);
+    log.logSummary(req.res.resBody);
+} );
+
   return app;
 };
 /* ------------- [END IMPLEMENT] ------------ */
 \ No newline at end of file
@@ -42,9 +42,10 @@ exports.customer = async function (req, res, next) {
         var response = responseMsg.error(req,getCmd,50000);
  
     log.logDetail.addOutput("Client",getCmd,"Response",response,response); 
-    log.logDetail.write();
-    // log.logSummary();
+    // log.logDetail.write();
+    log.logSummary();
     res.status(200).json(response);
+    next();
 };
  
  
@@ -11,9 +11,10 @@ var connection = [];
 connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
  
     var params = {
-        url               : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
-        body              : messageSOAP.objectToSOAP(soap,cmd),
-        method            : myMethod
+        url                 : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
+        body                : messageSOAP.objectToSOAP(soap,cmd),
+        method              : myMethod,
+        timeout             : cfg.service.SACF[myMethod+"_"+cmd+"_Timeout"]
     }
  
     log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap); 
@@ -26,9 +27,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
     var service = cfg.service.D01;
     // JSON.stringify(json)
     var params = {
-        url               : service[myMethod+"_"+cmd+"_URL"],
-        body              : obj,
-        method            : myMethod
+        url                 : service[myMethod+"_"+cmd+"_URL"],
+        body                : obj,
+        method              : myMethod,
+        timeout             : service[myMethod+"_"+cmd+"_Timeout"]
     }
  
     var result = {};
@@ -114,17 +116,25 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
  
     }
  
-    if(!result.response.resultCode)
-        result.err = "Miss resultCode";
-
-    if(!result.response.resultDescription)
-        result.err = "Miss resultDescription";
+    // console.log(result);
+    
+    if(result.response)
+    {
+        if(!result.response.resultCode)
+            result.err = "Miss resultCode";
  
-    // console.log(result); 
-    // delete result.body;
+        if(!result.response.resultDescription)
+            result.err = "Miss resultDescription";
+    }
  
     if(result.err)
-        stats.reciveResponse(service.Name,cmd,"Error");
+    {
+        result.response = {};
+        result.response.resultCode = "50000";
+
+        // stats.reciveResponse(service.Name,cmd,"Error");
+    }
+        
  
     return result;
  
@@ -158,11 +168,12 @@ function asyncRequest (params = {},cmd,node) {
     return new Promise((resolve, reject) => {
         request(params, function (error, response, body) {
  
-            stats.sendRequest(node,cmd);
+           
  
             if (error) {
  
-                stats.reciveResponse(node,cmd,"Error");
+                // console.log("End : "+new Date().toISOString());
+                console.log(error.code);
                 resolve({
                     'body'  : body,
                     'err'   : error
@@ -66,6 +66,7 @@ exports.vizcard = async function (req, res, next) {
         log.logDetail.write();
         log.logSummary(response);
         res.status(200).json(response);
+        next();
     }
 };
  
 module.exports = function (app) {
     var vizcardCtrl = app.modules.vizcard.vizCardCtrl;
     var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl;
+    var log = require('../helper/log.js');
...	...	@@ -18,6 +18,7 @@ var passport = require('passport');
18	18	var memCache = require('memory-cache');
19	19	var jwtDecode = require('jwt-decode');
20	20	var uuid = require('uuid');
	21	+var log = require('../modules/helper/log.js');
21	22
22	23	var expireTimeDef = 30 * 60 * 1000; //minutes * seconds * 1000 ==> ms
23	24	memCache.put('expires-ms-def', expireTimeDef);
...	...	@@ -266,6 +267,13 @@ module.exports = function () {
266	267	// // Future Action.
267	268	// });
268	269	/* ------------- [END NOT MATCH ROUTE - 404 ] ------------ */
	270	+
	271	+ app.use( function( req, res, next ) {
	272	+ // console.log("end");
	273	+ // console.log(req.res.resBody);
	274	+ log.logSummary(req.res.resBody);
	275	+} );
	276	+
269	277	return app;
270	278	};
271	279	/* ------------- [END IMPLEMENT] ------------ */
272	280	\ No newline at end of file
...	...
...	...	@@ -42,9 +42,10 @@ exports.customer = async function (req, res, next) {
42	42	var response = responseMsg.error(req,getCmd,50000);
43	43
44	44	log.logDetail.addOutput("Client",getCmd,"Response",response,response);
45		- log.logDetail.write();
46		- // log.logSummary();
	45	+ // log.logDetail.write();
	46	+ log.logSummary();
47	47	res.status(200).json(response);
	48	+ next();
48	49	};
49	50
50	51
...	...
...	...	@@ -11,9 +11,10 @@ var connection = [];
11	11	connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
12	12
13	13	var params = {
14		- url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
15		- body : messageSOAP.objectToSOAP(soap,cmd),
16		- method : myMethod
	14	+ url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
	15	+ body : messageSOAP.objectToSOAP(soap,cmd),
	16	+ method : myMethod,
	17	+ timeout : cfg.service.SACF[myMethod+"_"+cmd+"_Timeout"]
17	18	}
18	19
19	20	log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap);
...	...	@@ -26,9 +27,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
26	27	var service = cfg.service.D01;
27	28	// JSON.stringify(json)
28	29	var params = {
29		- url : service[myMethod+"_"+cmd+"_URL"],
30		- body : obj,
31		- method : myMethod
	30	+ url : service[myMethod+"_"+cmd+"_URL"],
	31	+ body : obj,
	32	+ method : myMethod,
	33	+ timeout : service[myMethod+"_"+cmd+"_Timeout"]
32	34	}
33	35
34	36	var result = {};
...	...	@@ -114,17 +116,25 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
114	116
115	117	}
116	118
117		- if(!result.response.resultCode)
118		- result.err = "Miss resultCode";
119		-
120		- if(!result.response.resultDescription)
121		- result.err = "Miss resultDescription";
	119	+ // console.log(result);
	120	+
	121	+ if(result.response)
	122	+ {
	123	+ if(!result.response.resultCode)
	124	+ result.err = "Miss resultCode";
122	125
123		- // console.log(result);
124		- // delete result.body;
	126	+ if(!result.response.resultDescription)
	127	+ result.err = "Miss resultDescription";
	128	+ }
125	129
126	130	if(result.err)
127		- stats.reciveResponse(service.Name,cmd,"Error");
	131	+ {
	132	+ result.response = {};
	133	+ result.response.resultCode = "50000";
	134	+
	135	+ // stats.reciveResponse(service.Name,cmd,"Error");
	136	+ }
	137	+
128	138
129	139	return result;
130	140
...	...	@@ -158,11 +168,12 @@ function asyncRequest (params = {},cmd,node) {
158	168	return new Promise((resolve, reject) => {
159	169	request(params, function (error, response, body) {
160	170
161		- stats.sendRequest(node,cmd);
	171	+
162	172
163	173	if (error) {
164	174
165		- stats.reciveResponse(node,cmd,"Error");
	175	+ // console.log("End : "+new Date().toISOString());
	176	+ console.log(error.code);
166	177	resolve({
167	178	'body' : body,
168	179	'err' : error
...	...
...	...	@@ -66,6 +66,7 @@ exports.vizcard = async function (req, res, next) {
66	66	log.logDetail.write();
67	67	log.logSummary(response);
68	68	res.status(200).json(response);
	69	+ next();
69	70	}
70	71	};
71	72
...	...
1	1	module.exports = function (app) {
2	2	var vizcardCtrl = app.modules.vizcard.vizCardCtrl;
3	3	var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl;
	4	+ var log = require('../helper/log.js');
4	5
5	6
6	7
...	...