完善

lock/lock.go

@@ -5,9 +5,8 @@ import (
 )
 
 var (
-	UserLockMap   = map[string]*sync.Mutex{}
-	MainLock      = sync.Mutex{}
-	OrderCodeLock = sync.Mutex{}
+	UserLockMap = map[string]*sync.Mutex{}
+	MainLock    = sync.Mutex{}
 )
 
 func InitUserLock(appID string) {

main.go

@@ -41,7 +41,7 @@ func main() {
 		db.GetSFISDB().Find(&apis)
 		for _, api := range apis {
 			utils.ProductCaches.Map.Store(api.ID, api)
-			utils.ApiUrlCache.Store(api.Path, *api)
+			utils.ApiUrlCache.Store(api.Path, api.ID)
 		}
 		global.Logger.Info("初始化产品缓存信息,", zap.Any("产品数量:", len(apis)))
 	}

middleware/auth.go

@@ -5,7 +5,6 @@ import (
 	"sfbase/global"
 	sutils "sfbase/utils"
 
-	// "sfis/model"
 	"sfis/model/response"
 	"sfis/utils"
 	"strconv"
@@ -29,16 +28,18 @@ func TokenAuth() gin.HandlerFunc {
 			requestIP  string
 		)
 		requestUrl = context.Request.URL.String()
-		requestUrl = strings.Split(requestUrl, "?")[0]
-		a := strings.Split(requestUrl, "/")
-		requestUrl = a[4]
-		// if p, ok := utils.ApiUrlCache.Load(requestUrl); ok {
-		// 	productID = p.(*model.Product).ID
-		// } else {
-		// 	response.FailWithDetailed(response.ParamError, nil, "url错误", context)
-		// 	context.Abort()
-		// 	return
-		// }
+		global.Logger.Info(requestUrl)
+		requestUrl = strings.Split(requestUrl, "v1")[1]
+		global.Logger.Info(requestUrl)
+		// a := strings.Split(requestUrl, "/")
+		// requestUrl = a[4]
+		if p, ok := utils.ApiUrlCache.Load(requestUrl); ok {
+			productID = p.(int)
+		} else {
+			response.FailWithDetailed(response.ParamError, nil, "url错误", context)
+			context.Abort()
+			return
+		}
 		productID = 1000
 		token = context.Request.Header.Get("token")
 		timestamp = context.Request.Header.Get("timestamp")

utils/cost_by_account_balance.go

@@ -7,7 +7,6 @@ import (
 	"sfbase/global"
 	"sfbase/utils"
 	"sfis/db"
-	"sfis/lock"
 	"sfis/model"
 
 	"go.uber.org/zap"
@@ -81,9 +80,7 @@ func afterCheck(dataLen, payMoney int, userProduct *model.UserProduct, statusCod
 	userAccount := &model.UserAccount{}
 	db.GetSFISDB().First(userAccount, &model.UserAccount{AppID: userProduct.AppID})
 	var errs error
-	lock.OrderCodeLock.Lock()
 	orderCode := utils.CreateOrderCode()
-	lock.OrderCodeLock.Unlock()
 	//按次扣费-(每调一次剩余量-1)
 	errs = db.GetSFISDB().Transaction(func(tx *gorm.DB) error {
 		orderBefore := userAccount.Money

utils/cost_by_left_num.go

@@ -6,7 +6,6 @@ import (
 	"sfbase/global"
 	"sfbase/utils"
 	"sfis/db"
-	"sfis/lock"
 	"sfis/model"
 
 	"gorm.io/gorm"
@@ -85,9 +84,7 @@ func after(productType int, dataLen int, userProduct *model.UserProduct, statusC
 	productID := userProduct.ProductID
 	userProductID := userProduct.ID
 	var errs error
-	lock.OrderCodeLock.Lock()
 	orderCode := utils.CreateOrderCode()
-	lock.OrderCodeLock.Unlock()
 	switch productType {
 	case 0:
 		//按次扣费-(每调一次剩余量-1)