修改traceId以及获取jsonObject

.idea/workspace.xml

@@ -2,81 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_alibaba_nacos_discovery_0_9_0_RELEASE.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_alibaba_nacos_discovery_0_9_0_RELEASE.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mooctestOrgBackend" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/docker/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_1_0_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_9.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_24.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_24.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_24.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_3_11_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_23_2_GA.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_1_10_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gateway-demo.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gateway-demo.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/dao/ReportTaskDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/dao/ReportTaskDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/model/ReportTaskPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/model/ReportTaskPO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/repository/IReportTaskRepo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/repository/IReportTaskRepo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/repository/ReportTaskRepo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/repository/ReportTaskRepo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/AutoReportProductService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/AutoReportProductService.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" />
       <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/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportAppBaseInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportAppBaseInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBug.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBug.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportDeviceInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportDeviceInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataVulnerability.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataVulnerability.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="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/resources/bootstrap.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yaml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -123,11 +57,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="cn.iselab.mooctest.site.web.ctrl" />
       <recent name="cn.iselab.mooctest.site.model" />
       <recent name="cn.iselab.mooctest.site.domainObject" />
       <recent name="cn.iselab.mooctest.site.service.impl" />
       <recent name="cn.iselab.mooctest.site.service" />
-      <recent name="cn.iselab.mooctest.site.web.ctrl" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
@@ -222,7 +156,10 @@
       <workItem from="1582504499815" duration="7000" />
       <workItem from="1582525833750" duration="570000" />
       <workItem from="1582603831591" duration="789000" />
-      <workItem from="1582719343080" duration="2182000" />
+      <workItem from="1582719343080" duration="4019000" />
+      <workItem from="1583024656089" duration="310000" />
+      <workItem from="1583115499177" duration="528000" />
+      <workItem from="1583155605297" duration="9435000" />
     </task>
     <servers />
   </component>

src/main/java/cn/iselab/mooctest/site/dao/ReportTaskDao.java

