去除上传配置，解决Win/Mac环境下启动时，需要修改dev配置的bug

src/main/java/edu/math/diagnosis/config/DiagnosisConfig.java

@@ -26,7 +26,7 @@ public class DiagnosisConfig {
 
     private static final Logger logger = LoggerFactory.getLogger(DiagnosisConfig.class);
 
-    @Bean
+//    @Bean
     public UploadProperties uploadProperties() {
         String[] dirs = {tempLocation, uploadLocation + UploadProperties.DOC_PATH, uploadLocation + UploadProperties.OTHER_PATH,
                 uploadLocation + UploadProperties.IMAGE_PATH, uploadLocation + UploadProperties.EXCEL_PATH};

src/main/java/edu/math/diagnosis/config/MvcConfig.java

@@ -12,7 +12,7 @@ import javax.annotation.Resource;
 @Configuration
 public class MvcConfig {
 
-    @Resource
+//    @Resource
     private UploadProperties uploadProperties;
 
     @Bean
@@ -26,10 +26,10 @@ public class MvcConfig {
                 registry.addViewController("/hello").setViewName("hello");
             }
 
-            public void addResourceHandlers(ResourceHandlerRegistry registry) {
-                registry.addResourceHandler(uploadProperties.getUploadPattern())
-                        .addResourceLocations("file:" + uploadProperties.getUploadLocation());
-            }
+//            public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//                registry.addResourceHandler(uploadProperties.getUploadPattern())
+//                        .addResourceLocations("file:" + uploadProperties.getUploadLocation());
+//            }
         };
     }
 

src/main/java/edu/math/diagnosis/config/WebSecurityConfig.java

@@ -37,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Resource
     private UserService userService;
-    @Resource
+//    @Resource
     private UploadProperties uploadProperties;
 
     @Value("${web.loginPage:/login}")
@@ -147,7 +147,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     public void configure(WebSecurity web) {
         web.ignoring().antMatchers("/resources/**", "/static/**", "/**.js");
-        web.ignoring().antMatchers(uploadProperties.getUploadPattern());
+//        web.ignoring().antMatchers(uploadProperties.getUploadPattern());
         web.ignoring().antMatchers("/**/*.js", "/lang/*.json", "/**/*.css", "/**/*.map", "/**/*.png",
                 "/**/*.jpg", "/**/*.woff", "/**/*.ttf", "/*.ico");
         web.ignoring().antMatchers(permitUrls);

src/main/java/edu/math/diagnosis/controller/FileController.java

@@ -2,7 +2,6 @@ package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.file.FileService;
 import edu.math.diagnosis.model.ResponseMessage;
-import edu.math.diagnosis.file.LocalFileService;
 import edu.math.diagnosis.util.OSSUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/edu/math/diagnosis/controller/QuestionController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
@@ -29,7 +30,7 @@ import java.util.concurrent.ExecutorService;
 public class QuestionController {
     @Resource
     private QuestionService questionService;
-    @Resource
+//    @Resource
     private UploadProperties properties;
     @Resource
     private ExecutorService executorService;
@@ -66,18 +67,21 @@ public class QuestionController {
     })
     public Result uploadQuestion(Long pid, Integer section, @RequestParam(required = false) Integer number,
                                  @RequestBody MultipartFile file) throws Exception {
-        String date = DateUtil.format(new Date(), "yyMMdd_HHmmss_");
+//        String date = DateUtil.format(new Date(), "yyMMdd_HHmmss_");
         //暂时缓存到本地
-        String saveName = properties.getUploadLocation() + date + file.getOriginalFilename();
-        byte[] data = file.getBytes();
-        byte[] clone = data.clone();
-        executorService.submit(() -> {
-            try {
-                FileCopyUtils.copy(clone, new File(saveName));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
+//        String saveName = properties.getUploadLocation() + date + file.getOriginalFilename();
+//        byte[] data = file.getBytes();
+//        byte[] clone = data.clone();
+//        executorService.submit(() -> {
+//            try {
+//                FileCopyUtils.copy(clone, new File(saveName));
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        });
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        FileCopyUtils.copy(file.getInputStream(), baos);
+        byte[] data = baos.toByteArray();
         return questionService.parseQuestion(pid, section, number, data);
     }
 }

src/main/java/edu/math/diagnosis/file/LocalFileService.java

@@ -15,7 +15,7 @@ import java.io.*;
 
 public class LocalFileService implements FileService{
 
-    @Resource
+//    @Resource
     private UploadProperties properties;
 
     private static final Logger logger = LoggerFactory.getLogger(LocalFileService.class);

src/main/java/edu/math/diagnosis/service/PaperService.java

@@ -242,8 +242,8 @@ public class PaperService {
         //TODO convert parse exception to reason
         //TODO use parallel
 //        Result<Paper> paperResult = add(paper);
-        return addWithQuestion(paper);
-//        return Result.ok(paper);
+//        return addWithQuestion(paper);
+        return Result.ok(paper);
     }
 
     private Map<String, List<XWPFParagraph>> initSections(Paper paper, String sectionPattern, String questionPattern, String picturePattern, List<XWPFParagraph> paragraphs) {

src/main/resources/application-dev.properties

@@ -1,12 +1,12 @@
 server.port=8085
 serverAddress=119.23.22.31
 
-uploadPattern=/upload/**
-#baseLocation=d:/diagnosis
+#uploadPattern=/upload/**
+#baseLocation=diagnosis
 #baseLocation=/Users/feick/IdeaProjects/yaoxiang/diagnosis
-baseLocation=/d:/diagnosis
-uploadLocation=${baseLocation}/upload/
-spring.servlet.multipart.location=${baseLocation}/uploadTemp/
+#baseLocation=/d:/diagnosis
+#uploadLocation=${baseLocation}/upload/
+#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${uploadLocation}
 
 #spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8