|
@@ -53,7 +53,6 @@ import cn.com.qmth.examcloud.support.examing.ExamFileAnswer;
|
|
import cn.com.qmth.examcloud.support.examing.ExamRecordData;
|
|
import cn.com.qmth.examcloud.support.examing.ExamRecordData;
|
|
import cn.com.qmth.examcloud.support.examing.ExamingSession;
|
|
import cn.com.qmth.examcloud.support.examing.ExamingSession;
|
|
import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
|
|
import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
|
|
-import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
|
|
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStoragePathEnvInfo;
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStoragePathEnvInfo;
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStorageType;
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStorageType;
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
|
|
import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
|
|
@@ -62,7 +61,6 @@ import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
|
|
import cn.com.qmth.examcloud.web.redis.RedisClient;
|
|
import cn.com.qmth.examcloud.web.redis.RedisClient;
|
|
import cn.com.qmth.examcloud.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.web.support.Naked;
|
|
import cn.com.qmth.examcloud.web.support.Naked;
|
|
-import cn.com.qmth.examcloud.web.upyun.UpYunHttpRequest;
|
|
|
|
import cn.com.qmth.examcloud.web.upyun.UpyunPathEnvironmentInfo;
|
|
import cn.com.qmth.examcloud.web.upyun.UpyunPathEnvironmentInfo;
|
|
import cn.com.qmth.examcloud.web.upyun.UpyunService;
|
|
import cn.com.qmth.examcloud.web.upyun.UpyunService;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -345,7 +343,7 @@ public class ExamControlController extends ControllerSupport {
|
|
env.setRootOrgId(accessUser.getRootOrgId().toString());
|
|
env.setRootOrgId(accessUser.getRootOrgId().toString());
|
|
env.setUserId(accessUser.getUserId().toString());
|
|
env.setUserId(accessUser.getUserId().toString());
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setFileSuffix(fileSuffix);
|
|
- UpYunHttpRequest upYunHttpRequest = upyunService.buildUpYunHttpRequest(Constants.CAPTURE_PHOTO_UPYUN_SITEID, env, query.getFileMd5());
|
|
|
|
|
|
+ YunHttpRequest upYunHttpRequest = upyunService.buildUpYunHttpRequest(Constants.CAPTURE_PHOTO_UPYUN_SITEID, env, query.getFileMd5());
|
|
redisClient.set(upyunSignRedisKey, upYunHttpRequest, 60);
|
|
redisClient.set(upyunSignRedisKey, upYunHttpRequest, 60);
|
|
result.setAccessUrl(upYunHttpRequest.getAccessUrl());
|
|
result.setAccessUrl(upYunHttpRequest.getAccessUrl());
|
|
result.setFormUrl(upYunHttpRequest.getFormUrl());
|
|
result.setFormUrl(upYunHttpRequest.getFormUrl());
|
|
@@ -420,7 +418,7 @@ public class ExamControlController extends ControllerSupport {
|
|
env.setRootOrgId(accessUser.getRootOrgId().toString());
|
|
env.setRootOrgId(accessUser.getRootOrgId().toString());
|
|
env.setUserId(accessUser.getUserId().toString());
|
|
env.setUserId(accessUser.getUserId().toString());
|
|
env.setFileSuffix(fileSuffix);
|
|
env.setFileSuffix(fileSuffix);
|
|
- UpYunHttpRequest upYunHttpRequest = upyunService.buildUpYunHttpRequest(Constants.CAPTURE_PHOTO_UPYUN_SITEID, env, query.getFileMd5());
|
|
|
|
|
|
+ YunHttpRequest upYunHttpRequest = upyunService.buildUpYunHttpRequest(Constants.CAPTURE_PHOTO_UPYUN_SITEID, env, query.getFileMd5());
|
|
redisClient.set(upyunSignRedisKey, upYunHttpRequest, 60);
|
|
redisClient.set(upyunSignRedisKey, upYunHttpRequest, 60);
|
|
upyunSignDomain.setAccessUrl(upYunHttpRequest.getAccessUrl());
|
|
upyunSignDomain.setAccessUrl(upYunHttpRequest.getAccessUrl());
|
|
upyunSignDomain.setFormUrl(upYunHttpRequest.getFormUrl());
|
|
upyunSignDomain.setFormUrl(upYunHttpRequest.getFormUrl());
|