Merge branch 'taskexecutor' of gitlab.gongsibao.com:jiangyong/zhichan into taskexecutor

taskexecutor/app/base/db/task/test/tmAuditDataTask.js

+const TaskBase=require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmtransferTask extends TaskBase{
+  constructor(){
+    super(TaskBase.getServiceName(TmtransferTask));
+    this.restclient = system.getObject("util.restClient");
+    this.igirlWeburl = settings.igirlWeburl();
+  }
+  async beforeTask(params){
+    console.log("前置操作......",this.serviceName);
+    //this.isThrough=true; 
+    //console.log(this.cacheManager);
+ }
+  async subDoTask(params){
+    console.log(params);
+    console.log("TestTask1.....");
+    var url = this.transferurl + "api/tmtransactionApi/tmAuditData";
+    var transferinfo = await this.execlient.execPost(null, url);
+    var result = JSON.parse(transferinfo.stdout)
+    return result;
+  }
+}
+module.exports=TmtransferTask;

taskexecutor/app/base/db/task/test/tmtransferTask.js

+const TaskBase=require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmtransferTask extends TaskBase{
+  constructor(){
+    super(TaskBase.getServiceName(TmtransferTask));
+    this.restclient = system.getObject("util.restClient");
+    this.transferurl = settings.reqTransferurl();
+  }
+  async beforeTask(params){
+    console.log("前置操作......",this.serviceName);
+    //this.isThrough=true; 
+    //console.log(this.cacheManager);
+ }
+  async subDoTask(params){
+    console.log(params);
+    console.log("TestTask1.....");
+    var url = this.transferurl + "api/transfer/tradeApi/uppaymentstatus";
+    var transferinfo = await this.execlient.execPost(null, url);
+    var result = JSON.parse(transferinfo.stdout)
+    return result;
+  }
+}
+module.exports=TmtransferTask;

taskexecutor/app/base/db/task/tmtransfer/tmAuditDataTask.js

+const TaskBase=require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmtransferTask extends TaskBase{
+  constructor(){
+    super(TaskBase.getServiceName(TmtransferTask));
+    this.restclient = system.getObject("util.restClient");
+    this.igirlWeburl = settings.igirlWeburl();
+  }
+  async beforeTask(params){
+    console.log("前置操作......",this.serviceName);
+    //this.isThrough=true; 
+    //console.log(this.cacheManager);
+ }
+  async subDoTask(){
+    console.log("--------------");
+    console.log("TestTask1.....");
+    var url = this.igirlWeburl + "api/tmtransactionApi/tmAuditData";
+    var transferinfo = await this.restclient.execGet(null, url);
+    var result = JSON.parse(transferinfo.stdout);
+    console.log(result);
+    return result;
+  }
+}
+module.exports=TmtransferTask;
+

taskexecutor/app/base/db/task/tmtransfer/tmtransferTask.js

+const TaskBase=require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmtransferTask extends TaskBase{
+  constructor(){
+    super(TaskBase.getServiceName(TmtransferTask));
+    this.restclient = system.getObject("util.restClient");
+    this.transferurl = settings.reqTransferurl();
+  }
+  async beforeTask(params){
+    console.log("前置操作......",this.serviceName);
+    //this.isThrough=true; 
+    //console.log(this.cacheManager);
+ }
+  async subDoTask(params){
+    console.log(params);
+    console.log("TestTask1.....");
+    var url = this.transferurl + "api/transfer/tradeApi/uppaymentstatus";
+    var transferinfo = await this.execlient.execGet(null, url);
+    var result = JSON.parse(transferinfo.stdout)
+    return result;
+  }
+}
+module.exports=TmtransferTask;

taskexecutor/app/config/settings.js

@@ -21,6 +21,13 @@ var settings = {
       return "http://fktaxctl-service.chaolai/api/rpt/rptApi/saveRptHistory";
     }
   },
+  igirlWeburl: function(){
+    if (this.env == "dev") {
+      return "http://192.168.18.61:3000/";
+    } else {
+      return "http://igirl/";
+    }
+  },
   redis:function(){
     if(this.env=="dev"){
       console.log("dev.........................................................");