From c5baa8f89912cce154e447e14a177601daf5a346 Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Sun, 18 Jan 2026 02:35:34 +0800 Subject: [PATCH] up --- config_examples/live.json | 19 +++++++++---------- tools/live.sh | 27 ++++++++------------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/config_examples/live.json b/config_examples/live.json index dff5f561..2c3d5694 100644 --- a/config_examples/live.json +++ b/config_examples/live.json @@ -19,12 +19,15 @@ "timeout": 20000 }, "pair_whitelist": [ - "ACT/USDT", + "AAVE/USDT", "ADA/USDT", "AVAX/USDT", "BCH/USDT", + "BIO/USDT", "BNB/USDT", "BTC/USDT", + "CHZ/USDT", + "CORE/USDT", "DOGE/USDT", "DOT/USDT", "ETH/USDT", @@ -33,14 +36,13 @@ "LINK/USDT", "LTC/USDT", "MASK/USDT", - "MOODENG/USDT", + "MERL/USDT", "OKB/USDT", "PENGU/USDT", "PEPE/USDT", - "PI/USDT", - "PNUT/USDT", - "RENDER/USDT", - "SHIB/USDT", + "POL/USDT", + "PUMP/USDT", + "SAND/USDT", "SNX/USDT", "SOL/USDT", "SUI/USDT", @@ -49,11 +51,8 @@ "TRUMP/USDT", "TRX/USDT", "UNI/USDT", - "WIF/USDT", - "WLD/USDT", + "USDG/USDT", "WLFI/USDT", - "XAUT/USDT", - "XPL/USDT", "XRP/USDT" ], "pair_blacklist": [ diff --git a/tools/live.sh b/tools/live.sh index fe0af162..491b2972 100755 --- a/tools/live.sh +++ b/tools/live.sh @@ -122,7 +122,7 @@ except: echo "⚠️ 获取失败,${retry_delay}秒后重试..." >&2 sleep $retry_delay fi - + attempt=$((attempt + 1)) done @@ -307,7 +307,7 @@ cd ../ source .venv/bin/activate # 智能清理:根据环境变量决定是否清理训练模型 -CLEAN_MODELS=${CLEAN_MODELS:-false} # 默认不清理,保留模型支持自适应阈值和增量训练 +CLEAN_MODELS=${CLEAN_MODELS:-false} # 默认不清理,保留模型支持自适应阈值和增量训练 if [ "$CLEAN_MODELS" = "true" ]; then echo "⚠️ CLEAN_MODELS=true,清理所有训练模型..." >&2 @@ -331,31 +331,21 @@ echo "正在启动新容器..." >&2 # 临时禁用 set -e,以便捕获 docker run 的错误 set +e -docker run -d --restart=always \ - --name "${CONTAINER_NAME}" \ +docker-compose run -d --rm \ + --name "$CONTAINER_NAME" \ -p 8080:8080 \ - --add-host "www.okx.com:104.18.43.174" \ - --add-host "api.okx.com:104.18.43.174" \ - # -v "$(pwd)/../user_data:/freqtrade/user_data" \ - # -v "$(pwd)/../config_examples:/freqtrade/config_examples" \ - # -v "$(pwd)/../freqtrade/templates:/freqtrade/templates" \ - # -v "$(pwd)/../freqtrade/exchange:/freqtrade/exchange" \ - # -v "$(pwd)/../freqtrade/plugins/protections:/freqtrade/freqtrade/plugins/protections" \ - # -v "$(pwd)/../ccxt/async_support/okx.py:/home/ftuser/.local/lib/python3.12/site-packages/ccxt/async_support/okx.py" \ - # -v "$(pwd)/../freqtrade/freqai/data_kitchen.py:/freqtrade/freqai/data_kitchen.py" \ - # -v "$(pwd)/../freqtrade/freqai/data_drawer.py:/freqtrade/freqai/data_drawer.py" \ - # -v "$(pwd)/../freqtrade/freqai/freqai_interface.py:/freqtrade/freqai/freqai_interface.py" \ - freqtradeorg/freqtrade:develop_freqai_withredis \ - trade \ + freqtrade trade \ --logfile /freqtrade/user_data/logs/freqtrade.log \ --db-url sqlite:////freqtrade/user_data/tradesv3.sqlite \ + --freqaimodel LightGBMRegressorMultiTarget \ --freqaimodel LightGBMClassifier \ - --fee 0.0008 \ + --fee 0.001 \ --config /freqtrade/config_examples/$CONFIG_FILE \ --config /freqtrade/templates/${PARAMS_NAME}.json \ --config /freqtrade/config_examples/live.json \ --strategy $STRATEGY_NAME \ --strategy-path /freqtrade/templates + RUN_RESULT=$? set -e # 恢复 set -e @@ -366,4 +356,3 @@ else echo "❌ 容器启动失败 (退出码: $RUN_RESULT),请查看上方错误信息" >&2 exit 1 fi -