This commit is contained in:
zhangkun9038@dingtalk.com 2024-12-21 01:53:26 +08:00
parent 674e13f49d
commit 957816e407
3 changed files with 11 additions and 5 deletions

2
go.mod
View File

@ -6,7 +6,7 @@ go 1.21
require (
github.com/go-redis/redis v6.15.9+incompatible
github.com/phyer/core v0.1.60
github.com/phyer/core v0.1.62
github.com/sirupsen/logrus v1.9.3
)

4
go.sum
View File

@ -49,8 +49,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
github.com/phyer/core v0.1.60 h1:CLKeH3Z9UfHnu/2gmWH7MM9Csqg4hnumhAzW8miAB68=
github.com/phyer/core v0.1.60/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
github.com/phyer/core v0.1.62 h1:WIrdjV+0SG9pnTll1LwphA9nd3EzrwbSyuIJYKorlpw=
github.com/phyer/core v0.1.62/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
github.com/phyer/texus v0.0.0-20241207132635-0e7fb63f8196 h1:P1sxgCsS0VIL38ufZzgUuZLLyY/B+po6kSY7ziNZT7E=
github.com/phyer/texus v0.0.0-20241207132635-0e7fb63f8196/go.mod h1:iZexs5agdApNlp8HW/FqKgma4Ij1x8/o+ZLcMvY3f80=
github.com/phyer/v5sdkgo v0.1.4 h1:mAxxjPJVTYGuGDarqOcFGkzj5AgqbbzJGsnYmmsbapU=

View File

@ -171,10 +171,15 @@ func LoopMakeMaX(cr *core.Core) {
go func(cad *core.Candle) {
time.Sleep(time.Duration(300) * time.Millisecond)
err, ct := MakeRsi(cr, cad, 16)
logrus.Warn(GetFuncName(), " ma30 err:", err, " ct:", ct, " cd.InstID:", cd.InstID, " cd.Period:", cd.Period)
logrus.Warn(GetFuncName(), " rsi16 err:", err, " ct:", ct, " cd.InstID:", cd.InstID, " cd.Period:", cd.Period)
// cd.InvokeRestQFromRemote(cr, ct)
}(cd)
go func(cad *core.Candle) {
time.Sleep(time.Duration(300) * time.Millisecond)
err, ct := MakeRsi(cr, cad, 12)
logrus.Warn(GetFuncName(), " rsi12 err:", err, " ct:", ct, " cd.InstID:", cd.InstID, " cd.Period:", cd.Period)
// cd.InvokeRestQFromRemote(cr, ct)
}(cd)
// TODO TODO 这地方不能加延时否则makeMax处理不过来多的就丢弃了造成maX的sortedSet比candle的短很多。后面所有依赖的逻辑都受影响.
// time.Sleep(300 * time.Millisecond)
}
@ -298,6 +303,7 @@ func MakeRsi(cr *core.Core, cl *core.Candle, count int) (error, int) {
Period: cl.Period,
Timestamp: cl.Timestamp,
Ts: tsi,
Count: count,
LastUpdate: time.Now(),
RsiVol: rv,
Confirm: false,