mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-21 00:36:51 +08:00
Merge branch 'zcwy0815-llf' into dev0525
# Conflicts: # servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
This commit is contained in:
@@ -9,8 +9,6 @@ import com.xboe.api.ThirdApi;
|
|||||||
import com.xboe.constants.CacheName;
|
import com.xboe.constants.CacheName;
|
||||||
import com.xboe.module.course.vo.TeacherVo;
|
import com.xboe.module.course.vo.TeacherVo;
|
||||||
import com.xboe.module.usergroup.service.IUserGroupService;
|
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.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
@@ -94,12 +92,6 @@ public class StudyCourseApi extends ApiBaseController{
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
StringRedisTemplate redisTemplate;
|
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
|
* @param pager
|
||||||
@@ -296,7 +288,7 @@ public class StudyCourseApi extends ApiBaseController{
|
|||||||
* @param
|
* @param
|
||||||
* @return 返回学习条目的id
|
* @return 返回学习条目的id
|
||||||
*/
|
*/
|
||||||
//@LimitRequest(count=5)
|
@LimitRequest(count=5)
|
||||||
@PostMapping("/study")
|
@PostMapping("/study")
|
||||||
public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){
|
public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){
|
||||||
|
|
||||||
@@ -714,7 +706,7 @@ public class StudyCourseApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST})
|
@RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST})
|
||||||
public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){
|
public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId){
|
||||||
if(StringUtils.isBlank(studyId)){
|
if(StringUtils.isBlank(studyId)){
|
||||||
return error("无学习信息");
|
return error("无学习信息");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user