Forráskód Böngészése

update: index.html

guochao 5 éve
szülő
commit
403dfc8d5f

+ 5 - 3
.idea/workspace.xml

@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTaskStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTaskStatus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -128,7 +128,9 @@
       <workItem from="1574392825833" duration="6599000" />
       <workItem from="1575964187611" duration="5133000" />
       <workItem from="1576044658914" duration="312000" />
-      <workItem from="1576141062434" duration="3049000" />
+      <workItem from="1576141062434" duration="3358000" />
+      <workItem from="1576166157531" duration="106000" />
+      <workItem from="1576220216208" duration="37000" />
     </task>
     <servers />
   </component>

+ 2 - 1
src/main/java/cn/iselab/mooctest/site/domainObject/ReportTaskStatus.java

@@ -7,5 +7,6 @@ package cn.iselab.mooctest.site.domainObject;
 public class ReportTaskStatus {
     public static final int GENERATING = 1; //报告任务生成中
     public static final int COMPLETED = 0;  //报告任务已完成
-    public static final int INEXISTENCE = -1; //报告任务不存在
+    public static final int FAILED = -1; //报告任务生成失败
+    public static final int INEXISTENCE = -2; //报告任务不存在
 }

+ 1 - 1
src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java

@@ -92,7 +92,7 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
             ossDownloadUrl = reportTransferToPath(orderId, ownerId, builderPath + "/"+reportType+"/");
             if(ossDownloadUrl != null && ossDownloadUrl != ""){
                 // 报告zip上次成功
-                String taskUrl = "http://" + HOST_IP + "/reportFile/" + ownerId + "/" + orderId + "/vulReport/dist/vulResults.html";
+                String taskUrl = "http://" + HOST_IP + "/reportFile/" + ownerId + "/" + orderId + "/vulReport/dist/index.html";
                 // 存入数据库
                 reportTask.setId(reportTaskId);
                 reportTask.setTaskUrl(taskUrl);