From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
index 33d7509..1eeab61 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
@@ -22,37 +22,37 @@
 @RequestMapping("/demo/rateLimiter")
 public class RedisRateLimiterController {
 
-	/**
-	 * 娴嬭瘯鍏ㄥ眬闄愭祦
-	 * 鍏ㄥ眬褰卞搷
-	 */
-	@ApiOperation("娴嬭瘯鍏ㄥ眬闄愭祦")
-	@RateLimiter(count = 2, time = 10)
-	@GetMapping("/test")
-	public  AjaxResult<String> test(String value){
-		return AjaxResult.success("鎿嶄綔鎴愬姛",value);
-	}
+    /**
+     * 娴嬭瘯鍏ㄥ眬闄愭祦
+     * 鍏ㄥ眬褰卞搷
+     */
+    @ApiOperation("娴嬭瘯鍏ㄥ眬闄愭祦")
+    @RateLimiter(count = 2, time = 10)
+    @GetMapping("/test")
+    public AjaxResult<String> test(String value) {
+        return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+    }
 
-	/**
-	 * 娴嬭瘯璇锋眰IP闄愭祦
-	 * 鍚屼竴IP璇锋眰鍙楀奖鍝�
-	 */
-	@ApiOperation("娴嬭瘯璇锋眰IP闄愭祦")
-	@RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
-	@GetMapping("/testip")
-	public  AjaxResult<String> testip(String value){
-		return AjaxResult.success("鎿嶄綔鎴愬姛",value);
-	}
+    /**
+     * 娴嬭瘯璇锋眰IP闄愭祦
+     * 鍚屼竴IP璇锋眰鍙楀奖鍝�
+     */
+    @ApiOperation("娴嬭瘯璇锋眰IP闄愭祦")
+    @RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
+    @GetMapping("/testip")
+    public AjaxResult<String> testip(String value) {
+        return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+    }
 
-	/**
-	 * 娴嬭瘯闆嗙兢瀹炰緥闄愭祦
-	 * 鍚姩涓や釜鍚庣鏈嶅姟浜掍笉褰卞搷
-	 */
-	@ApiOperation("娴嬭瘯闆嗙兢瀹炰緥闄愭祦")
-	@RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
-	@GetMapping("/testcluster")
-	public  AjaxResult<String> testcluster(String value){
-		return AjaxResult.success("鎿嶄綔鎴愬姛",value);
-	}
+    /**
+     * 娴嬭瘯闆嗙兢瀹炰緥闄愭祦
+     * 鍚姩涓や釜鍚庣鏈嶅姟浜掍笉褰卞搷
+     */
+    @ApiOperation("娴嬭瘯闆嗙兢瀹炰緥闄愭祦")
+    @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
+    @GetMapping("/testcluster")
+    public AjaxResult<String> testcluster(String value) {
+        return AjaxResult.success("鎿嶄綔鎴愬姛", value);
+    }
 
 }

--
Gitblit v1.9.3