go1.25版本有点不兼容老版本,增加对go1.25版本的支持

Merge remote-tracking branch 'origin/master'
# Conflicts: # go.mod # go.sum
2025-11-26 21:25:35 +08:00 · 2025-08-29 09:43:00 +08:00 · 2025-08-29 09:41:42 +08:00 · 2025-08-29 09:41:01 +08:00 · 2025-08-24 20:20:53 +08:00
5 changed files with 6 additions and 4 deletions
--- a/extend/pull-kline-mysql.go
+++ b/extend/pull-kline-mysql.go
@@ -43,7 +43,7 @@ func (this *PullKlineMysql) Name() string {
 }

 func (this *PullKlineMysql) Run(ctx context.Context, m *tdx.Manage) error {
-	limit := chans.NewWaitLimit(uint(this.Config.Limit))
+	limit := chans.NewWaitLimit(this.Config.Limit)

 	//1. 获取所有股票代码
 	codes := this.Config.Codes
--- a/extend/pull-kline.go
+++ b/extend/pull-kline.go
@@ -105,7 +105,7 @@ func (this *PullKline) DayKlines(code string) (Klines, error) {
 }

 func (this *PullKline) Run(ctx context.Context, m *tdx.Manage) error {
-	limit := chans.NewWaitLimit(uint(this.Config.Limit))
+	limit := chans.NewWaitLimit(this.Config.Limit)

 	//1. 获取所有股票代码
 	codes := this.Config.Codes
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/glebarez/go-sqlite v1.22.0
 	github.com/go-sql-driver/mysql v1.7.0
-	github.com/injoyai/base v1.2.15
+	github.com/injoyai/base v1.2.17
 	github.com/injoyai/conv v1.2.5
 	github.com/injoyai/ios v1.2.2
 	github.com/injoyai/logs v1.0.12
--- a/go.sum
+++ b/go.sum
@@ -28,6 +28,8 @@ 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.2.15 h1:K/ysPqZl7vgNUAz/jpG1IdDpzdSMWvUfoJL+1gPdM9g=
 github.com/injoyai/base v1.2.15/go.mod h1:NfCQjml3z2pCvQ3J3YcOXtecqXD0xVPKjo4YTsMLhr8=
+github.com/injoyai/base v1.2.17 h1:+qYeCSeEMWgmTla+LBC0Ozan9ysS4mV0ne5nfMt9opU=
+github.com/injoyai/base v1.2.17/go.mod h1:NfCQjml3z2pCvQ3J3YcOXtecqXD0xVPKjo4YTsMLhr8=
 github.com/injoyai/conv v1.2.5 h1:G4OCyF0NTZul5W1u9IgXDOhW4/zmIigdPKXFHQGmv1M=
 github.com/injoyai/conv v1.2.5/go.mod h1:s05l3fQJQ4mT4VX+KIdbvCWQB0YzZHprmUfUu2uxd1k=
 github.com/injoyai/ios v1.2.2 h1:fAPWBL6t22DiE2ZEpBgf5bzyVQTcm2ZhLMkM+JFPhZA=
--- a/protocol/types.go
+++ b/protocol/types.go
@@ -43,7 +43,7 @@ func (this Exchange) Name() string {
 const (
 	ExchangeSZ Exchange = iota //深圳交易所
 	ExchangeSH                 //上海交易所
-	//ExchangeBJ                 //北京交易所
+	ExchangeBJ                 //北京交易所
 )

 const (
Author	SHA1	Message	Date
injoyai	1656b41f02	go1.25版本有点不兼容老版本,增加对go1.25版本的支持	2025-08-29 09:43:00 +08:00
injoyai	8090cc7216	Merge remote-tracking branch 'origin/master' # Conflicts: # go.mod # go.sum	2025-08-29 09:41:42 +08:00
injoyai	a3169c67da	go1.25版本有点不兼容老版本,增加对go1.25版本的支持	2025-08-29 09:41:01 +08:00
钱纯净	0a1a6194af	升级引用库版本	2025-08-24 20:20:53 +08:00