diff --git a/pom.xml b/pom.xml index a6ecafd..2dc4bb2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.sample trend-grid-strategy - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT trend-grid-strategy 趋势网格策略 diff --git a/src/main/java/com/sample/trend/StrategyApplication.java b/src/main/java/com/sample/trend/StrategyApplication.java index ad5ba4d..507f310 100644 --- a/src/main/java/com/sample/trend/StrategyApplication.java +++ b/src/main/java/com/sample/trend/StrategyApplication.java @@ -2,31 +2,21 @@ package com.sample.trend; import com.sample.trend.strategy.AutoGridStrategy; -import com.sample.trend.strategy.util.ScriptUtil; import vip.uuquant.tradesystem.runner.core.StrategyRunner; import vip.uuquant.tradesystem.runner.vo.DebugConfig; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; - public class StrategyApplication { public static void main(String[] args) { // 调试模式 -// DebugConfig debugConfig = new DebugConfig(); -// debugConfig.setAgentHost("192.168.0.105"); -// debugConfig.setRobotId(2074501096701927426L); -// debugConfig.setRobotApiKey("be7520970034b54cb7f2bccab0d546ca"); -// -// StrategyRunner strategyRunner = StrategyRunner.getInstance(); -// strategyRunner.setDebugConfig(debugConfig); -// strategyRunner.init(AutoGridStrategy.class); + DebugConfig debugConfig = new DebugConfig(); + debugConfig.setAgentHost("192.168.0.105"); + debugConfig.setRobotId(2074501096701927426L); + debugConfig.setRobotApiKey("be7520970034b54cb7f2bccab0d546ca"); - Map map = new HashMap<>(); - map.put("atr", 1); - BigDecimal a = ScriptUtil.evalBigDecimal("atr > 1 ? 2 : 5", map); - System.out.println(a); + StrategyRunner strategyRunner = StrategyRunner.getInstance(); + strategyRunner.setDebugConfig(debugConfig); + strategyRunner.init(AutoGridStrategy.class); } diff --git a/src/main/java/com/sample/trend/config/CommonConstant.java b/src/main/java/com/sample/trend/config/CommonConstant.java index cd53e52..68f2992 100644 --- a/src/main/java/com/sample/trend/config/CommonConstant.java +++ b/src/main/java/com/sample/trend/config/CommonConstant.java @@ -4,15 +4,14 @@ import vip.uuquant.exhangeapi.core.ExchangeFactory; import vip.uuquant.exhangeapi.core.HttpClient; import vip.uuquant.exhangeapi.core.WebSocketManager; -import java.net.InetSocketAddress; -import java.net.Proxy; - /** * 交易所客户端全局单例 */ public class CommonConstant { - /** 全局 HTTP 代理 */ + /** + * 全局 HTTP 代理 + */ // public static final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 7897)); public static final HttpClient httpClient = HttpClient.builder().build(); diff --git a/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java b/src/main/java/com/sample/trend/strategy/AutoGridStrategy.java index 97f3bad..c794009 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.strategy.util.AtrUtil; import com.sample.trend.strategy.util.ScriptUtil; import okhttp3.Response; import org.slf4j.Logger; @@ -452,7 +452,7 @@ public class AutoGridStrategy extends BaseStrategy { if (klines == null || klines.isEmpty()) { return null; } - return AtrCalculator.calculate(klines, klinePeriod); + return AtrUtil.calculate(klines, klinePeriod); } // ======================== 价格边界 ======================== diff --git a/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java b/src/main/java/com/sample/trend/strategy/util/AtrUtil.java similarity index 96% rename from src/main/java/com/sample/trend/strategy/util/AtrCalculator.java rename to src/main/java/com/sample/trend/strategy/util/AtrUtil.java index 25447f0..88f4892 100644 --- a/src/main/java/com/sample/trend/strategy/util/AtrCalculator.java +++ b/src/main/java/com/sample/trend/strategy/util/AtrUtil.java @@ -10,9 +10,9 @@ import java.util.List; /** * ATR(Average True Range)计算工具 */ -public final class AtrCalculator { +public final class AtrUtil { - private AtrCalculator() { + private AtrUtil() { } /**