From 8f8660ab403d9386a2358c6209526ce824bfcd32 Mon Sep 17 00:00:00 2001
From: guowenfeng <841784596@qq.com>
Date: Wed, 11 Aug 2021 18:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E9=99=90=E6=B5=81=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                       |   3 +
 go.mod                                    |   5 +-
 go.sum                                    |  92 +++++++++++++----
 main.go                                   | 105 ++++++++++++-------
 redis_limiter/funnel_limiter/main.go      | 118 ++++++++++++++++++++++
 redis_limiter/simple_zset_limiter/main.go |  69 +++++++++++++
 6 files changed, 334 insertions(+), 58 deletions(-)
 create mode 100644 redis_limiter/funnel_limiter/main.go
 create mode 100644 redis_limiter/simple_zset_limiter/main.go

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d05d94d..3671801 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="872b37dd-87ef-4353-a7b3-8d2a8aa1dbd1" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/go.mod b/go.mod
index d7cffc4..b411756 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,6 @@ module do_some_fxxking_test
 go 1.14
 
 require (
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	gopkg.in/eapache/queue.v1 v1.1.0 // indirect
+	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/onsi/gomega v1.15.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 89b95e7..1ba5753 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,12 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
+github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -9,26 +14,69 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=
+github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -36,8 +84,16 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/eapache/queue.v1 v1.1.0 h1:EldqoJEGtXYiVCMRo2C9mePO2UUGnYn2+qLmlQSqPdc=
-gopkg.in/eapache/queue.v1 v1.1.0/go.mod h1:wNtmx1/O7kZSR9zNT1TTOJ7GLpm3Vn7srzlfylFbQwU=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/main.go b/main.go
index 82c8147..fe8d752 100644
--- a/main.go
+++ b/main.go
@@ -1,38 +1,69 @@
 package main
-//
-//import (
-//	"fmt"
-//	"strings"
-//)
-//
-//func main() {
-//	//tmp:= "111"
-//	//tmp += "&12312378172839172893719827389172389172389172893182734&req_id=__REQUEST_TD__"
-//	//
-//	//if tmp[(len(tmp)-len("&req_id=__REQUEST_TD__")):] == "&req_id=__REQUEST_TD__" {
-//	//	fmt.Println("yeah")
-//	//}
-//	//
-//	//test, _ := json.Marshal(tmp[(len(tmp)-len("&req_id=__REQUEST_TD__")):])
-//	//
-//	//var test2 string
-//	//
-//	//json.Unmarshal(test, &test2)
-//	//
-//	//fmt.Println(string(test))
-//	//fmt.Println(string(test2))
-//
-//	//testMap := make(map[string]int)
-//	//testMap["a"] = 1
-//	//fn(testMap)
-//	//
-//	//fmt.Println(testMap)
-//
-//	bytesArr := []byte{60 104 49 62 78 111 116 32 70 111 117 110 100 60 47 104 49 62 60 112 62 84 104 101 32 114 101 113 117 101 115 116 101 100 32 85 82 76 32 47 100 97 116 97 116 101 115 116 101 114 47 105 110 110 101 114 97 112 105 47 118 49 47 97 100 118 101 114 116 105 115 105 110 103 47 102 108 105 103 104 116 115 47 49 51 50 53 50 32 119 97 115 32 110 111 116 32 102 111 117 110 100 32 111 110 32 116 104 105 115 32 115 101 114 118 101 114 46 60 47 112 62}
-//
-//	fmt.Println(appIds)
-//}
-//
-//func fn(testMap map[string]int) {
-//	testMap["b"] = 2
-//}
+
+import (
+	"github.com/go-redis/redis"
+	"fmt"
+	"time"
+)
+
+var redisdb *redis.Client
+
+var counterLuaScript = `
+	-- 记录行为
+	redis.pcall("zadd", KEYS[1], ARGV[1], ARGV[1]); -- value 和 score 都使用纳秒时间戳，即ARGV[1]
+	redis.pcall("zremrangebyscore", KEYS[1], 0, ARGV[2]); -- 移除时间窗口之前的行为记录，剩下的都是时间窗口内的
+	local count = redis.pcall("zcard", KEYS[1]); -- 获取窗口内的行为数量
+	redis.pcall("expire", KEYS[1], ARGV[3]); -- 设置 zset 过期时间，避免冷用户持续占用内存
+	return count -- 返回窗口内行为数量`
+
+var evalSha string
+
+func init() {
+	initRedisClient()
+}
+
+func initRedisClient() {
+	redisdb = redis.NewClient(&redis.Options{
+		Addr:     "localhost:6379",
+		Password: "",
+		DB:       0,
+	})
+
+	var err error
+	evalSha, err = redisdb.ScriptLoad(counterLuaScript).Result()
+	if err != nil {
+		panic(err)
+	}
+}
+
+// period单位为秒
+func isAllowed(uid string, action string, period, maxCount int) bool {
+	key := fmt.Sprintf("%v_%v", uid, action)
+	now := time.Now().UnixNano()
+	beforeTime := now - int64(period*1000000000)
+	res, err := redisdb.EvalSha(evalSha, []string{key}, now, beforeTime, period).Result()
+	if err != nil {
+		panic(err)
+	}
+	if res.(int64) > int64(maxCount) {
+		return false
+	}
+	return true
+}
+
+func CreateOrder() {
+	canCreateOrder := isAllowed("berryjam", "createOrder", 5, 10)
+	if canCreateOrder {
+		// 处理下单逻辑
+		// ...
+		fmt.Println("下单成功")
+	} else { // 返回请求或者抛出异常、panic
+		panic("下单次数超限")
+	}
+}
+
+func main() {
+	for i := 0; i < 100; i++ {
+		CreateOrder()
+	}
+}
\ No newline at end of file
diff --git a/redis_limiter/funnel_limiter/main.go b/redis_limiter/funnel_limiter/main.go
new file mode 100644
index 0000000..6028457
--- /dev/null
+++ b/redis_limiter/funnel_limiter/main.go
@@ -0,0 +1,118 @@
+package main
+
+import (
+	"time"
+	"fmt"
+	"github.com/go-redis/redis"
+)
+
+const (
+	FAILED = iota
+	SUCC
+)
+
+var redisdb *redis.Client
+
+var initFunnelScript = `
+	-- 分别初始化漏斗结构的4个字段capacity、left_quota、leaking_rate、leaking_time
+	-- capacity:漏斗容量
+	-- left_quota:漏斗剩余空间
+	-- leaking_rate:漏嘴流水速率
+	-- leaking_time:上一次漏水时间
+	local key
+	for i,j in ipairs(ARGV) 
+	do if i%2 == 0
+		then
+			redis.pcall('hsetnx', KEYS[1], key, j)
+		else
+			key = j
+		end
+	end`
+
+var initFunnelSha string
+
+var makeSpaceScript = `
+	local leaking_time = tonumber(redis.pcall('hget', KEYS[1], 'leaking_time'))
+	local leaking_rate = tonumber(redis.pcall('hget', KEYS[1], 'leaking_rate'))
+	local left_quota = tonumber(redis.pcall('hget', KEYS[1], 'left_quota'))
+	local capacity = tonumber(redis.pcall('hget', KEYS[1], 'capacity'))
+	local now = tonumber(ARGV[1])
+	local delta_time = now - leaking_time -- 距离上一次漏水过去了多久
+	local delta_quota = leaking_rate * delta_time -- 又可以腾出不少空间了
+	
+	redis.pcall('hset', KEYS[1], 'leaking_time', now) -- 记录漏水时间
+	if delta_quota + left_quota >= capacity then -- 剩余空间不得高于容量
+		redis.pcall('hset', KEYS[1], 'left_quota', capacity) 
+	else 
+		redis.pcall('hset', KEYS[1], 'left_quota', delta_quota + left_quota) -- 增加剩余空间
+	end
+`
+var makeSpaceSha string
+
+var wateringScript = `
+	local left_quota = tonumber(redis.pcall('hget', KEYS[1], 'left_quota'))
+	local quota = tonumber(ARGV[1])
+	if left_quota >= quota then -- 判断剩余空间是否足够
+		redis.pcall('hset', KEYS[1], 'left_quota', left_quota-quota) 
+		return 1
+	else
+		return 0
+	end
+`
+
+var wateringSha string
+
+func init() {
+	initRedisClient()
+}
+
+func initRedisClient() {
+	redisdb = redis.NewClient(&redis.Options{
+		Addr:     "localhost:6379",
+		Password: "",
+		DB:       0,
+	})
+
+	var err error
+	initFunnelSha, err = redisdb.ScriptLoad(initFunnelScript).Result()
+	if err != nil {
+		panic(err)
+	}
+
+	makeSpaceSha, err = redisdb.ScriptLoad(makeSpaceScript).Result()
+	if err != nil {
+		panic(err)
+	}
+
+	wateringSha, err = redisdb.ScriptLoad(wateringScript).Result()
+	if err != nil {
+		panic(err)
+	}
+}
+
+func MakeSpace(key string) {
+	now := time.Now().Unix()
+	redisdb.EvalSha(makeSpaceSha, []string{key}, now).Result()
+}
+
+// quota为每次处理请求所需要的资源配额
+func Watering(key string, quota float64) bool {
+	MakeSpace(key)
+	res, err := redisdb.EvalSha(wateringSha, []string{key}, quota).Result()
+	if err != nil {
+		panic(err)
+	}
+	return res.(int64) == SUCC
+}
+
+func IsActionAllowed(uid, action string, capacity float64, leakingRate float64) bool {
+	key := fmt.Sprintf("%v_%v", uid, action)
+	redisdb.EvalSha(initFunnelSha, []string{key}, "capacity", capacity, "left_quota", capacity, "leaking_rate", leakingRate, "leaking_time", time.Now().Unix())
+	return Watering(key, 1)
+}
+
+func main() {
+	for i := 0; i < 20; i++ {
+		fmt.Printf("%+v\n", IsActionAllowed("berryjam", "reply", 15, 0.5))
+	}
+}
\ No newline at end of file
diff --git a/redis_limiter/simple_zset_limiter/main.go b/redis_limiter/simple_zset_limiter/main.go
new file mode 100644
index 0000000..fe8d752
--- /dev/null
+++ b/redis_limiter/simple_zset_limiter/main.go
@@ -0,0 +1,69 @@
+package main
+
+import (
+	"github.com/go-redis/redis"
+	"fmt"
+	"time"
+)
+
+var redisdb *redis.Client
+
+var counterLuaScript = `
+	-- 记录行为
+	redis.pcall("zadd", KEYS[1], ARGV[1], ARGV[1]); -- value 和 score 都使用纳秒时间戳，即ARGV[1]
+	redis.pcall("zremrangebyscore", KEYS[1], 0, ARGV[2]); -- 移除时间窗口之前的行为记录，剩下的都是时间窗口内的
+	local count = redis.pcall("zcard", KEYS[1]); -- 获取窗口内的行为数量
+	redis.pcall("expire", KEYS[1], ARGV[3]); -- 设置 zset 过期时间，避免冷用户持续占用内存
+	return count -- 返回窗口内行为数量`
+
+var evalSha string
+
+func init() {
+	initRedisClient()
+}
+
+func initRedisClient() {
+	redisdb = redis.NewClient(&redis.Options{
+		Addr:     "localhost:6379",
+		Password: "",
+		DB:       0,
+	})
+
+	var err error
+	evalSha, err = redisdb.ScriptLoad(counterLuaScript).Result()
+	if err != nil {
+		panic(err)
+	}
+}
+
+// period单位为秒
+func isAllowed(uid string, action string, period, maxCount int) bool {
+	key := fmt.Sprintf("%v_%v", uid, action)
+	now := time.Now().UnixNano()
+	beforeTime := now - int64(period*1000000000)
+	res, err := redisdb.EvalSha(evalSha, []string{key}, now, beforeTime, period).Result()
+	if err != nil {
+		panic(err)
+	}
+	if res.(int64) > int64(maxCount) {
+		return false
+	}
+	return true
+}
+
+func CreateOrder() {
+	canCreateOrder := isAllowed("berryjam", "createOrder", 5, 10)
+	if canCreateOrder {
+		// 处理下单逻辑
+		// ...
+		fmt.Println("下单成功")
+	} else { // 返回请求或者抛出异常、panic
+		panic("下单次数超限")
+	}
+}
+
+func main() {
+	for i := 0; i < 100; i++ {
+		CreateOrder()
+	}
+}
\ No newline at end of file