@@ -13,7 +13,7 @@ import java.util.Optional;
 @Component
 public interface ReportTaskDao extends CrudRepository<ReportTaskPO, Long> {
 
-    Optional<Long> findByTaskIdAndOwnerId(Long taskId, Long ownerId);
+    Optional<Long> findByTraceId(String traceId);
 
     @Override
     <S extends ReportTaskPO> S save(S s);

src/main/java/cn/iselab/mooctest/site/domainObject/ReportTask.java

@@ -9,6 +9,7 @@ import lombok.Data;
 public class ReportTask {
     private Long id;
     private Long taskId;
+    private String traceId;
     private Long ownerId;
     private String reportType;
     private String taskUrl;

src/main/java/cn/iselab/mooctest/site/model/ReportTaskPO.java

@@ -19,6 +19,9 @@ public class ReportTaskPO implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(name = "RT_TRACE_ID")
+    private String traceId;
+
     @Column(name = "RT_TASK_ID")
     private Long taskId;
 

src/main/java/cn/iselab/mooctest/site/repository/IReportTaskRepo.java

@@ -9,7 +9,7 @@ import cn.iselab.mooctest.site.domainObject.ReportTask;
 
 public interface IReportTaskRepo {
 
-    ReportTask getByTaskId(Long taskId, Long ownerId);
-
     Long saveReportTask(ReportTask reportTask);
+
+    ReportTask getReportByTraceId(String traceId);
 }

src/main/java/cn/iselab/mooctest/site/repository/ReportTaskRepo.java

@@ -19,16 +19,16 @@ public class ReportTaskRepo implements IReportTaskRepo {
     private ReportTaskDao reportTaskDao;
 
     @Override
-    public ReportTask getByTaskId(Long taskId, Long ownerId) {
-        Optional<Long> reportTaskOptional = reportTaskDao.findByTaskIdAndOwnerId(taskId, ownerId);
+    public Long saveReportTask(ReportTask reportTask) {
+        return reportTaskDao.save(Converter.convert(ReportTaskPO.class, reportTask)).getId();
+    }
+
+    @Override
+    public ReportTask getReportByTraceId(String traceId) {
+        Optional<Long> reportTaskOptional = reportTaskDao.findByTraceId(traceId);
         if(!reportTaskOptional.isPresent()){
             return null;
         }
         return Converter.convert(ReportTask.class, reportTaskOptional.get());
     }
-
-    @Override
-    public Long saveReportTask(ReportTask reportTask) {
-        return reportTaskDao.save(Converter.convert(ReportTaskPO.class, reportTask)).getId();
-    }
 }

src/main/java/cn/iselab/mooctest/site/service/AutoReportProductService.java

@@ -11,17 +11,15 @@ import java.util.concurrent.Future;
 
 public interface AutoReportProductService {
 
-    int getReportTaskStatus(Long orderId, Long ownerId);
+    ReportTask getReport(String traceId);
 
-    ReportTask getReportTask(Long orderId, Long ownerId);
+    void generateReport(String traceId, String jsonData, String reportType);
 
-    void generateReport(Long orderId, Long ownerId, ReportDataVO reportData, String reportType);
+    String copyReportBuilderToPath(String traceId, String reportBuilderName);
 
     void writeDataToJsonFile(String jsonData,String path);
 
     boolean runBuilderToProductReport(String command,String path);
 
-    String copyReportBuilderToPath(Long orderId, String reportBuilderName);
-
     String handleReportTemplate(String reportType, String reportTemplateFileName);
 }

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

@@ -57,44 +57,34 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
     private String HOST_IP;
 
     @Override
-    public int getReportTaskStatus(Long orderId, Long ownerId) {
-        ReportTask reportTask = iReportTaskRepo.getByTaskId(orderId, ownerId);
-        if(reportTask == null){
-            return -1;
-        }
-        return reportTask.getStatus();
-    }
-
-    @Override
-    public ReportTask getReportTask(Long orderId, Long ownerId) {
-        return iReportTaskRepo.getByTaskId(orderId, ownerId);
+    public ReportTask getReport(String traceId) {
+        return iReportTaskRepo.getReportByTraceId(traceId);
     }
 
     @Async
     @Override
-    public void generateReport(Long orderId, Long ownerId, ReportDataVO reportData, String reportType) {
-        log.info("开始做任务" + orderId);
+    public void generateReport(String traceId, String jsonData, String reportType) {
+        log.info("开始做任务" + traceId);
         //存入数据库
         ReportTask reportTask = ReportTaskFactory.createReportTask();
-        reportTask.setTaskId(orderId);
-        reportTask.setOwnerId(ownerId);
+        reportTask.setTraceId(traceId);
         reportTask.setReportType(reportType);
         reportTask.setStatus(ReportTaskStatus.GENERATING);
         Long reportTaskId = iReportTaskRepo.saveReportTask(reportTask);
 
         long start = System.currentTimeMillis();
 
-        String builderPath = copyReportBuilderToPath(orderId, reportType);
-        writeDataToJsonFile(new Gson().toJson(reportData), builderPath + "/" + reportType + REPORT_JSON_UPLOAD_PATH);
-        System.out.println(builderPath + "/"+ reportType +"/");
+        String builderPath = copyReportBuilderToPath(traceId, reportType);
+        writeDataToJsonFile(jsonData, builderPath + "/" + reportType + REPORT_JSON_UPLOAD_PATH);
+        System.out.println("Copy success: " + builderPath + "/"+ reportType +"/");
         boolean bale = runBuilderToProductReport("npm run build", builderPath + "/"+ reportType +"/");
         String ossDownloadUrl;
         if (bale) {
             // npm run build 执行成功
-            ossDownloadUrl = reportTransferToPath(orderId, ownerId, builderPath + "/"+reportType+"/");
+            ossDownloadUrl = reportTransferToPath(traceId, builderPath + "/"+reportType+"/");
             if(ossDownloadUrl != null && ossDownloadUrl != ""){
                 // 报告zip上次成功
-                String taskUrl = "http://" + HOST_IP + "/reportFile/" + ownerId + "/" + orderId + "/vulReport/dist/index.html";
+                String taskUrl = "http://" + HOST_IP + "/reportFile/" + traceId + "/vulReport/dist/index.html";
                 // 存入数据库
                 reportTask.setId(reportTaskId);
                 reportTask.setTaskUrl(taskUrl);
@@ -103,7 +93,7 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
                 iReportTaskRepo.saveReportTask(reportTask);
 
                 long end = System.currentTimeMillis();
-                log.info("完成任务"+orderId+"，耗时：" + (end - start) + "毫秒");
+                log.info("完成任务"+traceId+"，耗时：" + (end - start) + "毫秒");
                 return ;
             }else{
                 // zip上传失败
@@ -124,9 +114,8 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
         }
     }
 
-    private String reportTransferToPath(Long orderId, Long ownerId, String path) {
-        String autoReportPath = REPORT_UPLOAD_PATH + ownerId + "/" + orderId + "/vulReport";
-        String orderOwnerId = ownerId + "_" + orderId;
+    private String reportTransferToPath(String traceId, String path) {
+        String autoReportPath = REPORT_UPLOAD_PATH + traceId + "/vulReport";
         String downloadPath = autoReportPath + "/report.zip";
         File uploadFile = new File(autoReportPath);
         File downloadFile = new File(downloadPath);
@@ -145,7 +134,7 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
             FileInputStream inputStream = new FileInputStream(downloadFile);
             MultipartFile multipartFile = new MockMultipartFile(downloadFile.getName(), downloadFile.getName(), "", inputStream);
             log.info("----------------拷贝结束-------------------");
-            return ossUploadService.uploadReportZip(multipartFile, orderOwnerId);
+            return ossUploadService.uploadReportZip(multipartFile, traceId);
         } catch (IOException e) {
             log.info("----------copy error{}---------", e);
         } catch (ZipException e) {
@@ -154,7 +143,53 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
         return null;
     }
 
+
     @Override
+    public String copyReportBuilderToPath(String  traceId, String reportTypeBuilderName) {
+        File file = new File(BUILDER_COPYPATH + traceId);
+        File reportFile = new File(REPORT_SERVICE_PATH + reportTypeBuilderName + "-template");
+        System.out.println("Using reportFileTemplate: " + reportFile);
+        String command = "cp -r " + reportTypeBuilderName + " " + BUILDER_COPYPATH + traceId + "/";
+        System.out.println("Copy template report to reportBuilder: "+ command);
+        if (!file.exists()) {
+            log.info("-------------开始拷贝生成器---------------");
+            file.mkdirs();
+            try {
+                Process process = Runtime.getRuntime().exec(command, null, reportFile);
+                new Thread() {
+                    @Override
+                    public void run() {
+                        BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
+                        BufferedReader err = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+                        String line = null;
+                        String errLine = null;
+                        try {
+                            while ((line=in.readLine())!=null||(errLine=err.readLine())!=null) {
+                                if(line!=null)
+                                    log.info(line);
+                                if(errLine!=null)
+                                    log.info(errLine);
+                            }
+                        } catch (IOException e) {
+                            log.error("-------copyReportBuilder readInputstreamException:{}",e);
+                        } finally {
+                            try {
+                                in.close();
+                                err.close();
+                            }catch (IOException e){
+                                log.error("-------copyReportBuilder closeInputstreamException:{}",e);
+                            }
+                        }
+                    }
+                }.start();
+                process.waitFor();
+            } catch (Exception e) {
+                log.info("-------------copy reportBuild error{}--------------",e);
+            }
+        }
+        return BUILDER_COPYPATH + traceId;
+    }
+
     public void writeDataToJsonFile(String jsonData, String path) {
         File file = new File(path, "reportData.json");
         if (!file.getParentFile().exists()) {
@@ -218,53 +253,6 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
         }
     }
 
-
-    @Override
-    public String copyReportBuilderToPath(Long orderId, String reportTypeBuilderName) {
-        File file = new File(BUILDER_COPYPATH + orderId);
-        File reportFile = new File(REPORT_SERVICE_PATH + reportTypeBuilderName + "-template");
-        System.out.println("reportFile " + reportFile);
-        String command = "cp -r " + reportTypeBuilderName + " " + BUILDER_COPYPATH + orderId + "/";
-        System.out.println(command);
-        if (!file.exists()) {
-            log.info("-------------开始拷贝生成器---------------");
-            file.mkdirs();
-            try {
-                Process process = Runtime.getRuntime().exec(command, null, reportFile);
-                new Thread() {
-                    @Override
-                    public void run() {
-                        BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
-                        BufferedReader err = new BufferedReader(new InputStreamReader(process.getErrorStream()));
-                        String line = null;
-                        String errLine = null;
-                        try {
-                            while ((line=in.readLine())!=null||(errLine=err.readLine())!=null) {
-                                if(line!=null)
-                                    log.info(line);
-                                if(errLine!=null)
-                                    log.info(errLine);
-                            }
-                        } catch (IOException e) {
-                            log.error("-------copyReportBuilder readInputstreamException:{}",e);
-                        } finally {
-                            try {
-                                in.close();
-                                err.close();
-                            }catch (IOException e){
-                                log.error("-------copyReportBuilder closeInputstreamException:{}",e);
-                            }
-                        }
-                    }
-                }.start();
-                process.waitFor();
-            } catch (Exception e) {
-                log.info("-------------copy reportBuild error{}--------------",e);
-            }
-        }
-        return BUILDER_COPYPATH + orderId;
-    }
-
     @Override
     public String handleReportTemplate(String reportTypeName, String reportTemplateFileName) {
 

src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java

@@ -7,13 +7,21 @@ import cn.iselab.mooctest.site.web.data.ReportVO.AppAutoTestReportVO;
 import cn.iselab.mooctest.site.web.data.ReportVO.ReportDataVO;
 import cn.iselab.mooctest.site.web.data.ReportVO.StaticScanReportDataVO;
 import cn.iselab.mooctest.site.web.data.ReportVO.WebData;
+import org.apache.http.protocol.HTTP;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author guochao
@@ -32,12 +40,6 @@ public class HandleReportController {
     @Autowired
     private AutoReportProductService autoReportProductService;
 
-//    @Autowired
-//    private StaticScanReportDataVO staticScanReportDataVO;
-//
-//    @Autowired
-//    private ReportDataVO reportDataVO;
-
     private static final Logger log = LoggerFactory.getLogger(Process.class.getName());
 
 
@@ -51,17 +53,15 @@ public class HandleReportController {
 
     /**
      * 获取报告任务状态
-     * @param orderId
-     * @param ownerId
+     * @param traceId
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/status/order/{orderId}/owner/{ownerId}", method = RequestMethod.GET)
-    public Map getReportTaskStatus(@PathVariable(value = "orderId") Long orderId,
-                            @PathVariable(value = "ownerId") Long ownerId) {
+    @RequestMapping(value = "/api/report/status/{traceId}", method = RequestMethod.GET)
+    public Map getReportTaskStatus(@PathVariable(value = "traceId") String traceId) {
         Map<String, Object> map = new HashMap<>();
 
-        ReportTask reportTask = autoReportProductService.getReportTask(orderId, ownerId);
+        ReportTask reportTask = autoReportProductService.getReport(traceId);
         if(reportTask == null) {
             // 报告任务不存在
             map.put("status", ReportTaskStatus.INEXISTENCE);
@@ -87,71 +87,47 @@ public class HandleReportController {
     }
 
     /**
-     * 静态扫描任务
-     * @param orderId 任务ID
-     * @param ownerId 用户ID
-     * @param staticScanReportDataVO
+     * 静态扫描任务      static-scan-report
+     * web扫描任务       web-auto-test-report
+     * android扫描任务   app-auto-test-report
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/static-scan-report", method = RequestMethod.POST)
-    public Map handleStaticScanReport(@PathVariable(value = "orderId") Long orderId,
-                            @PathVariable(value = "ownerId") Long ownerId,
-                            @RequestBody StaticScanReportDataVO staticScanReportDataVO) {
-
-        log.info(staticScanReportDataVO.toString());
-        return generate(orderId, ownerId, staticScanReportDataVO, "static-scan-report");
+    @RequestMapping(value = "/api/report/generate/{reportType}", method = RequestMethod.POST)
+    public Map handleStaticScanReport(@PathVariable("reportType") String reportType, HttpServletRequest request) throws IOException {
+        // 读取请求内容
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(request.getInputStream()));
+        String line = null;
+        StringBuilder stringBuilder = new StringBuilder();
+        while((line = bufferedReader.readLine())!=null){
+            stringBuilder.append(line);
+        }
+        String jsonData = stringBuilder.toString();
+        String traceId = generateTraceId(reportType);
+        return generateReportRes(traceId, jsonData, reportType);
     }
 
-    /**
-     * web扫描任务
-     * @param orderId 任务ID
-     * @param ownerId 用户ID
-     * @param webData
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/web-auto-test-report", method = RequestMethod.POST)
-    public Map handleWebReport(@PathVariable(value = "orderId") Long orderId,
-                            @PathVariable(value = "ownerId") Long ownerId,
-                            @RequestBody WebData webData) {
-
-        log.info(webData.toString());
-        return generate(orderId, ownerId, webData, "web-auto-test-report");
+    private String generateTraceId(String reportType) {
+        String uuid = UUID.randomUUID().toString();
+        return reportType.substring(0,3) + "-" + uuid;
     }
 
-    /**
-     * android扫描任务
-     * @param orderId 任务ID
-     * @param ownerId 用户ID
-     * @param appAutoTestReportVO
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/app-auto-test-report", method = RequestMethod.POST)
-    public Map handleAppAutoTestReport(@PathVariable(value = "orderId") Long orderId,
-                            @PathVariable(value = "ownerId") Long ownerId,
-                            @RequestBody AppAutoTestReportVO appAutoTestReportVO) {
 
-        log.info(appAutoTestReportVO.toString());
-        return generate(orderId, ownerId, appAutoTestReportVO, "app-auto-test-report");
-    }
-
-    private Map<String, Object> generate(Long orderId, Long ownerId, ReportDataVO reportDataVO, String reportType){
+    private Map<String, Object> generateReportRes(String traceId, String jsonData, String reportType) {
         Map<String, Object> map = new HashMap<>();
         // 查询报告任务是否存在
-        ReportTask reportTask = autoReportProductService.getReportTask(orderId, ownerId);
+        ReportTask reportTask = autoReportProductService.getReport(traceId);
         if(reportTask != null) {
             // 报告任务已存在
             map.put("status", ReportTaskStatus.EXISTED);
             map.put("describe", "报告任务已存在");
         }else{
             // 报告任务不存在，生成报告
-            autoReportProductService.generateReport(orderId, ownerId, reportDataVO, reportType);
+            autoReportProductService.generateReport(traceId, jsonData, reportType);
+            map.put("traceId", traceId);
             map.put("status", ReportTaskStatus.GENERATING);
             map.put("describe", "报告生成中");
         }
         return map;
     }
-
 }

target/classes/application.yml

@@ -0,0 +1,83 @@
+spring:
+  profiles:
+    active: report-server-dev
+#    active: report-server-online
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8
+    #    username: mooctest
+    #    password: secr3t!
+    # Keep the connection alive if idle for a long time (needed in production)
+    testWhileIdle: true
+    validationQuery: SELECT 1
+    # Show or not log for each sql query
+  jpa:
+    show-sql: true
+  # Hibernate ddl auto (create, create-drop, update)
+  hibernate:
+    ddl-auto: validate
+    #hbm2ddl.auto: update
+    # Naming strategy
+    naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+  # The SQL dialect makes Hibernate generate better SQL for the chosen database
+  properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
+
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+oss:
+  accessKeyId: LTAI4FdrT3HsfdR5edBVN7ws
+  accessKeySecret: yroxrpm46DzTyzHrLBZzS3MRNIicP6
+  endPoint: oss-cn-hangzhou.aliyuncs.com
+  bucketName: mooctest-share
+
+sleep: 0
+
+# 配置输出日志
+logging:
+  level:
+    org.springframework.cloud.gateway: TRACE
+    org.springframework.http.server.reactive: DEBUG
+    org.springframework.web.reactive: DEBUG
+    reactor.ipc.netty: DEBUG
+
+#开启端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  security:
+    enabled: false
+---
+# 报告服务开发环境
+spring:
+  profiles: report-server-dev
+  datasource:
+    url: jdbc:mysql://106.14.81.62:3306/report_service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8
+    username: root
+    password: 123456
+order.autoReport.upload.path: /Users/guochao/Desktop/project/enterprise-mooctest-site/var/www/reportFile/
+order.autoReport.builder.copyPath: /Users/guochao/Desktop/project/enterprise-mooctest-site/var/www/reportBuilder/
+order.autoReport.service.path: /Users/guochao/Desktop/project/enterprise-mooctest-site/projects/mooctest-report-template/
+order.autoReport.service.template.path: /Users/guochao/Desktop/project/enterprise-mooctest-site/projects/mooctest-report-template/
+static.resource.autoReport.url: /reportFile/
+order.vulReport.json.upload.path: /src/json/
+host.ip: 106.14.81.62
+
+---
+# 报告服务线上环境
+spring:
+  profiles: report-server-online
+  datasource:
+    url: jdbc:mysql://106.14.81.62:3306/report_service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8
+    username: root
+    password: 123456
+static.resource.autoReport.url: /reportFile/
+order.autoReport.upload.path: /var/www/reportFile/
+order.autoReport.service.path: /root/mooctest-report-template/
+order.autoReport.service.template.path: /root/mooctest-report-template/
+order.autoReport.builder.copyPath: /var/www/reportBuilder/
+order.vulReport.json.upload.path: /src/json/
+host.ip: 106.14.81.62

target/classes/bootstrap.yaml

@@ -0,0 +1,57 @@
+server:
+    port: 8080
+spring:
+    application:
+        name: mooctest-report-service
+    cloud:
+        nacos:
+            discovery:
+                # 指定nacos server的地址
+                server-addr: 106.14.81.62:8848
+#            config:
+#                server-addr: 106.14.81.62:8848
+# actuator相关配置
+management:
+    endpoints:
+        web:
+            exposure:
+                # 暴露所有监控端点
+                include: '*'
+    endpoint:
+        health:
+            # 总是显示健康检测详情
+            show-details: always
+
+#spring:
+#    application:
+#        name: mooctest-report-service
+#    cloud:
+#        nacos:
+#            discovery:
+#                #        namespace: 98123199-6adc-41b1-9c28-a97c6ed0e689 # 分组（dev，test等）
+#                # 指定nacos server的地址
+#                server-addr: 106.14.81.62:8848
+#                namespace: 7b6ae537-56f8-4e80-b551-c143db51a389
+##                server-addr: 192.168.43.174:8848
+##                namespace: 98123199-6adc-41b1-9c28-a97c6ed0e689
+#            config:
+#                server-addr: 106.14.81.62:8848
+#                namespace: 7b6ae537-56f8-4e80-b551-c143db51a389
+##                namespace: 98123199-6adc-41b1-9c28-a97c6ed0e689 # 分组（dev，test等）
+##                server-addr: 192.168.43.174:8848
+#                file-extension: yaml
+#                ##        shared-dataids: pkcs8_rsa_private_key.pem,mongo.yaml,mysql.yaml,redis.yaml,xxl-job.yaml,mybatis-plus.yaml,actuator.yaml,mybatis-plus.yaml
+#                ##        refreshable-dataids: pkcs8_rsa_private_key.pem,mongo.yaml,mysql.yaml,redis.yaml,xxl-job.yaml,mybatis-plus.yaml,actuator.yaml,mybatis-plus.yaml
+#
+#                # 用于多配置项 （比如读取该项目的主配置之后，再读取一个单独的配置）
+#                ext-config[0]:                                      # 数组形式
+#                    data-id: 'mooctest-report-service-public.yml'   # 配置名称
+#                    group: 'MOOCTEST-REPORT'                        # 分组名称
+#                    refresh: true                                   # 是否动态刷新
+
+#        prefix: ${spring.application.name}
+# ${prefix}-${spring.profile.active}.${file-extension}
+# prefix 默认为 spring.application.name 的值，也可以通过配置项 spring.cloud.nacos.config.prefix来配置。
+# file-exetension 为配置内容的数据格式，可以通过配置项 spring.cloud.nacos.config.file-extension 来配置。目前只支持 properties 和 yaml 类型。
+#  profiles:
+#    active: dev