tj

queue-center/app/base/db/impl/opLogs/errorLogDao.js

@@ -17,9 +17,9 @@ class ErrorLogDao extends Dao {
     var params = {
     var params = {
       identify_code: actionBody.identifyCode,
       identify_code: actionBody.identifyCode,
       op_title: opTitle,
       op_title: opTitle,
-      push_content: actionBody,
-      error_info: error,
-      result_info: execResult,
+      push_content: actionBody || null,
+      error_info: error || null,
+      result_info: execResult || null,
       request_id: actionBody.requestId,
       request_id: actionBody.requestId,
       client_ip: actionBody.clientIp || "",
       client_ip: actionBody.clientIp || "",
       created_at: new Date()
       created_at: new Date()

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

 const system = require("../system");
 const system = require("../system");
 const util = require('util');
 const util = require('util');
-const axios = require('axios');
+// const axios = require('axios');
 class EsUtils {
 class EsUtils {
     constructor() {
     constructor() {
         this.execClient = system.getObject("util.execClient");
         this.execClient = system.getObject("util.execClient");
@@ -49,32 +49,32 @@ class EsUtils {
     async execPostEs(queuedName, params, reqUrl, esName, esPwd) {
     async execPostEs(queuedName, params, reqUrl, esName, esPwd) {
 
 
         try {
         try {
-            let result = await axios({
-                // headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-                headers: {
-                    'Content-type': 'application/json',
-                    'Authorization': 'Basic YWRtaW5lczphZG1pbkdTQmVzLg=='
-                },
-                method: 'POST',
-                url: reqUrl,
-                data: JSON.stringify(params),
-                timeout: 5000
-            });
-            if (result.status == 201) {
-                return system.getResultSuccess();
-            }
+            // let result = await axios({
+            //     // headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+            //     headers: {
+            //         'Content-type': 'application/json',
+            //         'Authorization': 'Basic YWRtaW5lczphZG1pbkdTQmVzLg=='
+            //     },
+            //     method: 'POST',
+            //     url: reqUrl,
+            //     data: JSON.stringify(params),
+            //     timeout: 5000
+            // });
+            // if (result.status == 201) {
+            //     return system.getResultSuccess();
+            // }
 
 
-            this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在错误", params, result, null, 3);
-            return system.getResult(null, "执行execPostEs存在错误");
+            // this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在错误", params, result, null, 3);
+            // return system.getResult(null, "执行execPostEs存在错误");
 
 
             //方式二
             //方式二
-            // var rtn = await this.execClient.execPostEs(params, reqUrl, esName, esPwd);
-            // if (!rtn || !rtn.stdout) {
-            //     return system.getResult(null, "execPostTimeOut data is empty");
-            // }
-            // var result = JSON.parse(rtn.stdout);
-            // return result;
-
+            var result = await this.execClient.execPostEs(params, reqUrl, esName, esPwd);
+            if (!result || !result.stdout) {
+                this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在错误", params, result, null, 3);
+                return system.getResult(null, "执行execPostEs存在错误");
+                return system.getResult(null, "execPostTimeOut data is empty");
+            }
+            return system.getResultSuccess();
         } catch (error) {
         } catch (error) {
             console.log(error.stack, "......axios.........");
             console.log(error.stack, "......axios.........");
             this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在异常", params, null, error.stack, 3);
             this.errorLogDao.addOpErrorLogs(queuedName + "执行execPostEs存在异常", params, null, error.stack, 3);

queue-center/app/config/localsettings.js

 var settings = {
 var settings = {
   redis: {
   redis: {
-    host: "121.36.3.35",
-    port: 6379,
-    // host: "43.247.184.32",
-    // port: 8967,
+    // host: "121.36.3.35",
+    // port: 6379,
+    host: "43.247.184.32",
+    port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
     db: 5,
     db: 5,
   },
   },