Merge branch 'dev' into release

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientStatusServiceImpl.java

@@ -32,6 +32,7 @@ public class ClientStatusServiceImpl extends ServiceImpl<ClientStatusMapper, Cli
             queryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getExamDetailId, examDetailCours.getExamDetailId()).eq(ClientStatus::getPrintPlanId, printPlanId).eq(ClientStatus::getCourseCode, courseCode).eq(ClientStatus::getPaperNumber, paperNumber).eq(ClientStatus::getMachineCode, machineCode);
             ClientStatus clientStatus = this.getOne(queryWrapper);
             if(clientStatus != null){
+                clientStatus.setTry(true);
                 clientStatus.setPass(isPass);
                 clientStatus.setUpdateId(userId);
                 clientStatus.setUpdateTime(currentTime);

distributed-print-business/src/main/resources/db/init-table.sql

@@ -113,7 +113,7 @@ CREATE TABLE `basic_message`  (
     `template_content` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '模板内容',
     `message_type` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息类型',
     `send_status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送状态',
-    `send_result` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送结果',
+    `send_result` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送结果',
     `remark` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注',
     `resend_count` INT CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '失败重发次数',
     `create_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人',

distributed-print/src/main/java/com/qmth/distributed/print/aspect/ApiControllerAspect.java

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
 /**
@@ -61,7 +62,7 @@ public class ApiControllerAspect {
                 log.info("============方法===========:{}", methodName);
                 if (Objects.nonNull(args) && args.length > 0) {
                     for (int i = 0; i < args.length; i++) {
-                        if (args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult) {
+                        if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
                             continue;
                         } else {
                             log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName[i]), JacksonUtil.parseJson(args[i]));