修复计数插件使用Redis时回滚操作会将key删掉的问题

eolinker · Aug 31, 2023 · ca65714 · ca65714
1 parent bb5924c
commit ca65714
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/drivers/plugins/counter/matcher/match.go b/drivers/plugins/counter/matcher/match.go
@@ -10,6 +10,6 @@ type IMatcher interface {
 
 type MatchParam struct {
 	Key   string   `json:"key"`
-	Kind  string   `json:"kind"` // int|string|bool
+	Kind  string   `json:"kind" enum:"int,string,bool" default:"string"` // int|string|bool
 	Value []string `json:"value"`
 }
diff --git a/drivers/plugins/counter/separator/count.go b/drivers/plugins/counter/separator/count.go
@@ -18,7 +18,7 @@ var (
 )
 
 type CountRule struct {
-	RequestBodyType string `json:"request_body_type" label:"请求体类型" enum:"form-data,json"`
+	RequestBodyType string `json:"request_body_type" label:"请求体类型" enum:"form-data,json,multipart-formdata"`
 	Key             string `json:"key" label:"参数名称（支持json path）"`
 	Separator       string `json:"separator" label:"分隔符" switch:"separator_type===splite"`
 	SeparatorType   string `json:"separator_type" label:"分割类型" enum:"splite,array,length"`
@@ -32,7 +32,7 @@ type ICounter interface {
 }
 
 func GetCounter(rule *CountRule) (ICounter, error) {
-	if rule == nil && rule.Key == "" {
+	if rule == nil || rule.Key == "" {
 		return NewEmptyCounter(), nil
 	}
 	switch strings.ToLower(rule.RequestBodyType) {

diff --git a/drivers/resources/redis/redis.go b/drivers/resources/redis/redis.go
@@ -3,9 +3,10 @@ package redis
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/eolinker/apinto/resources"
 	"github.com/go-redis/redis/v8"
-	"time"
 )
 
 type statusResult struct {
@@ -63,7 +64,9 @@ func (r *Cmdable) SetNX(ctx context.Context, key string, value []byte, expiratio
 func (r *Cmdable) DecrBy(ctx context.Context, key string, decrement int64, expiration time.Duration) resources.IntResult {
 	pipeline := r.cmdable.Pipeline()
 	result := pipeline.DecrBy(ctx, key, decrement)
-	pipeline.Expire(ctx, key, expiration)
+	if expiration > 0 {
+		pipeline.Expire(ctx, key, expiration)
+	}
 	_, err := pipeline.Exec(ctx)
 	if err != nil {
 		return nil
@@ -75,7 +78,10 @@ func (r *Cmdable) DecrBy(ctx context.Context, key string, decrement int64, expir
 func (r *Cmdable) IncrBy(ctx context.Context, key string, decrement int64, expiration time.Duration) resources.IntResult {
 	pipeline := r.cmdable.Pipeline()
 	result := pipeline.IncrBy(ctx, key, decrement)
-	pipeline.Expire(ctx, key, expiration)
+	if expiration > 0 {
+		pipeline.Expire(ctx, key, expiration)
+	}
+
 	_, err := pipeline.Exec(ctx)
 	if err != nil {
 		return nil

diff --git a/drivers/router/http-router/router.go b/drivers/router/http-router/router.go
@@ -2,13 +2,14 @@ package http_router
 
 import (
 	"net/http"
+	"net/url"
 	"strings"
 	"time"
 
-	"github.com/eolinker/apinto/drivers/router/http-router/websocket"
-
 	"github.com/eolinker/apinto/service"
 
+	"github.com/eolinker/apinto/drivers/router/http-router/websocket"
+
 	"github.com/eolinker/eosc/eocontext"
 
 	"github.com/eolinker/apinto/drivers"
@@ -87,7 +88,11 @@ func (h *HttpRouter) reset(cfg *Config, workers map[eosc.RequireId]eosc.IWorker)
 			// 当service未指定，使用默认返回
 			handler.completeHandler = http_complete.NewNoServiceCompleteHandler(cfg.Status, cfg.Header, cfg.Body)
 		} else {
-			serviceWorker, has := workers[cfg.Service]
+			s, err := url.PathUnescape(string(cfg.Service))
+			if err != nil {
+				s = string(cfg.Service)
+			}
+			serviceWorker, has := workers[eosc.RequireId(s)]
 			if !has || !serviceWorker.CheckSkill(service.ServiceSkill) {
 				return eosc.ErrorNotGetSillForRequire
 			}

diff --git a/resources/cache-local.go b/resources/cache-local.go
@@ -2,10 +2,11 @@ package resources
 
 import (
 	"context"
-	"github.com/coocood/freecache"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/coocood/freecache"
 )
 
 var (
@@ -79,6 +80,7 @@ func (n *cacheLocal) DecrBy(ctx context.Context, key string, decrement int64, ex
 }
 
 func (n *cacheLocal) IncrBy(ctx context.Context, key string, incr int64, expiration time.Duration) IntResult {
+
 	n.keyLock.Lock()
 	lock, has := n.keyLocks[key]
 	if !has {
@@ -101,6 +103,7 @@ func (n *cacheLocal) IncrBy(ctx context.Context, key string, incr int64, expirat
 			n.keyLock.Unlock()
 		}
 	}()
+
 	v, err := n.client.Get([]byte(key))
 	if err != nil || len(v) != 8 {
 		v = ToBytes(incr)