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

@@ -27,4 +27,4 @@ class TmtransferTask extends TaskBase {
     }
   }
 }
-module.exports = TmtransferTask;
+module.exports = TmtransferTask;
\ No newline at end of file

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

+const TaskBase = require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmreportTask extends TaskBase {
+  constructor() {
+    super(TaskBase.getServiceName(TmreportTask));
+    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.....");
+    try {
+      var url = this.igirlWeburl + "api/tmtransactionApi/tmreport";
+      var transferinfo = await this.restclient.execGet(null, url);
+      var result = JSON.parse(transferinfo.stdout);
+      console.log(result);
+      return result;
+    } catch (error) {
+      console.log(error);
+      return null;
+    }
+  }
+}
+module.exports = TmreportTask;
\ No newline at end of file

taskexecutor/app/config/settings.js

@@ -28,6 +28,13 @@ var settings = {
       return "http://igirl-service.chaolai/";
     }
   },
+  reqTransferurl: function () {
+    if (this.env == "dev") {
+      return "http://192.168.18.61:3003/";
+    } else {
+      return "http://jiaxiya-service/";
+    }
+  },
   redis:function(){
     if(this.env=="dev"){
       console.log("dev.........................................................");