Merge branch 'dev' into release

1

themis-backend/src/main/java/com/qmth/themis/backend/aspect/ApiControllerAspect.java

@@ -11,8 +11,10 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 /**
  * @Description: api aspect
@@ -53,7 +55,22 @@ public class ApiControllerAspect {
             log.info("============请求地址========:{}", request.getRequestURL());
             log.info("============类=============:{}", className);
             log.info("============方法===========:{}", methodName);
-            log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName), JacksonUtil.parseJson(args));
+            if (Objects.nonNull(args) && args.length > 0) {
+                boolean jsonOut = true;
+                for (Object o : args) {
+                    if (o instanceof CommonsMultipartFile) {
+                        jsonOut = false;
+                        break;
+                    }
+                }
+                if (jsonOut) {
+                    log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName), JacksonUtil.parseJson(args));
+                } else {
+                    for (int i = 0; i < args.length; i++) {
+                        log.info("============参数key:{},参数value===========:{}", paramsName[i], args[i]);
+                    }
+                }
+            }
             log.info("============platform===========:{}", ServletUtil.getRequestPlatform());
             log.info("============deviceId===========:{}", ServletUtil.getRequestDeviceId());
             log.info("============Authorization===========:{}", ServletUtil.getRequestAuthorizationForAspect());

themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -122,7 +122,7 @@
             teea.opening_seconds as activityOpeningSeconds,
             (teea.start_time / 1000 - IFNULL(teea.prepare_seconds, tee.prepare_seconds)) * 1000 as prepareTime,
             IFNULL(teea.start_time, tee.start_time) as minStartTime,
-            (teea.start_time / 1000 + IFNULL(teea.opening_seconds, tee.opening_seconds)) as maxStartTime,
+            (teea.start_time / 1000 + IFNULL(teea.opening_seconds, tee.opening_seconds)) * 1000 as maxStartTime,
             IF(tee.mode = 'TOGETHER' and tee.force_finish = 1, IFNULL(teea.finish_time , tee.end_time), null) as maxFinishTime,
             tee.monitor_video_source as monitorVideoSourceStr,
             IFNULL(teea.prepare_seconds,tee.prepare_seconds) as prepareSeconds,

themis-exam/src/main/java/com/qmth/themis/exam/aspect/ApiControllerAspect.java

@@ -11,8 +11,10 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 /**
  * @Description: api aspect
@@ -53,7 +55,22 @@ public class ApiControllerAspect {
             log.info("============请求地址========:{}", request.getRequestURL());
             log.info("============类=============:{}", className);
             log.info("============方法===========:{}", methodName);
-            log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName), JacksonUtil.parseJson(args));
+            if (Objects.nonNull(args) && args.length > 0) {
+                boolean jsonOut = true;
+                for (Object o : args) {
+                    if (o instanceof CommonsMultipartFile) {
+                        jsonOut = false;
+                        break;
+                    }
+                }
+                if (jsonOut) {
+                    log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName), JacksonUtil.parseJson(args));
+                } else {
+                    for (int i = 0; i < args.length; i++) {
+                        log.info("============参数key:{},参数value===========:{}", paramsName[i], args[i]);
+                    }
+                }
+            }
             log.info("============platform===========:{}", ServletUtil.getRequestPlatform());
             log.info("============deviceId===========:{}", ServletUtil.getRequestDeviceId());
             log.info("============Authorization===========:{}", ServletUtil.getRequestAuthorizationForAspect());