update logs

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultQuesionController.java

@@ -13,6 +13,8 @@ import cn.com.qmth.examcloud.support.handler.QuestionBodyHandler;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -33,6 +35,8 @@ import java.util.Set;
 @RequestMapping("${api_cqb}/default_question")
 public class DefaultQuesionController extends ControllerSupport {
 
+    private static final Logger log = LoggerFactory.getLogger(DefaultQuesionController.class);
+
     @Autowired
     private QuestionProviderService questionProviderService;
 
@@ -80,7 +84,8 @@ public class DefaultQuesionController extends ControllerSupport {
         if (rootOrgId == null) {
             throw new StatusException("Q-011079", "rootOrgId is null");
         }
-        Page<DefaultQuestion> defaultQuestions = questionProviderService.findQustions(rootOrgId, req.getProperties(), req.getCurPage(), req.getPageSize());
+        Page<DefaultQuestion> defaultQuestions = questionProviderService.findQustions(rootOrgId, req.getProperties(),
+                req.getCurPage(), req.getPageSize());
         return new ResponseEntity<>(defaultQuestions, HttpStatus.OK);
     }
 
@@ -114,7 +119,9 @@ public class DefaultQuesionController extends ControllerSupport {
         if (StringUtils.isBlank(questionId)) {
             throw new StatusException("Q-010090", "questionId is null");
         }
-        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
+
+        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode,
+                questionId, "webClient");
         return new ResponseEntity<>(defaultQuestion, HttpStatus.OK);
     }
 
@@ -138,7 +145,9 @@ public class DefaultQuesionController extends ControllerSupport {
         if (StringUtils.isBlank(questionId)) {
             throw new StatusException("Q-010090", "questionId is null");
         }
-        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
+
+        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode,
+                questionId, "pcClient");
 
         // 将题干、选项等 HTML结构转换为“富文本”JSON结构
         QuestionBodyHandler.convertRichText(defaultQuestion);

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/provider/ExtractConfigCloudServiceProvider.java

@@ -96,7 +96,10 @@ public class ExtractConfigCloudServiceProvider implements ExtractConfigCloudServ
         if (StringUtils.isBlank(questionId)) {
             throw new StatusException("Q-010090", "questionId is null");
         }
-        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
+
+        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode,
+                questionId, "extract_config");
+
         GetQuestionResp resp = new GetQuestionResp();
         resp.setDefaultQuestion(defaultQuestion);
         return resp;
@@ -152,7 +155,10 @@ public class ExtractConfigCloudServiceProvider implements ExtractConfigCloudServ
         if (StringUtils.isBlank(id)) {
             throw new StatusException("Q-010149", "questionId is null");
         }
-        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(null, null, null, id);
+
+        DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(null, null, null,
+                id, "baseQuestion");
+
         GetQuestionResp resp = new GetQuestionResp();
         resp.setDefaultQuestion(defaultQuestion);
         return resp;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExtractConfigProviderService.java

@@ -36,7 +36,7 @@ public interface ExtractConfigProviderService {
     /**
      * 根据调卷规则获取某个试题
      */
-    public DefaultQuestion getDefaultQuestion(Long examId, String courseCode, String groupCode, String questionId);
+    public DefaultQuestion getDefaultQuestion(Long examId, String courseCode, String groupCode, String questionId, String fromBy);
 
     /**
      * 获取某份试卷的试卷结构

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/cache/QuestionCache.java

@@ -39,7 +39,8 @@ public class QuestionCache extends HashRedisCache<QuestionCacheBean> {
             throw new StatusException("400", "questionId is empty");
         }
 
-        DefaultQuestion defaultQuestion = extractConfigProviderService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
+        DefaultQuestion defaultQuestion = extractConfigProviderService.getDefaultQuestion(examId, courseCode, groupCode,
+                questionId, "cache");
 
         QuestionCacheBean cacheBean = new QuestionCacheBean();
         cacheBean.setDefaultQuestion(defaultQuestion);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigProviderServiceImpl.java

@@ -402,7 +402,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 	}
 
 	@Override
-	public DefaultQuestion getDefaultQuestion(Long examId, String courseCode, String groupCode, String questionId) {
+	public DefaultQuestion getDefaultQuestion(Long examId, String courseCode, String groupCode, String questionId, String fromBy) {
 		Question question = Model.of(quesRepo.findById(questionId));
 		if (question == null) {
 			throw new StatusException("500", "试题不存在！");
@@ -446,8 +446,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 		}
 
 		// 获取试题信息带答案（敏感信息日志，用于排查调用者）
-		LOG.warn("$$$getQuestionWithAnswer questionId:{} examId:{} courseCode:{} groupCode:{}", questionId, examId,
-				courseCode, groupCode);
+		LOG.warn("$$$getQuestionWithAnswer fromBy:{} questionId:{} {}_{}_{} ", fromBy, questionId, examId, courseCode, groupCode);
 		return defaultQuestion;
 	}
 
@@ -653,7 +652,9 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 			throw new StatusException("Q-020572", "根据试题id的集合没有查询到试题结合");
 		}
 		for (Question question : questions) {
-			DefaultQuestion defaultQuestion = getDefaultQuestion(null, null, null, question.getId());
+			DefaultQuestion defaultQuestion = getDefaultQuestion(null, null, null,
+					question.getId(), "default");
+
 			map.put(question.getId(), defaultQuestion);
 		}
 		return map;