change log

model/db/mysql_db.js

@@ -68,7 +68,7 @@ function addConnEvent() {
         });
 
         MYSQL_INSTANCE.on('connection', function (connection) {
-            logger.log('mysql connection', connection);
+            logger.log('mysql connection', connection.threadId);
         });
         MYSQL_INSTANCE.on('enqueue', function () {
             logger.log('Waiting for available connection slot');

model/moralis_sdk.js

@@ -861,10 +861,7 @@ async function getTokenTransfers(opt) {
             // if (!options.to_date) {
             //     options.to_date = '2099-01-01'
             // }
-<<<<<<< HEAD
-=======
             logger.log('getTokenTransfers account getTokenTransfers>>>>>', options);
->>>>>>> dev
             var t_2 = await Moralis.Web3API.account.getTokenTransfers(options);
             logger.log('getTokenTransfers token ret -->>> t_2', t_2);
             setTransfersDataType('token', t_2.result)

routes/sdk.js

@@ -34,7 +34,7 @@ async function getTransfers(ctx) {
     var temp_obj = { ...obj }
 
     await moralis.getTokenTransfers(obj).then((result) => {
-        logger.log('getTransfers response',result)
+        logger.log('getTransfers response', result)
         ctx.body = result;
         if (result) {
             //提交归集任务 native 能获取到 gas 、token 无法获取到 gas 费
@@ -221,10 +221,6 @@ async function withdrawV2(ctx) {
     }
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
 async function withdraw_(obj) {
     console.log("withdraw_", obj);
     var log_obj = { ...obj }
@@ -280,7 +276,6 @@ async function getWithdrawStatus(ctx) {
     var info = await withdraw_db.queryWithdrawInfoFromWithdrawId(obj.withdrawId)
     logger.log('getWithdrawStatus info', JSON.stringify(info))
     if (info) {
-<<<<<<< HEAD
         if (info.withdraw_status != 3) {
             ctx.body = utils.toJson(0, {
                 withdrawId: info.withdraw_id,
@@ -292,15 +287,6 @@ async function getWithdrawStatus(ctx) {
         } else {
             ctx.body = utils.toJson(-1, null, info.errorMsg)
         }
-=======
-        ctx.body = utils.toJson(0, {
-            withdrawId: info.withdraw_id,
-            withdrawStatus: info.withdraw_status,
-            withdrawHash: info.withdraw_hash,
-            chainId: info.chain_id,
-            transferTimestamp: info.update_time,
-        }, null)
->>>>>>> dev
     } else {
         ctx.body = utils.toJson(-1, null, obj.withdraw_id + ' id does not exist.')
     }