tj

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

@@ -52,7 +52,7 @@ class ConsumerBase {
         if (notifyQueuedName != queuedName) {
           actionBody.resultInfo = execResult;
         } else {
-          actionBody.pushAgainResultInfo = execResult;
+          actionBody.pushNotifyResultInfo = execResult;
         }
         if (execResult.status === 1) {
           if (notifyQueuedName != queuedName) {
@@ -72,7 +72,6 @@ class ConsumerBase {
         return;
       }
       if (actionBody.counter > 4) {
-        actionBody.pushAgainResultInfo = actionBody.pushAgainResultInfo || actionBody.resultInfo;
         await this.pushFailureLogDao.addOpFailureLogs("推送失败", actionBody, actionBody.pushAgainResultInfo);
         return;
       }

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

@@ -17,7 +17,8 @@ class PublicNotifyConsumer extends ConsumerBase {
       },
       requestId: actionBody.requestId
     }
-    var execResult = await this.execPostByTimeOut(params, actionBody.notifyUrl);
+    var headData = actionBody.headData || null;
+    var execResult = await this.execPostByTimeOut(params, actionBody.notifyUrl, null, headData, 20);
     return execResult;
   }
 }

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

@@ -17,7 +17,8 @@ class PublicConsumer extends ConsumerBase {
       requestId: actionBody.requestId
     }
     console.log(JSON.stringify(params), "publicConsumer-->subDoConsumer...pushurl=" + actionBody.pushUrl);
-    var execResult = await this.execPostByTimeOut(params, actionBody.pushUrl, null, null, 5);
+    var headData = actionBody.headData || null;
+    var execResult = await this.execPostByTimeOut(params, actionBody.pushUrl, null, headData, 20);
     var tmpBody = {
       "opTitle": "队列推送数据记录，推送地址：" + actionBody.pushUrl,// N 操作的业务标题
       "identifyCode": actionBody.identifyCode || "",// Y 操作的业务标识

brg-queue-center/readme.txt

@@ -30,11 +30,14 @@
                     "messageBody": { // Y 推送的业务消息，必须有一项对象属性值
                         "name":"张三",
                         "age":21
-                    }
+                    },
+                    "headData":null //N 请求头信息，Json格式，如：{token:"XXXXXXX"}
                 },
                 "requestId":"PUB-202006111530vbot" // N 请求id
             }
     1.(1) 推送地址:http://60.205.209.94:4012/web/auth/channelAccessAuth/springBoard    
+       
+       如果传递了headData则在请求头中会有传递的信息
        参数:
             {
                 "actionType": "test",// Y 功能名称
@@ -52,6 +55,8 @@
                 data: null//业务处理返回
             }
     1.(2) 有推送成功后通知的Url地址:http://60.205.209.94:4012/web/auth/channelAccessAuth/springBoard (举例)   
+
+    　　如果传递了headData则在请求头中会有传递的信息
        参数:
             {
                 "actionType": "test",// Y 功能名称