update: application.yml

.idea/workspace.xml

@@ -2,9 +2,55 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/bootstrap.yaml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/Application.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/AutoReportProductService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$1.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$2.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/ctrl/HandleReportController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/enums/VulVerifyStatus.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/Bug.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/DeviceBugListItem.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/DeviceDetailItem.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/DeviceDistributionData.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/DeviceUCListItem.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/FunctionalTestVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/GeneralResult.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/ScreenShot.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/TypePassResult.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/UCItemCaseInfo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/UCPassResult.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/UCResultDeviceItem.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/functionalTestData/UCResultItem.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/ActiveIssueDetailVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/AppBasicInfoVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/DeviceDetailVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/IssueDistributionAttributeVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/IssueDistributionVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/IssuePhoneVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/NeedOptimizedProblemVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/PerformanceDetailAttributeVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/PerformanceDetailItemVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/PerformanceSummaryAttributeVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/PerformanceSummaryItemVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/PieDataVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/ReportDataVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/reportData/TestResultVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/ProjectInfoVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/StatVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/Vul2TaskVo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/VulCheckVo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/VulReferenceVo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/VulReportDataVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/VulStatisticsVO.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/data/vulData/VulnerabilityVo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/example/demo/DemoApplicationTests.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/demo/DemoApplicationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/demo/DemoApplicationTests.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/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" />
@@ -110,7 +156,7 @@
       <workItem from="1573797788287" duration="4744000" />
       <workItem from="1573803183351" duration="6316000" />
       <workItem from="1573817067721" duration="3410000" />
-      <workItem from="1573886504964" duration="4423000" />
+      <workItem from="1573886504964" duration="5212000" />
     </task>
     <servers />
   </component>

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

@@ -17,8 +17,6 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
     private String REPORT_SERVICE_PATH;
     @Value("${order.autoReport.upload.path}")
     private String REPORT_UPLOAD_PATH;
-    @Value("${order.autoReport.image.upload.path}")
-    private String REPORT_IMAGE_UPLOAD_PATH;
     @Value("${order.autoReport.builder.copyPath}")
     private String BUILDER_COPYPATH;
     @Value("${static.resource.autoReport.url}")

src/main/resources/application.yml

@@ -25,7 +25,6 @@ order.autoReport.upload.path: /Users/guochao/Desktop/project/enterprise-mooctest
 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.autoReport.image.upload.path: /mooctest-report/src/images/
 order.vulReport.json.upload.path: /static-scan-report/src/json/
 host.ip: 106.14.81.62
 
@@ -35,8 +34,7 @@ spring:
   profiles: report-server-online
 static.resource.autoReport.url: /reportFile/
 order.autoReport.upload.path: /var/www/reportFile/
-order.autoReport.image.upload.path: /mooctest-report/src/images/
-order.autoReport.service.path: /projects/
+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/application.properties

@@ -0,0 +1,16 @@
+#static.resource.autoReport.url=/reportFile/
+#order.autoReport.upload.path=/var/www/reportFile/
+#order.autoReport.image.upload.path=/mooctest-report/src/images/
+#order.autoReport.service.path: /projects/
+#order.autoReport.builder.copyPath: /var/www/reportBuilder/
+#order.vulReport.json.upload.path=/static-scan-report/src/json/
+#
+#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.autoReport.image.upload.path=/mooctest-report/src/images/
+#order.vulReport.json.upload.path=/static-scan-report/src/json/
+#host.ip=106.14.81.62
+#
+#

target/classes/application.yml

@@ -0,0 +1,40 @@
+spring.profiles.active: report-server-dev
+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
+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
+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: 8082
+spring:
+    application:
+        name: mooctest-report-server
+    cloud:
+        nacos:
+            discovery:
+                # 指定nacos server的地址
+                server-addr: 127.0.0.1:8848
+
+# actuator相关配置
+management:
+    endpoints:
+        web:
+            exposure:
+                # 暴露所有监控端点
+                include: '*'
+    endpoint:
+        health:
+            # 总是显示健康检测详情
+            show-details: always