update: api

.idea/workspace.xml

@@ -2,36 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportAction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportAppBaseInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBug.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBugCluster.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBugDistribution.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBugInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportBugListInfoForTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportDeviceInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportDeviceListInfoForTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportLabel.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportPie.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportTableBug.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData/AppAutoTestReportType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/ReportVO/AppAutoTestReportVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/ReportVO/WebData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataBrowserStat.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataBugDetail.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataCategoryStat.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataEnvironment.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataPlatformStat.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataProjectInfoVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataRiskLevelStat.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataVulStatistic.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/WebScanData/WebDataVulnerability.java" afterDir="false" />
       <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/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/StaticScanData/ReportDataVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/ReportVO/ReportDataVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/StaticScanData/StaticScanReportDataVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/ReportVO/StaticScanReportDataVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -155,7 +128,7 @@
       <workItem from="1574392825833" duration="6599000" />
       <workItem from="1575964187611" duration="5133000" />
       <workItem from="1576044658914" duration="312000" />
-      <workItem from="1576141062434" duration="2004000" />
+      <workItem from="1576141062434" duration="3049000" />
     </task>
     <servers />
   </component>

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

@@ -83,7 +83,7 @@ public class HandleReportController {
      */
     @ResponseBody
     @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
-    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
+    public Map handleStaticScanReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
                             @PathVariable(value = "reportType") String reportType,
                             @RequestBody StaticScanReportDataVO staticScanReportDataVO) {
@@ -100,8 +100,8 @@ public class HandleReportController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
-    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
+    @RequestMapping(value = "/api/report/generate/web/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    public Map handleWebReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
                             @PathVariable(value = "reportType") String reportType,
                             @RequestBody WebData webData) {
@@ -118,8 +118,8 @@ public class HandleReportController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
-    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
+    @RequestMapping(value = "/api/report/generate/app/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    public Map handleAppAutoTestReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
                             @PathVariable(value = "reportType") String reportType,
                             @RequestBody AppAutoTestReportVO appAutoTestReportVO) {