diff --git a/go.sum b/go.sum index 6afbbdf..2c9f6d2 100644 --- a/go.sum +++ b/go.sum @@ -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.16 h1:ssuBoL3lKe1+JkDuOSLjLB/v+MLq4nh98gbmPyOMIRM= -github.com/phyer/core v0.2.16/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg= +github.com/phyer/core v0.2.18 h1:kgAH4FSugwZisR1yIzq4Ru+qAU13/yQLNwCooEfzWq8= +github.com/phyer/core v0.2.18/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= diff --git a/modules/extent.go b/modules/extent.go index addee0a..2ea955c 100644 --- a/modules/extent.go +++ b/modules/extent.go @@ -269,7 +269,7 @@ func GetRangeCandleSortedSet(cr *core.Core, setName string, count int, from time Count: int64(count), } ary := []string{} - extt, err := GetExpiration(cr, period) + extt, err := cr.GetExpiration(period) ot := time.Now().Add(extt * -1) oti := ot.UnixMilli() cli := cr.RedisLocalCli @@ -340,17 +340,17 @@ func extractString(input string) (string, error) { return remaining[:pipeIndex], nil } -func GetExpiration(cr *core.Core, per string) (time.Duration, error) { - if len(per) == 0 { - erstr := fmt.Sprint("period没有设置") - logrus.Warn(erstr) - err := errors.New(erstr) - return 0, err - } - exp, err := cr.PeriodToMinutes(per) - dur := time.Duration(exp*319) * time.Minute - return dur, err -} +// func GetExpiration(cr *core.Core, per string) (time.Duration, error) { +// if len(per) == 0 { +// erstr := fmt.Sprint("period没有设置") +// logrus.Warn(erstr) +// err := errors.New(erstr) +// return 0, err +// } +// exp, err := cr.PeriodToMinutes(per) +// dur := time.Duration(exp*319) * time.Minute +// return dur, err +// } func MakeRsi(cr *core.Core, cl *core.Candle, count int, makeStock bool) (error, int) { data := cl.Data js, _ := json.Marshal(data)