tj

center-taskexecutor/app/base/db/task/ic/icZipTask.js

@@ -15,6 +15,7 @@ class IcZipTask extends TaskBase {
     this.cosgetsecreturl = settings.cosGetSecreturl();
     this.cosgetsecreturl = settings.cosGetSecreturl();
     this.icMaterialurl = settings.icMaterialurl();
     this.icMaterialurl = settings.icMaterialurl();
     this.restclient = system.getObject("util.restClient");
     this.restclient = system.getObject("util.restClient");
+    this.execClient = system.getObject("util.execClient");
   }
   }
 
 
 
 
@@ -138,9 +139,13 @@ class IcZipTask extends TaskBase {
           resultJson.url = 'http://' + getParam;
           resultJson.url = 'http://' + getParam;
           console.log(resultJson);
           console.log(resultJson);
           var icUpMaterialurl = this.icMaterialurl + '/web/bizchance/materialCtl/updateZipById';
           var icUpMaterialurl = this.icMaterialurl + '/web/bizchance/materialCtl/updateZipById';
-          // //请求返回接口，传输上传接口
+          //请求返回接口，传输上传接口
           var res = await this.restclient.execPost3(resultJson, icUpMaterialurl);
           var res = await this.restclient.execPost3(resultJson, icUpMaterialurl);
-          console.log(res);
+          // var headData = {
+          //   "xappkey": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE"
+          // };
+          // var res = await this.execClient.execPostTimeOutByBusiness("icZipTask.js/subBeforeTask", resultJson, icUpMaterialurl, null, headData);
+          console.log(res, "......res...........");
         }
         }
       } catch (error) {
       } catch (error) {
         continue;
         continue;

center-taskexecutor/app/base/utils/execClient.js

@@ -2,8 +2,6 @@ var childproc = require('child_process');
 const system = require("../system");
 const system = require("../system");
 const util = require('util');
 const util = require('util');
 const exec = util.promisify(require('child_process').exec);
 const exec = util.promisify(require('child_process').exec);
-const settings = require("../../../app/config/settings");
-const axios = require('axios');
 const moment = require('moment');
 const moment = require('moment');
 const uuid = require('uuid');
 const uuid = require('uuid');
 class ExecClient {
 class ExecClient {
@@ -37,7 +35,7 @@ class ExecClient {
             return reqResult;
             return reqResult;
         } catch (error) {
         } catch (error) {
             var stackStr = error.stack ? error.stack : JSON.stringify(error);
             var stackStr = error.stack ? error.stack : JSON.stringify(error);
-            console.log(stackStr,".....execPostTimeOutByBusiness.........");
+            console.log(stackStr, ".....execPostTimeOutByBusiness.........");
             reqResult = system.getResultFail(-200, execFile + "执行execPostByTimeOut存在异常");
             reqResult = system.getResultFail(-200, execFile + "执行execPostByTimeOut存在异常");
             reqResult.requestId = uuid.v1();
             reqResult.requestId = uuid.v1();
             return reqResult;
             return reqResult;
@@ -159,7 +157,7 @@ class ExecClient {
             }
             }
         }
         }
         cmdStr = cmdStr + " -d '" + data + "' " + url;
         cmdStr = cmdStr + " -d '" + data + "' " + url;
-        console.log(cmdStr, "：cmdStr.................");
+        console.log(cmdStr, "：cmdStr.....................");
         return cmdStr;
         return cmdStr;
     }
     }
 
 

center-taskexecutor/app/base/utils/restClient.js

@@ -12,7 +12,7 @@ class RestClient {
 
 
     this.cmdDownLoadFilePattern = "curl -G -o {fileName} {url}";
     this.cmdDownLoadFilePattern = "curl -G -o {fileName} {url}";
     this.cmdPostPattern2 = "curl -k -H 'Content-type: application/x-www-form-urlencoded'  -d '{data}' {url}";
     this.cmdPostPattern2 = "curl -k -H 'Content-type: application/x-www-form-urlencoded'  -d '{data}' {url}";
-    this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json'  -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE'  -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}";
+    this.cmdPostPattern3 = "curl -k -H 'Content-type:application/json' -H 'xappkey:Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE' -d '{data}' {url}";
     // form-data形式post  data参数类型 md5=2&data=1
     // form-data形式post  data参数类型 md5=2&data=1
     this.cmdPostPattern5 = "curl -k --data '{data}' {url}";
     this.cmdPostPattern5 = "curl -k --data '{data}' {url}";
 
 
@@ -41,7 +41,7 @@ class RestClient {
     return cmd;
     return cmd;
   }
   }
   FetchPostCmd3(subData, url) {
   FetchPostCmd3(subData, url) {
-    var data = subData;
+    var data = JSON.stringify(subData);
     var cmd = this.cmdPostPattern3.replace(/\{data\}/g,
     var cmd = this.cmdPostPattern3.replace(/\{data\}/g,
       data).replace(/\{url\}/g, url);
       data).replace(/\{url\}/g, url);
     return cmd;
     return cmd;
@@ -124,7 +124,7 @@ class RestClient {
   async execPost3(subData, url) {
   async execPost3(subData, url) {
     // console.log("subData-----------------" + JSON.stringify(subData));
     // console.log("subData-----------------" + JSON.stringify(subData));
     let cmd = this.FetchPostCmd3(subData, url);
     let cmd = this.FetchPostCmd3(subData, url);
-    console.log(cmd,"...............cmd3....................");
+    console.log(cmd, "...............cmd3....................");
     var result = await this.exec(cmd);
     var result = await this.exec(cmd);
     // console.log(result,"...............cmd3........result............");
     // console.log(result,"...............cmd3........result............");
     return result;
     return result;