Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -8,7 +8,6 @@ class TxHandler {
     this.userService = system.getObject("service.auth.userSve");
     this.msgService = system.getObject("service.msg.msgSve")
     this.cacheManager = system.getObject("db.common.cacheManager");
-    this.queueUrl = settings.bpushUrl();
     this.bookUrl = settings.bookUrl() + "/web/bizchance";
   }
 
@@ -544,7 +543,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   async ServiceUpdate(datajson) { //更新融易算服务信息到队列
@@ -559,7 +558,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   //融易算创建需求
@@ -575,7 +574,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   //融易算更新需求状态
@@ -591,8 +590,13 @@ class TxHandler {
       }
 
     }
+<<<<<<< HEAD
+    return system.rysQueueOper(obj);
+    
+=======
     return systetm.rysQueueOper(obj);
 
+>>>>>>> 7836d50cb415f70a29da5fdfc628da6d8971e68c
   }
 
   // 融易算服务状态变更通知
@@ -610,7 +614,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   //融易算报表确认
@@ -630,7 +634,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   //融易算报税确认
@@ -650,7 +654,7 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
   //融易算接收票据快递单号
@@ -666,30 +670,37 @@ class TxHandler {
       }
 
     }
-    return systetm.rysQueueOper(obj);
+    return system.rysQueueOper(obj);
   }
 
+  async test(datajson){
+    var rc = system.getObject("util.execClient");
+    var reqUrl = this.bookUrl + "/bizOptCtl/insertInfo";
+    var result = await rc.execPost3(datajson, reqUrl);
+    //var j = JSON.parse(result.stdout);
+    return result;
+  }
 
 }
 
 module.exports = new TxHandler();
 
-// (async () => {
-//   var task = new TxHandler();
-//   var obj = {
-//     "requestId": "825da0a74432-738f-4bed-b48d-d51aa808",
-//     "bizId": "5892748825678",
-//     "contactsPhone": "18510669321",
-//     "userId": "10973452443103825",
-//     "orderId": "341184456620456778900",
-//     "areatype": "city",
-//     "area": "100010",
-//     "topOrgCode": "rong_yi_suan",
-//     "taxpayerType": 1
-//   }
-//   var d = await task.ServiceCreate(obj);
-//   console.log("ddddddddddddd");
-//   console.log(JSON.stringify(d));
-//   console.log("dddddddddddddd");
-// })()
+(async () => {
+  var task = new TxHandler();
+  var obj = {
+    "requestId": "825da0a74432-738f-4bed-b48d-d51aa808",
+    "bizId": "5892748825678",
+    "contactsPhone": "18510669321",
+    "userId": "10973452443103825",
+    "orderId": "341184456620456778900",
+    "areatype": "city",
+    "area": "100010",
+    "topOrgCode": "rong_yi_suan",
+    "taxpayerType": 1
+  }
+  var d = await task.test(obj);
+  console.log("ddddddddddddd");
+  console.log(JSON.stringify(d));
+  console.log("dddddddddddddd");
+})()
 

center-manage/app/base/system.js

@@ -376,25 +376,26 @@ class System {
 		requestId	string	请求id
 	 */
 	static async rysQueueOper(obj) {
+		console.log("obj-----------------------",obj);
 		if (obj.pushUrl && obj.actionType && obj.messageBody) {
 			try {
 				var rc = this.getObject("util.execClient");
-				var reqUrl = settings.queueUrl;
+				var reqUrl = settings.pushUrl;
 				var reqId = uuidv4();
 				var param = {
-					actionType: "produceData",
-					actionBody: {
-						pushUrl: obj.pushUrl,
-						actionType: obj.actionType,
-						identifyCode: "book-manage",
-						messageBody: obj.messageBody
+					"actionType": "produceData",
+					"actionBody": {
+						"pushUrl": obj.pushUrl,
+						"actionType": obj.actionType,
+						"identifyCode": "book-manage",
+						"messageBody": obj.messageBody
 					}
 				}
 				if (obj.notifyUrl) {
 					param.actionBody.notifyUrl = obj.notifyUrl;
 				}
 				if (obj.headData) {
-					param.actionBody.headData;
+					param.actionBody.headData = obj.headData;
 				}
 				if (obj.requestId) {
 					param.requestId = obj.requestId;

center-manage/app/config/settings.js

@@ -49,7 +49,7 @@ var settings = {
   },
   bookUrl: function () {
     if (this.env == "localhost") {
-      return "http://192.168.1.19:8889";
+      return "http://192.168.210.185:8889";
     } else {
       return "http://icdeliver-service";
     }
@@ -63,14 +63,7 @@ var settings = {
   },
   pushUrl: function () {
     if (this.env == "localhost") {
-      return "http://192.168.18.101:4018/api/queueAction/producer/springBoard";
-    } else {
-      return "http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard";
-    }
-  },
-  bpushUrl: function () {
-    if (this.env == "localhost") {
-      return "http://192.168.1.19:4018/api/queueAction/producer/springBoard";
+      return "http://192.168.18.101:4018/api/queueAction/plsroducer/springBoard";
     } else {
       return "http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard";
     }