update

config/dev_config.js

@@ -19,8 +19,9 @@ const account_config = {
     TRANSFER_GAS: true,
     FEISHU_URL: 'https://open.feishu.cn/open-apis/bot/v2/hook/18dfe21f-b1bd-46ca-a8c7-c85e1c84f02d',
     CZZ_BASEURL: "https://internal-block-payout-test.denet.me",
-    // STATISTICS_URL: 'https://testapi.denetme.net/denet/wallet/stat/getMoneyStat?date='
-    STATISTICS_URL:'https://api.denetme.net/denet/wallet/stat/getMoneyStat?date='
+    // CZZ_BASEURL: "https://internal-block-payout.denet.me",
+    STATISTICS_URL: 'https://testapi.denetme.net/denet/wallet/stat/getMoneyStat?date='
+    // STATISTICS_URL:'https://api.denetme.net/denet/wallet/stat/getMoneyStat?date='
 }
 
 const reids_token_config = {
@@ -48,26 +49,6 @@ const http_log_report_config = {
 // 设置数据库配置文件
 const db_config = {
     // 数据库配置
-    // mysql: {
-    //     DATABASE: 'denet_chain',   //数据库名称
-    //     DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
-    //     TABLENAME: 'user_key_manage',   //表名
-    //     USERNAME: 'denet',   //用户名
-    //     PASSWORD: 'cyber#Together_2022', //密码
-    //     PORT: '3306', //连接的端口
-    //     HOST: 'denet-test.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
-    //     OPEN_POOL: true,
-    //     POOL_SIZE: 5,
-    // },
-
-    // redis: {
-    //     PORT: 6379, // Redis port
-    //     HOST: "denet-test.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
-    //     USERNAME: null, // needs Redis >= 6
-    //     PASSWORD: null,
-    // },
-
-    // 线上数据库配置
     mysql: {
         DATABASE: 'denet_chain',   //数据库名称
         DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
@@ -75,17 +56,37 @@ const db_config = {
         USERNAME: 'denet',   //用户名
         PASSWORD: 'cyber#Together_2022', //密码
         PORT: '3306', //连接的端口
-        HOST: 'denet-chain-prod.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
+        HOST: 'denet-test.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
         OPEN_POOL: true,
         POOL_SIZE: 5,
     },
 
     redis: {
         PORT: 6379, // Redis port
-        HOST: "denet-chain-prod.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
-        USERNAME: null,
+        HOST: "denet-test.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
+        USERNAME: null, // needs Redis >= 6
         PASSWORD: null,
     },
+
+    // // 线上数据库配置
+    // mysql: {
+    //     DATABASE: 'denet_chain',   //数据库名称
+    //     DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
+    //     TABLENAME: 'user_key_manage',   //表名
+    //     USERNAME: 'denet',   //用户名
+    //     PASSWORD: 'cyber#Together_2022', //密码
+    //     PORT: '3306', //连接的端口
+    //     HOST: 'denet-chain-prod.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
+    //     OPEN_POOL: true,
+    //     POOL_SIZE: 5,
+    // },
+
+    // redis: {
+    //     PORT: 6379, // Redis port
+    //     HOST: "denet-chain-prod.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
+    //     USERNAME: null,
+    //     PASSWORD: null,
+    // },
 }
 
 // 设置 moralis sdk 配置文件

model/db/collect_coins_db.js

@@ -16,6 +16,11 @@ async function query_collect_total_fee(startTime, endTime) {
         param = [0]
     }
 
+    if (!startTime && endTime) {
+        sql = 'select * from collect_coins_manage WHERE status=? AND update_time>=? AND update_time<=? '
+        param = [0,0,endTime]
+    }
+
     // sql = 'select * from collect_coins_manage'
     // param=[]
     return new Promise((resolve) => {

model/http_withdraw.js

@@ -11,12 +11,12 @@ var url = account_config.CZZ_BASEURL
 const withdraw = async (params) => {
     params.privateKey = ''
     params.toAddress = params.receiver
-    logger.info('withdraw_czz', process.env.NODE_ENV, url, ' params ', params)
+    logger.info('http-withdraw', process.env.NODE_ENV, url, ' params ', params)
     var data = { ...params }
     return new Promise(resolve => {
         axios.post(url + '/withdraw', data, { timeout: 5 * 60 * 1000 })
             .then(res => {
-                console.log('res=>', res.status, res.data);
+                console.log('withdraw res=>', res.status, res.data);
                 resolve(res.data)
             }).catch(err => {
                 logger.error('http_request_post withdraw_czz error ', JSON.stringify(err));
@@ -29,7 +29,7 @@ const withdraw = async (params) => {
 const check_withdraw_status = async (params) => {
     logger.info('txn_status_czz', process.env.NODE_ENV, url, ' params ', params)
     var pars = {
-        txn_hash: params.txn_hash,
+        txn_hash: params.hash,
         chain: params.chain
     }
     var data = pars

model/moralis_sdk.js

@@ -685,12 +685,15 @@ const transfer_handle = async (obj) => {
     }
 
     try {
-        //解密
-        obj.privateKey = utils.decryptPrivityKey(obj.privateKey);
+        if (utils.getChainNameFromChain(obj.chain) == 'bsc') {
 
-        if (!obj.privateKey) {
-            logger.error('decryptPrivityKey error', obj);
-            return toJson(-1, null, "decryptPrivityKey error.");
+            //解密
+            obj.privateKey = utils.decryptPrivityKey(obj.privateKey);
+
+            if (!obj.privateKey) {
+                logger.error('decryptPrivityKey error', obj);
+                return toJson(-1, null, "decryptPrivityKey error.");
+            }
         }
     } catch (error) {
         logger.error('decryptPrivityKey error', error.toString(), JSON.stringify(obj));
@@ -1134,7 +1137,8 @@ async function pushChainDetailTOQueue(withdraw, request, obj) {
             var obj = JSON.parse(obj)
             var temp_obj = {
                 withdraw_id: request.withdraw_id,
-                hash: obj.hash,
+                hash: obj.data.hash,
+                chain:obj.data.chain,
                 create_time: obj.data.create_time,
                 lifecycle: obj.data.lifecycle
             }
@@ -1544,7 +1548,7 @@ function convertChain(chain) {
  * @param {} opts 
  */
 async function getTransferRecord(opts, type, use_moralis_sdk_) {
-    logger.info('getTransferRecord>>>>>>>>', opts, type,use_moralis_sdk_)
+    logger.info('getTransferRecord>>>>>>>>', opts, type, use_moralis_sdk_)
     //是否使用 moralis sdk 进行查询
     var use_moralis_sdk = use_moralis_sdk_
     var temp_opts = { ...opts }

model/server_data_statisticsv2.js

@@ -308,6 +308,14 @@ async function getWithdrawOutInfoV2(startTime, endTime) {
         startTime = new Date(startTime).getTime()
         endTime = new Date(endTime).getTime()
     }
+
+
+    if (!startTime && endTime) {
+        startTime = 0
+        endTime = new Date(endTime).getTime()
+    }
+
+
     var withdraw_ret = await withdraw_db.getWidthdrawTotalFee(startTime, endTime)
 
     var withDrawInfos = []
@@ -516,7 +524,7 @@ async function getStatisticsInfoV2(day) {
     var rangeData = await getServerData(startTime, endTime)
     logger.info('getServerData rangeData', rangeData)
 
-    var allData = await getServerData(null, null)
+    var allData = await getServerData(null, endTime)
     // var allData = rangeData
     logger.info('getServerData allData', allData)
 
@@ -820,7 +828,7 @@ async function test() {
     // }
 
 }
-test()
+// test()
 // exec()
 module.exports = {
     getStatisticsInfoV2

routes/sdk.js

@@ -239,8 +239,8 @@ async function check_czz_withdraw_task() {
                 continue
             }
 
-            if (!exec_obj.txn_hash || !exec_obj.chain) {
-                logger.error('check_withdraw_status error:',JSON.stringify(exec_obj))
+            if (!exec_obj.hash || !exec_obj.chain) {
+                logger.error('check_withdraw_status error:', JSON.stringify(exec_obj))
                 continue
             }
             var obj = await czz.check_withdraw_status(exec_obj)
@@ -726,7 +726,7 @@ async function timer_collect_conis_bsc_task() {
     }
 }
 
-async function timer_collect_conis_task(chain,address){
+async function timer_collect_conis_task(chain, address) {
     var index = 0
     var delay = 60 * 1000 * 60
     while (1) {
@@ -754,18 +754,18 @@ async function timer_collect_conis_czz_task() {
     }
 }
 
-async function timer_transfer_bsc_task() {
+async function timer_transfer_task(obj_) {
     var index = 0
     var delay = 60 * 1000 * 60
     while (1) {
-        var obj_ = {
-            "type": "erc20",
-            "contractAddress": "0xFF94950Ee8A79c52cC4B0Aa5178C8cEa48A3F3A6",
-            "amount": "123000000000000000000",
-            "chain": "bsc_testnet",
-            "receiver": "0x3B525c35DdC323B08241493f148340D89e3A73a7",
-            "withdrawId": index.toString()
-        }
+        // var obj_ = {
+        //     "type": "erc20",
+        //     "contractAddress": "0xFF94950Ee8A79c52cC4B0Aa5178C8cEa48A3F3A6",
+        //     "amount": "123000000000000000000",
+        //     "chain": "bsc_testnet",
+        //     "receiver": "0x3B525c35DdC323B08241493f148340D89e3A73a7",
+        //     "withdrawId": index.toString()
+        // }
         obj_.withdraw_id = utils.getCurrentDateFormat('YYYY-MM-DD-HH:mm:ss:SSS').toString()
         var info = await moralis.queryCompanyInfoFromId(0);
         obj_.user_address = info.user_address
@@ -873,11 +873,26 @@ check_czz_withdraw_task();
 bsc_log_monitoring()
 
 if (process.env.NODE_ENV == 'dev' || process.env.NODE_ENV == 'test') {
-    // timer_transfer_bsc_task()
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0xFF94950Ee8A79c52cC4B0Aa5178C8cEa48A3F3A6",
+    //     "amount": "123000000000000000000",
+    //     "chain": "bsc_testnet",
+    //     "receiver": "0x3B525c35DdC323B08241493f148340D89e3A73a7",
+    //     "withdrawId": index.toString()
+    // })
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0x9984086cb9d93dbe47c4e70890aad5454bbc2518",
+    //     "amount": "1200000000000000000000",
+    //     "chain": "kcc_testnet",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 1
+    // })
     // timer_transfer_czz_task()
-    timer_collect_conis_bsc_task()
+    // timer_collect_conis_bsc_task()
     // timer_collect_conis_czz_task()
-    // timer_collect_conis_task('kcc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+    timer_collect_conis_task('kcc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
 }
 
 module.exports = router