修改同花顺的复权日线数据接口

README.md

@@ -60,43 +60,43 @@ func main() {
 
 | IP              | 测试时间       | 所属地区 | 运营商 |
 |-----------------|------------|------|-----|
-| 124.71.187.122  | 2025-03-15 | 上海   | 华为  |
-| 122.51.120.217  | 2025-03-15 | 上海   | 腾讯  |
-| 111.229.247.189 | 2025-03-15 | 上海   | 腾讯  |
-| 124.70.176.52   | 2025-03-15 | 上海   | 华为  |
-| 123.60.186.45   | 2025-03-15 | 上海   | 华为  |
-| 122.51.232.182  | 2025-03-15 | 上海   | 腾讯  |
-| 118.25.98.114   | 2025-03-15 | 上海   | 腾讯  |
-| 124.70.199.56   | 2025-03-15 | 上海   | 华为  |
-| 121.36.225.169  | 2025-03-15 | 上海   | 华为  |
-| 123.60.70.228   | 2025-03-15 | 上海   | 华为  |
-| 123.60.73.44    | 2025-03-15 | 上海   | 华为  |
-| 124.70.133.119  | 2025-03-15 | 上海   | 华为  |
-| 124.71.187.72   | 2025-03-15 | 上海   | 华为  |
-| 123.60.84.66    | 2025-03-15 | 上海   | 华为  |
+| 124.71.187.122  | 2025-05-21 | 上海   | 华为  |
+| 122.51.120.217  | 2025-05-21 | 上海   | 腾讯  |
+| 111.229.247.189 | 2025-05-21 | 上海   | 腾讯  |
+| 124.70.176.52   | 2025-05-21 | 上海   | 华为  |
+| 123.60.186.45   | 2025-05-21 | 上海   | 华为  |
+| 122.51.232.182  | 2025-05-21 | 上海   | 腾讯  |
+| 118.25.98.114   | 2025-05-21 | 上海   | 腾讯  |
+| 124.70.199.56   | 2025-05-21 | 上海   | 华为  |
+| 121.36.225.169  | 2025-05-21 | 上海   | 华为  |
+| 123.60.70.228   | 2025-05-21 | 上海   | 华为  |
+| 123.60.73.44    | 2025-05-21 | 上海   | 华为  |
+| 124.70.133.119  | 2025-05-21 | 上海   | 华为  |
+| 124.71.187.72   | 2025-05-21 | 上海   | 华为  |
+| 123.60.84.66    | 2025-05-21 | 上海   | 华为  |
 |                 |            |      |     |
-| 121.36.54.217   | 2025-03-15 | 北京   | 华为  |
-| 121.36.81.195   | 2025-03-15 | 北京   | 华为  |
-| 123.249.15.60   | 2025-03-15 | 北京   | 华为  |
-| 124.70.75.113   | 2025-03-15 | 北京   | 华为  |
-| 120.46.186.223  | 2025-03-15 | 北京   | 华为  |
-| 124.70.22.210   | 2025-03-15 | 北京   | 华为  |
-| 139.9.133.247   | 2025-03-15 | 北京   | 华为  |
+| 121.36.54.217   | 2025-05-21 | 北京   | 华为  |
+| 121.36.81.195   | 2025-05-21 | 北京   | 华为  |
+| 123.249.15.60   | 2025-05-21 | 北京   | 华为  |
+| 124.70.75.113   | 2025-05-21 | 北京   | 华为  |
+| 120.46.186.223  | 2025-05-21 | 北京   | 华为  |
+| 124.70.22.210   | 2025-05-21 | 北京   | 华为  |
+| 139.9.133.247   | 2025-05-21 | 北京   | 华为  |
 |                 |            |      |     |
-| 124.71.85.110   | 2025-03-15 | 广州   | 华为  |
-| 139.9.51.18     | 2025-03-15 | 广州   | 华为  |
-| 139.159.239.163 | 2025-03-15 | 广州   | 华为  |
-| 124.71.9.153    | 2025-03-15 | 广州   | 华为  |
-| 116.205.163.254 | 2025-03-15 | 广州   | 华为  |
-| 116.205.171.132 | 2025-03-15 | 广州   | 华为  |
-| 116.205.183.150 | 2025-03-15 | 广州   | 华为  |
-| 111.230.186.52  | 2025-03-15 | 广州   | 腾讯  |
-| 110.41.4.4      | 2025-03-15 | 广州   | 华为  |
-| 110.41.2.72     | 2025-03-15 | 广州   | 华为  |
-| 110.41.154.219  | 2025-03-15 | 广州   | 华为  |
-| 110.41.147.114  | 2025-03-15 | 广州   | 华为  |
+| 124.71.85.110   | 2025-05-21 | 广州   | 华为  |
+| 139.9.51.18     | 2025-05-21 | 广州   | 华为  |
+| 139.159.239.163 | 2025-05-21 | 广州   | 华为  |
+| 124.71.9.153    | 2025-05-21 | 广州   | 华为  |
+| 116.205.163.254 | 2025-05-21 | 广州   | 华为  |
+| 116.205.171.132 | 2025-05-21 | 广州   | 华为  |
+| 116.205.183.150 | 2025-05-21 | 广州   | 华为  |
+| 111.230.186.52  | 2025-05-21 | 广州   | 腾讯  |
+| 110.41.4.4      | 2025-05-21 | 广州   | 华为  |
+| 110.41.2.72     | 2025-05-21 | 广州   | 华为  |
+| 110.41.154.219  | 2025-05-21 | 广州   | 华为  |
+| 110.41.147.114  | 2025-05-21 | 广州   | 华为  |
 |                 |            |      |     |
-| 119.97.185.59   | 2025-03-15 | 武汉   | 电信  |
+| 119.97.185.59   | 2025-05-21 | 武汉   | 电信  |
 
 
 

client.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/injoyai/base/maps"
-	"github.com/injoyai/base/maps/wait/v2"
+	"github.com/injoyai/base/maps/wait"
 	"github.com/injoyai/conv"
 	"github.com/injoyai/ios"
 	"github.com/injoyai/ios/client"
@@ -235,12 +235,18 @@ func (this *Client) GetCodeAll(exchange protocol.Exchange) (*protocol.CodeResp,
 
 // GetQuote 获取盘口五档报价
 func (this *Client) GetQuote(codes ...string) (protocol.QuotesResp, error) {
-	if DefaultCodes == nil {
-		return nil, errors.New("DefaultCodes未初始化")
-	}
 	for i := range codes {
-		codes[i] = DefaultCodes.AddExchange(codes[i])
+		//如果是股票代码,则加上前缀
+		codes[i] = protocol.AddPrefix(codes[i])
+		if !protocol.IsStock(codes[i]) {
+			if DefaultCodes == nil {
+				return nil, errors.New("DefaultCodes未初始化")
+			}
+			//不是股票代码的话，根据codes的信息加上前缀
+			codes[i] = DefaultCodes.AddExchange(codes[i])
+		}
 	}
+
 	f, err := protocol.MQuote.Frame(codes...)
 	if err != nil {
 		return nil, err
@@ -256,26 +262,25 @@ func (this *Client) GetQuote(codes ...string) (protocol.QuotesResp, error) {
 		if len(quotes) != len(codes) {
 			return nil, fmt.Errorf("预期%d个，实际%d个", len(codes), len(quotes))
 		}
-		if DefaultCodes == nil {
-			return nil, errors.New("DefaultCodes未初始化")
-		}
 		for i, code := range codes {
-			m := DefaultCodes.Get(code)
-			if m == nil {
-				return nil, fmt.Errorf("未查询到代码[%s]相关信息", code)
-			}
-			for ii, v := range quotes[i].SellLevel {
-				quotes[i].SellLevel[ii].Price = m.Price(v.Price)
-			}
-			for ii, v := range quotes[i].BuyLevel {
-				quotes[i].BuyLevel[ii].Price = m.Price(v.Price)
-			}
-			quotes[i].K = protocol.K{
-				Last:  m.Price(quotes[i].K.Last),
-				Open:  m.Price(quotes[i].K.Open),
-				High:  m.Price(quotes[i].K.High),
-				Low:   m.Price(quotes[i].K.Low),
-				Close: m.Price(quotes[i].K.Close),
+			if !protocol.IsStock(code) {
+				m := DefaultCodes.Get(code)
+				if m == nil {
+					return nil, fmt.Errorf("未查询到代码[%s]相关信息", code)
+				}
+				for ii, v := range quotes[i].SellLevel {
+					quotes[i].SellLevel[ii].Price = m.Price(v.Price)
+				}
+				for ii, v := range quotes[i].BuyLevel {
+					quotes[i].BuyLevel[ii].Price = m.Price(v.Price)
+				}
+				quotes[i].K = protocol.K{
+					Last:  m.Price(quotes[i].K.Last),
+					Open:  m.Price(quotes[i].K.Open),
+					High:  m.Price(quotes[i].K.High),
+					Low:   m.Price(quotes[i].K.Low),
+					Close: m.Price(quotes[i].K.Close),
+				}
 			}
 		}
 	}

codes.go

@@ -28,7 +28,10 @@ func DialCodes(filename string, op ...client.Option) (*Codes, error) {
 
 func NewCodes(c *Client, filenames ...string) (*Codes, error) {
 
-	filename := conv.DefaultString("./codes.db", filenames...)
+	//如果没有指定文件名,则使用默认
+	defaultFilename := filepath.Join(DefaultDatabaseDir, "codes.db")
+	filename := conv.Default(defaultFilename, filenames...)
+	filename = conv.Select(filename == "", defaultFilename, filename)
 
 	//如果文件夹不存在就创建
 	dir, _ := filepath.Split(filename)
@@ -118,7 +121,7 @@ func (this *Codes) GetName(code string) string {
 
 // GetStocks 获取股票代码,sh6xxx sz0xx sz30xx
 func (this *Codes) GetStocks(limits ...int) []string {
-	limit := conv.DefaultInt(-1, limits...)
+	limit := conv.Default(-1, limits...)
 	ls := []string(nil)
 	for _, m := range this.list {
 		code := m.FullCode()
@@ -132,6 +135,22 @@ func (this *Codes) GetStocks(limits ...int) []string {
 	return ls
 }
 
+// GetETFs 获取基金代码,sz159xxx,sh510xxx,sh511xxx
+func (this *Codes) GetETFs(limits ...int) []string {
+	limit := conv.Default(-1, limits...)
+	ls := []string(nil)
+	for _, m := range this.list {
+		code := m.FullCode()
+		if protocol.IsETF(code) {
+			ls = append(ls, code)
+		}
+		if limit > 0 && len(ls) >= limit {
+			break
+		}
+	}
+	return ls
+}
+
 func (this *Codes) Get(code string) *CodeModel {
 	return this.Map[code]
 }
@@ -314,7 +333,8 @@ func (this *CodeModel) FullCode() string {
 }
 
 func (this *CodeModel) Price(p protocol.Price) protocol.Price {
-	return p * protocol.Price(math.Pow10(int(3-this.Decimal)))
+	return protocol.Price(float64(p) * math.Pow10(int(2-this.Decimal)))
+	return p * protocol.Price(math.Pow10(int(2-this.Decimal)))
 }
 
 func NewSessionFunc(db *xorm.Engine, fn func(session *xorm.Session) error) error {

example/FastHosts/main.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+)
+
+func main() {
+	ls := tdx.FastHosts(tdx.Hosts...)
+	for _, v := range ls {
+		logs.Debug(v)
+	}
+	logs.Debug("总数量:", len(ls))
+}

example/GetCode/main.go

@@ -3,20 +3,18 @@ package main
 import (
 	"github.com/injoyai/logs"
 	"github.com/injoyai/tdx"
+	"github.com/injoyai/tdx/example/common"
 	"github.com/injoyai/tdx/protocol"
 )
 
 func main() {
-	c, err := tdx.Dial("124.71.187.122:7709")
-	logs.PanicErr(err)
+	common.Test(func(c *tdx.Client) {
+		resp, err := c.GetCode(protocol.ExchangeSH, 369)
+		logs.PanicErr(err)
 
-	resp, err := c.GetCode(protocol.ExchangeSH, 369)
-	logs.PanicErr(err)
-
-	for i, v := range resp.List {
-		logs.Debug(i, v)
-	}
-	logs.Debug("总数:", resp.Count)
-
-	select {}
+		for i, v := range resp.List {
+			logs.Debug(i, v, v.LastPrice)
+		}
+		logs.Debug("总数:", resp.Count)
+	})
 }

example/GetKline30MinuteAll/main.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+	"github.com/injoyai/tdx/example/common"
+)
+
+func main() {
+	common.Test(func(c *tdx.Client) {
+		resp, err := c.GetKline30Minute("sz000001", 0, 20)
+		logs.PanicErr(err)
+
+		for _, v := range resp.List {
+			logs.Debug(v)
+		}
+
+		logs.Debug("总数：", resp.Count)
+	})
+}

example/Income/main.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx/extend"
+	"time"
+)
+
+func main() {
+	code := "sz000001"
+
+	pull := extend.NewPullKline(extend.PullKlineConfig{
+		Codes:  []string{code},
+		Tables: []string{extend.Day},
+	})
+
+	//m, err := tdx.NewManage(nil)
+	//logs.PanicErr(err)
+
+	//err = pull.Run(context.Background(), m)
+	//logs.PanicErr(err)
+
+	ks, err := pull.DayKlines(code)
+	logs.PanicErr(err)
+
+	t := time.Now().AddDate(0, -1, -9)
+	logs.Debug(t.Format(time.DateOnly))
+	ls := extend.DoIncomes(ks, t, 5, 10, 20)
+
+	logs.Debug(len(ls))
+
+	for _, v := range ls {
+		logs.Info(v)
+	}
+
+}

extend/income.go

@@ -0,0 +1,65 @@
+package extend
+
+import (
+	"fmt"
+	"github.com/injoyai/tdx/protocol"
+	"time"
+)
+
+func DoIncomes(ks Klines, startAt time.Time, days ...int) Incomes {
+	year, month, day := startAt.Date()
+	start := time.Date(year, month, day, 15, 0, 0, 0, startAt.Location()).Unix()
+	for i, v := range ks {
+		if v.Date >= start {
+			ks = ks[i:]
+			break
+		}
+	}
+
+	ls := Incomes{}
+
+	for _, v := range days {
+		if v < len(ks) {
+			x := ks[v]
+			ls = append(ls, &Income{
+				Offset: v,
+				Time:   time.Unix(x.Date, 0),
+				Source: protocol.K{
+					Open:  ks[0].Open,
+					High:  ks[0].High,
+					Low:   ks[0].Low,
+					Close: ks[0].Close,
+				},
+				Current: protocol.K{
+					Open:  x.Open,
+					High:  x.High,
+					Low:   x.Low,
+					Close: x.Close,
+				},
+			})
+		}
+	}
+
+	return ls
+}
+
+type Incomes []*Income
+
+type Income struct {
+	Offset  int        //偏移量
+	Time    time.Time  //时间
+	Source  protocol.K //源
+	Current protocol.K //当前
+}
+
+func (this *Income) String() string {
+	return fmt.Sprintf("偏移: %d, 时间: %s, 涨幅: %.1f%%", this.Offset, this.Time.Format(time.DateOnly), this.RiseRate()*100)
+}
+
+func (this *Income) Rise() protocol.Price {
+	return this.Current.Close - this.Source.Close
+}
+
+func (this *Income) RiseRate() float64 {
+	return this.Rise().Float64() / this.Source.Close.Float64()
+}

extend/pull-kline-mysql.go

@@ -0,0 +1,148 @@
+package extend
+
+import (
+	"context"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/injoyai/base/chans"
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+	"github.com/injoyai/tdx/protocol"
+	"xorm.io/core"
+	"xorm.io/xorm"
+)
+
+func NewPullKlineMysql(cfg PullKlineConfig) (*PullKlineMysql, error) {
+	db, err := xorm.NewEngine("mysql", cfg.Dir)
+	if err != nil {
+		return nil, err
+	}
+	db.SetMapper(core.SameMapper{})
+	_tables := []*KlineTable(nil)
+	for _, v := range cfg.Tables {
+		table := KlineTableMap[v]
+		if err = db.Sync2(table); err != nil {
+			return nil, err
+		}
+		_tables = append(_tables, table)
+	}
+	return &PullKlineMysql{
+		tables: _tables,
+		Config: cfg,
+		DB:     db,
+	}, nil
+}
+
+type PullKlineMysql struct {
+	tables []*KlineTable
+	Config PullKlineConfig
+	DB     *xorm.Engine
+}
+
+func (this *PullKlineMysql) Name() string {
+	return "拉取k线数据"
+}
+
+func (this *PullKlineMysql) Run(ctx context.Context, m *tdx.Manage) error {
+	limit := chans.NewWaitLimit(uint(this.Config.Limit))
+
+	//1. 获取所有股票代码
+	codes := this.Config.Codes
+	if len(codes) == 0 {
+		codes = m.Codes.GetStocks()
+	}
+
+	for _, v := range codes {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
+
+		limit.Add()
+		go func(code string) {
+			defer limit.Done()
+
+			for _, table := range this.tables {
+				if table == nil {
+					continue
+				}
+
+				select {
+				case <-ctx.Done():
+					return
+				default:
+				}
+
+				var err error
+
+				//2. 获取最后一条数据
+				last := new(Kline)
+				if _, err = this.DB.Table(table).Where("Code=?", code).Desc("Date").Get(last); err != nil {
+					logs.Err(err)
+					return
+				}
+
+				//3. 从服务器获取数据
+				insert := Klines{}
+				err = m.Do(func(c *tdx.Client) error {
+					insert, err = this.pull(code, last.Date, table.Handler(c))
+					return err
+				})
+				if err != nil {
+					logs.Err(err)
+					return
+				}
+
+				//4. 插入数据库
+				err = tdx.NewSessionFunc(this.DB, func(session *xorm.Session) error {
+					for i, v := range insert {
+						if i == 0 {
+							if _, err := session.Table(table).Where("Code=? and Date >= ?", code, v.Date).Delete(); err != nil {
+								return err
+							}
+						}
+						if _, err := session.Table(table).Insert(v); err != nil {
+							return err
+						}
+					}
+					return nil
+				})
+				logs.PrintErr(err)
+
+			}
+
+		}(v)
+	}
+	limit.Wait()
+	return nil
+}
+
+func (this *PullKlineMysql) pull(code string, lastDate int64, f func(code string, f func(k *protocol.Kline) bool) (*protocol.KlineResp, error)) (Klines, error) {
+
+	if lastDate == 0 {
+		lastDate = protocol.ExchangeEstablish.Unix()
+	}
+
+	resp, err := f(code, func(k *protocol.Kline) bool {
+		return k.Time.Unix() <= lastDate || k.Time.Unix() <= this.Config.StartAt.Unix()
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	ks := Klines{}
+	for _, v := range resp.List {
+		ks = append(ks, &Kline{
+			Code:   code,
+			Date:   v.Time.Unix(),
+			Open:   v.Open,
+			High:   v.High,
+			Low:    v.Low,
+			Close:  v.Close,
+			Volume: v.Volume,
+			Amount: v.Amount,
+		})
+	}
+
+	return ks, nil
+}

extend/pull-kline.go

@@ -7,6 +7,7 @@ import (
 	"github.com/injoyai/logs"
 	"github.com/injoyai/tdx"
 	"github.com/injoyai/tdx/protocol"
+	"os"
 	"path/filepath"
 	"sort"
 	"time"
@@ -25,21 +26,32 @@ const (
 	Month    = "month"
 	Quarter  = "quarter"
 	Year     = "year"
+
+	tableMinute   = "MinuteKline"
+	table5Minute  = "Minute5Kline"
+	table15Minute = "Minute15Kline"
+	table30Minute = "Minute30Kline"
+	tableHour     = "HourKline"
+	tableDay      = "DayKline"
+	tableWeek     = "WeekKline"
+	tableMonth    = "MonthKline"
+	tableQuarter  = "QuarterKline"
+	tableYear     = "YearKline"
 )
 
 var (
 	AllKlineType  = []string{Minute, Minute5, Minute15, Minute30, Hour, Day, Week, Month, Quarter, Year}
 	KlineTableMap = map[string]*KlineTable{
-		Minute:   NewKlineTable("MinuteKline", func(c *tdx.Client) KlineHandler { return c.GetKlineMinuteUntil }),
-		Minute5:  NewKlineTable("Minute5Kline", func(c *tdx.Client) KlineHandler { return c.GetKline5MinuteUntil }),
-		Minute15: NewKlineTable("Minute15Kline", func(c *tdx.Client) KlineHandler { return c.GetKline15MinuteUntil }),
-		Minute30: NewKlineTable("Minute30Kline", func(c *tdx.Client) KlineHandler { return c.GetKline30MinuteUntil }),
-		Hour:     NewKlineTable("HourKline", func(c *tdx.Client) KlineHandler { return c.GetKlineHourUntil }),
-		Day:      NewKlineTable("DayKline", func(c *tdx.Client) KlineHandler { return c.GetKlineDayUntil }),
-		Week:     NewKlineTable("WeekKline", func(c *tdx.Client) KlineHandler { return c.GetKlineWeekUntil }),
-		Month:    NewKlineTable("MonthKline", func(c *tdx.Client) KlineHandler { return c.GetKlineMonthUntil }),
-		Quarter:  NewKlineTable("QuarterKline", func(c *tdx.Client) KlineHandler { return c.GetKlineQuarterUntil }),
-		Year:     NewKlineTable("YearKline", func(c *tdx.Client) KlineHandler { return c.GetKlineYearUntil }),
+		Minute:   NewKlineTable(tableMinute, func(c *tdx.Client) KlineHandler { return c.GetKlineMinuteUntil }),
+		Minute5:  NewKlineTable(table5Minute, func(c *tdx.Client) KlineHandler { return c.GetKline5MinuteUntil }),
+		Minute15: NewKlineTable(table15Minute, func(c *tdx.Client) KlineHandler { return c.GetKline15MinuteUntil }),
+		Minute30: NewKlineTable(table30Minute, func(c *tdx.Client) KlineHandler { return c.GetKline30MinuteUntil }),
+		Hour:     NewKlineTable(tableHour, func(c *tdx.Client) KlineHandler { return c.GetKlineHourUntil }),
+		Day:      NewKlineTable(tableDay, func(c *tdx.Client) KlineHandler { return c.GetKlineDayUntil }),
+		Week:     NewKlineTable(tableWeek, func(c *tdx.Client) KlineHandler { return c.GetKlineWeekUntil }),
+		Month:    NewKlineTable(tableMonth, func(c *tdx.Client) KlineHandler { return c.GetKlineMonthUntil }),
+		Quarter:  NewKlineTable(tableQuarter, func(c *tdx.Client) KlineHandler { return c.GetKlineQuarterUntil }),
+		Year:     NewKlineTable(tableYear, func(c *tdx.Client) KlineHandler { return c.GetKlineYearUntil }),
 	}
 )
 
@@ -56,6 +68,12 @@ func NewPullKline(cfg PullKlineConfig) *PullKline {
 	for _, v := range cfg.Tables {
 		_tables = append(_tables, KlineTableMap[v])
 	}
+	if cfg.Limit <= 0 {
+		cfg.Limit = 1
+	}
+	if len(cfg.Dir) == 0 {
+		cfg.Dir = filepath.Join(tdx.DefaultDatabaseDir, "kline")
+	}
 	return &PullKline{
 		tables: _tables,
 		Config: cfg,
@@ -71,6 +89,21 @@ func (this *PullKline) Name() string {
 	return "拉取k线数据"
 }
 
+func (this *PullKline) DayKlines(code string) (Klines, error) {
+	//连接数据库
+	db, err := xorm.NewEngine("sqlite", filepath.Join(this.Config.Dir, code+".db"))
+	if err != nil {
+		return nil, err
+	}
+	db.SetMapper(core.SameMapper{})
+	db.DB().SetMaxOpenConns(1)
+	defer db.Close()
+
+	data := Klines{}
+	err = db.Table(tableDay).Asc("date").Find(&data)
+	return data, err
+}
+
 func (this *PullKline) Run(ctx context.Context, m *tdx.Manage) error {
 	limit := chans.NewWaitLimit(uint(this.Config.Limit))
 
@@ -91,12 +124,15 @@ func (this *PullKline) Run(ctx context.Context, m *tdx.Manage) error {
 		go func(code string) {
 			defer limit.Done()
 
+			_ = os.MkdirAll(this.Config.Dir, 0777)
+
 			//连接数据库
 			db, err := xorm.NewEngine("sqlite", filepath.Join(this.Config.Dir, code+".db"))
 			if err != nil {
 				logs.Err(err)
 				return
 			}
+			defer db.Close()
 			db.SetMapper(core.SameMapper{})
 			db.DB().SetMaxOpenConns(1)
 
@@ -111,7 +147,7 @@ func (this *PullKline) Run(ctx context.Context, m *tdx.Manage) error {
 				default:
 				}
 
-				db.Sync2(table)
+				logs.PrintErr(db.Sync2(table))
 
 				//2. 获取最后一条数据
 				last := new(Kline)
@@ -186,7 +222,7 @@ func (this *PullKline) pull(code string, lastDate int64, f func(code string, f f
 }
 
 type Kline struct {
-	Code   string         `json:"code" xorm:"-"`         //代码
+	Code   string         `json:"code"`                  //代码
 	Date   int64          `json:"date"`                  //时间节点 2006-01-02 15:00
 	Open   protocol.Price `json:"open"`                  //开盘价
 	High   protocol.Price `json:"high"`                  //最高价

extend/spider_ths.go

@@ -0,0 +1,118 @@
+package extend
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/injoyai/conv"
+	"github.com/injoyai/tdx/protocol"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+)
+
+const (
+	UrlTHSDayKline       = "http://d.10jqka.com.cn/v6/line/hs_%s/0%d/all.js"
+	THS_QFQ        uint8 = 1 //前复权
+	THS_HFQ        uint8 = 2 //后复权
+)
+
+/*
+GetTHSDayKline
+前复权,和通达信对的上,和东方财富对不上
+后复权,和通达信,东方财富都对不上
+*/
+func GetTHSDayKline(code string, _type uint8) ([]*Kline, error) {
+	if _type != THS_QFQ && _type != THS_HFQ {
+		return nil, fmt.Errorf("数据类型错误,例如:前复权1或后复权2")
+	}
+
+	code = protocol.AddPrefix(code)
+	if len(code) != 8 {
+		return nil, fmt.Errorf("股票代码错误,例如:SZ000001或000001")
+	}
+
+	u := fmt.Sprintf(UrlTHSDayKline, code[2:], _type)
+	req, err := http.NewRequest(http.MethodGet, u, nil)
+	if err != nil {
+		return nil, err
+	}
+	/*
+	 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
+	                      'Chrome/90.0.4430.212 Safari/537.36',
+	        'Referer': 'http://stockpage.10jqka.com.cn/',
+	        'DNT': '1',
+	*/
+	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36 Edg/89.0.774.54")
+	req.Header.Set("Referer", "http://stockpage.10jqka.com.cn/")
+	req.Header.Set("DNT", "1")
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+	bs, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	n := bytes.IndexByte(bs, '(')
+	bs = bs[n+1 : len(bs)-1]
+
+	m := map[string]any{}
+	err = json.Unmarshal(bs, &m)
+	if err != nil {
+		return nil, err
+	}
+
+	total := conv.Int(m["total"])
+	priceFactor := conv.Float64(m["priceFactor"])
+	prices := strings.Split(conv.String(m["price"]), ",")
+	dates := strings.Split(conv.String(m["dates"]), ",")
+	volumes := strings.Split(conv.String(m["volumn"]), ",")
+	start := conv.String(m["start"])
+	t, err := time.Parse("20060102", start)
+	if err != nil {
+		return nil, err
+	}
+
+	//好像到了22点,总数量会比实际多1
+	if total == len(dates)+1 && total == len(volumes)+1 {
+		total -= 1
+	}
+	//判断数量是否对应
+	if total*4 != len(prices) || total != len(dates) || total != len(volumes) {
+		return nil, fmt.Errorf("total=%d prices=%d dates=%d volumns=%d", total, len(prices), len(dates), len(volumes))
+	}
+
+	ls := []*Kline(nil)
+
+	year := t.Year()
+	lastDate := ""
+	for i := 0; i < total; i++ {
+		//当日前变小时(12xx变01xx),说明过了1年,除非该股票停牌了1年多则数据错误
+		if dates[i] < lastDate {
+			year++
+		}
+		lastDate = dates[i]
+		x, err := time.Parse("0102", dates[i])
+		if err != nil {
+			return nil, err
+		}
+		x = time.Date(year, x.Month(), x.Day(), 15, 0, 0, 0, time.Local)
+		low := protocol.Price(conv.Float64(prices[i*4+0]) * 1000 / priceFactor)
+		ls = append(ls, &Kline{
+			Code:   protocol.AddPrefix(code),
+			Date:   x.Unix(),
+			Open:   protocol.Price(conv.Float64(prices[i*4+1])*1000/priceFactor) + low,
+			High:   protocol.Price(conv.Float64(prices[i*4+2])*1000/priceFactor) + low,
+			Low:    low,
+			Close:  protocol.Price(conv.Float64(prices[i*4+3])*1000/priceFactor) + low,
+			Volume: (conv.Int64(volumes[i]) + 50) / 100,
+		})
+	}
+
+	return ls, nil
+}

extend/spider_ths_test.go

@@ -0,0 +1,16 @@
+package extend
+
+import (
+	"testing"
+)
+
+func TestNewSpiderTHS(t *testing.T) {
+	ls, err := GetTHSDayKline("sz000001", THS_HFQ)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	for _, v := range ls {
+		t.Log(v)
+	}
+}

go.mod

@@ -4,9 +4,10 @@ go 1.20
 
 require (
 	github.com/glebarez/go-sqlite v1.22.0
-	github.com/injoyai/base v1.0.18
-	github.com/injoyai/conv v1.1.10
-	github.com/injoyai/ios v0.0.4
+	github.com/go-sql-driver/mysql v1.7.0
+	github.com/injoyai/base v1.2.7
+	github.com/injoyai/conv v1.2.2
+	github.com/injoyai/ios v0.0.7
 	github.com/injoyai/logs v1.0.9
 	github.com/robfig/cron/v3 v3.0.1
 	golang.org/x/text v0.16.0
@@ -21,14 +22,13 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect

go.sum

@@ -14,36 +14,32 @@ github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec
 github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI=
 github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/injoyai/base v1.0.18 h1:AMB1NhPe9acvMp04sThE8Ji/SRS1/MHsx19NmSoD8LA=
-github.com/injoyai/base v1.0.18/go.mod h1:2JSv8ndJ/FmKyazfhDBewzylEbVfJV0EE/r6kOvnzwU=
-github.com/injoyai/conv v1.1.5/go.mod h1:PYoJcbqaz4eyQUovzErRFCuDSPGB4L07AvdmFsTrTew=
-github.com/injoyai/conv v1.1.10 h1:LefmOA4SKTEw6gGHXZ6UT8n2K+OzCttYSW8lVmvgQd8=
-github.com/injoyai/conv v1.1.10/go.mod h1:PYoJcbqaz4eyQUovzErRFCuDSPGB4L07AvdmFsTrTew=
-github.com/injoyai/ios v0.0.4 h1:yEZ6wN5uCSjAJB4qwpT6R77aMtjkblZo4giKwu9/s7Y=
-github.com/injoyai/ios v0.0.4/go.mod h1:heABkaIUwoRRe424otl6mKgdU6LYt5gadav/V4gaojA=
+github.com/injoyai/base v1.2.7 h1:uYZoUIPGidkTNMfQfObsyHulu5VvNCOzuCh1DGn+Hz0=
+github.com/injoyai/base v1.2.7/go.mod h1:BsXiJ6/hXpswWxI4zLdKz+pW2Cwo+qhdfyaWDfR/vwg=
+github.com/injoyai/conv v1.2.2 h1:nxFD3zCYq/ZvVE6xAExBR+agi6gB+vc9O0si67VAsPk=
+github.com/injoyai/conv v1.2.2/go.mod h1:s05l3fQJQ4mT4VX+KIdbvCWQB0YzZHprmUfUu2uxd1k=
+github.com/injoyai/ios v0.0.7 h1:7k/brTmpnoqE6ajodyilkr2EJmJmcvSkpUD+LptgUVU=
+github.com/injoyai/ios v0.0.7/go.mod h1:9HemWSJTmhyJCnr+kH+lRfmvrEdABi1rkCBVsbqV5X8=
 github.com/injoyai/logs v1.0.9 h1:Wq7rCVIQKcPx+z+lzKQb2qyDK4TML/cgmaSZN9tx33c=
 github.com/injoyai/logs v1.0.9/go.mod h1:CLchJCGhb39Obyrci816R+KMtbxZhgPs0FuikhyixK4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -68,14 +64,15 @@ github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
 github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -88,7 +85,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -104,18 +100,12 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

hosts.go

@@ -1,5 +1,12 @@
 package tdx
 
+import (
+	"github.com/injoyai/logs"
+	"net"
+	"strings"
+	"sync"
+)
+
 var (
 
 	// Hosts 所有服务器地址(2024-11-30测试通过)
@@ -67,3 +74,31 @@ var (
 		"119.97.185.59", //电信
 	}
 )
+
+// FastHosts 通过tcp(ping不可用)的方式筛选可用的地址,并排序(有点误差)
+func FastHosts(hosts ...string) []string {
+	wg := sync.WaitGroup{}
+	wg.Add(len(hosts))
+	mu := sync.Mutex{}
+	ls := []string(nil)
+	for _, host := range hosts {
+		go func(host string) {
+			defer wg.Done()
+			addr := host
+			if !strings.Contains(addr, ":") {
+				addr += ":7709"
+			}
+			c, err := net.Dial("tcp", addr)
+			if err != nil {
+				logs.Err(err)
+				return
+			}
+			defer c.Close()
+			mu.Lock()
+			ls = append(ls, host)
+			mu.Unlock()
+		}(host)
+	}
+	wg.Wait()
+	return ls
+}

protocol/frame.go

@@ -1,11 +1,11 @@
 package protocol
 
 import (
+	"bytes"
 	"compress/zlib"
 	"errors"
 	"fmt"
-	"github.com/injoyai/base/bytes"
-	"github.com/injoyai/base/g"
+	"github.com/injoyai/base/types"
 	"github.com/injoyai/conv"
 	"io"
 )
@@ -19,7 +19,7 @@ const (
 )
 
 type Message interface {
-	Bytes() g.Bytes
+	Bytes() types.Bytes
 }
 
 /*
@@ -39,7 +39,7 @@ type Frame struct {
 	Data    []byte  //数据
 }
 
-func (this *Frame) Bytes() g.Bytes {
+func (this *Frame) Bytes() types.Bytes {
 	length := uint16(len(this.Data) + 2)
 	data := make([]byte, 12+len(this.Data))
 	data[0] = Prefix

protocol/model_code.go

@@ -49,7 +49,7 @@ func (code) Decode(bs []byte) (*CodeResp, error) {
 			Multiple:  Uint16(bs[6:8]),
 			Name:      string(UTF8ToGBK(bs[8:16])),
 			Decimal:   int8(bs[20]),
-			LastPrice: getVolume(Uint32(bs[21:25])),
+			LastPrice: getVolume2(Uint32(bs[21:25])),
 		}
 		//logs.Debug(bs[25:29]) //26和28字节 好像是枚举(基本是44,45和34,35)
 		bs = bs[29:]

protocol/model_kline.go

@@ -3,7 +3,7 @@ package protocol
 import (
 	"errors"
 	"fmt"
-	"github.com/injoyai/base/g"
+	"github.com/injoyai/base/types"
 	"github.com/injoyai/conv"
 	"time"
 )
@@ -15,7 +15,7 @@ type KlineReq struct {
 	Count    uint16
 }
 
-func (this *KlineReq) Bytes(Type uint8) (g.Bytes, error) {
+func (this *KlineReq) Bytes(Type uint8) (types.Bytes, error) {
 	if this.Count > 800 {
 		return nil, errors.New("单次数量不能超过800")
 	}
@@ -177,7 +177,7 @@ func (kline) Decode(bs []byte, c KlineCache) (*KlineResp, error) {
 
 		resp.List = append(resp.List, k)
 	}
-
+	resp.List = FixKlineTime(resp.List)
 	return resp, nil
 }
 
@@ -185,3 +185,27 @@ type KlineCache struct {
 	Type uint8  //1分钟,5分钟,日线等
 	Kind string //指数,个股等
 }
+
+// FixKlineTime 修复盘内下午(13~15点)拉取数据的时候,11.30的时间变成13.00
+func FixKlineTime(ks []*Kline) []*Kline {
+	if len(ks) == 0 {
+		return ks
+	}
+	now := time.Now()
+	//只有当天下午13~15点之间才会出现的时间问题
+	node1 := time.Date(now.Year(), now.Month(), now.Day(), 13, 0, 0, 0, now.Location())
+	node2 := time.Date(now.Year(), now.Month(), now.Day(), 15, 0, 0, 0, now.Location())
+	if ks[len(ks)-1].Time.Unix() < node1.Unix() || ks[len(ks)-1].Time.Unix() > node2.Unix() {
+		return ks
+	}
+	ls := ks
+	if len(ls) >= 120 {
+		ls = ls[len(ls)-120:]
+	}
+	for i, v := range ls {
+		if v.Time.Unix() == node1.Unix() {
+			ls[i].Time = time.Date(now.Year(), now.Month(), now.Day(), 11, 30, 0, 0, now.Location())
+		}
+	}
+	return ks
+}

protocol/model_kline_test.go

@@ -19,7 +19,10 @@ func Test_stockKline_Decode(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	resp, err := MKline.Decode(bs, 9)
+	resp, err := MKline.Decode(bs, KlineCache{
+		Type: 9,
+		Kind: "",
+	})
 	if err != nil {
 		t.Error(err)
 		return

protocol/model_quote.go

@@ -47,7 +47,7 @@ type Quote struct {
 func (this *Quote) String() string {
 	return fmt.Sprintf(`%s%s
 %s
-总量：%s, 现量：%s, 总金额：%s, 内盘：%s, 外盘：%s
+总手：%s, 现量：%s, 总金额：%s, 内盘：%s, 外盘：%s
 %s%s
 `,
 		this.Exchange.String(), this.Code, this.K,
@@ -142,9 +142,9 @@ func (this quote) Decode(bs []byte) QuotesResp {
 			sellLevel := PriceLevel{}
 
 			bs, p = GetPrice(bs)
-			buyLevel.Price = p + sec.K.Close
+			buyLevel.Price = p*10 + sec.K.Close
 			bs, p = GetPrice(bs)
-			sellLevel.Price = p + sec.K.Close
+			sellLevel.Price = p*10 + sec.K.Close
 
 			bs, buyLevel.Number = CutInt(bs)
 			bs, sellLevel.Number = CutInt(bs)

protocol/types_price.go

@@ -78,6 +78,13 @@ func DecodeK(bs []byte) ([]byte, K) {
 	bs, k.Low = GetPrice(bs)
 	k.Low += k.Close
 
+	//默认按股票展示
+	k.Last *= 10
+	k.Open *= 10
+	k.Close *= 10
+	k.High *= 10
+	k.Low *= 10
+
 	return bs, k
 }
 

protocol/unit.go

@@ -3,7 +3,6 @@ package protocol
 import (
 	"bytes"
 	"fmt"
-	bytes2 "github.com/injoyai/base/bytes"
 	"github.com/injoyai/conv"
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"golang.org/x/text/transform"
@@ -15,12 +14,12 @@ import (
 
 // String 字节先转小端,再转字符
 func String(bs []byte) string {
-	return string(bytes2.Reverse(bs))
+	return string(Reverse(bs))
 }
 
 // Bytes 任意类型转小端字节
 func Bytes(n any) []byte {
-	return bytes2.Reverse(conv.Bytes(n))
+	return Reverse(conv.Bytes(n))
 }
 
 // Reverse 字节倒序
@@ -34,12 +33,12 @@ func Reverse(bs []byte) []byte {
 
 // Uint32 字节通过小端方式转为uint32
 func Uint32(bs []byte) uint32 {
-	return conv.Uint32(bytes2.Reverse(bs))
+	return conv.Uint32(Reverse(bs))
 }
 
 // Uint16 字节通过小端方式转为uint16
 func Uint16(bs []byte) uint16 {
-	return conv.Uint16(bytes2.Reverse(bs))
+	return conv.Uint16(Reverse(bs))
 }
 
 func UTF8ToGBK(text []byte) []byte {
@@ -196,6 +195,46 @@ func getVolume(val uint32) (volume float64) {
 	return
 }
 
+func getVolume2(val uint32) float64 {
+	ivol := int32(val)
+	logpoint := ivol >> 24       // 提取最高字节（原8*3移位）
+	hleax := (ivol >> 16) & 0xff // 提取次高字节
+	lheax := (ivol >> 8) & 0xff  // 提取第三字节
+	lleax := ivol & 0xff         // 提取最低字节
+
+	dwEcx := logpoint*2 - 0x7f            // 基础指数计算
+	dbl_xmm6 := math.Exp2(float64(dwEcx)) // 核心指数计算仅一次
+
+	// 计算dbl_xmm4
+	var dbl_xmm4 float64
+	if hleax > 0x80 {
+		// 高位分支：合并指数计算
+		dbl_xmm4 = dbl_xmm6 * (64.0 + float64(hleax&0x7f)) / 64.0
+	} else {
+		// 低位分支：复用核心指数
+		dbl_xmm4 = dbl_xmm6 * float64(hleax) / 128.0
+	}
+
+	// 计算缩放因子
+	scale := 1.0
+	if (hleax & 0x80) != 0 {
+		scale = 2.0
+	}
+
+	// 预计算常量的倒数，优化除法
+	const (
+		inv32768   = 1.0 / 32768.0   // 2^15
+		inv8388608 = 1.0 / 8388608.0 // 2^23
+	)
+
+	// 计算低位分量
+	dbl_xmm3 := dbl_xmm6 * float64(lheax) * inv32768 * scale
+	dbl_xmm1 := dbl_xmm6 * float64(lleax) * inv8388608 * scale
+
+	// 合计最终结果
+	return dbl_xmm6 + dbl_xmm4 + dbl_xmm3 + dbl_xmm1
+}
+
 // IsStock 是否是股票,示例sz000001
 func IsStock(code string) bool {
 	if len(code) != 8 {
@@ -214,6 +253,24 @@ func IsStock(code string) bool {
 	return false
 }
 
+// IsETF 是否是基金,示例sz159558
+func IsETF(code string) bool {
+	if len(code) != 8 {
+		return false
+	}
+	code = strings.ToLower(code)
+	switch {
+	case code[0:2] == ExchangeSH.String() &&
+		(code[2:5] == "510" || code[2:5] == "511" || code[2:5] == "512" || code[2:5] == "513" || code[2:5] == "515"):
+		return true
+
+	case code[0:2] == ExchangeSZ.String() &&
+		(code[2:5] == "159"):
+		return true
+	}
+	return false
+}
+
 // AddPrefix 添加股票代码前缀,针对股票生效,例如000001,会增加前缀sz000001(平安银行),而不是sh000001(上证指数)
 func AddPrefix(code string) string {
 	if len(code) == 6 {

protocol/unit_test.go

@@ -20,5 +20,6 @@ func TestUTF8ToGBK(t *testing.T) {
 
 func Test_getVolume(t *testing.T) {
 	t.Log(getVolume(1237966432))
-	t.Log(getVolume(1237966432))
+	t.Log(getVolume2(1237966432))
+
 }