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 1/6] =?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 2/6] =?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
From 616594af9e6773452eacfce235737afe38e184df Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Wed, 21 Aug 2024 14:00:35 +0800
Subject: [PATCH 3/6] =?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 => conf}/LimitRequest.java | 2 +-
.../xboe/school/{aspect => conf}/LimitRequestAspect.java | 2 +-
.../java/com/xboe/school/study/api/StudyCourseApi.java | 8 +-------
3 files changed, 3 insertions(+), 9 deletions(-)
rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequest.java (87%)
rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequestAspect.java (98%)
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/conf/LimitRequest.java
similarity index 87%
rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java
rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java
index 6ff03484..c943011c 100644
--- 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/conf/LimitRequest.java
@@ -1,4 +1,4 @@
-package com.xboe.school.aspect;
+package com.xboe.school.conf;
import java.lang.annotation.*;
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/conf/LimitRequestAspect.java
similarity index 98%
rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java
rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java
index 8e2368fa..d8efa0bf 100644
--- 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/conf/LimitRequestAspect.java
@@ -1,4 +1,4 @@
-package com.xboe.school.aspect;
+package com.xboe.school.conf;
import com.xboe.api.vo.Result;
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 7991bd0c..32ef6de6 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
@@ -3,19 +3,13 @@ package com.xboe.school.study.api;
import java.time.LocalDateTime;
import java.util.*;
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 com.xboe.school.conf.LimitRequest;
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;
From 0fcd4568ecedc30a2018f2a013df208a766dd342 Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Wed, 4 Sep 2024 16:35:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?802bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/xboe/constants/CacheName.java | 2 +
.../com/xboe/school/conf/LimitRequest.java | 12 ----
.../xboe/school/conf/LimitRequestAspect.java | 59 -------------------
.../xboe/school/study/api/StudyCourseApi.java | 26 ++++++--
4 files changed, 23 insertions(+), 76 deletions(-)
delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java
delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java
diff --git a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
index b92aff08..3d765d51 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
@@ -133,4 +133,6 @@ public interface CacheName {
* 字典缓存key
* */
String KEY_DICT="dict";
+
+ String STUDY_KEY = "StudyKey:";
}
diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java
deleted file mode 100644
index c943011c..00000000
--- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.xboe.school.conf;
-
-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/conf/LimitRequestAspect.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java
deleted file mode 100644
index d8efa0bf..00000000
--- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.xboe.school.conf;
-
-
-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
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 32ef6de6..32427fc0 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,9 +6,9 @@ import java.util.concurrent.TimeUnit;
import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
import com.xboe.api.ThirdApi;
+import com.xboe.constants.CacheName;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.module.usergroup.service.IUserGroupService;
-import com.xboe.school.conf.LimitRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -294,7 +294,7 @@ public class StudyCourseApi extends ApiBaseController{
* @param
* @return 返回学习条目的id
*/
- @LimitRequest(count=5)
+ //@LimitRequest(count=5)
@PostMapping("/study")
public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){
@@ -329,17 +329,33 @@ public class StudyCourseApi extends ApiBaseController{
new Thread(() -> example.someApi()).start();
//检查是否已存在
}
+
StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
if(item!=null) {
- //如果记录存在,但是进度不100无成情况,就更新进度,一期不会有这种情况
- if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
- studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+ String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
+ String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
+ redisTemplate.opsForValue().set(studyKey,
+ String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
+ String progressStr = redisTemplate.opsForValue().get(studyKey2);
+ if (progressStr != null && !progressStr.isEmpty()) {
+ // 尝试将 Redis 中的字符串转换为整数
+ int redisProgress = Integer.parseInt(progressStr);
+ // 假设 item.getProgress() 返回的是 int 类型
+ int sciProgress = sci.getProgress();
+
+ if (redisProgress < sciProgress && redisProgress < 100) {
+ // 执行一些操作
+// if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
+// }
+ studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+ }
}
//追加学习时长
studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
List allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(item.getId());
+ //如果记录存在,但是进度不100无成情况,就更新进度,一期不会有这种情况
}
if(StringUtils.isBlank(sci.getCourseId())){
From 903a1369f58c28bb21ddc701bcf80c5d693db5d4 Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Wed, 4 Sep 2024 16:48:12 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
servers/boe-server-all/pom.xml | 5 -----
.../src/main/java/com/xboe/api/vo/Result.java | 3 ---
.../main/java/com/xboe/school/study/api/StudyCourseApi.java | 6 ------
3 files changed, 14 deletions(-)
diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml
index 4b5efdba..2c0d034a 100644
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -84,11 +84,6 @@
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 a2c610f7..8f837786 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,7 +24,4 @@ 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 32427fc0..7d5598a6 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
@@ -324,12 +324,6 @@ 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) {
String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
From 29a17efd44b2b846452f3a45e4173796d1c546e1 Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Tue, 10 Sep 2024 15:32:54 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/xboe/school/study/api/StudyCourseApi.java | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
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 7d5598a6..73b49625 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
@@ -92,12 +92,6 @@ 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
@@ -289,12 +283,7 @@ public class StudyCourseApi extends ApiBaseController{
}
- /**
- * 记录学习信息,在学习每个资源时都要记录.前端用户打开课程资源按规则调用带着课程及学习信息调用此接口。
- * @param
- * @return 返回学习条目的id
- */
- //@LimitRequest(count=5)
+
@PostMapping("/study")
public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){