add log and upload process

.idea/workspace.xml

@@ -2,15 +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$/src/main/resources/logback.xml" 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/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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/index_tem.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/index_tem.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,6 +19,7 @@
       <list>
         <option value="Interface" />
         <option value="Class" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -41,6 +38,7 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="PropertiesComponent">
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
     <property name="RequestMappingsPanelWidth0" value="75" />
@@ -48,7 +46,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
@@ -64,11 +62,11 @@
       <recent name="cn.iselab.mooctest.site.service" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/main/resources" />
       <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/src/main" />
       <recent name="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/ReportVO" />
       <recent name="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/AppAutoTestData" />
-      <recent name="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/data/webData" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -159,7 +157,7 @@
       <workItem from="1582719343080" duration="4019000" />
       <workItem from="1583024656089" duration="310000" />
       <workItem from="1583115499177" duration="528000" />
-      <workItem from="1583155605297" duration="9435000" />
+      <workItem from="1583155605297" duration="14779000" />
     </task>
     <servers />
   </component>

src/main/resources/application.yml

@@ -50,6 +50,9 @@ management:
         include: '*'
   security:
     enabled: false
+
+logging.all.level: info
+logging.levelfile: /root/logs/mooctest-report
 ---
 # 报告服务开发环境
 spring:
@@ -65,6 +68,8 @@ order.autoReport.service.template.path: /Users/guochao/Desktop/project/enterpris
 static.resource.autoReport.url: /reportFile/
 order.vulReport.json.upload.path: /src/json/
 host.ip: 106.14.81.62
+logging.all.level: info
+logging.levelfile: /Users/guochao/Desktop/logs/report-service-log
 
 ---
 # 报告服务线上环境

src/main/resources/logback.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <property resource="application.yml"></property>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="${logging.levelfile}" />
+    <property name="LOG_LEVEL" value="${logging.all.level}" />
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg  %n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>90</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>1GB</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+
+    <!--<logger name="com.zaxxer" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="org.apache.ibatis" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="org.mybatis.spring" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="org.springframework" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="java.sql.Connection" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="java.sql.Statement" level="${LOG_LEVEL}"/>-->
+    <!--<logger name="java.sql.PreparedStatement" level="${LOG_LEVEL}"/>-->
+
+    <!-- 日志输出级别 -->
+    <root level="${LOG_LEVEL}">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>

src/main/resources/static/index.html

