From 4b3e1727840673f6b3fd19801bcd3bfa1f1b935d Mon Sep 17 00:00:00 2001 From: dongzp_book <90fanhua@gmail.com> Date: Wed, 8 Jul 2026 15:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../com/sample/trend/StrategyApplication.java | 4 ++-- .../sample/trend/config/CommonConstant.java | 2 +- .../trend/strategy/AutoGridStrategy.java | 18 ++++-------------- .../{strategy => }/util/AtrCalculator.java | 2 +- 5 files changed, 9 insertions(+), 19 deletions(-) rename src/main/java/com/sample/trend/{strategy => }/util/AtrCalculator.java (97%) diff --git a/pom.xml b/pom.xml index 6be101e..f480d6e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ vip.uuquant uuquant-exchange-api - 20260327.1656 + 20260619.0130 diff --git a/src/main/java/com/sample/trend/StrategyApplication.java b/src/main/java/com/sample/trend/StrategyApplication.java index 2101c0e..507f310 100644 --- a/src/main/java/com/sample/trend/StrategyApplication.java +++ b/src/main/java/com/sample/trend/StrategyApplication.java @@ -11,8 +11,8 @@ public class StrategyApplication { // 调试模式 DebugConfig debugConfig = new DebugConfig(); debugConfig.setAgentHost("192.168.0.105"); - debugConfig.setRobotId(2038210296263434242L); - debugConfig.setRobotApiKey("454d7146f092fdbbcfdef0ff554d9aa4"); + debugConfig.setRobotId(2074501096701927426L); + debugConfig.setRobotApiKey("be7520970034b54cb7f2bccab0d546ca"); StrategyRunner strategyRunner = StrategyRunner.getInstance(); strategyRunner.setDebugConfig(debugConfig); diff --git a/src/main/java/com/sample/trend/config/CommonConstant.java b/src/main/java/com/sample/trend/config/CommonConstant.java index a54adfc..9ad3eee 100644 --- a/src/main/java/com/sample/trend/config/CommonConstant.java +++ b/src/main/java/com/sample/trend/config/CommonConstant.java @@ -16,7 +16,7 @@ public class CommonConstant { public static final ExchangeFactory exchangeFactory = new ExchangeFactory(); static { - webSocketManager.setLogEnabled(false); + webSocketManager.setLogEnabled(true); } private CommonConstant() { diff --git a/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java b/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java index 4a2c827..500d199 100644 --- a/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java +++ b/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.hengyi.xbaseweb.common.result.ApiResult; import com.sample.trend.config.CommonConstant; -import com.sample.trend.strategy.util.AtrCalculator; +import com.sample.trend.util.AtrCalculator; import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,6 @@ import vip.uuquant.tradesystem.runner.enums.AlarmLevel; import vip.uuquant.tradesystem.runner.enums.RobotChartType; import vip.uuquant.tradesystem.runner.strategy.BaseStrategy; import vip.uuquant.tradesystem.runner.vo.AccountVO; -import vip.uuquant.tradesystem.runner.vo.RobotVO; import vip.uuquant.tradesystem.runner.vo.SymbolVO; import java.math.BigDecimal; @@ -204,7 +203,7 @@ public class AutoGridStrategy extends BaseStrategy { tryParams("base_quantity", "atr_multiplier", "kline_interval", "kline_period", "grid_adjust_interval", "min_gap", "max_gap", "upper_bound", "lower_bound", - "grid_count", "testMode"); + "grid_count", "test_mode"); baseQuantity = getRunParams().getBigDecimal("base_quantity"); atrMultiplier = getRunParams().getBigDecimal("atr_multiplier"); @@ -215,7 +214,7 @@ public class AutoGridStrategy extends BaseStrategy { maxGap = getRunParams().getBigDecimal("max_gap"); upperBound = getRunParams().getBigDecimal("upper_bound"); lowerBound = getRunParams().getBigDecimal("lower_bound"); - testMode = getRunParams().getBooleanValue("testMode"); + testMode = getRunParams().getBooleanValue("test_mode"); leverage = getRunParams().getIntValue("leverage"); if (leverage <= 0) { leverage = 10; @@ -239,11 +238,7 @@ public class AutoGridStrategy extends BaseStrategy { } } - RobotVO robotInfo = getRobotInfo(); - if (robotInfo != null) { - robotId = robotInfo.getRobotId(); - } - + robotId = getRobotConfig().getRobotId(); initBitGetClient(); initCharts(); @@ -303,11 +298,6 @@ public class AutoGridStrategy extends BaseStrategy { AccountVO account = getAccount(); bitGetClient.init(account.getApiKey(), account.getSecretKey(), account.getPassphrase(), null, CommonConstant.webSocketManager); - try { - bitGetClient.setLeverage(getSymbol(), leverage); - } catch (Exception e) { - logger.warn("设置杠杆失败：{}", e.getMessage()); - } try { bitGetClient.createPublicWebsocket(webSocketMessageHandler); bitGetClient.createPrivateWebsocket(webSocketMessageHandler); diff --git a/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java b/src/main/java/com/sample/trend/util/AtrCalculator.java similarity index 97% rename from src/main/java/com/sample/trend/strategy/util/AtrCalculator.java rename to src/main/java/com/sample/trend/util/AtrCalculator.java index 25447f0..74a7ea3 100644 --- a/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java +++ b/src/main/java/com/sample/trend/util/AtrCalculator.java @@ -1,4 +1,4 @@ -package com.sample.trend.strategy.util; +package com.sample.trend.util; import com.alibaba.fastjson2.JSONArray;