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

fi-taxctl/node_modules/MD5

-_MD5@1.3.0@MD5
\ No newline at end of file

taskexecutor/app/base/db/task/alichannel/aliicapiTask.js

+//tag规则 release-v188.1.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");
@@ -25,9 +26,8 @@ class AliicapiTask extends TaskBase {
     }
     try {
       var url = settings.centerChannelUrl() + "api/auth/taskapi/taskAliIcapi";
-      var icinfo = await this.restclient.execPost(obj, url);
-      console.log(icinfo);
-      return icinfo;
+      this.restclient.execPost(obj, url);
+      return system.getResultSuccess();
     } catch (error) {
       console.log(error);
       return null;

taskexecutor/app/base/db/task/alichannel/taskPushPublicService.js

+//tag规则 release-v188.2.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/pushmarketplatneed2fq.js

+//tag规则 release-v188.3.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/taskalirpcagainpush.js

+//tag规则 release-v188.4.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/taskalitmupdate.js

+//tag规则 release-v188.5.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/taskcustomer2fq.js

+//tag规则 release-v188.6.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/taskigorder2fq.js

+//tag规则 release-v188.7.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/tasktm2fq.js

+//tag规则 release-v188.8.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

taskexecutor/app/base/db/task/tm/tmdeliveryDing.js

+//tag规则 release-v188.15.*
+const TaskBase = require("../../task.base");
+const system = require("../../../system");
+var settings = require("../../../../config/settings");
+class TmNotifyTask extends TaskBase {
+    constructor() {
+        super(TaskBase.getServiceName(TmNotifyTask));
+        this.restclient = system.getObject("util.restClient");
+    }
+    /**
+     * 每隔10分钟检查一次
+     * @param {*} taskName
+     */
+    formatedTaskName (taskName) {
+        console.log("formatedTaskName", taskName)
+        return taskName + "|i|5"
+    }
+    async subDoTask () {
+        console.log("--------------");
+        console.log("TestTask1.....");
+        var obj = {
+        }
+        try {
+            var url = settings.tmnotifyUrl() + "/api/action/tmNotify/dataCount";
+            this.restclient.execPost(obj, url);
+            return system.getResultSuccess();
+        } catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
+}
+module.exports = TmNotifyTask;
+
+
+ var a=new TmNotifyTask();
+ a.subDoTask();
\ No newline at end of file

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

+//tag规则 release-v188.9.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");
@@ -17,10 +18,8 @@ class TmtransferTask extends TaskBase {
     console.log("TestTask1.....");
     try {
       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;
+      this.restclient.execGet(null, url);
+      return  system.getResultSuccess();
     } catch (error) {
       console.log(error);
       return null;

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

+//tag规则 release-v188.10.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

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

+//tag规则 release-v188.11.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");

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

+//tag规则 release-v188.12.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");
@@ -9,18 +10,14 @@ class TmreportTask extends TaskBase {
   }
   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;
+      this.restclient.execGet(null, url);
+      return system.getResultSuccess();
     } catch (error) {
       console.log(error);
       return null;

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

+//tag规则 release-v188.13.*
 const TaskBase = require("../../task.base");
 const system = require("../../../system");
 var settings = require("../../../../config/settings");
@@ -23,9 +24,8 @@ class TmtransactionTask extends TaskBase {
     }
     try {
       var url = this.centerChannelUrl + "api/auth/taskapi/taskAlijsonfile";
-      var transferinfo = await this.restclient.execPost(obj, url);
-      console.log(rtn);
-      return rtn;
+      this.restclient.execPost(obj, url);
+      return system.getResultSuccess();
     } catch (error) {
       console.log(error);
       return null;

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

-const TaskBase=require("../../task.base");
+//tag规则 release-v188.14.*
+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();
-  }
-  formatedTaskName (taskName) {
-    console.log("formatedTaskName", taskName)
-    return taskName + "|i|20"
-  }
 
-  async subDoTask(params){
-    console.log(params);
-    console.log("TestTask1.....");
-    var url = this.transferurl + "api/transfer/tradeApi/uppaymentstatus";
-    var transferinfo = await this.restclient.execGet(null, url);
-    var result = JSON.parse(transferinfo.stdout)
-    return result;
-  }
+class TmtransferTask extends TaskBase {
+    constructor() {
+        super(TaskBase.getServiceName(TmtransferTask));
+        this.restclient = system.getObject("util.restClient");
+        this.transferurl = settings.reqTransferurl();
+    }
+
+    formatedTaskName(taskName) {
+        console.log("formatedTaskName", taskName)
+        return taskName + "|i|20"
+    }
+
+    async subDoTask(params) {
+        console.log(params);
+        console.log("TestTask1.....");
+        try {
+            var url = this.transferurl + "api/transfer/tradeApi/uppaymentstatus";
+            this.restclient.execGet(null, url);
+            return system.getResultSuccess();
+        } catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
 }
-module.exports=TmtransferTask;
+
+module.exports = TmtransferTask;

taskexecutor/app/config/settings.js

@@ -64,6 +64,13 @@ var settings = {
       return "http://fqboss-service.chaolai/";
     }
   },
+  tmnotifyUrl: function () {
+    if (this.env == "dev") {
+      return "https://fqdev.gongsibao.com/tmnotify";
+    } else {
+      return "https://fq.gongsibao.com/tmnotify";
+    }
+  },
   reqTransferurl: function () {
     if (this.env == "dev") {
       return "http://192.168.18.61:3003/";