Sfoglia il codice sorgente

归集+提币定时优化

DevYK 2 anni fa
parent
commit
b01f4b81e7
4 ha cambiato i file con 32 aggiunte e 3 eliminazioni
  1. 1 0
      config/dev_config.js
  2. 1 0
      config/prd_config.js
  3. 1 0
      config/test_config.js
  4. 29 3
      routes/sdk.js

+ 1 - 0
config/dev_config.js

@@ -27,6 +27,7 @@ const reids_token_config = {
     LAST_GAS_PRICE: 'LAST_TOKEN_GAS_PRICE',
     WITHDRAW_QUEUE_KEY: 'WITHDRAW_QUEUE_KEY',
     WITHDRAW_QUEUE_STATUS:'WITHDRAW_QUEUE_STATUS',
+    COLLECT_CONIS_QUEUE_KEY:'COLLECT_CONIS_QUEUE_KEY',
 
 }
 

+ 1 - 0
config/prd_config.js

@@ -26,6 +26,7 @@ const reids_token_config = {
     LAST_GAS_PRICE: 'LAST_TOKEN_GAS_PRICE',
     WITHDRAW_QUEUE_KEY: 'WITHDRAW_QUEUE_KEY',
     WITHDRAW_QUEUE_STATUS:'WITHDRAW_QUEUE_STATUS',
+    COLLECT_CONIS_QUEUE_KEY:'COLLECT_CONIS_QUEUE_KEY',
     
 
 }

+ 1 - 0
config/test_config.js

@@ -26,6 +26,7 @@ const reids_token_config = {
     LAST_GAS_PRICE: 'LAST_TOKEN_GAS_PRICE',
     WITHDRAW_QUEUE_KEY: 'WITHDRAW_QUEUE_KEY',
     WITHDRAW_QUEUE_STATUS:'WITHDRAW_QUEUE_STATUS',
+    COLLECT_CONIS_QUEUE_KEY:'COLLECT_CONIS_QUEUE_KEY',
 }
 
 

+ 29 - 3
routes/sdk.js

@@ -61,7 +61,8 @@ async function getTransfers(ctx) {
                     //提交归集任务
                     if (temp_obj.address) {
                         logger.log('pushCollectConisObj>>>', temp_obj.address)
-                        moralis.pushCollectConisObj(temp_obj)
+                        // moralis.pushCollectConisObj(temp_obj)
+                        redis.redis_push(reids_token_config.COLLECT_CONIS_QUEUE_KEY, JSON.stringify(temp_obj))
                     }
                 }
             } catch (error) {
@@ -82,6 +83,28 @@ async function getAllTokenWithdrawInfoLists(ctx) {
     ctx.body = await moralis.getAllTokenWithdrawInfoLists(ctx);
 }
 
+async function collect_conis_task() {
+    while (true) {
+        var exec_obj = await redis.redis_pop(reids_token_config.COLLECT_CONIS_QUEUE_KEY)
+        if (!exec_obj) {
+            await utils.sleep(10000)
+            logger.log("没有归集任务")
+            continue
+        }
+
+        try {
+            exec_obj = JSON.parse(exec_obj)
+        } catch (error) {
+            logger.error('item parse error', error);
+            break
+        }
+        logger.log('collect_conis_task exec item>>>>', exec_obj);
+        //开始收集用户地址里面的币到归集地址
+        var ret = await moralis.collectCoins(exec_obj)
+        logger.log('collect_conis_task ret =', exec_obj, ret)
+    }
+}
+
 async function withdraw_task() {
     // var status = await redis.readRedis(reids_token_config.WITHDRAW_QUEUE_STATUS)
     // if (status && status == 1) {
@@ -93,7 +116,7 @@ async function withdraw_task() {
     while (true) {
         var exec_obj = await redis.redis_pop(reids_token_config.WITHDRAW_QUEUE_KEY)
         if (!exec_obj) {
-            await utils.sleep(5000)
+            await utils.sleep(10000)
             logger.log("没有出金任务")
             continue
         }
@@ -321,6 +344,9 @@ router.post('/getWithdrawStatus', getWithdrawStatus);
 //获取所有地址的所要消耗的最低提取费
 router.post('/getAllTokenWithdrawInfoLists', getAllTokenWithdrawInfoLists)
 
-// 定时任务
+// 定时任务 提币+归集
 withdraw_task();
+collect_conis_task();
+
+
 module.exports = router