Merge pull request #1 from hyhcoder/dev

hyhcoder · web-flow · commit 8bc622cc3173 · 2020-11-29T22:27:17.000+08:00
Dev分支合并
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
         <quickframe-pay.version>1.0.0-SNAPSHOT</quickframe-pay.version>
         <quickframe-security.version>1.0.0-SNAPSHOT</quickframe-security.version>
         <jjwt.version>0.9.0</jjwt.version>
+        <guava.version>27.1-jre</guava.version>
     </properties>
 
     <parent>
@@ -126,6 +127,12 @@
                 <version>${jjwt.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>
diff --git a/quickframe-protal/pom.xml b/quickframe-protal/pom.xml
@@ -106,6 +106,11 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <!-- springboot test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/module/ratelimiter/RateLimiterService.java b/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/module/ratelimiter/RateLimiterService.java
@@ -0,0 +1,61 @@
+package com.hyhcoder.quickframe.protal.module.ratelimiter;
+
+import com.google.common.util.concurrent.RateLimiter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author hyhcoder
+ * @date 2020/10/9 11:55
+ *
+ * 测试限流
+ *
+ */
+@Component
+@Slf4j
+public class RateLimiterService {
+	
+	
+	@Autowired
+	private RateLimiter rateLimiter;
+	
+	
+	public void rateRun(Integer code) {
+		
+		for (int i = 0; i < 10; i++) {
+			rateLimiter.acquire(1);
+			log.info(code + "  执行 " + i);
+		}
+		
+	}
+	
+	
+	public static void main(String[] args) throws Exception {
+		// qps设置为5，代表一秒钟只允许处理五个并发请求
+		RateLimiter rateLimiter = RateLimiter.create(2);
+		
+		ExecutorService executorService = Executors.newFixedThreadPool(5);
+		int nTasks = 10;
+		//CountDownLatch countDownLatch = new CountDownLatch(nTasks);
+		
+		
+		long start = System.currentTimeMillis();
+		for (int i = 0; i < nTasks; i++) {
+			
+			rateLimiter.acquire(1);
+			System.out.println("处理完毕" + " " + i);
+		}
+		executorService.shutdown();
+		//countDownLatch.await();
+		long end = System.currentTimeMillis();
+		
+		System.out.println("10 jobs gets done by 5 threads concurrently in " + (end - start) + " milliseconds");
+		
+	}
+	
+	
+}
diff --git a/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/module/ratelimiter/config/RateLimiterConfig.java b/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/module/ratelimiter/config/RateLimiterConfig.java
@@ -0,0 +1,23 @@
+package com.hyhcoder.quickframe.protal.module.ratelimiter.config;
+
+import com.google.common.util.concurrent.RateLimiter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author hyhcoder
+ * @date 2020/10/9 14:40
+ */
+@Configuration
+public class RateLimiterConfig {
+	
+	
+	@Bean
+	public RateLimiter myRateLimiter() {
+		
+		RateLimiter rateLimiter = RateLimiter.create(2);
+		//RateLimiter.create()
+		return rateLimiter;
+	}
+	
+}
diff --git a/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/test/TestController.java b/quickframe-protal/src/main/java/com/hyhcoder/quickframe/protal/test/TestController.java
@@ -2,7 +2,9 @@
 
 import com.hyhcoder.quickframe.common.core.reqres.response.ResponseData;
 import com.hyhcoder.quickframe.protal.module.rabbitmq.MessageSender;
+import com.hyhcoder.quickframe.protal.module.ratelimiter.RateLimiterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,15 +20,19 @@ public class TestController {
 	@Autowired
 	private MessageSender messageSender;
 	
+	@Autowired
+	private RateLimiterService rateLimiterService;
+	
 	
 	@RequestMapping("/sendMessage")
 	private ResponseData sendMessage(@RequestParam("message") String message) {
 		
-		messageSender.sendMessage(message);
+		//messageSender.sendMessage(message);
 		return ResponseData.success();
 	}
 	
 	@RequestMapping("/sendMessageTransaction")
+	@Transactional
 	private ResponseData sendMessageTransaction(@RequestParam("message") String message) {
 		
 		messageSender.sendMessageTransaction(message);
@@ -41,5 +47,12 @@ private ResponseData sendMessageAck(@RequestParam("message") String message) {
 		return ResponseData.success();
 	}
 	
+	@RequestMapping("/raterun")
+	private ResponseData raterun(@RequestParam("code") Integer code) {
+		
+		rateLimiterService.rateRun(code);
+		return ResponseData.success();
+	}
+	
 	
 }
diff --git a/quickframe-protal/src/test/java/com/hyhcoder/quickframe/protal/ProtalApplicationTests.java b/quickframe-protal/src/test/java/com/hyhcoder/quickframe/protal/ProtalApplicationTests.java
@@ -1,17 +1,39 @@
 package com.hyhcoder.quickframe.protal;
 
+import com.hyhcoder.quickframe.mapper.OmsMenuMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class ProtalApplicationTests {
 	
+	@Autowired
+	private OmsMenuMapper omsMenuMapper;
+	
 	@Test
 	public void contextLoads() {
-	
+		
+		List<Integer> a = new ArrayList<>();
+		a.add(2);
+		a.add(3);
+		a.add(4);
+		a.add(3);
+		List<Integer> b = new ArrayList<>();
+		for (Integer integer : a) {
+			
+			if (!b.contains(integer)) {
+				b.add(integer);
+			}
+		}
+		
+		System.out.println(b.size());
 	}
 	
 }
