tj

brg-queue-center/app/base/api/api.base.js

@@ -24,17 +24,17 @@ class APIBase {
                 pobj.actionBody.resultInfo = result;
                 pobj.actionBody.resultInfo = result;
                 pobj.actionBody.requestId = result.requestId;
                 pobj.actionBody.requestId = result.requestId;
                 pobj.actionBody.opTitle = "reqPath:" + req.path;
                 pobj.actionBody.opTitle = "reqPath:" + req.path;
-                this.esUtils.addEsLogs(settings.queuedName + "api-req", pobj.actionBody);
+                this.esUtils.addEsLogs(settings.queuedName + "api-req", pobj);
             }
             }
             return result;
             return result;
-        } catch (e) {
-            var stackStr = e.stack ? e.stack : JSON.stringify(e);
-            console.log(stackStr, "api.base调用出现异常，请联系管理员..........");
+        } catch (error) {
+            var stackStr = error.stack ? error.stack : JSON.stringify(error);
+            // console.log(stackStr, "api.base调用出现异常，请联系管理员..........");
             var rtnerror = system.getResultFail(-200, "出现异常，error：" + stackStr);
             var rtnerror = system.getResultFail(-200, "出现异常，error：" + stackStr);
             pobj.actionBody.requestId = await this.getBusUid("err");
             pobj.actionBody.requestId = await this.getBusUid("err");
             pobj.actionBody.errorInfo = stackStr;
             pobj.actionBody.errorInfo = stackStr;
             pobj.actionBody.opTitle = "，reqPath:" + req.path;
             pobj.actionBody.opTitle = "，reqPath:" + req.path;
-            this.esUtils.addEsLogs(settings.queuedName + "apidoexec-error", pobj.actionBody);
+            this.esUtils.addEsLogs(settings.queuedName + "apidoexec-error", pobj);
             return rtnerror;
             return rtnerror;
         }
         }
     }
     }

brg-queue-center/app/base/db/consumer.base.js

@@ -33,9 +33,10 @@ class ConsumerBase {
         }
         }
       });
       });
     } catch (error) {
     } catch (error) {
-      this.errorLogDao.addOpErrorLogs("队列执行doConsumer存在异常", null, null, error.stack, 3);
+      var stackStr = error.stack ? error.stack : JSON.stringify(error);
+      this.errorLogDao.addOpErrorLogs("队列执行doConsumer存在异常", null, null, stackStr, 3);
       //日志
       //日志
-      console.log(error.stack, "，队列执行doConsumer存在异常");
+      console.log(stackStr, "，队列执行doConsumer存在异常");
     }
     }
   }
   }
 
 
@@ -71,9 +72,10 @@ class ConsumerBase {
       }
       }
       execResult = await this.subDoConsumer(queuedName, actionBody);
       execResult = await this.subDoConsumer(queuedName, actionBody);
     } catch (error) {
     } catch (error) {
-      this.errorLogDao.addOpErrorLogs("队列执行execSubDoConsumer存在异常", actionBody, execResult, error.stack, 3);
+      var stackStr = error.stack ? error.stack : JSON.stringify(error);
+      this.errorLogDao.addOpErrorLogs("队列执行execSubDoConsumer存在异常", actionBody, execResult, stackStr, 3);
       //日志记录
       //日志记录
-      console.log(error.stack, "，队列执行execSubDoConsumer存在异常");
+      console.log(stackStr, "，队列执行execSubDoConsumer存在异常");
     }
     }
   }
   }
 
 

brg-queue-center/app/base/service/impl/utilsSve/utilsIcSve.js

@@ -114,8 +114,9 @@ class UtilsIcService extends AppServiceBase {
         sources.push(source);
         sources.push(source);
       });
       });
       return system.getResultSuccess(data);
       return system.getResultSuccess(data);
-    } catch (e) {
-      console.log(e.stack, ".. getListByLikeCompanyName query is error");
+    } catch (error) {
+      var stackStr = error.stack ? error.stack : JSON.stringify(error);
+      console.log(stackStr, ".. getListByLikeCompanyName query is error");
       //TODO:日志
       //TODO:日志
       return system.getResultError("query is error");
       return system.getResultError("query is error");
     }
     }
@@ -206,9 +207,10 @@ class UtilsIcService extends AppServiceBase {
         "companyCate3": resultData.data.hits.hits[0]._source.company_cate_3 || ""//行业分类三级分类	
         "companyCate3": resultData.data.hits.hits[0]._source.company_cate_3 || ""//行业分类三级分类	
       };
       };
       return system.getResultSuccess(item);
       return system.getResultSuccess(item);
