guochao пре 5 година
родитељ
комит
2369a70c8d

+ 3 - 71
.idea/workspace.xml

@@ -2,78 +2,10 @@
 <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__com_aliyun_aliyun_java_sdk_core_4_4_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_2_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_5_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_24.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_24.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_24.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_3.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/configuration/DefaultView.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/configuration/OSSConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/UploadType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/UploadService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/OSSUploadServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/index_tem.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/jquery.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_39_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_39_Final.xml" beforeDir="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__io_projectreactor_netty_reactor_netty_0_8_11_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_javax_el_3_0_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_1_8_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_1_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_8_RELEASE.xml" afterDir="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/libraries/Maven__org_springframework_spring_webflux_5_1_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.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/Exception/BaseException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/exception/BaseException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/Exception/ReportTaskNotExistException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/exception/ReportTaskNotExistException.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/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$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/Exception/BaseException.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/Exception/BaseException.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/Exception/ReportTaskNotExistException.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/Exception/ReportTaskNotExistException.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/domainObject/ReportTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/domainObject/ReportTask.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/model/ReportTaskPO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/model/ReportTaskPO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/repository/ReportTaskRepo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/repository/ReportTaskRepo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/AutoReportProductService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/AutoReportProductService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.class" 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/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java" 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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -192,7 +124,7 @@
       <workItem from="1574148794239" duration="247000" />
       <workItem from="1574243622969" duration="17039000" />
       <workItem from="1574324790942" duration="17204000" />
-      <workItem from="1574392825833" duration="591000" />
+      <workItem from="1574392825833" duration="2061000" />
     </task>
     <servers />
   </component>

+ 4 - 0
src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java

@@ -267,15 +267,19 @@ public class AutoReportProductServiceImpl implements AutoReportProductService {
 //        System.out.println(oldTemplateFile);
 
         // 删除原本的报告模板文件
+        log.info("oldTemplateFile " + oldTemplateFile);
         File file=new File(oldTemplateFile);//路径
         deleteFile(file);
+        log.info("删除oldTemplateFile " + oldTemplateFile);
 
         String pathFile = REPORT_SERVICE_TEMPLATE_PATH + reportTypeName+ "/";
         String zipPath = pathFile + reportTemplateFileName;
 //        System.out.println(pathFile);
 //        System.out.println(zipPath);
         // 解压zip
+        log.info("解压zip " + zipPath);
         decompressZip(zipPath, pathFile + "/");
+        log.info("解压zip SUCCESS");
         return "SUCCESS";
     }
 

+ 2 - 0
src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java

@@ -34,7 +34,9 @@ public class UploadController {
     public String uploadGeneralFile(MultipartFile file) throws IOException {
         // 将文件上传至本地服务器中
 
+        log.info("save file to server");
         String fileName = file.getOriginalFilename();
+        log.info("fileName " + fileName);
         String name = fileName.substring(0,fileName.indexOf("."));
         uploadFile(name, file);
         autoReportProductService.handleReportTemplate(name,fileName);

+ 2 - 1
src/main/resources/static/index.html

@@ -442,7 +442,8 @@ body {
     var xhr;
     function UpladFile() {
         var fileObj = document.getElementById("file").files[0]; // js 获取文件对象
-        var url = "http://localhost:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
+		// var url = "http://127.0.0.1:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
+        var url = "http://106.14.81.62:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
 
         var form = new FormData(); // FormData 对象
         form.append("file", fileObj); // 文件对象