Merge branch 'dev'

111

themis-business/src/main/resources/db/init.sql

@@ -1030,8 +1030,8 @@ CREATE TABLE `t_e_exam_reexam` (
   `exam_activity_id` bigint NOT NULL COMMENT '场次ID',
   `exam_record_id` bigint NOT NULL COMMENT '考试记录ID',
   `exam_student_id` bigint NOT NULL COMMENT '考生id',
-  `apply_model` tinyint DEFAULT NULL COMMENT '重考方式，0：批次内，1：换批次',
-  `apply_reason` tinyint DEFAULT NULL COMMENT '重考原因',
+  `model` tinyint DEFAULT NULL COMMENT '重考方式，0：批次内，1：换批次',
+  `reason` varchar(30) DEFAULT NULL COMMENT '重考原因',
   `status` tinyint DEFAULT NULL COMMENT '状态，0：无需审核，1：待审核，2：已审核',
   `auditing_id` bigint DEFAULT NULL COMMENT '待审核人id',
   `auditing_status` tinyint DEFAULT NULL COMMENT '审核状态，0：通过，1：不通过',

themis-exam/src/main/java/com/qmth/themis/exam/api/TEQrcodeController.java

@@ -53,7 +53,7 @@ public class TEQrcodeController {
 
 	@ApiOperation(value = "获取移动端拍照/录音上传二维码")
 	@RequestMapping(value = "/{uploadType}", method = RequestMethod.POST)
-	public Result mobileMonitor(@PathVariable String uploadType,@RequestBody QrUploadParamBean param) {
+	public Result upload(@PathVariable String uploadType,@RequestBody QrUploadParamBean param) {
 		if (param.getRecordId() == null) {
 			throw new BusinessException("recordId不能为空");
 		}

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

@@ -150,7 +150,7 @@ spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/MET
 prefix.url.exam=api/oe
 prefix.url.mobile=api/mobile
 
-wxapp.upload.url=http://wxapp2.qmth.com.cn
+wxapp.upload.url=https://wxapp3.qmth.com.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