Compare commits

..

No commits in common. "0516c28dce0542b407028cecc2b2c928fede5cda" and "2504f59fddc566b6a355c6440f0528729415aa37" have entirely different histories.

4 changed files with 12 additions and 12 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.2.6
github.com/phyer/core v0.1.100
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.2.6 h1:zLNgJ3PP4s5EvSC40RLXw0QptnvkbXwRBwvWHVCWVfA=
github.com/phyer/core v0.2.6/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
github.com/phyer/core v0.1.100 h1:xYOywQnKBqNqCD1NK/iFHi5EZX0CDsAfLgaE/BLmz8s=
github.com/phyer/core v0.1.100/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

@ -288,12 +288,12 @@ func GetRangeCandleSortedSet(cr *core.Core, setName string, count int, from time
if err != nil || len(keyAry) == 0 {
logrus.Warning("no record with cmd: ZRevRangeByScore ", "setName: ", setName, " from: ", froms, " sts: ", sts, " err:", err.Error())
logrus.Warning("zrev lens of ary: lens: ", len(ary), "GetRangeSortedSet ZRevRangeByScore:", "setName:", setName, " opt.Max:", opt.Max, " opt.Min:", opt.Min)
// go func() {
// parts := strings.Split(setName, "|")
// instId := parts[1]
// period, _ := extractString(setName)
// InvokeCandle(cr, instId, period, fromt, sti)
// }()
go func() {
parts := strings.Split(setName, "|")
instId := parts[1]
period, _ := extractString(setName)
InvokeCandle(cr, instId, period, fromt, sti)
}()
return &cdl, err
}
for _, str := range keyAry {
@ -462,9 +462,9 @@ func MakeMaX(cr *core.Core, cl *core.Candle, count int) (error, int) {
// cdl, err := cr.GetLastCandleListOfCoin(cl.InstID, cl.Period, count, lastTime)
cdl, err := GetRangeCandleSortedSet(cr, setName, count, lastTime)
if err != nil {
// to, _ := cr.PeriodToMinutes(cl.Period)
// to = tsi + to*ToInt64(count)
// InvokeCandle(cr, cl.InstID, cl.Period, tsi, to)
to, _ := cr.PeriodToMinutes(cl.Period)
to = tsi + to*ToInt64(count)
InvokeCandle(cr, cl.InstID, cl.Period, tsi, to)
return err, 0
}

BIN
siaga

Binary file not shown.