Merge branch 'zcwy0815-llf' into dev0525

servers/boe-server-all/pom.xml

@@ -84,7 +84,11 @@
 			<artifactId>xboe-module-es</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-
+		<dependency>
+			<groupId>net.jodah</groupId>
+			<artifactId>expiringmap</artifactId>
+			<version>0.5.10</version>
+		</dependency>
 		<dependency>
 			<groupId>it.sauronsoftware</groupId>
 			<artifactId>jave</artifactId>

servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java

@@ -24,4 +24,7 @@ public class Result {
     private int totalPage;
     private List<AuditList> list;
 
+    public static Object error(String s) {
+        return "500 服务异常";
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java

@@ -0,0 +1,12 @@
+package com.xboe.school.aspect;
+
+import java.lang.annotation.*;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LimitRequest {
+
+    long time() default 2000;
+    int count() default Integer.MAX_VALUE;
+}

servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java

@@ -0,0 +1,59 @@
+package com.xboe.school.aspect;
+
+
+import com.xboe.api.vo.Result;
+import net.jodah.expiringmap.ExpirationPolicy;
+import net.jodah.expiringmap.ExpiringMap;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+public class LimitRequestAspect {
+    private static ConcurrentHashMap<String, ExpiringMap<String, Integer>> book = new ConcurrentHashMap<>();
+    // 定义切点
+    // 让所有有@LimitRequest注解的方法都执行切面方法
+    @Pointcut("@annotation(limitRequest)")
+    public void excudeService(LimitRequest limitRequest) {
+    }
+
+    @Around("excudeService(limitRequest)")
+    public Object doAround(ProceedingJoinPoint pjp, LimitRequest limitRequest) throws Throwable {
+        // 获得request对象
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        HttpServletRequest request = sra.getRequest();
+
+        // 获取Map对象， 如果没有则返回默认值
+        // 第一个参数是key， 第二个参数是默认值
+        ExpiringMap<String, Integer> map = book.getOrDefault(request.getRequestURI(), ExpiringMap.builder().variableExpiration().build());
+        Integer uCount = map.getOrDefault(request.getRemoteAddr(), 0);
+
+
+        if (uCount >= limitRequest.count()) { // 超过次数，不执行目标方法
+            //这里的返回对象类型根据controller方法的返回方式一致
+            return Result.error("请求过于频繁，请稍后再试");
+        } else if (uCount == 0){ // 第一次请求时，设置开始有效时间
+            map.put(request.getRemoteAddr(), uCount + 1, ExpirationPolicy.CREATED, limitRequest.time(), TimeUnit.MILLISECONDS);
+        } else { // 未超过次数， 记录数据加一
+            map.put(request.getRemoteAddr(), uCount + 1);
+        }
+        book.put(request.getRequestURI(), map);
+
+        // result的值就是被拦截方法的返回值
+        Object result = pjp.proceed();
+
+        return result;
+    }
+
+}

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

@@ -6,13 +6,16 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
 import com.xboe.api.vo.*;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.usergroup.entity.UserGroupItem;
 import com.xboe.module.usergroup.service.IUserGroupService;
+import com.xboe.school.aspect.LimitRequest;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.annotation.Aspect;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -95,7 +98,12 @@ public class StudyCourseApi extends ApiBaseController{
 
 	@Autowired
 	StringRedisTemplate redisTemplate;
-
+	private static final RateLimiter rateLimiter = RateLimiter.create(1.0);
+	public void someApi() {
+		rateLimiter.acquire(); // 请求之前获取许可
+		// 你的业务逻辑
+		log.info("Request processed at " + System.currentTimeMillis());
+	}
 	/**
 	 * 用于查询课程的学习记录
 	 * @param pager
@@ -292,6 +300,7 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @param
 	 * @return 返回学习条目的id
 	 */
+	@LimitRequest(count=5)
 	@PostMapping("/study")
 	public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){
 		
@@ -321,7 +330,11 @@ public class StudyCourseApi extends ApiBaseController{
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader("token");
 		}
-		//检查是否已存在
+		StudyCourseApi example = new StudyCourseApi();
+		for (int i = 0; i < 10; i++) {
+			new Thread(() -> example.someApi()).start();
+			//检查是否已存在
+		}
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
 			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
@@ -334,7 +347,7 @@ public class StudyCourseApi extends ApiBaseController{
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
 		}
-		
+
 		if(StringUtils.isBlank(sci.getCourseId())){
 			return error("无课程信息");
 		}

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java

@@ -103,8 +103,8 @@ public class StudyServiceImpl implements IStudyService{
 		if (sci.getId() != null){
 			dto.setStudyItemId(sci.getId());
 		}else {
-			log.info("学习记录id不能为空"+sci.getId());
-			throw new IllegalArgumentException("学习记录id不能为空");
+			log.info("学习记录插入失败"+sci.getId());
+			throw new IllegalArgumentException("学习记录插入失败");
 		}
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);