update: application.yml

.idea/workspace.xml

@@ -2,17 +2,11 @@
 <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__javax_servlet_javax_servlet_api_4_0_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_lingala_zip4j_zip4j_1_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_2_3_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_1_3_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_1_3_RELEASE.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/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.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/ctrl/HandleReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/web/ctrl/HandleReportController.class" 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$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -118,7 +112,7 @@
       <workItem from="1573797788287" duration="4744000" />
       <workItem from="1573803183351" duration="6316000" />
       <workItem from="1573817067721" duration="3410000" />
-      <workItem from="1573886504964" duration="1797000" />
+      <workItem from="1573886504964" duration="3058000" />
     </task>
     <servers />
   </component>

src/main/resources/application.properties

@@ -4,13 +4,13 @@
 #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
-
-
+#
+#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
+#
+#

src/main/resources/application.yml

@@ -1,3 +1,4 @@
+spring.profiles.active: report-server-dev
 sleep: 0
 
 # 配置输出日志
@@ -16,3 +17,25 @@ management:
         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.autoReport.image.upload.path: /mooctest-report/src/images/
+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.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/

target/classes/application.properties

@@ -4,13 +4,13 @@
 #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
-
-
+#
+#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

@@ -1,3 +1,4 @@
+spring.profiles.active: report-server-dev
 sleep: 0
 
 # 配置输出日志
@@ -16,3 +17,25 @@ management:
         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.autoReport.image.upload.path: /mooctest-report/src/images/
+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.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/