guochao 5 éve
szülő
commit
6743462e2a

+ 2 - 3
.idea/workspace.xml

@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <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/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/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/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" />
@@ -124,7 +123,7 @@
       <workItem from="1574148794239" duration="247000" />
       <workItem from="1574243622969" duration="17039000" />
       <workItem from="1574324790942" duration="17204000" />
-      <workItem from="1574392825833" duration="3103000" />
+      <workItem from="1574392825833" duration="3457000" />
     </task>
     <servers />
   </component>

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

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

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

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