Просмотр исходного кода

improvement: 对接传送做题数据接口

ChenSiTong 6 лет назад
Родитель
Сommit
947497d471

+ 1 - 2
src/main/java/nju/seec/helper/api/bok/RecordApi.java

@@ -31,8 +31,7 @@ public class RecordApi {
 
     @Async
     public void reportUserRecord(List<RecordDTO> records) {
-        System.out.println(records);
-//        restRequestUtil.sendPostRequest(url, records, String.class);
+        restRequestUtil.sendPostRequest(url, records, String.class);
     }
 
     public RecordDTO createRecordDTO(String studentId, String questionId, Object answer, Boolean pass, LocalDateTime startAt, LocalDateTime finishAt) {

+ 3 - 2
src/main/java/nju/seec/helper/aspect/auth/AuthAspect.java

@@ -1,5 +1,6 @@
 package nju.seec.helper.aspect.auth;
 
+import cn.hutool.core.util.StrUtil;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
@@ -52,7 +53,7 @@ public class AuthAspect {
                 .stream(auth.roles())
                 .collect(Collectors.toSet())
                 .contains(user.getRole())) {
-            throw HelperException.of(ExceptionType.FORBIDDEN, String.format("您暂时无法%s,请重新登录", auth.message()));
+            throw HelperException.of(ExceptionType.FORBIDDEN, StrUtil.format("您暂时无法{},请重新登录", auth.message()));
         }
 
         Object[] objects = joinPoint.getArgs();
@@ -97,7 +98,7 @@ public class AuthAspect {
 
         user.setName(userInfo.name)
                 .setEmail(userInfo.email)
-//                .setRole(userInfo.role)
+                .setRole(userInfo.role)
                 .setPhone(userInfo.phone)
                 .setPid(userInfo.id);
 

+ 2 - 4
src/main/java/nju/seec/helper/vo/quiz/QuizVO.java

@@ -1,7 +1,8 @@
 package nju.seec.helper.vo.quiz;
 
 
-import lombok.*;
+import lombok.Data;
+import lombok.NonNull;
 import nju.seec.helper.entity.Quiz;
 import nju.seec.helper.enums.QuizState;
 import nju.seec.helper.enums.QuizType;
@@ -14,9 +15,6 @@ import java.time.LocalDateTime;
  * updated by cst
  */
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class QuizVO {
     private Long id;
     private String name;

+ 2 - 1
src/main/resources/application-deploy.yml

@@ -70,7 +70,8 @@ bok:
     url: ${bok.api-url}/user
     rate-url: ${bok.user.url}/{userId}/question/{questionId}/rate
     collection-url: ${bok.user.url}/{userId}/question/{questionId}/collection
-    question-url: ${bok.user.url}/{userId}/question?collection={collection}&rate={rate}
+    question-url: ${bok.user.url}/{userId}/question?collection={collection}&rate={rate}&page={page}&size={size}&{sort}
+    interactive-url: ${bok.user.url}/{userId}/questionInList?questionId={questionId}
   record:
     url: ${bok.api-url}/record
     question-url: ${bok.record.url}/{userId}/question?page={page}&size={size}&{sort}

+ 1 - 1
src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/helper?setUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://localhost:3306/helper?setUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: 123456