-    } catch (e) {
+    } catch (error) {
+      var stackStr = error.stack ? error.stack : JSON.stringify(error);
       //TODO:日志
       //TODO:日志
-      console.log(e.stack, ".. getItemByCompanyName query is error");
+      console.log(stackStr, ".. getItemByCompanyName query is error");
       return system.getResultError("query is error");
       return system.getResultError("query is error");
     }
     }
   }
   }

brg-queue-center/app/base/system.js

@@ -216,7 +216,7 @@ class System {
 			try {
 			try {
 				ClassObj = require(objabspath);
 				ClassObj = require(objabspath);
 			} catch (e) {
 			} catch (e) {
-				console.log(e.stack, "...getObject.....errror");
+				// console.log(e.stack, "...getObject.....errror");
 				let fname = objsettings[packageName + "base"];
 				let fname = objsettings[packageName + "base"];
 				ClassObj = require(fname);
 				ClassObj = require(fname);
 			}
 			}

brg-queue-center/app/base/utils/esUtils.js

@@ -85,8 +85,9 @@ class EsUtils {
             }
             }
             return system.getResultSuccess(stdoutInfo);
             return system.getResultSuccess(stdoutInfo);
         } catch (error) {
         } catch (error) {
-            console.log(error.stack, "......execPostEs....error.....");
-            this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在异常", params, null, error.stack, 3);
+            var stackStr = error.stack ? error.stack : JSON.stringify(error);
+            console.log(stackStr, "......execPostEs....error.....");
+            this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在异常", params, null, stackStr, 3);
         }
         }
     }
     }
 }
 }

brg-queue-center/app/base/utils/execClient.js

@@ -61,7 +61,8 @@ class ExecClient {
             var result = JSON.parse(rtn.stdout);
             var result = JSON.parse(rtn.stdout);
             return result;
             return result;
         } catch (error) {
         } catch (error) {
-            this.errorLogDao.addOpErrorLogs(execFile + "执行execPostByTimeOut存在异常", params, rtn.stdout, error.stack, 3);
+            var stackStr = error.stack ? error.stack : JSON.stringify(error);
+            this.errorLogDao.addOpErrorLogs(execFile + "执行execPostByTimeOut存在异常", params, rtn ? rtn.stdout : null, stackStr, 3);
             return system.getResultFail(-200, execFile + "执行execPostByTimeOut存在异常");
             return system.getResultFail(-200, execFile + "执行execPostByTimeOut存在异常");
         }
         }
     }
     }

brg-queue-center/app/base/utils/redisClient.js

@@ -42,8 +42,9 @@ class RedisClient {
               await self.zremRangebyscoreData(opResult[0], opResult[1], opResult[1]);
               await self.zremRangebyscoreData(opResult[0], opResult[1], opResult[1]);
             }
             }
           } catch (error) {
           } catch (error) {
+            var stackStr = error.stack ? error.stack : JSON.stringify(error);
             //TODO：日志处理
             //TODO：日志处理
-            console.log(error.stack, ".....message......................error...........");
+            console.log(stackStr, ".....message......................error...........");
           }
           }
 
 
         });
         });

brg-queue-center/app/config/localsettings.js

@@ -5,7 +5,7 @@ var settings = {
     host: "43.247.184.32",
     host: "43.247.184.32",
     port: 8967,
     port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
-    db: 2,
+    db: 1,
   },
   },
   database: {
   database: {
     dbname: "tx-queue-log",
     dbname: "tx-queue-log",

brg-queue-center/app/config/settings.js

@@ -9,7 +9,7 @@ var ENVINPUT = {
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_DB: process.env.QUEUE_REDIS_DB,
   REDIS_DB: process.env.QUEUE_REDIS_DB,
   DB_NAME: process.env.QUEUE_DB_NAME,
   DB_NAME: process.env.QUEUE_DB_NAME,
-  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "test",//运行环境
+  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev",//运行环境
   CONSUMER_NAME: process.env.CONSUMER_NAME || "publicServiceAllocation.publicConsumer",//消费者名称
   CONSUMER_NAME: process.env.CONSUMER_NAME || "publicServiceAllocation.publicConsumer",//消费者名称
   QUEUED_NAME: process.env.QUEUED_NAME || "SYTXPUBLIC-MSGQ",//队列名称，FAIL-失败队列（队列和失败队列一对存在进行部署）
   QUEUED_NAME: process.env.QUEUED_NAME || "SYTXPUBLIC-MSGQ",//队列名称，FAIL-失败队列（队列和失败队列一对存在进行部署）
 };
 };