diff --git a/pom.xml b/pom.xml index f480d6e..6be101e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ vip.uuquant uuquant-exchange-api - 20260619.0130 + 20260327.1656 diff --git a/src/main/java/com/sample/trend/StrategyApplication.java b/src/main/java/com/sample/trend/StrategyApplication.java index 507f310..2101c0e 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(2074501096701927426L); - debugConfig.setRobotApiKey("be7520970034b54cb7f2bccab0d546ca"); + debugConfig.setRobotId(2038210296263434242L); + debugConfig.setRobotApiKey("454d7146f092fdbbcfdef0ff554d9aa4"); 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 9ad3eee..a54adfc 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(true); + webSocketManager.setLogEnabled(false); } 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 500d199..4a2c827 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.util.AtrCalculator; +import com.sample.trend.strategy.util.AtrCalculator; import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +22,7 @@ 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; @@ -203,7 +204,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", "test_mode"); + "grid_count", "testMode"); baseQuantity = getRunParams().getBigDecimal("base_quantity"); atrMultiplier = getRunParams().getBigDecimal("atr_multiplier"); @@ -214,7 +215,7 @@ public class AutoGridStrategy extends BaseStrategy { maxGap = getRunParams().getBigDecimal("max_gap"); upperBound = getRunParams().getBigDecimal("upper_bound"); lowerBound = getRunParams().getBigDecimal("lower_bound"); - testMode = getRunParams().getBooleanValue("test_mode"); + testMode = getRunParams().getBooleanValue("testMode"); leverage = getRunParams().getIntValue("leverage"); if (leverage <= 0) { leverage = 10; @@ -238,7 +239,11 @@ public class AutoGridStrategy extends BaseStrategy { } } - robotId = getRobotConfig().getRobotId(); + RobotVO robotInfo = getRobotInfo(); + if (robotInfo != null) { + robotId = robotInfo.getRobotId(); + } + initBitGetClient(); initCharts(); @@ -298,6 +303,11 @@ 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/util/AtrCalculator.java b/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java similarity index 97% rename from src/main/java/com/sample/trend/util/AtrCalculator.java rename to src/main/java/com/sample/trend/strategy/util/AtrCalculator.java index 74a7ea3..25447f0 100644 --- a/src/main/java/com/sample/trend/util/AtrCalculator.java +++ b/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java @@ -1,4 +1,4 @@ -package com.sample.trend.util; +package com.sample.trend.strategy.util; import com.alibaba.fastjson2.JSONArray;