@@ -43,6 +43,8 @@ body {
   -webkit-transform: translateY(20px);
           transform: translateY(20px);
   opacity: 0;
+	text-align: center;
+	margin: 0px auto;
 }
 .upload .upload-files header {
   background: #4db6ac;
@@ -345,7 +347,7 @@ body {
   -webkit-transform: translateY(15px);
           transform: translateY(15px);
   opacity: 0;
-  margin-left: calc(50% - 40px);
+  /*margin-left: calc(50% - 40px);*/
 }
 .upload .upload-files footer .importar.active {
   -webkit-transition: opacity .5s 1.5s ease, -webkit-transform .5s 1.5s ease;
@@ -432,7 +434,7 @@ body {
 			<div class="list-files">
 				<!--   template   -->
 			</div>
-			<button class="importar" onclick="UpladFile()">UPDATE FILES</button>
+			<button class="importar" onclick="UpladFile()">上传</button>
 <!--            <button class="importar" onclick="cancleUploadFile()">CALCLE FILES</button>-->
 		</footer>
 	</div>
@@ -442,7 +444,7 @@ body {
     var xhr;
     function UpladFile() {
         var fileObj = document.getElementById("file").files[0]; // js 获取文件对象
-		// var url = "http://127.0.0.1:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
+		// var url = "http://localhost:8080" + "/api/report/generalReportTemplate"; // 接收上传文件的后台地址
         var url = "http://106.14.81.62:8080" + "/api/report/generalReportTemplate"; // 接收上传文件的后台地址
 
         var form = new FormData(); // FormData 对象
@@ -452,9 +454,26 @@ body {
         xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。
         xhr.onload = uploadComplete; //请求完成
         xhr.onerror = uploadFailed; //请求失败
+		xhr.upload.onprogress = progressFunction; // 添加 监听函数
         xhr.send(form); //开始上传，发送form数据
     }
 
+	// 处理上传进度
+	function progressFunction(e){
+		var progress_bar = document.getElementById("progress_bar");
+		var loading_dom = document.getElementById("loading");
+		var loading = Math.round(e.loaded / e.total * 100);
+		// console.log("loading::", loading);
+
+		if(loading === 100){
+			loading_dom.innerHTML = "上传成功";
+		}else{
+			loading_dom.innerHTML = "上传进度"+loading+"%"
+		}
+
+		progress_bar.style.width = String(loading * 3) + "px";
+	}
+
     //上传成功响应
     function uploadComplete(evt) {
         //服务断接收完文件返回的结果
@@ -466,7 +485,7 @@ body {
         // } else {
         //     alert("上传失败！");
         // }
-        alert("上传成功！");
+        alert("服务器模板替换成功！");
     }
 
     //上传失败
@@ -500,7 +519,15 @@ App.init = (function() {
                                 </a>
                             </div>
                         </div>`)
-            .join("")}`;
+            .join("")}`+`
+            <div style="text-align: left;display: inline-block;width: 300px; height: 20px; border: 1px solid #4EB6AC; border-radius: 5px;position: relative">
+				<div id="progress_bar" style="display: inline-block; width: 0px; height: 20px;background-color: #05E1BA"></div>
+				<div style="text-align: center;width: 300px;position: absolute; top: 0; font-size:14px; color: #4EB6AC">
+					<div id="loading">
+						上传进度0%
+					</div>
+				</div>
+			</div>`;
 
 		$("#drop").classList.add("hidden");
 		$("footer").classList.add("hasFiles");
@@ -549,7 +576,15 @@ App.init = (function() {
                                 </a>
                             </div>
                         </div>`)
-        .join("")}`;
+        .join("")}`+`
+            <div style="text-align: left;display: inline-block;width: 300px; height: 20px; border: 1px solid #fff; border-radius: 2px;position: relative">
+				<div id="progress_bar" style="display: inline-block; width: 0px; height: 20px;background-color: #05EED8"></div>
+					<div style="text-align: center;width: 300px;position: absolute; top: 0; font-size:16px; color: #413F43">
+					<div id="loading">
+						上传进度0%
+					</div>
+				</div>
+			</div>`;
 
         $("#drop").classList.add("hidden");
         $("footer").classList.add("hasFiles");
@@ -577,14 +612,14 @@ App.init = (function() {
 	};
 
 	//upload more
-	$(".importar").addEventListener("click", () => {
-		$(".list-files").innerHTML = "";
-		$("footer").classList.remove("hasFiles");
-		$(".importar").classList.remove("active");
-		setTimeout(() => {
-			$("#drop").classList.remove("hidden");
-		}, 500);
-	});
+	// $(".importar").addEventListener("click", () => {
+	// 	$(".list-files").innerHTML = "";
+	// 	$("footer").classList.remove("hasFiles");
+	// 	// $(".importar").classList.remove("active");
+	// 	// setTimeout(() => {
+	// 	// 	$("#drop").classList.remove("hidden");
+	// 	// }, 500);
+	// });
 
 	// input change
 	$("input[type=file]").addEventListener("change", handleFileSelect);

src/main/resources/static/index_tem.html

@@ -10,7 +10,7 @@
 		//上传文件方法
 		function UpladFile() {
 			var fileObj = document.getElementById("file").files[0]; // js 获取文件对象
-			var url = "http://localhost:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
+			var url = "http://localhost:8080" + "/api/report/generalReportTemplate"; // 接收上传文件的后台地址
 
 			var form = new FormData(); // FormData 对象
 			form.append("file", fileObj); // 文件对象
@@ -34,6 +34,7 @@
 			//服务断接收完文件返回的结果
 
 			var data = JSON.parse(evt.target.responseText);
+			console.log(evt);
 			if (data.success) {
 				alert("上传成功！");
 			} else {

target/classes/application.yml

@@ -0,0 +1,88 @@
+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
+
+logging.all.level: info
+logging.levelfile: /root/logs/mooctest-report
+---
+# 报告服务开发环境
+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
+logging.all.level: info
+logging.levelfile: /Users/guochao/Desktop/logs/report-service-log
+
+---
+# 报告服务线上环境
+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