Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -460,10 +460,10 @@ public class TIeInvigilateController {
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //发送mq给客户端监考消息end
 
-        //发送mq给客户端监考强制活体验证start
-        mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.OE_LIVENESS_VERIFY.name(), recordId, MqTagEnum.OE_LIVENESS_VERIFY, String.valueOf(tbUser.getId()), mapParameter, tbUser.getName());
-        mqDtoService.assembleSendOneWayMsg(mqDto);
-        //发送mq给客户端监考强制活体验证end
+//        //发送mq给客户端监考强制活体验证start
+//        mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.OE_LIVENESS_VERIFY.name(), recordId, MqTagEnum.OE_LIVENESS_VERIFY, String.valueOf(tbUser.getId()), mapParameter, tbUser.getName());
+//        mqDtoService.assembleSendOneWayMsg(mqDto);
+//        //发送mq给客户端监考强制活体验证end
         return ResultUtil.ok(Collections.singletonMap("success", true));
     }
 

themis-backend/src/main/resources/application.properties

@@ -124,7 +124,7 @@ tencentyun.sdk.urls=http://live1.qmth.com.cn,http://live2.qmth.com.cn,http://liv
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip
+sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3
 sys.config.serverUpload=/Users/king/git/themis-files/
 #\u7F51\u5173accessKey\u548Csecret,\u6D4B\u8BD5\u7528
 #sys.config.gatewayAccessKey=LTAI4FhEmrrhh27vzPGh25xe

themis-business/src/main/java/com/qmth/themis/business/util/SessionUtil.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.util;
 
+import com.qmth.themis.common.util.MD5Util;
+
 import java.security.NoSuchAlgorithmException;
 import java.util.Objects;
 import java.util.StringJoiner;
@@ -26,6 +28,6 @@ public class SessionUtil {
                 stringJoiner.add(String.valueOf(o[i])).add("-");
             }
         }
-        return stringJoiner.toString().substring(0, stringJoiner.length() - 1);
+        return MD5Util.encoder(stringJoiner.toString().substring(0, stringJoiner.length() - 1));
     }
 }

themis-exam/src/main/resources/application.properties

@@ -135,7 +135,7 @@ tencentyun.sdk.key=d78004c94473cb1cf78af33d333e18b731132e527e829e44e2ab133945243
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip
+sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3
 sys.config.serverUpload=/Users/king/git/themis-files/
 #\u7F51\u5173accessKey\u548Csecret,\u6D4B\u8BD5\u7528
 #sys.config.gatewayAccessKey=LTAI4FhEmrrhh27vzPGh25xe

themis-task/src/main/resources/application.properties

@@ -95,7 +95,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip
+sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3
 sys.config.serverUpload=/Users/king/git/themis-files/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/