Merge branch 'dev'

1

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamPrepareBean.java

@@ -30,6 +30,17 @@ public class ExamPrepareBean {
 	@ApiModelProperty("用户认证签名")
 	private String monitorUserSig;
 
+	@ApiModelProperty("腾讯云SDK APP ID")
+	private String monitorAppId;
+
+	public String getMonitorAppId() {
+		return monitorAppId;
+	}
+
+	public void setMonitorAppId(String monitorAppId) {
+		this.monitorAppId = monitorAppId;
+	}
+
 	public String getMonitorKey() {
 		return monitorKey;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamResumeBean.java

@@ -43,6 +43,17 @@ public class ExamResumeBean {
 	@ApiModelProperty("用户认证签名")
 	private String monitorUserSig;
 
+	@ApiModelProperty("腾讯云SDK APP ID")
+	private String monitorAppId;
+
+	public String getMonitorAppId() {
+		return monitorAppId;
+	}
+
+	public void setMonitorAppId(String monitorAppId) {
+		this.monitorAppId = monitorAppId;
+	}
+
 	public String getMonitorUserId() {
 		return monitorUserId;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/mobile/MobileAuthorizationMonitorBean.java

@@ -20,9 +20,21 @@ public class MobileAuthorizationMonitorBean  extends MobileAuthorizationBean{
 
 	@ApiModelProperty("加入房间用户ID")
 	private String monitorUserId;
+
 	@ApiModelProperty("用户认证签名")
 	private String monitorUserSig;
 
+	@ApiModelProperty("腾讯云SDK APP ID")
+	private String monitorAppId;
+
+	public String getMonitorAppId() {
+		return monitorAppId;
+	}
+
+	public void setMonitorAppId(String monitorAppId) {
+		this.monitorAppId = monitorAppId;
+	}
+
 	public String getMonitorUserId() {
 		return monitorUserId;
 	}

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -249,6 +249,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
                 String structurl = OssUtil.getUrlForPrivateBucket(systemConfig.getOssEnv(3), ep.getStructPath());
                 prepare.setPaperUrl(paperurl);
                 prepare.setStructUrl(structurl);
+                prepare.setMonitorAppId(systemConfig.getProperty("tencentyun.sdk.appId"));
                 prepare.setMonitorKey(ExamRecordCacheUtil.getMonitorKey(recordId));
                 prepare.setMonitorUserId("s_" + tbSession.getId());
                 prepare.setMonitorUserSig(tencentYunUtil.getSign(prepare.getMonitorUserId(), SystemConstant.TENCENT_EXPIRE_TIME));
@@ -321,6 +322,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         String structurl = OssUtil.getUrlForPrivateBucket(systemConfig.getOssEnv(3), ep.getStructPath());
         prepare.setPaperUrl(paperurl);
         prepare.setStructUrl(structurl);
+        prepare.setMonitorAppId(systemConfig.getProperty("tencentyun.sdk.appId"));
         prepare.setMonitorKey(ExamRecordCacheUtil.getMonitorKey(recordId));
         prepare.setMonitorUserId("s_" + tbSession.getId());
         prepare.setMonitorUserSig(tencentYunUtil.getSign(prepare.getMonitorUserId(), SystemConstant.TENCENT_EXPIRE_TIME));
@@ -802,6 +804,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         ret.setStructUrl(OssUtil.getUrlForPrivateBucket(systemConfig.getOssEnv(3), ep.getStructPath()));
         ret.setHasAudio((ep.getHasAudio() != null && ep.getHasAudio().intValue() == 1 ? true : false));
         ret.setAudioPlayCount(ep.getAudioPlayCount());
+        ret.setMonitorAppId(systemConfig.getProperty("tencentyun.sdk.appId"));
         ret.setMonitorKey(ExamRecordCacheUtil.getMonitorKey(recordId));
         ret.setMonitorUserId("s_" + tbSession.getId());
         ret.setMonitorUserSig(tencentYunUtil.getSign(ret.getMonitorUserId(), SystemConstant.TENCENT_EXPIRE_TIME));

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEMobileServiceImpl.java

@@ -10,6 +10,7 @@ import com.qmth.themis.business.cache.MobileAuthCacheUtil;
 import com.qmth.themis.business.cache.RedisKeyHelper;
 import com.qmth.themis.business.cache.bean.ExamStudentAnswerCacheBean;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
+import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.MqDto;
@@ -52,6 +53,9 @@ public class TEMobileServiceImpl implements TEMobileService {
     @Resource
     MqDtoService mqDtoService;
 
+    @Resource
+    SystemConfig systemConfig;
+
     @Override
     public MobileAuthorizationBean authorization(MobileAuthorizationParamBean param) throws NoSuchAlgorithmException {
         MobileModeEnum mode = MobileModeEnum.valueOf(param.getMode().toUpperCase());
@@ -113,6 +117,7 @@ public class TEMobileServiceImpl implements TEMobileService {
         }
         MobileAuthorizationMonitorBean ret = new MobileAuthorizationMonitorBean();
         ret.setRecordId(recordId);
+        ret.setMonitorAppId(systemConfig.getProperty("tencentyun.sdk.appId"));
         ret.setMonitorKey(monitorKey);
         ret.setMonitorVideoSource(monitorVideoSource);
         ret.setMonitorAudioEnable(monitorAudioEnable);

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

@@ -159,7 +159,7 @@ spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/MET
 prefix.url.exam=api/oe
 prefix.url.mobile=api/mobile
 
-wxapp.upload.url=https://wxapp3.qmth.com.cn
+wxapp.upload.url=https://mobile-test.online-exam.cn/
 
 #\u65E0\u9700\u9274\u6743\u7684url
 no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources/**,/v2/api-docs,/webjars/springfox-swagger-ui/**,/api/oe/student/login,/api/oe/sys/env,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**,/api/oe/exam/short_code,/api/mobile/authorization