From 731e62c89fd8fe1668a5dc4b12445e9c1ba7d49b Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Thu, 15 Aug 2024 19:44:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8Cstudyitemid=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 39fa4e4c..f8107750 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -102,7 +102,7 @@ public class StudyServiceImpl implements IStudyService{ dto.setStudyItemId(sci.getId()); }else { log.info("学习记录id不能为空"+sci.getId()); - throw new IllegalArgumentException("学习记录id不能为空"); + throw new IllegalArgumentException("学习记录插入失败"); } //检查是否全部学习完成 scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token); From df3b0b95c114d29a432d32be23b6ac0664c548a9 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Thu, 15 Aug 2024 20:19:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8Cstudyitemid=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index f8107750..2bcc3343 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -101,7 +101,7 @@ public class StudyServiceImpl implements IStudyService{ if (sci.getId() != null){ dto.setStudyItemId(sci.getId()); }else { - log.info("学习记录id不能为空"+sci.getId()); + log.info("学习记录插入失败"+sci.getId()); throw new IllegalArgumentException("学习记录插入失败"); } //检查是否全部学习完成 From b7e8c43b5f398bc02166a0ed66b77fe122a4e4b6 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 21 Aug 2024 10:22:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 6 +++++- .../src/main/java/com/xboe/api/vo/Result.java | 3 +++ .../xboe/school/study/api/StudyCourseApi.java | 19 ++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 8e84c962..4b5efdba 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -84,7 +84,11 @@ xboe-module-es 1.0.0 - + + net.jodah + expiringmap + 0.5.10 + it.sauronsoftware jave diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java index 8f837786..a2c610f7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java +++ b/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 list; + public static Object error(String s) { + return "500 服务异常"; + } } \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 9e875451..7991bd0c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/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 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("无课程信息"); } From 4ff47085b8940d92f5c4861b1fa1d78908adb7f2 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 21 Aug 2024 10:22:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/aspect/LimitRequest.java | 12 ++++ .../school/aspect/LimitRequestAspect.java | 59 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java b/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java new file mode 100644 index 00000000..6ff03484 --- /dev/null +++ b/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; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java b/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java new file mode 100644 index 00000000..8e2368fa --- /dev/null +++ b/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> 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 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; + } + +} \ No newline at end of file