|
@@ -7,6 +7,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import java.sql.Timestamp;
|
|
|
+import java.util.Base64;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
@@ -72,23 +73,22 @@ public class CrowdTestTaskCommand {
|
|
|
crowdTestTask.setRequirementFile(requirementFile);
|
|
|
crowdTestTask.setParticipantCount(participantCount);
|
|
|
|
|
|
- //http://59.42.10.17:8081/report/detail/examId_50/caseId_50/userId
|
|
|
if(endPoint.getServerCode() != null && endPoint.getServerCode() != ""){
|
|
|
String serverCode = endPoint.getServerCode();
|
|
|
- if(serverCode.contains("examId_")){
|
|
|
- endPoint.setExamId(serverCode.split("examId_")[1].split("/")[0]);
|
|
|
- serverCode = serverCode.replaceFirst("examId_","");
|
|
|
+ byte[] decodedBytes = Base64.getDecoder().decode(serverCode);
|
|
|
+ String url = new String(decodedBytes);
|
|
|
+
|
|
|
+ if(url.contains("examId_")){
|
|
|
+ endPoint.setExamId(url.split("examId_")[1].split("/")[0]);
|
|
|
+ url = url.replaceFirst("examId_","");
|
|
|
}
|
|
|
- if(serverCode.contains("caseId_")){
|
|
|
- endPoint.setCaseId(serverCode.split("caseId_")[1].split("/")[0]);
|
|
|
- serverCode = serverCode.replaceFirst("caseId_","");
|
|
|
+ if(url.contains("caseId_")){
|
|
|
+ endPoint.setCaseId(url.split("caseId_")[1].split("/")[0]);
|
|
|
+ url = url.replaceFirst("caseId_","");
|
|
|
}
|
|
|
- endPoint.setServerCode(serverCode);
|
|
|
+ endPoint.setUrl(url);
|
|
|
crowdTestTask.setEndPoint(endPoint);
|
|
|
}
|
|
|
-// if(endpoint != null && endpoint.getCaseId() != null && endpoint.getExamId() != null){
|
|
|
-// crowdTestTask.setEndPoint(endpoint);
|
|
|
-// }
|
|
|
return crowdTestTask;
|
|
|
}
|
|
|
|