guo00guo 5 vuotta sitten
vanhempi
commit
7ec91d8feb

+ 9 - 1
core/src/main/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepo.java

@@ -159,12 +159,20 @@ public class CrowdTestProjectRepo implements ICrowdTestProjectRepo {
                 // 保存配置项信息
                 if(crowdTestTask.getEndPoint() != null){
                     Optional<EndPointPO> endPointPO = endPointDao.findByTaskCode(crowdTestTask.getCode());
+                    EndPoint endPoint = crowdTestTask.getEndPoint();
                     if(endPointPO.isPresent()){
-                        EndPointPO addEndPointPO = Converter.convert(EndPointPO.class, crowdTestTask.getEndPoint());
+                        EndPointPO addEndPointPO = Converter.convert(EndPointPO.class, endPoint);
                         addEndPointPO.setId(endPointPO.get().getId());
                         addEndPointPO.setProjectCode(crowdTestProject.getCode());
                         addEndPointPO.setTaskCode(crowdTestTask.getCode());
                         endPointDao.save(addEndPointPO);
+                    }else{
+                        EndPointPO addEndPointPO = new EndPointPO();
+                        addEndPointPO.setCaseId(endPoint.getCaseId());
+                        addEndPointPO.setExamId(endPoint.getExamId());
+                        addEndPointPO.setProjectCode(crowdTestProject.getCode());
+                        addEndPointPO.setTaskCode(crowdTestTask.getCode());
+                        endPointDao.save(addEndPointPO);
                     }
                 }
             }

+ 1 - 1
site/src/main/java/com/mooctest/crowd/site/command/CrowdTestTaskCommand.java

@@ -72,7 +72,7 @@ public class CrowdTestTaskCommand {
         crowdTestTask.setRequirementFile(requirementFile);
         crowdTestTask.setParticipantCount(participantCount);
 
-        if(endpoint.getCaseId() != null && endpoint.getExamId() != null){
+        if(endpoint != null && endpoint.getCaseId() != null && endpoint.getExamId() != null){
             crowdTestTask.setEndPoint(endpoint);
         }
         return crowdTestTask;

+ 3 - 3
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -960,9 +960,9 @@ public class WebMediatorImpl implements ViewMediator {
                 // 获取测试类型对应的跳转url
                 TestType testType = commonRepo.getTestTypeByAppCode(task.get().getType());
                 String url = testType.getUrl();
-                String reportUrl = url.replaceFirst("examId", endPointPOOptional.get().getExamId())
-                        .replaceFirst("caseId", endPointPOOptional.get().getCaseId())
-                        .replaceFirst("userId", String.valueOf(userId));
+                String reportUrl = url.replace("examId", endPointPOOptional.get().getExamId())
+                        .replace("caseId", endPointPOOptional.get().getCaseId())
+                        .replace("userId", String.valueOf(userId));
 
                 taskVO.setWriteReportUrl(reportUrl);
             }