重构项目结构，将 orm 和 rds 包迁移到 web/globals

web/services/resource.go

@@ -5,11 +5,11 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	"platform/pkg/orm"
-	"platform/pkg/rds"
 	bill2 "platform/web/domains/bill"
 	resource2 "platform/web/domains/resource"
 	trade2 "platform/web/domains/trade"
+	g "platform/web/globals"
+	"platform/web/globals/orm"
 	m "platform/web/models"
 	q "platform/web/queries"
 	"strings"
@@ -52,7 +52,7 @@ func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResou
 		if err != nil {
 			return err
 		}
-		err = rds.Client.Set(ctx, result.TradeNo, reqStr, 30*time.Minute).Err()
+		err = g.Redis.Set(ctx, result.TradeNo, reqStr, 30*time.Minute).Err()
 		if err != nil {
 			return err
 		}
@@ -69,7 +69,7 @@ func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResou
 func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string, rs *TransactionVerifyResult) error {
 
 	// 获取请求缓存
-	reqStr, err := rds.Client.Get(ctx, tradeNo).Result()
+	reqStr, err := g.Redis.Get(ctx, tradeNo).Result()
 	if err != nil {
 		return err
 	}
@@ -108,7 +108,7 @@ func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string,
 		}
 
 		// 删除缓存
-		err = rds.Client.Del(ctx, tradeNo).Err()
+		err = g.Redis.Del(ctx, tradeNo).Err()
 		if err != nil {
 			return err
 		}
@@ -265,7 +265,7 @@ func createResource(q *q.Query, data *CreateResourceData, uid int32) (*m.Resourc
 
 func (s *resourceService) CancelResource(ctx context.Context, tradeNo string, at time.Time, method trade2.Method) error {
 	// 删除请求缓存
-	_, err := rds.Client.Del(ctx, tradeNo).Result()
+	_, err := g.Redis.Del(ctx, tradeNo).Result()
 	if err != nil {
 		return err
 	}