Merge branch 'dev_v1.2.3' into release_v1.2.3

merge

themis-admin/src/main/resources/application-test.properties

@@ -221,7 +221,7 @@ monitor.config.prefix=oe_test
 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/**,/api/admin/client/save,/api/admin/client/upload,/api/admin/client/query,/api/admin/app/save,/api/admin/app/query,/api/notify/monitor/record/tencent,/api/notify/monitor/status/tencent
 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,/api/admin/sys/exam/finish/query,/api/admin/sys/get_tencent_video
 
-tencentyun.sdk.callbackTime=1h
+tencentyun.sdk.callbackTime=2m
 
 ### update ###
 tencentyun.sdk.trtcQueryUrl=trtc.tencentcloudapi.com

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

@@ -191,8 +191,8 @@ no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources
 common.system.urls=/api/oe/student/logout,/api/oe/exam/file/upload,/api/mobile/file/upload
 
 #update
-sys.config.qrExpireTime=120
-tencentyun.sdk.callbackTime=1h
+sys.config.qrExpireTime=30
+tencentyun.sdk.callbackTime=2m
 
 tencentyun.sdk.trtcQueryUrl=trtc.tencentcloudapi.com
 tencentyun.sdk.trtcRegion=ap-guangzhou

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

@@ -226,8 +226,12 @@ tencentyun.sdk.secretId=AKIDKUO2PVLuCDxQcW9VaOuA8pFOGq9BwQdZ
 tencentyun.sdk.secretKey=g5D4dwxhByXrvjGWVDfqkPqzrSmqd9OM
 tencentyun.sdk.vodAppId=1500002365
 tencentyun.sdk.callbackPwd=123456
-tencentyun.sdk.callbackTime=1h
+tencentyun.sdk.callbackTime=2m
 tencentyun.sdk.trtcQueryUrl=trtc.tencentcloudapi.com
 tencentyun.sdk.trtcRegion=ap-guangzhou
 
-monitor.config.prefix=oe_test
+monitor.config.prefix=oe_test
+
+#\u4E91\u9605\u5377\u540C\u6B65\u914D\u7F6E
+yun.mark.url=http://192.168.10.224:80
+yun.mark.studentScoreApi=/api/exam/student/score