Merge remote-tracking branch 'origin/master'

config/log4js.json

 {  
 
-  "customBaseDir" :"/var/tmp/mytoken/",  
+  "customBaseDir" :"/var/tmp/madex/backend/",
   "customDefaultAtt" :{  
         "type": "file",  
         "maxLogSize": "10M",

cron/model/task.fee.rate.log.model.ts

+/**
+ * 原文件:b024-spot.rpc.utils.js
+ */
+import {
+    ormDB,
+    userInfo,
+    coinType,
+    mainUserAsset,
+    userInfoSon,
+    feeRateSpotLog,
+    feeRateContractLog,
+    commonUserFeeSetting,
+    feeRateBaseCoinContractLog, spotPairs, contractPairs
+} from "@madex/ex-ts-dao";
+import { FEE_RATE_LOG_STATUS } from "../../src/constant/feeRateLogConst";
+import { changeTradingFee, getPairFromCore } from "../../src/utils/coreSystemUtils";
+
+let BigNumber = require('bignumber.js');
+
+const logger = require('@madex/ex-js-public').logger;
+
+
+let user_info = userInfo.prototype;
+let coin_type = coinType.prototype;
+let fee_rate_spot_log = feeRateSpotLog.prototype;
+let feeRateCheckStatus = FEE_RATE_LOG_STATUS;
+
+
+let WHITE_LIST: any = [];
+
+
+const sleep = ms => new Promise((res) => setTimeout(res, ms));
+
+/**
+ * 检查交易对是否存在
+ * @param pair
+ * @param type 1 现货 2 U本位合约 3 币本位合约
+ */
+let checkPair = async function (pair: string, type: number) {
+    let _func_name_ = 'task.fee.rate.log.model.checkPair';
+    if (!pair || !type) {
+        throw '3000';
+    }
+    let dbPair: any;
+    if (type == 1) {//现货
+        dbPair = await spotPairs.prototype.findOne({
+            attributes: ['id'],
+            where: {
+                symbol: String(pair),
+                status: 2,//提交成功
+            },
+            raw: true,
+        });
+    }
+    else {//U、币本位合约
+        dbPair = await contractPairs.prototype.findOne({
+            attributes: ['id'],
+            where: {
+                symbol: String(pair),
+                status: 2,//提交成功
+            },
+            raw: true,
+        })
+    }
+    if (!dbPair) {
+        logger.warn(_func_name_, `spot_pairs or contract_pairs  no found ${pair} or no push core`);
+        throw '3000';
+    }
+    return dbPair;
+};
+
+let checkUser = async function (user_id) {
+    let _func_name_ = 'task.fee.rate.log.model.checkUser';
+    if (!user_id || isNaN(user_id)) {
+        throw '3000';
+    }
+    let dbinfo = await user_info.findOne({
+        attributes: ['user_id'],
+        where: {
+            user_id: Number(user_id),
+        },
+        raw: true,
+    });
+    if (!dbinfo) {
+        logger.warn(_func_name_, `user_info no found ${user_id}`);
+        throw '3000';
+    }
+    return dbinfo;
+};
+
+let checkFeeModel = async function (fee_model) {
+    let _func_name_ = 'task.fee.rate.log.model.checkFeeModel';
+    let validFeeModel = {
+        fixed: 1,
+        fixedingain: 1,
+        tered: 1,
+        tieredingain: 1,
+        fixedingainuser: 1,
+    };
+    if (!validFeeModel[fee_model]) {
+        logger.warn(_func_name_, `fee_model error ${fee_model}`);
+        throw '3000';
+    }
+};
+
+
+let checkFeeRate = async function (fee_rate) {
+    let _func_name_ = 'spotRpcUtils.checkFeeRate';
+