Merge branch 'dev'

1

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

@@ -18,6 +18,7 @@ import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.EhcacheUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
+import com.qmth.themis.business.util.TencentYunUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -345,4 +346,11 @@ public class SysController {
         map.put("examCourses", courseSet);
         return ResultUtil.ok(map);
     }
+
+    @ApiOperation(value = "获取播放域接口")
+    @RequestMapping(value = "/getPlayUrls", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "播放域接口", response = Result.class)})
+    public Result getPlayUrls() {
+        return ResultUtil.ok(dictionaryConfig.tencentYunDomain().getUrls());
+    }
 }

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

@@ -3,6 +3,7 @@ package com.qmth.themis.backend.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.themis.backend.config.DictionaryConfig;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.bean.mobile.MobileAuthorizationMonitorBean;
@@ -67,6 +68,9 @@ public class TIeInvigilateCallMobileController {
     @Resource
     SystemConfig systemConfig;
 
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
     @ApiOperation(value = "监考监控通话查询接口")
     @RequestMapping(value = "/call/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "监考监控信息", response = TIeExamInvigilateCallDto.class)})
@@ -174,6 +178,8 @@ public class TIeInvigilateCallMobileController {
         map.put("monitorKey", monitorKey);
         map.put("monitorUserId", monitorUserId);
         map.put("monitorUserSig", monitorUserSig);
+        map.put("appId", dictionaryConfig.tencentYunDomain().getAppId());
+        map.put("key", dictionaryConfig.tencentYunDomain().getKey());
         return ResultUtil.ok(map);
     }
 }

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

@@ -120,6 +120,7 @@ aliyun.oss.url=http://qmth-test.oss-cn-shenzhen.aliyuncs.com
 #\u817E\u8BAF\u4E91\u914D\u7F6E
 tencentyun.sdk.appId=1400411036
 tencentyun.sdk.key=d78004c94473cb1cf78af33d333e18b731132e527e829e44e2ab133945243b11
+tencentyun.sdk.urls=http://live1.qmth.com.cn,http://live2.qmth.com.cn,http://live3.qmth.com.cn,http://live4.qmth.com.cn,http://live5.qmth.com.cn,http://live6.qmth.com.cn
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -164,4 +165,4 @@ prefix.url.admin=api/admin
 
 #\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/admin/user/login/account,/api/admin/sys/org/queryByOrgCode,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**
-common.system.urls=/api/admin/sys/getMenu,/api/admin/user/logout,/api/admin/sys/env,/api/admin/sys/file/upload,/api/admin/sys/file/download,/api/admin/sys/org/query,/api/admin/sys/role/query,/api/admin/sys/examActivity/query,/api/admin/sys/exam/query,/api/admin/sys/examRoom/query,/api/admin/sys/exam/privilegeQuery,/api/admin/student/photo/upload
+common.system.urls=/api/admin/sys/getMenu,/api/admin/user/logout,/api/admin/sys/env,/api/admin/sys/file/upload,/api/admin/sys/file/download,/api/admin/sys/org/query,/api/admin/sys/role/query,/api/admin/sys/examActivity/query,/api/admin/sys/exam/query,/api/admin/sys/examRoom/query,/api/admin/sys/exam/privilegeQuery,/api/admin/student/photo/upload,/api/admin/sys/getPlayUrls

themis-business/src/main/java/com/qmth/themis/business/domain/TencentYunDomain.java

@@ -1,6 +1,7 @@
 package com.qmth.themis.business.domain;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * @Description: 腾讯云 domain
@@ -13,6 +14,15 @@ public class TencentYunDomain implements Serializable {
 
     private String appId;
     private String key;
+    private List urls;
+
+    public List getUrls() {
+        return urls;
+    }
+
+    public void setUrls(List urls) {
+        this.urls = urls;
+    }
 
     public String getAppId() {
         return appId;