增加pull-kline的mysql版本,待测试

client.go

@@ -1,21 +1,31 @@
 package tdx
 
 import (
+	"errors"
 	"fmt"
 	"github.com/injoyai/base/maps"
 	"github.com/injoyai/base/maps/wait/v2"
 	"github.com/injoyai/conv"
 	"github.com/injoyai/ios"
 	"github.com/injoyai/ios/client"
-	"github.com/injoyai/ios/module/tcp"
+	"github.com/injoyai/ios/module/common"
 	"github.com/injoyai/logs"
 	"github.com/injoyai/tdx/protocol"
 	"runtime/debug"
-	"strings"
 	"sync/atomic"
 	"time"
 )
 
+const (
+	LevelNone  = common.LevelNone
+	LevelDebug = common.LevelDebug
+	LevelWrite = common.LevelWrite
+	LevelRead  = common.LevelRead
+	LevelInfo  = common.LevelInfo
+	LevelError = common.LevelError
+	LevelAll   = common.LevelAll
+)
+
 // WithDebug 是否打印通讯数据
 func WithDebug(b ...bool) client.Option {
 	return func(c *client.Client) {
@@ -23,6 +33,12 @@ func WithDebug(b ...bool) client.Option {
 	}
 }
 
+func WithLevel(level int) client.Option {
+	return func(c *client.Client) {
+		c.Logger.SetLevel(level)
+	}
+}
+
 // WithRedial 断线重连
 func WithRedial(b ...bool) client.Option {
 	return func(c *client.Client) {
@@ -30,17 +46,15 @@ func WithRedial(b ...bool) client.Option {
 	}
 }
 
-// Dial 与服务器建立连接
-func Dial(addr string, op ...client.Option) (cli *Client, err error) {
-	if !strings.Contains(addr, ":") {
-		addr += ":7709"
-	}
-	return DialWith(tcp.NewDial(addr), op...)
-}
-
 // DialDefault 默认连接方式
 func DialDefault(op ...client.Option) (cli *Client, err error) {
-	return DialWith(NewHostDial(Hosts), op...)
+	op = append([]client.Option{WithRedial()}, op...)
+	return DialHostsRange(Hosts, op...)
+}
+
+// Dial 与服务器建立连接
+func Dial(addr string, op ...client.Option) (cli *Client, err error) {
+	return DialWith(NewTCPDial(addr), op...)
 }
 
 // DialHosts 与服务器建立连接,多个服务器轮询,开启重试生效
@@ -53,6 +67,11 @@ func DialHostsRandom(hosts []string, op ...client.Option) (cli *Client, err erro
 	return DialWith(NewRandomDial(hosts), op...)
 }
 
+// DialHostsRange 遍历设置的服务地址进行连接,成功则结束遍历
+func DialHostsRange(hosts []string, op ...client.Option) (cli *Client, err error) {
+	return DialWith(NewRangeDial(hosts), op...)
+}
+
 // DialWith 与服务器建立连接
 func DialWith(dial ios.DialFunc, op ...client.Option) (cli *Client, err error) {
 
@@ -62,7 +81,8 @@ func DialWith(dial ios.DialFunc, op ...client.Option) (cli *Client, err error) {
 	}
 
 	cli.Client, err = client.Dial(dial, func(c *client.Client) {
-		c.Logger.Debug(false)                          //关闭日志打印
+		c.Logger.Debug(true)                           //关闭日志打印
+		c.Logger.SetLevel(LevelInfo)                   //设置日志级别
 		c.Logger.WithHEX()                             //以HEX显示
 		c.SetOption(op...)                             //自定义选项
 		c.Event.OnReadFrom = protocol.ReadFrom         //分包
@@ -85,7 +105,7 @@ func DialWith(dial ios.DialFunc, op ...client.Option) (cli *Client, err error) {
 
 	go cli.Client.Run()
 
-	return cli, nil
+	return cli, err
 }
 
 type Client struct {
@@ -215,6 +235,18 @@ func (this *Client) GetCodeAll(exchange protocol.Exchange) (*protocol.CodeResp,
 
 // GetQuote 获取盘口五档报价
 func (this *Client) GetQuote(codes ...string) (protocol.QuotesResp, error) {
+	for i := range codes {
+		//如果是股票代码,则加上前缀
+		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
@@ -223,7 +255,37 @@ func (this *Client) GetQuote(codes ...string) (protocol.QuotesResp, error) {
 	if err != nil {
 		return nil, err
 	}
-	return result.(protocol.QuotesResp), nil
+	quotes := result.(protocol.QuotesResp)
+
+	{ //todo 临时处理下先,后续优化,感觉有问题
+		//判断长度和预期是否一致
+		if len(quotes) != len(codes) {
+			return nil, fmt.Errorf("预期%d个，实际%d个", len(codes), len(quotes))
+		}
+		for i, code := range codes {
+			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),
+				}
+			}
+		}
+	}
+
+	return quotes, nil
 }
 
 // GetMinute 获取分时数据,todo 解析好像不对,先用历史数据
@@ -322,6 +384,12 @@ func (this *Client) GetHistoryMinuteTradeAll(date, code string) (*protocol.Histo
 	return resp, nil
 }
 
+/*
+
+
+
+ */
+
 // GetIndex 获取指数,接口是和k线一样的,但是解析不知道怎么区分(解析方式不一致),所以加一个方法
 func (this *Client) GetIndex(Type uint8, code string, start, count uint16) (*protocol.KlineResp, error) {
 	code = protocol.AddPrefix(code)
@@ -342,7 +410,7 @@ func (this *Client) GetIndexUntil(Type uint8, code string, f func(k *protocol.Kl
 	size := uint16(800)
 	var last *protocol.Kline
 	for start := uint16(0); ; start += size {
-		r, err := this.GetKline(Type, code, start, size)
+		r, err := this.GetIndex(Type, code, start, size)
 		if err != nil {
 			return nil, err
 		}
@@ -368,6 +436,11 @@ func (this *Client) GetIndexUntil(Type uint8, code string, f func(k *protocol.Kl
 	return resp, nil
 }
 
+// GetIndexAll 获取全部k线数据
+func (this *Client) GetIndexAll(Type uint8, code string) (*protocol.KlineResp, error) {
+	return this.GetIndexUntil(Type, code, func(k *protocol.Kline) bool { return false })
+}
+
 func (this *Client) GetIndexDay(code string, start, count uint16) (*protocol.KlineResp, error) {
 	return this.GetIndex(protocol.TypeKlineDay, code, start, count)
 }
@@ -376,6 +449,31 @@ func (this *Client) GetIndexDayUntil(code string, f func(k *protocol.Kline) bool
 	return this.GetIndexUntil(protocol.TypeKlineDay, code, f)
 }
 
+func (this *Client) GetIndexDayAll(code string) (*protocol.KlineResp, error) {
+	return this.GetIndexAll(protocol.TypeKlineDay, code)
+}
+
+func (this *Client) GetIndexWeekAll(code string) (*protocol.KlineResp, error) {
+	return this.GetIndexAll(protocol.TypeKlineWeek, code)
+}
+
+func (this *Client) GetIndexMonthAll(code string) (*protocol.KlineResp, error) {
+	return this.GetIndexAll(protocol.TypeKlineMonth, code)
+}
+
+func (this *Client) GetIndexQuarterAll(code string) (*protocol.KlineResp, error) {
+	return this.GetIndexAll(protocol.TypeKlineQuarter, code)
+}
+
+func (this *Client) GetIndexYearAll(code string) (*protocol.KlineResp, error) {
+	return this.GetIndexAll(protocol.TypeKlineYear, code)
+}
+
+/*
+
+
+ */
+
 // GetKline 获取k线数据,推荐收盘之后获取,否则会获取到当天的数据
 func (this *Client) GetKline(Type uint8, code string, start, count uint16) (*protocol.KlineResp, error) {
 	code = protocol.AddPrefix(code)
@@ -424,27 +522,7 @@ func (this *Client) GetKlineUntil(Type uint8, code string, f func(k *protocol.Kl
 
 // GetKlineAll 获取全部k线数据
 func (this *Client) GetKlineAll(Type uint8, code string) (*protocol.KlineResp, error) {
-	resp := &protocol.KlineResp{}
-	size := uint16(800)
-	var last *protocol.Kline
-	for start := uint16(0); ; start += size {
-		r, err := this.GetKline(Type, code, start, size)
-		if err != nil {
-			return nil, err
-		}
-		if last != nil && len(r.List) > 0 {
-			last.Last = r.List[len(r.List)-1].Close
-		}
-		if len(r.List) > 0 {
-			last = r.List[0]
-		}
-		resp.Count += r.Count
-		resp.List = append(r.List, resp.List...)
-		if r.Count < size {
-			break
-		}
-	}
-	return resp, nil
+	return this.GetKlineUntil(Type, code, func(k *protocol.Kline) bool { return false })
 }
 
 // GetKlineMinute 获取一分钟k线数据,每次最多800条,最多只能获取24000条数据

codes.go

@@ -1,9 +1,13 @@
 package tdx
 
 import (
+	"errors"
+	"github.com/injoyai/conv"
+	"github.com/injoyai/ios/client"
 	"github.com/injoyai/logs"
 	"github.com/injoyai/tdx/protocol"
 	"github.com/robfig/cron/v3"
+	"math"
 	"os"
 	"path/filepath"
 	"time"
@@ -11,7 +15,20 @@ import (
 	"xorm.io/xorm"
 )
 
-func NewCodes(c *Client, filename string) (*Codes, error) {
+// DefaultCodes 增加单例,部分数据需要通过Codes里面的信息计算
+var DefaultCodes *Codes
+
+func DialCodes(filename string, op ...client.Option) (*Codes, error) {
+	c, err := DialDefault(op...)
+	if err != nil {
+		return nil, err
+	}
+	return NewCodes(c, filename)
+}
+
+func NewCodes(c *Client, filenames ...string) (*Codes, error) {
+
+	filename := conv.DefaultString("./codes.db", filenames...)
 
 	//如果文件夹不存在就创建
 	dir, _ := filepath.Split(filename)
@@ -27,69 +44,172 @@ func NewCodes(c *Client, filename string) (*Codes, error) {
 	if err := db.Sync2(new(CodeModel)); err != nil {
 		return nil, err
 	}
+	if err := db.Sync2(new(UpdateModel)); err != nil {
+		return nil, err
+	}
+
+	update := new(UpdateModel)
+	{ //查询或者插入一条数据
+		has, err := db.Get(update)
+		if err != nil {
+			return nil, err
+		} else if !has {
+			if _, err := db.Insert(update); err != nil {
+				return nil, err
+			}
+		}
+	}
 
 	cc := &Codes{
 		Client: c,
 		db:     db,
-		Codes:  nil,
 	}
 
-	//设置定时器,每天早上9点更新数据
-	task := cron.New(cron.WithSeconds())
-	task.AddFunc("0 0 9 * * *", func() {
-		for i := 0; i < 3; i++ {
-			if err := cc.Update(); err == nil {
-				return
+	{ //设置定时器,每天早上9点更新数据
+		task := cron.New(cron.WithSeconds())
+		task.AddFunc("0 0 9 * * *", func() {
+			for i := 0; i < 3; i++ {
+				if err := cc.Update(); err == nil {
+					return
+				}
+				logs.Err(err)
+				<-time.After(time.Minute * 5)
 			}
-			logs.Err(err)
-			<-time.After(time.Minute * 5)
-		}
-	})
-	task.Start()
+		})
+		task.Start()
+	}
 
-	return cc, cc.Update()
+	{ //判断是否更新过,更新过则不更新
+		now := time.Now()
+		node := time.Date(now.Year(), now.Month(), now.Day(), 9, 0, 0, 0, time.Local)
+		updateTime := time.Unix(update.Time, 0)
+		if now.Sub(node) > 0 {
+			//当前时间在9点之后,且更新时间在9点之前,需要更新
+			if updateTime.Sub(node) < 0 {
+				return cc, cc.Update()
+			}
+		} else {
+			//当前时间在9点之前,且更新时间在上个节点之前
+			if updateTime.Sub(node.Add(time.Hour*24)) < 0 {
+				return cc, cc.Update()
+			}
+		}
+	}
+
+	//从缓存中加载
+	return cc, cc.Update(true)
 }
 
 type Codes struct {
-	*Client                       //客户端
-	db      *xorm.Engine          //数据库实例
-	Codes   map[string]*CodeModel //股票缓存
+	*Client                         //客户端
+	db        *xorm.Engine          //数据库实例
+	Map       map[string]*CodeModel //股票缓存
+	list      []*CodeModel          //列表方式缓存
+	exchanges map[string][]string   //交易所缓存
 }
 
 // GetName 获取股票名称
 func (this *Codes) GetName(code string) string {
-	if v, ok := this.Codes[code]; ok {
+	if v, ok := this.Map[code]; ok {
 		return v.Name
 	}
 	return "未知"
 }
 
 // GetStocks 获取股票代码,sh6xxx sz0xx sz30xx
-func (this *Codes) GetStocks() []string {
+func (this *Codes) GetStocks(limits ...int) []string {
+	limit := conv.DefaultInt(-1, limits...)
 	ls := []string(nil)
-	for k, _ := range this.Codes {
-		if protocol.IsStock(k) {
-			ls = append(ls, k)
+	for _, m := range this.list {
+		code := m.FullCode()
+		if protocol.IsStock(code) {
+			ls = append(ls, code)
+		}
+		if limit > 0 && len(ls) >= limit {
+			break
 		}
 	}
 	return ls
 }
 
-func (this *Codes) Update() error {
-	codes, err := this.Code(false)
+func (this *Codes) Get(code string) *CodeModel {
+	return this.Map[code]
+}
+
+// GetExchange 获取股票交易所,这里的参数不需要带前缀
+func (this *Codes) GetExchange(code string) protocol.Exchange {
+	if len(code) == 6 {
+		switch {
+		case code[:1] == "6":
+			return protocol.ExchangeSH
+		case code[:1] == "0":
+			return protocol.ExchangeSZ
+		case code[:2] == "30":
+			return protocol.ExchangeSZ
+		}
+	}
+	var exchange string
+	exchanges := this.exchanges[code]
+	if len(exchanges) >= 1 {
+		exchange = exchanges[0]
+	}
+	if len(code) == 8 {
+		exchange = code[0:2]
+	}
+	switch exchange {
+	case protocol.ExchangeSH.String():
+		return protocol.ExchangeSH
+	case protocol.ExchangeSZ.String():
+		return protocol.ExchangeSZ
+	default:
+		return protocol.ExchangeSH
+	}
+}
+
+func (this *Codes) AddExchange(code string) string {
+	if exchanges := this.exchanges[code]; len(exchanges) == 1 {
+		return exchanges[0] + code
+	}
+	if len(code) == 6 {
+		switch {
+		case code[:1] == "6":
+			return protocol.ExchangeSH.String() + code
+		case code[:1] == "0":
+			return protocol.ExchangeSZ.String() + code
+		case code[:2] == "30":
+			return protocol.ExchangeSZ.String() + code
+		}
+		return this.GetExchange(code).String() + code
+	}
+	return code
+}
+
+// Update 更新数据,从服务器或者数据库
+func (this *Codes) Update(byDB ...bool) error {
+	codes, err := this.GetCodes(len(byDB) > 0 && byDB[0])
 	if err != nil {
 		return err
 	}
 	codeMap := make(map[string]*CodeModel)
+	exchanges := make(map[string][]string)
 	for _, code := range codes {
 		codeMap[code.Exchange+code.Code] = code
+		exchanges[code.Code] = append(exchanges[code.Code], code.Exchange)
 	}
-	this.Codes = codeMap
-	return nil
+	this.Map = codeMap
+	this.list = codes
+	this.exchanges = exchanges
+	//更新时间
+	_, err = this.db.Update(&UpdateModel{Time: time.Now().Unix()})
+	return err
 }
 
-// Code 更新股票并返回结果
-func (this *Codes) Code(byDatabase bool) ([]*CodeModel, error) {
+// GetCodes 更新股票并返回结果
+func (this *Codes) GetCodes(byDatabase bool) ([]*CodeModel, error) {
+
+	if this.Client == nil {
+		return nil, errors.New("client is nil")
+	}
 
 	//2. 查询数据库所有股票
 	list := []*CodeModel(nil)
@@ -151,7 +271,7 @@ func (this *Codes) Code(byDatabase bool) ([]*CodeModel, error) {
 			}
 		}
 		for _, v := range update {
-			if _, err := session.Where("Exchange=? and Code=? ", v.Exchange, v.Code).Cols("Name").Update(v); err != nil {
+			if _, err := session.Where("Exchange=? and Code=? ", v.Exchange, v.Code).Cols("Name,LastPrice").Update(v); err != nil {
 				return err
 			}
 		}
@@ -165,6 +285,14 @@ func (this *Codes) Code(byDatabase bool) ([]*CodeModel, error) {
 
 }
 
+type UpdateModel struct {
+	Time int64 //更新时间
+}
+
+func (*UpdateModel) TableName() string {
+	return "update"
+}
+
 type CodeModel struct {
 	ID        int64   `json:"id"`                      //主键
 	Name      string  `json:"name"`                    //名称,有时候名称会变,例STxxx
@@ -177,10 +305,19 @@ type CodeModel struct {
 	InDate    int64   `json:"inDate" xorm:"created"`   //创建时间
 }
 
-func (c *CodeModel) TableName() string {
+func (*CodeModel) TableName() string {
 	return "codes"
 }
 
+func (this *CodeModel) FullCode() string {
+	return this.Exchange + this.Code
+}
+
+func (this *CodeModel) Price(p protocol.Price) protocol.Price {
+	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 {
 	session := db.NewSession()
 	defer session.Close()

dial.go

@@ -3,12 +3,21 @@ package tdx
 import (
 	"context"
 	"github.com/injoyai/ios"
+	"github.com/injoyai/ios/module/tcp"
+	"github.com/injoyai/logs"
 	"math/rand"
 	"net"
 	"strings"
 	"time"
 )
 
+func NewTCPDial(addr string) ios.DialFunc {
+	if !strings.Contains(addr, ":") {
+		addr += ":7709"
+	}
+	return tcp.NewDial(addr)
+}
+
 func NewHostDial(hosts []string) ios.DialFunc {
 	if len(hosts) == 0 {
 		hosts = Hosts
@@ -43,3 +52,31 @@ func NewRandomDial(hosts []string) ios.DialFunc {
 		return c, addr, err
 	}
 }
+
+func NewRangeDial(hosts []string) ios.DialFunc {
+	if len(hosts) == 0 {
+		hosts = Hosts
+	}
+	return func(ctx context.Context) (c ios.ReadWriteCloser, _ string, err error) {
+		for i, addr := range hosts {
+			select {
+			case <-ctx.Done():
+				return nil, "", ctx.Err()
+			default:
+			}
+			if !strings.Contains(addr, ":") {
+				addr += ":7709"
+			}
+			c, err = net.Dial("tcp", addr)
+			if err == nil {
+				return c, addr, nil
+			}
+			if i < len(hosts)-1 {
+				//最后一个错误返回出去
+				logs.Err(err, "等待2秒后尝试下一个服务地址...")
+				<-time.After(time.Second * 2)
+			}
+		}
+		return
+	}
+}

example/CheckGetHistoryErr/main.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+	"time"
+)
+
+func main() {
+	m, err := tdx.NewManage(nil)
+	logs.PanicErr(err)
+
+	codes := m.Codes.GetStocks()
+	//codes = []string{
+	//	"sz000001",
+	//	"sz000002",
+	//}
+
+	for _, code := range codes {
+		m.Do(func(c *tdx.Client) error {
+			resp, err := c.GetHistoryMinute(time.Now().Format("20060102"), code)
+			logs.PanicErr(err)
+
+			resp2, err := c.GetKlineDay(code, 0, 1)
+			logs.PanicErr(err)
+
+			if len(resp2.List) == 0 {
+				logs.Debug(code)
+				return nil
+			}
+
+			if len(resp.List) == 0 {
+				logs.Debug(code)
+				return nil
+			}
+
+			if resp2.List[0].Close != resp.List[len(resp.List)-1].Price {
+				logs.Debug(code)
+			}
+
+			return nil
+
+		})
+	}
+
+}

example/DialHostsRange/main.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+)
+
+func main() {
+	_, err := tdx.DialHostsRange([]string{"1", "2", "127.0.0.1"})
+	logs.PrintErr(err)
+}

example/GetIndex/main.go

@@ -8,7 +8,7 @@ import (
 
 func main() {
 	common.Test(func(c *tdx.Client) {
-		resp, err := c.GetKlineDay("sh000001", 0, 10)
+		resp, err := c.GetIndexDay("sh000001", 0, 10)
 		logs.PanicErr(err)
 
 		for _, v := range resp.List {

example/GetQuote/main.go

@@ -10,6 +10,9 @@ func main() {
 	c, err := tdx.Dial("124.71.187.122:7709", tdx.WithDebug())
 	logs.PanicErr(err)
 
+	tdx.DefaultCodes, err = tdx.NewCodes(c, "./codes.db")
+	logs.PanicErr(err)
+
 	_ = c
 
 	/*
@@ -21,7 +24,7 @@ func main() {
 		b1cb74001c00000000000d005100bd00789c6378c1cecb252ace6066c5b4898987b9050ed1f90cc5b74c18a5bc18c1b43490fecff09c81819191f13fc3c9f3bb169f5e7dfefeb5ef57f7199a305009308208e5b32bb6bcbf70148712002d7f1e13
 		b1cb74000c02000000003e05ac00ac000102020000303030303031601294121a1c2d4eadabcf0ed412aae5fc01afb0024561124fbcc08301afa47900b2e3174100bf68871a4201b741b6144302bb09af334403972e96354504ac09b619560e00000000f8ff601201363030303038b60fba04060607429788a70efa04ada37ab2531c12974d91e7449dbc354184b6010001844bad324102b5679ea1014203a65abd8d0143048a6ba4dd01440587e101b3d2029613000000000000b60f
 	*/
-	resp, err := c.GetQuote("sz000001", "sh600008")
+	resp, err := c.GetQuote("000001", "600000", "159558", "010504")
 	logs.PanicErr(err)
 
 	for _, v := range resp {

example/PullKline/main.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"context"
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+	"github.com/injoyai/tdx/extend"
+	"path/filepath"
+	"time"
+)
+
+func main() {
+
+	m, err := tdx.NewManage(nil)
+	logs.PanicErr(err)
+
+	err = extend.NewPullKline(extend.PullKlineConfig{
+		Codes:   []string{"sz000001"},
+		Tables:  []string{extend.Year},
+		Dir:     filepath.Join(tdx.DefaultDatabaseDir, "kline"),
+		Limit:   1,
+		StartAt: time.Time{},
+	}).Run(context.Background(), m)
+	logs.PanicErr(err)
+
+}

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

@@ -0,0 +1,273 @@
+package extend
+
+import (
+	"context"
+	_ "github.com/glebarez/go-sqlite"
+	"github.com/injoyai/base/chans"
+	"github.com/injoyai/logs"
+	"github.com/injoyai/tdx"
+	"github.com/injoyai/tdx/protocol"
+	"path/filepath"
+	"sort"
+	"time"
+	"xorm.io/core"
+	"xorm.io/xorm"
+)
+
+const (
+	Minute   = "minute"
+	Minute5  = "5minute"
+	Minute15 = "15minute"
+	Minute30 = "30minute"
+	Hour     = "hour"
+	Day      = "day"
+	Week     = "week"
+	Month    = "month"
+	Quarter  = "quarter"
+	Year     = "year"
+)
+
+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 }),
+	}
+)
+
+type PullKlineConfig struct {
+	Codes   []string  //操作代码
+	Tables  []string  //数据类型
+	Dir     string    //数据位置
+	Limit   int       //协程数量
+	StartAt time.Time //数据开始时间
+}
+
+func NewPullKline(cfg PullKlineConfig) *PullKline {
+	_tables := []*KlineTable(nil)
+	for _, v := range cfg.Tables {
+		_tables = append(_tables, KlineTableMap[v])
+	}
+	return &PullKline{
+		tables: _tables,
+		Config: cfg,
+	}
+}
+
+type PullKline struct {
+	tables []*KlineTable
+	Config PullKlineConfig
+}
+
+func (this *PullKline) Name() string {
+	return "拉取k线数据"
+}
+
+func (this *PullKline) 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()
+
+			//连接数据库
+			db, err := xorm.NewEngine("sqlite", filepath.Join(this.Config.Dir, code+".db"))
+			if err != nil {
+				logs.Err(err)
+				return
+			}
+			db.SetMapper(core.SameMapper{})
+			db.DB().SetMaxOpenConns(1)
+
+			for _, table := range this.tables {
+				if table == nil {
+					continue
+				}
+
+				select {
+				case <-ctx.Done():
+					return
+				default:
+				}
+
+				db.Sync2(table)
+
+				//2. 获取最后一条数据
+				last := new(Kline)
+				if _, err = db.Table(table).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(db, func(session *xorm.Session) error {
+					for i, v := range insert {
+						if i == 0 {
+							if _, err := session.Table(table).Where("Date >= ?", 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 *PullKline) 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
+}
+
+type Kline struct {
+	Code   string         `json:"code"`                  //代码
+	Date   int64          `json:"date"`                  //时间节点 2006-01-02 15:00
+	Open   protocol.Price `json:"open"`                  //开盘价
+	High   protocol.Price `json:"high"`                  //最高价
+	Low    protocol.Price `json:"low"`                   //最低价
+	Close  protocol.Price `json:"close"`                 //收盘价
+	Volume int64          `json:"volume"`                //成交量
+	Amount protocol.Price `json:"amount"`                //成交额
+	InDate int64          `json:"inDate" xorm:"created"` //创建时间
+}
+
+type Klines []*Kline
+
+func (this Klines) Less(i, j int) bool { return this[i].Code > this[j].Code }
+
+func (this Klines) Swap(i, j int) { this[i], this[j] = this[j], this[i] }
+
+func (this Klines) Len() int { return len(this) }
+
+func (this Klines) Sort() { sort.Sort(this) }
+
+// Kline 计算多个K线,成一个K线
+func (this Klines) Kline() *Kline {
+	if this == nil {
+		return new(Kline)
+	}
+	k := new(Kline)
+	for i, v := range this {
+		switch i {
+		case 0:
+			k.Open = v.Open
+			k.High = v.High
+			k.Low = v.Low
+			k.Close = v.Close
+		case len(this) - 1:
+			k.Close = v.Close
+			k.Date = v.Date
+		}
+		if v.High > k.High {
+			k.High = v.High
+		}
+		if v.Low < k.Low {
+			k.Low = v.Low
+		}
+		k.Volume += v.Volume
+		k.Amount += v.Amount
+	}
+
+	return k
+}
+
+// Merge 合并K线
+func (this Klines) Merge(n int) Klines {
+	if this == nil {
+		return nil
+	}
+	ks := []*Kline(nil)
+	for i := 0; i < len(this); i += n {
+		if i+n > len(this) {
+			ks = append(ks, this[i:].Kline())
+		} else {
+			ks = append(ks, this[i:i+n].Kline())
+		}
+	}
+	return ks
+}
+
+type KlineHandler func(code string, f func(k *protocol.Kline) bool) (*protocol.KlineResp, error)
+
+func NewKlineTable(tableName string, handler func(c *tdx.Client) KlineHandler) *KlineTable {
+	return &KlineTable{
+		tableName: tableName,
+		Handler:   handler,
+	}
+}
+
+type KlineTable struct {
+	Kline     `xorm:"extends"`
+	tableName string
+	Handler   func(c *tdx.Client) KlineHandler `xorm:"-"`
+}
+
+func (this *KlineTable) TableName() string {
+	return this.tableName
+}

manage.go

@@ -3,51 +3,54 @@ package tdx
 import (
 	"github.com/injoyai/ios/client"
 	"github.com/robfig/cron/v3"
-	"path/filepath"
 	"time"
 )
 
+const (
+	DefaultDatabaseDir = "./data/database"
+)
+
 func NewManage(cfg *ManageConfig, op ...client.Option) (*Manage, error) {
 	//初始化配置
 	if cfg == nil {
 		cfg = &ManageConfig{}
 	}
-	if len(cfg.Hosts) == 0 {
-		cfg.Hosts = Hosts
+	if cfg.CodesFilename == "" {
+		cfg.CodesFilename = DefaultDatabaseDir + "/codes.db"
 	}
-	if cfg.CodesDir == "" {
-		cfg.CodesDir = "./data/database"
+	if cfg.WorkdayFileName == "" {
+		cfg.WorkdayFileName = DefaultDatabaseDir + "/workday.db"
 	}
-	if cfg.WorkdayDir == "" {
-		cfg.WorkdayDir = "./data/database"
+	if cfg.Dial == nil {
+		cfg.Dial = DialDefault
+	}
+
+	//代码
+	codesClient, err := cfg.Dial(op...)
+	if err != nil {
+		return nil, err
+	}
+	codesClient.Wait.SetTimeout(time.Second * 5)
+	codes, err := NewCodes(codesClient, cfg.CodesFilename)
+	if err != nil {
+		return nil, err
 	}
 
 	//连接池
 	p, err := NewPool(func() (*Client, error) {
-		return DialHosts(cfg.Hosts, op...)
+		return cfg.Dial(op...)
 	}, cfg.Number)
 	if err != nil {
 		return nil, err
 	}
 
-	//代码
-	codesClient, err := DialHosts(cfg.Hosts, op...)
-	if err != nil {
-		return nil, err
-	}
-	codesClient.Wait.SetTimeout(time.Second * 5)
-	codes, err := NewCodes(codesClient, filepath.Join(cfg.CodesDir, "codes.db"))
-	if err != nil {
-		return nil, err
-	}
-
 	//工作日
-	workdayClient, err := DialHosts(cfg.Hosts, op...)
+	workdayClient, err := cfg.Dial(op...)
 	if err != nil {
 		return nil, err
 	}
 	workdayClient.Wait.SetTimeout(time.Second * 5)
-	workday, err := NewWorkday(workdayClient, filepath.Join(cfg.WorkdayDir, "workday.db"))
+	workday, err := NewWorkday(workdayClient, cfg.WorkdayFileName)
 	if err != nil {
 		return nil, err
 	}
@@ -79,8 +82,8 @@ func (this *Manage) AddWorkdayTask(spec string, f func(m *Manage)) {
 }
 
 type ManageConfig struct {
-	Hosts      []string //服务端IP
-	Number     int      //客户端数量
-	CodesDir   string   //代码数据库位置
-	WorkdayDir string   //工作日数据库位置
+	Number          int                                                //客户端数量
+	CodesFilename   string                                             //代码数据库位置
+	WorkdayFileName string                                             //工作日数据库位置
+	Dial            func(op ...client.Option) (cli *Client, err error) //默认连接方式
 }

pool.go

@@ -5,6 +5,7 @@ import (
 	"github.com/injoyai/base/safe"
 )
 
+// NewPool 简易版本的连接池
 func NewPool(dial func() (*Client, error), number int) (*Pool, error) {
 	if number <= 0 {
 		number = 1

protocol/model_history_minute.go

@@ -33,10 +33,10 @@ func (this historyMinute) Decode(bs []byte) (*MinuteResp, error) {
 		Count: Uint16(bs[:2]),
 	}
 
-	multiple := Price(1)
-	if bs[5] > 0x40 {
-		multiple = 10
-	}
+	multiple := Price(1) * 10
+	//if bs[5] > 0x40 {
+	//multiple = 10
+	//}
 
 	//2-4字节是啥?
 	bs = bs[6:]

protocol/model_kline.go

@@ -77,7 +77,10 @@ func (this *Kline) RisePrice() Price {
 
 // RiseRate 涨跌比例/涨跌幅,第一个数据不准，仅做参考
 func (this *Kline) RiseRate() float64 {
-	return float64(this.RisePrice()) / float64(this.Open) * 100
+	if this.Last == 0 {
+		return float64(this.Close-this.Open) / float64(this.Open) * 100
+	}
+	return float64(this.Close-this.Last) / float64(this.Last) * 100
 }
 
 type kline struct{}

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
 }
 

workday.go

@@ -1,6 +1,7 @@
 package tdx
 
 import (
+	"errors"
 	_ "github.com/glebarez/go-sqlite"
 	"github.com/injoyai/base/maps"
 	"github.com/injoyai/logs"
@@ -59,6 +60,11 @@ type Workday struct {
 
 // Update 更新
 func (this *Workday) Update() error {
+
+	if this.Client == nil {
+		return errors.New("client is nil")
+	}
+
 	//获取沪市指数的日K线,用作历史是否节假日的判断依据
 	//判断日K线是否拉取过
 
@@ -77,7 +83,7 @@ func (this *Workday) Update() error {
 
 	now := time.Now()
 	if lastWorkday == nil || lastWorkday.Unix < IntegerDay(now).Unix() {
-		resp, err := this.Client.GetKlineDayAll("sh000001")
+		resp, err := this.Client.GetIndexDayAll("sh000001")
 		if err != nil {
 			logs.Err(err)
 			return err