update: status

.idea/workspace.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="" />
+    <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/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/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" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,6 +118,9 @@
       <workItem from="1573817067721" duration="3410000" />
       <workItem from="1573886504964" duration="7019000" />
       <workItem from="1574039613479" duration="16845000" />
+      <workItem from="1574084268566" duration="729000" />
+      <workItem from="1574148794239" duration="247000" />
+      <workItem from="1574243622969" duration="3831000" />
     </task>
     <servers />
   </component>

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

@@ -5,6 +5,7 @@ package cn.iselab.mooctest.site.domainObject;
  * @date 2019-11-18 16:24
  */
 public class ReportTaskStatus {
-    public static final int GENERATING = 0; //报告任务生成中
-    public static final int COMPLETED = 1;  //报告任务已完成
+    public static final int GENERATING = 1; //报告任务生成中
+    public static final int COMPLETED = 0;  //报告任务已完成
+    public static final int INEXISTENCE = -1; //报告任务不存在
 }

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

@@ -15,7 +15,7 @@ public interface AutoReportProductService {
 
     ReportTask getReportTask(Long orderId, Long ownerId);
 
-    Future<String> generateReport(Long orderId, Long ownerId, VulReportDataVO reportData) throws InterruptedException;
+    Future<String> generateReport(Long orderId, Long ownerId, VulReportDataVO reportData);
 
     void writeDataToJsonFile(String jsonData,String path);
 

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

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.dao.ReportTaskDao;
 import cn.iselab.mooctest.site.domainObject.ReportTask;
 import cn.iselab.mooctest.site.domainObject.ReportTaskStatus;
 import cn.iselab.mooctest.site.factory.ReportTaskFactory;
@@ -59,9 +58,8 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
 
     @Async
     @Override
-    public Future<String> generateReport(Long orderId, Long ownerId, VulReportDataVO reportData) throws InterruptedException {
+    public Future<String> generateReport(Long orderId, Long ownerId, VulReportDataVO reportData) {
         log.info("开始做任务" + orderId);
-        log.info("当前线程:" + Thread.currentThread().getName() + "=-=====queryUserMsgCount");
         //存入数据库
         ReportTask reportTask = ReportTaskFactory.createReportTask();
         reportTask.setTaskId(orderId);
@@ -79,7 +77,6 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
         }
         String taskUrl = "http://" + HOST_IP + "/reportFile/" + ownerId + "/" + orderId + "/vulReport/dist/vulResults.html";
 
-
         //存入数据库
         reportTask.setId(reportTaskId);
         reportTask.setTaskUrl(taskUrl);
@@ -169,8 +166,7 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
 
             int status = process.waitFor();
             if (status == 0) {
-                log.info(String.valueOf(status));
-//                System.out.println(status);
+//                log.info(String.valueOf(status));
                 return true;
             }
             return false;

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

@@ -1,33 +1,24 @@
 package cn.iselab.mooctest.site.web.ctrl;
 
 import cn.iselab.mooctest.site.domainObject.ReportTask;
+import cn.iselab.mooctest.site.domainObject.ReportTaskStatus;
 import cn.iselab.mooctest.site.service.AutoReportProductService;
 import cn.iselab.mooctest.site.web.data.vulData.ProjectInfoVO;
 import cn.iselab.mooctest.site.web.data.vulData.VulReportDataVO;
 import cn.iselab.mooctest.site.web.data.vulData.VulStatisticsVO;
 import cn.iselab.mooctest.site.web.data.vulData.VulnerabilityVo;
-import net.lingala.zip4j.exception.ZipException;
-import net.lingala.zip4j.model.ZipParameters;
-import net.lingala.zip4j.util.Zip4jConstants;
-import org.apache.commons.io.FileUtils;
 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.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.web.bind.annotation.*;
-import com.google.gson.Gson;
-import java.io.*;
 import java.sql.Timestamp;
 import java.util.*;
-import java.util.concurrent.Future;
 
 /**
  * @author guochao
  * @date 2019-11-14 22:22
  */
-
 @RestController
 public class HandleReportController {
 
@@ -43,8 +34,50 @@ public class HandleReportController {
 
     private static final Logger log = LoggerFactory.getLogger(Process.class.getName());
 
-//    @RequestMapping(value = "/generate/report/{orderId}/{ownerId}", method = RequestMethod.GET)
-//    public String generateReport(@PathVariable(value = "orderId") Long orderId, @PathVariable(value = "ownerId") Long ownerId){
+    /**
+     * 获取报告任务状态
+     * @param orderId
+     * @param ownerId
+     * @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) {
+        Map<String, Object> map = new HashMap<>();
+
+        ReportTask reportTask = autoReportProductService.getReportTask(orderId, ownerId);
+        if(reportTask == null) {
+            // 报告任务不存在
+            map.put("status", ReportTaskStatus.INEXISTENCE);
+            map.put("describe", "报告任务不存在");
+        }else{
+            // 报告任务存在
+            if(reportTask.getStatus() == ReportTaskStatus.GENERATING){
+                // 报告任务正在执行
+                map.put("status", ReportTaskStatus.GENERATING);
+                map.put("describe", "报告生成中");
+            }else{
+                // 报告任务执行结束，返回任务状态和url
+                map.put("status", ReportTaskStatus.COMPLETED);
+                map.put("describe", "报告生成结束");
+                map.put("url",reportTask.getTaskUrl());
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 生成报告
+     * @param orderId 任务ID
+     * @param ownerId 用户ID
+     * @param vulReportDataVO
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/api/generate/report/order/{orderId}/owner/{ownerId}", method = RequestMethod.POST)
+    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
+                               @PathVariable(value = "ownerId") Long ownerId, @RequestBody VulReportDataVO vulReportDataVO) {
 //        List<String> menus = new ArrayList<>();
 //        menus.add("APK扫描");
 //        ProjectInfoVO projectInfoVO = new ProjectInfoVO();
@@ -60,100 +93,12 @@ public class HandleReportController {
 //        vulReportDataVO.setProjectInfo(projectInfoVO);
 //        vulReportDataVO.setVulnerability(vulnerabilityVos);
 //        vulReportDataVO.setVulStatistics(vulStatisticsVO);
-//        System.out.println(vulReportDataVO.toString());
-//        handleReport(orderId, ownerId, vulReportDataVO);
-//
-//    }
-
-
-    //    @RequiresPermissions("task:create")
-//    @RequestMapping(value = "generate/report", method = RequestMethod.POST)
-//    private void handleReport(Long orderId, Long ownerId, VulReportDataVO reportData) {
-//        String builderPath = autoReportProductService.copyReportBuilderToPath(orderId, "static-scan-report");
-//        autoReportProductService.writeDataToJsonFile(new Gson().toJson(reportData), builderPath + REPORT_JSON_UPLOAD_PATH);
-//        boolean bale = autoReportProductService.runBuilderToProductReport("npm run build", builderPath + "/static-scan-report/");
-//        if (bale) {
-//            reportTransferToPath(orderId, ownerId, builderPath + "/static-scan-report/");
-//        }
-//    }
-
-    /**
-     *
-     * @param orderId 任务ID
-     * @param ownerId 用户ID
-//     * @param reportData
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/generate/report/order/{orderId}/owner/{ownerId}", method = RequestMethod.POST)
-    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
-                               @PathVariable(value = "ownerId") Long ownerId) throws Exception {
-        List<String> menus = new ArrayList<>();
-        menus.add("APK扫描");
-        ProjectInfoVO projectInfoVO = new ProjectInfoVO();
-        projectInfoVO.setCostTime("2019/11/15");
-        projectInfoVO.setProjectName("途牛APP");
-        projectInfoVO.setStartTime(new Timestamp(new Date().getTime()));
-        projectInfoVO.setUserName("郭超");
-        List<VulnerabilityVo> vulnerabilityVos = new ArrayList<>();
-        VulStatisticsVO vulStatisticsVO = new VulStatisticsVO();
-
-        VulReportDataVO vulReportDataVO = new VulReportDataVO();
-        vulReportDataVO.setMenus(menus);
-        vulReportDataVO.setProjectInfo(projectInfoVO);
-        vulReportDataVO.setVulnerability(vulnerabilityVos);
-        vulReportDataVO.setVulStatistics(vulStatisticsVO);
 
+        autoReportProductService.generateReport(orderId, ownerId, vulReportDataVO);
         Map<String, Object> map = new HashMap<>();
-
-        ReportTask reportTask = autoReportProductService.getReportTask(orderId, ownerId);
-        if(reportTask == null){
-            // 没有当前报告任务，执行报告生成任务
-            autoReportProductService.generateReport(orderId, ownerId, vulReportDataVO);
-            map.put("status", -1);
-            map.put("describe", "异步生成报告");
-        }else if(reportTask.getStatus() == 0){
-            // 报告任务正在执行
-            map.put("status", 0);
-            map.put("describe", "报告生成中");
-        }else{
-            // 报告任务执行结束，返回任务状态和url
-            map.put("status", 1);
-            map.put("describe", "报告生成结束");
-            map.put("url",reportTask.getTaskUrl());
-        }
+        map.put("status", ReportTaskStatus.GENERATING);
+        map.put("describe", "报告生成中");
         return map;
     }
 
-
-
-
-
-//    @RequestMapping(value = "/download/report/{orderId}/{ownerId}", method = RequestMethod.GET)
-//    public void downloadFile(@PathVariable(value = "orderId") Long orderId, @PathVariable(value = "ownerId") Long ownerId, HttpServletResponse response){
-//
-//        String filePath = REPORT_UPLOAD_PATH + ownerId + "/" + orderId + "/vulReport/";
-//        String fileName = "report.zip";
-//        response.setCharacterEncoding("utf-8");
-//        try {
-//            File file=new File(filePath,fileName);
-//            // 以流的形式下载文件。
-//            BufferedInputStream fis = new BufferedInputStream(new FileInputStream(file.getPath()));
-//            byte[] buffer = new byte[fis.available()];
-//            fis.read(buffer);
-//            fis.close();
-//            // 清空response
-//            response.reset();
-//            OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
-//            response.setContentType("application/octet-stream");
-//            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-//            toClient.write(buffer);
-//            toClient.flush();
-//            toClient.close();
-//        }
-//        catch (IOException ex) {
-//            ex.printStackTrace();
-//        }
-//    }
-
 }

target/classes/application.yml

@@ -0,0 +1,70 @@
+spring:
+  profiles:
+    active: report-server-dev
+  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
+
+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/
+static.resource.autoReport.url: /reportFile/
+order.vulReport.json.upload.path: /static-scan-report/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/
+order.autoReport.builder.copyPath: /var/www/reportBuilder/
+order.vulReport.json.upload.path: /static-scan-report/src/json/
+host.ip: 106.14.81.62

target/classes/bootstrap.yaml

@@ -0,0 +1,22 @@
+server:
+    port: 8080
+spring:
+    application:
+        name: mooctest-report-service
+    cloud:
+        nacos:
+            discovery:
+                # 指定nacos server的地址
+                server-addr: 127.0.0.1:8848
+
+# actuator相关配置
+management:
+    endpoints:
+        web:
+            exposure:
+                # 暴露所有监控端点
+                include: '*'
+    endpoint:
+        health:
+            # 总是显示健康检测详情
+            show-details: always