无订阅支付后出现两个订阅

2026-03-05 21:53:36 -08:00
parent a1ab0fefa4
commit 7308aa9191
51 changed files with 2041 additions and 556 deletions
@@ -28,6 +28,7 @@ import (
 	"github.com/perfect-panel/server/pkg/limit"
 	"github.com/perfect-panel/server/pkg/nodeMultiplier"
 	"github.com/perfect-panel/server/pkg/orm"
+	"github.com/perfect-panel/server/pkg/signature"

 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 	"github.com/hibiken/asynq"
@@ -36,33 +37,34 @@ import (
 )

 type ServiceContext struct {
-	DB           *gorm.DB
-	Redis        *redis.Client
-	Config       config.Config
-	Queue        *asynq.Client
-	ExchangeRate float64
-	GeoIP        *IPLocation
+	DB                 *gorm.DB
+	Redis              *redis.Client
+	Config             config.Config
+	Queue              *asynq.Client
+	ExchangeRate       float64
+	GeoIP              *IPLocation
+	SignatureValidator *signature.Validator

 	//NodeCache   *cache.NodeCacheClient
-	AuthModel   auth.Model
-	AdsModel    ads.Model
-	LogModel    log.Model
+	AuthModel       auth.Model
+	AdsModel        ads.Model
+	LogModel        log.Model
 	LogMessageModel logmessage.Model
-	NodeModel   node.Model
-	UserModel   user.Model
-	OrderModel  order.Model
-	ClientModel client.Model
-	TicketModel ticket.Model
+	NodeModel       node.Model
+	UserModel       user.Model
+	OrderModel      order.Model
+	ClientModel     client.Model
+	TicketModel     ticket.Model
 	//ServerModel        server.Model
-	SystemModel           system.Model
-	CouponModel           coupon.Model
-	RedemptionCodeModel   redemption.RedemptionCodeModel
-	RedemptionRecordModel redemption.RedemptionRecordModel
-	PaymentModel          payment.Model
-	DocumentModel         document.Model
-	SubscribeModel        subscribe.Model
-	TrafficLogModel       traffic.Model
-	AnnouncementModel     announcement.Model
+	SystemModel              system.Model
+	CouponModel              coupon.Model
+	RedemptionCodeModel      redemption.RedemptionCodeModel
+	RedemptionRecordModel    redemption.RedemptionRecordModel
+	PaymentModel             payment.Model
+	DocumentModel            document.Model
+	SubscribeModel           subscribe.Model
+	TrafficLogModel          traffic.Model
+	AnnouncementModel        announcement.Model
 	IAPAppleTransactionModel iapapple.Model

 	Restart               func() error
@@ -109,24 +111,27 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		_ = rds.FlushAll(context.Background()).Err()
 	}
 	authLimiter := limit.NewPeriodLimit(86400, 15, rds, config.SendCountLimitKeyPrefix, limit.Align())
+	nonceStore := signature.NewRedisNonceStore(rds)
+
 	srv := &ServiceContext{
-		DB:           db,
-		Redis:        rds,
-		Config:       c,
-		Queue:        NewAsynqClient(c),
-		ExchangeRate: 0,
-		GeoIP:        geoIP,
+		DB:                 db,
+		Redis:              rds,
+		Config:             c,
+		Queue:              NewAsynqClient(c),
+		ExchangeRate:       0,
+		GeoIP:              geoIP,
+		SignatureValidator: signature.NewValidator(c.AppSignature, nonceStore),
 		//NodeCache:   cache.NewNodeCacheClient(rds),
-		AuthLimiter: authLimiter,
-		AdsModel:    ads.NewModel(db, rds),
-		LogModel:    log.NewModel(db),
+		AuthLimiter:     authLimiter,
+		AdsModel:        ads.NewModel(db, rds),
+		LogModel:        log.NewModel(db),
 		LogMessageModel: logmessage.NewModel(db),
-		NodeModel:   node.NewModel(db, rds),
-		AuthModel:   auth.NewModel(db, rds),
-		UserModel:   user.NewModel(db, rds),
-		OrderModel:  order.NewModel(db, rds),
-		ClientModel: client.NewSubscribeApplicationModel(db),
-		TicketModel: ticket.NewModel(db, rds),
+		NodeModel:       node.NewModel(db, rds),
+		AuthModel:       auth.NewModel(db, rds),
+		UserModel:       user.NewModel(db, rds),
+		OrderModel:      order.NewModel(db, rds),
+		ClientModel:     client.NewSubscribeApplicationModel(db),
+		TicketModel:     ticket.NewModel(db, rds),
 		//ServerModel:       server.NewModel(db, rds),
 		SystemModel:           system.NewModel(db, rds),
 		CouponModel:           coupon.NewModel(db, rds),