简单测试北交所数据

client.go

@@ -220,6 +220,26 @@ func (this *Client) GetCode(exchange protocol.Exchange, start uint16) (*protocol
 // GetCodeAll 通过多次请求的方式获取全部证券代码
 func (this *Client) GetCodeAll(exchange protocol.Exchange) (*protocol.CodeResp, error) {
 	resp := &protocol.CodeResp{}
+
+	//通达信没有北交所代码列表,通过爬虫的方式从北交所官网获取,放在这里是为了方便业务逻辑
+	//不放在extend包时防止循环引用
+	//todo 这是临时方案,等通达信有北交所代码列表时再改
+	if exchange == protocol.ExchangeBJ {
+		codes, err := GetBjCodes()
+		if err != nil {
+			return nil, err
+		}
+		resp.Count = uint16(len(codes))
+		for _, v := range codes {
+			resp.List = append(resp.List, &protocol.Code{
+				Code:      v.Code,
+				Name:      v.Name,
+				LastPrice: v.Last,
+			})
+		}
+		return resp, nil
+	}
+
 	size := uint16(1000)
 	for start := uint16(0); ; start += size {
 		r, err := this.GetCode(exchange, start)
@@ -238,7 +258,7 @@ func (this *Client) GetCodeAll(exchange protocol.Exchange) (*protocol.CodeResp,
 // GetStockAll 获取所有股票代码
 func (this *Client) GetStockAll() ([]string, error) {
 	ls := []string(nil)
-	for _, ex := range []protocol.Exchange{protocol.ExchangeSH, protocol.ExchangeSZ} {
+	for _, ex := range []protocol.Exchange{protocol.ExchangeSH, protocol.ExchangeSZ, protocol.ExchangeBJ} {
 		resp, err := this.GetCodeAll(ex)
 		if err != nil {
 			return nil, err

client_bj_code.go

@@ -0,0 +1,102 @@
+package tdx
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/injoyai/conv"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+)
+
+const (
+	// UrlBjCodes 最后跟的是时间戳(ms),但是随便什么时间戳都能请求成功
+	UrlBjCodes = "https://www.bse.cn/nqhqController/nqhq_en.do?callback=jQuery3710848510589806625_%d"
+)
+
+func GetBjCodes() ([]*BjCode, error) {
+	list := []*BjCode(nil)
+	//这个200预防下bug,除非北京上市公司有4000个
+	for page := 0; page < 200; page++ {
+		ls, done, err := getBjCodes(page)
+		if err != nil {
+			return nil, err
+		}
+
+		list = append(list, ls...)
+		if done {
+			break
+		}
+		<-time.After(time.Millisecond * 100)
+	}
+	return list, nil
+}
+
+func getBjCodes(page int) (_ []*BjCode, last bool, err error) {
+
+	url := fmt.Sprintf(UrlBjCodes, time.Now().UnixMilli())
+
+	bodyStr := "page=" + conv.String(page) + "&type_en=%5B%22B%22%5D&sortfield=hqcjsl&sorttype=desc&xxfcbj_en=%5B2%5D&zqdm="
+
+	req, err := http.NewRequest(http.MethodPost, url, strings.NewReader(bodyStr))
+	if err != nil {
+		return nil, false, err
+	}
+	req.Header.Set("X-Requested-With", "XMLHttpRequest")
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.39 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, false, err
+	}
+	defer resp.Body.Close()
+
+	bs, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, false, err
+	}
+
+	//处理数据
+	i := bytes.IndexByte(bs, '(')
+	if len(bs) < 1 || len(bs) <= i {
+		return nil, false, errors.New("未知错误: " + string(bs))
+	}
+
+	bs = bs[i+1 : len(bs)-1]
+
+	ls := []*BjCodes(nil)
+	err = json.Unmarshal(bs, &ls)
+	if err != nil {
+		return nil, false, err
+	}
+
+	if len(ls) == 0 {
+		return nil, false, errors.New("未知错误: " + string(bs))
+	}
+
+	return ls[0].Data, ls[0].LastPage, nil
+}
+
+type BjCodes struct {
+	Data        []*BjCode `json:"content"`
+	TotalNumber int       `json:"totalElements"`
+	TotalPage   int       `json:"totalPages"`
+	LastPage    bool      `json:"lastPage"`
+}
+
+type BjCode struct {
+	Date      string  `json:"hqjsrq"` //日期
+	Code      string  `json:"hqzqdm"` //代码
+	Name      string  `json:"hqzqjc"` //名称
+	LastClose float64 `json:"hqzrsp"` //前一天收盘价
+	Open      float64 `json:"hqjrkp"` //开盘价
+	High      float64 `json:"hqzgcj"` //最高价
+	Low       float64 `json:"hqzdcj"` //最低价
+	Last      float64 `json:"hqzjcj"` //最新价/收盘价
+	Volume    int     `json:"hqcjsl"` //成交量,股
+	Amount    float64 `json:"hqcjje"` //成交额,元
+}

codes.go

@@ -155,52 +155,53 @@ 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
-	}
-}
+//// 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
+	return protocol.AddPrefix(code)
+	//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 更新数据,从服务器或者数据库
@@ -249,7 +250,7 @@ func (this *Codes) GetCodes(byDatabase bool) ([]*CodeModel, error) {
 	//3. 从服务器获取所有股票代码
 	insert := []*CodeModel(nil)
 	update := []*CodeModel(nil)
-	for _, exchange := range []protocol.Exchange{protocol.ExchangeSH, protocol.ExchangeSZ} {
+	for _, exchange := range []protocol.Exchange{protocol.ExchangeSH, protocol.ExchangeSZ, protocol.ExchangeBJ} {
 		resp, err := this.Client.GetCodeAll(exchange)
 		if err != nil {
 			return nil, err
@@ -334,7 +335,7 @@ func (this *CodeModel) FullCode() string {
 
 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)))
+	//return p * protocol.Price(math.Pow10(int(2-this.Decimal)))
 }
 
 func NewSessionFunc(db *xorm.Engine, fn func(session *xorm.Session) error) error {

example/GetHistoryTrade/main.go

@@ -8,7 +8,7 @@ import (
 
 func main() {
 	common.Test(func(c *tdx.Client) {
-		resp, err := c.GetHistoryMinuteTrade("20250609", "sz000001", 0, 20)
+		resp, err := c.GetHistoryMinuteTrade("20250929", "bj838971", 0, 20)
 		logs.PanicErr(err)
 
 		for _, v := range resp.List {

example/WorkdayAndCodes/main.go

@@ -9,11 +9,12 @@ import (
 func main() {
 	common.Test(func(c *tdx.Client) {
 
-		_, err := tdx.NewWorkday(c, "./workday.db")
+		_, err := tdx.NewWorkday(c) //"./workday.db"
 		logs.PanicErr(err)
 
-		_, err = tdx.NewCodes(c, "./codes.db")
+		_, err = tdx.NewCodes(c) //"./codes.db"
 		logs.PanicErr(err)
 
+		c.Close()
 	})
 }

extend/codes_bj.go

@@ -1,102 +1,9 @@
 package extend
 
 import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/injoyai/conv"
-	"io"
-	"net/http"
-	"strings"
-	"time"
+	"github.com/injoyai/tdx"
 )
 
-const (
-	// UrlBjCodes 最后跟的是时间戳(ms),但是随便什么时间戳都能请求成功
-	UrlBjCodes = "https://www.bse.cn/nqhqController/nqhq_en.do?callback=jQuery3710848510589806625_%d"
-)
-
-func GetBjCodes() ([]*BjCode, error) {
-	list := []*BjCode(nil)
-	//这个200预防下bug,除非北京上市公司有4000个
-	for page := 0; page < 200; page++ {
-		ls, done, err := getBjCodes(page)
-		if err != nil {
-			return nil, err
-		}
-
-		list = append(list, ls...)
-		if done {
-			break
-		}
-		<-time.After(time.Millisecond * 100)
-	}
-	return list, nil
-}
-
-func getBjCodes(page int) (_ []*BjCode, last bool, err error) {
-
-	url := fmt.Sprintf(UrlBjCodes, time.Now().UnixMilli())
-
-	bodyStr := "page=" + conv.String(page) + "&type_en=%5B%22B%22%5D&sortfield=hqcjsl&sorttype=desc&xxfcbj_en=%5B2%5D&zqdm="
-
-	req, err := http.NewRequest(http.MethodPost, url, strings.NewReader(bodyStr))
-	if err != nil {
-		return nil, false, err
-	}
-	req.Header.Set("X-Requested-With", "XMLHttpRequest")
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.39 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, false, err
-	}
-	defer resp.Body.Close()
-
-	bs, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, false, err
-	}
-
-	//处理数据
-	i := bytes.IndexByte(bs, '(')
-	if len(bs) < 1 || len(bs) <= i {
-		return nil, false, errors.New("未知错误: " + string(bs))
-	}
-
-	bs = bs[i+1 : len(bs)-1]
-
-	ls := []*BjCodes(nil)
-	err = json.Unmarshal(bs, &ls)
-	if err != nil {
-		return nil, false, err
-	}
-
-	if len(ls) == 0 {
-		return nil, false, errors.New("未知错误: " + string(bs))
-	}
-
-	return ls[0].Data, ls[0].LastPage, nil
-}
-
-type BjCodes struct {
-	Data        []*BjCode `json:"content"`
-	TotalNumber int       `json:"totalElements"`
-	TotalPage   int       `json:"totalPages"`
-	LastPage    bool      `json:"lastPage"`
-}
-
-type BjCode struct {
-	Date      string  `json:"hqjsrq"` //日期
-	Code      string  `json:"hqzqdm"` //代码
-	Name      string  `json:"hqzqjc"` //名称
-	LastClose float64 `json:"hqzrsp"` //前一天收盘价
-	Open      float64 `json:"hqjrkp"` //开盘价
-	High      float64 `json:"hqzgcj"` //最高价
-	Low       float64 `json:"hqzdcj"` //最低价
-	Last      float64 `json:"hqzjcj"` //最新价/收盘价
-	Volume    int     `json:"hqcjsl"` //成交量,股
-	Amount    float64 `json:"hqcjje"` //成交额,元
+func GetBjCodes() ([]*tdx.BjCode, error) {
+	return tdx.GetBjCodes()
 }

protocol/unit.go

@@ -127,11 +127,15 @@ func GetTime(bs [4]byte, Type uint8) time.Time {
 }
 
 func basePrice(code string) Price {
-	if len(code) == 0 {
+	if len(code) < 2 {
+		return 1
+	}
+	switch code[:1] {
+	case "8":
 		return 1
 	}
 	switch code[:2] {
-	case "60", "30", "68", "00":
+	case "60", "30", "68", "00", "92", "43":
 		return 1
 	default:
 		return 10

workday.go

@@ -15,7 +15,10 @@ import (
 	"xorm.io/xorm"
 )
 
-func NewWorkday(c *Client, filename string) (*Workday, error) {
+func NewWorkday(c *Client, filenames ...string) (*Workday, error) {
+
+	defaultFilename := filepath.Join(DefaultDatabaseDir, "workday.db")
+	filename := conv.Default(defaultFilename, filenames...)
 
 	//如果文件夹不存在就创建
 	dir, _ := filepath.Split(filename)