diff --git a/BitgetApi/Data/API/APIKeyInfo_Bitget.cs b/BitgetApi/Data/API/APIKeyInfo_Bitget.cs index 2776f18..fbfcdb3 100644 --- a/BitgetApi/Data/API/APIKeyInfo_Bitget.cs +++ b/BitgetApi/Data/API/APIKeyInfo_Bitget.cs @@ -23,8 +23,8 @@ namespace BitgetApi.Data.API { Id = 0, Name = "김영호", - AccessKey = "bg_fbf275132203dcdbdca0db1e4b2351bb", - SecretKey = "40ad89ac5347b9c3164ddf8b8e1c464038705266b25049a4f21ca12f509603bd", + AccessKey = "bg_f93aa530288b6ec9d62095994c51972a", + SecretKey = "2fce18bcd12ca23a7920c48295a58da031443ea383af8114ed599c1b14ac678e", PassphraseKey = "dudgh0505" }; public static APIKeyInfo_Bitget 이장화 = new APIKeyInfo_Bitget() diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 23602ac..07123c4 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -374,14 +374,14 @@ namespace BitgetAPI.IndicatorConditionSetup var Bol24 = candleData.movingAverageDataList[24].BolangerValue; //5분봉이 default이지만 15분봉으로 변경 - if ((int)interval != 15) + if ((int)interval != 5) { continue; } #region 15분봉 처리 //15분봉이지만 60분봉으로 변경 - var candleDatas15 = findedMarket.candleDataList[MCandleTimeType.H1]; + var candleDatas15 = findedMarket.candleDataList[MCandleTimeType.M15]; var candleDatas15_정렬 = candleDatas15.ToList().OrderBy(i => i.Argument).ToList(); var candleData15 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); @@ -436,7 +436,7 @@ namespace BitgetAPI.IndicatorConditionSetup #region 1분봉 처리 //1분봉이지만 3분봉으로 변경 - var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M3]; + var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M1]; var candleDatas1_정렬 = candleDatas1.ToList().OrderBy(i => i.Argument).ToList(); var candleData1 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument); @@ -485,7 +485,7 @@ namespace BitgetAPI.IndicatorConditionSetup #region 60분봉 처리 //60분봉이지만 180분 처리 - var candleDatas60 = findedMarket.candleDataList[MCandleTimeType.H2]; + var candleDatas60 = findedMarket.candleDataList[MCandleTimeType.H1]; var candleDatas60_정렬 = candleDatas60.ToList().OrderBy(i => i.Argument).ToList(); var candleData60 = candleDatas60.Find(i => i.Argument == candleDatas60_정렬.Last().Argument); @@ -551,11 +551,11 @@ namespace BitgetAPI.IndicatorConditionSetup try { var candle15Flag = 현재봉15_4 > 현재봉15_12 - && candleData15.Open < candleData15.Close + // && candleData15.Open < candleData15.Close && 현재봉15_4 > 전봉15_4 - && 전봉15_4 > 전전봉15_4 + // && 전봉15_4 > 전전봉15_4 && 현재봉15_12 > 전봉15_12 - && 전봉15_12 > 전전봉15_12 + // && 전봉15_12 > 전전봉15_12 && 전봉15Bol12 - 전봉15Bol24 > 현재봉15Bol12 - 현재봉15Bol24; var candle60Flag = 현재봉60_4 > 현재봉60_12 @@ -875,11 +875,11 @@ namespace BitgetAPI.IndicatorConditionSetup try { var candle15Flag = 현재봉15_4 < 현재봉15_12 - && candleData15.Open > candleData15.Close + //&& candleData15.Open > candleData15.Close && 현재봉15_4 < 전봉15_4 - && 전봉15_4 < 전전봉15_4 + //&& 전봉15_4 < 전전봉15_4 && 현재봉15_12 < 전봉15_12 - && 전봉15_12 < 전전봉15_12 + //&& 전봉15_12 < 전전봉15_12 && 전봉15Bol12 - 전봉15Bol24 > 현재봉15Bol12 - 현재봉15Bol24;